modularised code and fixed misc. erros in .github/scripts/parse_rpt.py

.github/scripts/parse_rpt.py

@@ -1,6 +1,9 @@
 import sys
 import json
 import os
+import re, subprocess
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+from common.check_gen_files import check_gen_files
 
 sys.stdout.flush()
 
@@ -14,6 +17,7 @@
     drc_filename = "work/"+sys.argv[1]+"/6_final_drc.rpt"
     lvs_filename = "work/"+sys.argv[1]+"/6_final_lvs.rpt"
 
+# using full because sims disabled for LDO for now
 if (len(sys.argv) > 1) and ((sys.argv[1] == "sky130hvl_ldo") or (sys.argv[1] == "sky130hvl_ldo_full")):
     with open(drc_filename, 'r') as f1, open("../../../.github/scripts/expected_drc_reports/expected_ldo_drc.rpt", 'r') as f2:
         content1 = f1.readlines()
@@ -27,6 +31,7 @@
 else:
     print("DRC is clean!")
 
+# cryo LVS check 
 if (len(sys.argv) > 1) and (sys.argv[1] == "sky130hd_cryo"):
     lvs_line = subprocess.check_output(["tail", "-1", lvs_filename]).decode(
         sys.stdout.encoding
@@ -48,31 +53,14 @@
             print("LVS is clean!")
 
 if ((len(sys.argv) > 1) and ((sys.argv[1] == "sky130hvl_ldo") or (sys.argv[1] == "sky130hvl_ldo_full"))) or ((len(sys.argv) > 1) and (sys.argv[1] == "sky130hd_cryo")):
-    print("Generator check is clean!")
+    print("Flow check is clean!")
 else:
     json_filename = "test.json"
+
     if os.path.exists(json_filename):
-        with open(json_filename) as file:
-        	data = json.load(file)
-        print('Found .json config file...')
-
-        module_name = data.get("module_name", "default")
-
-        work_dir = "./work/"
-
-        if (os.path.exists(work_dir) == 0):
-            raise ValueError("work directory does not exist!")
+        if check_gen_files():
+            print("Flow check is clean!")
         else:
-            filename = work_dir + module_name
-            for file in (filename + ".gds", filename + ".spice", filename + ".v", filename + ".def", filename + "_pex.spice", filename + ".sdc"):
-                if (os.path.exists(file) == 0):
-                    raise ValueError(file + " does not exist!")
-        print("Found necessary work result files!")
-
-        for file in ("error_within_x.csv", "golden_error_opt.csv", "search_result.csv"):
-            if os.path.exists(file) == 0:
-                raise ValueError(file + " does not exist!")
-        print("Found generated .csv files!")
-        print("Generator check is clean!")
+            print("Flow check failed!")
     else:
         raise ValueError(".json config file not found!")

openfasoc/generators/common/__init__.py

@@ -7,6 +7,8 @@
 	2. `COMMON_PLATFORMS_PREFIX_MAP` (dict): This is a dictionary of common platforms (currently sky130) and their cell naming prefixes.
 - `common.simulation`
 	1. `run_simulations()`: Used to run SPICE testbenches with multiple parameters.
+- `common.check_gen_files`
+	1. `check_gen_files()`: Used to check if the various files that should be generated by the flow are present in their required directories. 
 
 See individual function documentation for more information on a particular function.
 """

openfasoc/generators/common/check_gen_files.py

@@ -0,0 +1,29 @@
+import json
+import os
+
+def check_gen_files():
+    with open('test.json', 'r') as file:
+        data = json.load(file)
+
+    # print('Found .json config file...')
+
+    module_name = data.get("module_name", "default")
+
+    work_dir = "./work/"
+
+    if (os.path.exists(work_dir) == 0):
+        raise ValueError("work directory does not exist!")
+    else:
+        filename = work_dir + module_name
+        for file in (filename + ".gds", filename + ".spice", filename + ".v", filename + ".def", filename + "_pex.spice", filename + ".sdc"):
+            if (os.path.exists(file) == 0):
+                raise ValueError(file + " does not exist!")
+
+    # print("Found necessary work result files!")
+
+    for file in ("error_within_x.csv", "golden_error_opt.csv", "search_result.csv"):
+        if os.path.exists(file) == 0:
+            raise ValueError(file + " does not exist!")
+
+    #print("Found generated .csv files!")
+    return 1

openfasoc/generators/cryo-gen/parse_rpt.py

@@ -0,0 +1,66 @@
+import sys
+import json
+import os
+import re, subprocess
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+from common.check_gen_files import check_gen_files
+
+sys.stdout.flush()
+
+if (len(sys.argv) > 1) and (sys.argv[1] == "sky130hd_cryo"):
+    drc_filename = "flow/reports/sky130hd/cryo/6_final_drc.rpt"
+    lvs_filename = "flow/reports/sky130hd/cyro/6_final_lvs.rpt"
+elif (len(sys.argv) == 1) or (sys.argv[1] == "sky130hvl_ldo"):
+    drc_filename = "work/6_final_drc.rpt"
+    lvs_filename = "work/6_final_lvs.rpt"
+else:
+    drc_filename = "work/"+sys.argv[1]+"/6_final_drc.rpt"
+    lvs_filename = "work/"+sys.argv[1]+"/6_final_lvs.rpt"
+
+# using full because sims disabled for LDO for now
+if (len(sys.argv) > 1) and ((sys.argv[1] == "sky130hvl_ldo") or (sys.argv[1] == "sky130hvl_ldo_full")):
+    with open(drc_filename, 'r') as f1, open("../../../.github/scripts/expected_drc_reports/expected_ldo_drc.rpt", 'r') as f2:
+        content1 = f1.readlines()
+        content2 = f2.readlines()
+        if content1 == content2:
+            print("DRC is clean!")
+        else:
+            raise ValueError("DRC failed!")
+elif sum(1 for line in open(drc_filename)) > 3:
+    raise ValueError("DRC failed!")
+else:
+    print("DRC is clean!")
+
+# cryo LVS check 
+if (len(sys.argv) > 1) and (sys.argv[1] == "sky130hd_cryo"):
+    lvs_line = subprocess.check_output(["tail", "-1", lvs_filename]).decode(
+        sys.stdout.encoding
+    )
+    regex = r"failed"
+    match = re.search(regex, lvs_line)
+
+    if match != None:
+        raise ValueError("LVS failed!")
+    else:
+        print("LVS is clean!")
+else:        
+    with open(lvs_filename) as f:
+        f1 = f.read()
+
+        if "failed" in f1:
+            raise ValueError("LVS failed!")
+        else:
+            print("LVS is clean!")
+
+if ((len(sys.argv) > 1) and ((sys.argv[1] == "sky130hvl_ldo") or (sys.argv[1] == "sky130hvl_ldo_full"))) or ((len(sys.argv) > 1) and (sys.argv[1] == "sky130hd_cryo")):
+    print("Flow check is clean!")
+else:
+    json_filename = "test.json"
+
+    if os.path.exists(json_filename):
+        if check_gen_files():
+            print("Flow check is clean!")
+        else:
+            print("Flow check failed!")
+    else:
+        raise ValueError(".json config file not found!")

openfasoc/generators/cryo-gen/tools/parse_rpt.py

@@ -1,6 +1,9 @@
 import re
 import subprocess
-import sys
+import sys, os
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
+from common.check_gen_files import check_gen_files
 
 drc_filename = "flow/reports/sky130hd/cryo/6_final_drc.rpt"
 num_lines = sum(1 for line in open(drc_filename))
@@ -23,26 +26,12 @@
 else:
     print("LVS is clean!")
 
-# with open('test.json', 'r') as file:
-#     data = json.load(file)
-# print('Found .json config file...')
-
-# module_name = data.get("module_name", "default")
-
-# work_dir = "./work/"
+json_filename = "test.json"
 
-# if (os.path.exists(work_dir) == 0):
-#     raise ValueError("work directory does not exist!")
-# else:
-#     filename = work_dir + module_name
-#     for file in (filename + ".gds", filename + ".spice", filename + ".v", filename + ".def", filename + "_pex.spice", filename + ".sdc"):
-#         if (os.path.exists(file) == 0):
-#             raise ValueError(file + " does not exist!")
-# print("Found necessary work result files!")
-
-# for file in ("error_within_x.csv", "golden_error_opt.csv", "search_result.csv"):
-#     if os.path.exists(file) == 0:
-#         raise ValueError(file + " does not exist!")
-# print("Found generated .csv files!")
-
-print("Generator check is clean!")
+if os.path.exists(json_filename):
+    if check_gen_files():
+        print("Flow check is clean!")
+    else:
+        print("Flow check failed!")
+else:
+    raise ValueError(".json config file not found!")

openfasoc/generators/temp-sense-gen/tools/parse_rpt.py

@@ -1,5 +1,7 @@
-import json
-import os 
+import os, sys 
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
+from common.check_gen_files import check_gen_files
 
 drc_filename = "flow/reports/sky130hd/tempsense/6_final_drc.rpt"
 num_lines = sum(1 for line in open(drc_filename))
@@ -19,26 +21,13 @@
         raise ValueError("LVS failed!")
     else:
         print("LVS is clean!")
-
-with open('test.json', 'r') as file:
-    data = json.load(file)
-print('Found .json config file...')
-
-module_name = data.get("module_name", "default")
 
-work_dir = "./work/"
+json_filename = "test.json"
 
-if (os.path.exists(work_dir) == 0):
-    raise ValueError("work directory does not exist!")
+if os.path.exists(json_filename):
+    if check_gen_files():
+        print("Flow check is clean!")
+    else:
+        print("Flow check failed!")
 else:
-    filename = work_dir + module_name
-    for file in (filename + ".gds", filename + ".spice", filename + ".v", filename + ".def", filename + "_pex.spice", filename + ".sdc"):
-        if (os.path.exists(file) == 0):
-            raise ValueError(file + " does not exist!")
-print("Found necessary work result files!")
-
-for file in ("error_within_x.csv", "golden_error_opt.csv", "search_result.csv"):
-    if os.path.exists(file) == 0:
-        raise ValueError(file + " does not exist!")
-print("Found generated .csv files!")
-print("Generator check is clean!")
+    raise ValueError(".json config file not found!")