Remove dangling files, update parsing scripts across generators and workflows

.github/scripts/parse_rpt.py

@@ -1,33 +1,62 @@
 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 or sys.argv[1] == "sky130hvl_ldo":
+dir_path = r'flow/reports'
+lib = os.listdir(dir_path)
+
+if (len(sys.argv) > 1) and (sys.argv[1] == str(lib[0])):
+    drc_filename = "flow/reports/" + sys.argv[1] + "/cryo/6_final_drc.rpt"
+    lvs_filename = "flow/reports/" + sys.argv[1] + "/cryo/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"
 
-if len(sys.argv) > 1 and sys.argv[1] == "sky130hvl_ldo":
+if (len(sys.argv) > 1) and (sys.argv[1] == "sky130hvl_ldo"):
     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 == content1:
+        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!")
 
-
-with open(lvs_filename) as f:
-    f1 = f.read()
-
-    if "failed" in f1:
+# cryo LVS check 
+if (len(sys.argv) > 1) and (sys.argv[1] == str(lib[0])):
+    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!")
+
+json_filename = "test.json"
+
+if check_gen_files(json_filename, (len(sys.argv) == 1)):
+        print("Flow check is clean!")
+else:
+    print("Flow check failed!")

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

@@ -22,3 +22,26 @@
     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/"
+
+# 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!")

openfasoc/generators/common/__init__.py

@@ -7,6 +7,9 @@
 	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(parameters: json_filename, is_tempsense)`: Used to check if the various files that should be generated by the flow are present in their required directories. 
+- `common.check_gen_extensions`
+	1. Stores the extensions of the files generated by the flow. 
 See individual function documentation for more information on a particular function.
 """

openfasoc/generators/common/check_gen_files.py

@@ -0,0 +1,42 @@
+import json
+import os
+
+def check_gen_files(json_filename, is_tempsense) -> int:
+    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!")
+    else:
+        filename = work_dir + module_name
+        extension_file_path = "./tools/check_gen_extensions"
+
+        if os.path.exists(extension_file_path):
+            with open(extension_file_path) as f:
+
+                for extension in f:
+                    file = "".join([filename, extension.strip()])
+                    if (os.path.exists(file) == 0):
+                        raise ValueError(file + " does not exist!")
+        else: 
+            print("checking flow results with possibly stale list of extensions...")
+            extensions = [".sdc", ".gds", ".def", ".spice", ".v", "_pex.spice"]
+            for extension in extensions:
+                    file = "".join([filename, extension])
+
+                    if (os.path.exists(file) == 0):
+                        raise ValueError(file + " does not exist!")
+    # print("Found necessary work result files!")
+    if (is_tempsense):
+        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/tools/check_gen_extensions

@@ -0,0 +1,8 @@
+.gds
+.spice
+.v
+.cdl
+_sim.spice
+_pex.spice
+.sdc
+.def

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

@@ -1,16 +1,22 @@
 import re
 import subprocess
-import sys
+import sys, os
 
-drc_filename = "flow/reports/sky130hd/cyro/6_final_drc.rpt"
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
+from common.check_gen_files import check_gen_files
+
+dir_path = r'flow/reports'
+lib = os.listdir(dir_path)
+
+drc_filename = "flow/reports/" + str(lib[0]) + "/cryo/6_final_drc.rpt"
 num_lines = sum(1 for line in open(drc_filename))
 
 if num_lines > 3:
     raise ValueError("DRC failed!")
 else:
     print("DRC is clean!")
 
-lvs_filename = "flow/reports/sky130hd/cyro/6_final_lvs.rpt"
+lvs_filename = "flow/reports/" + str(lib[0]) + "/cryo/6_final_lvs.rpt"
 lvs_line = subprocess.check_output(["tail", "-1", lvs_filename]).decode(
     sys.stdout.encoding
 )
@@ -22,3 +28,10 @@
     raise ValueError("LVS failed!")
 else:
     print("LVS is clean!")
+
+json_filename = "test.json"
+
+if check_gen_files(json_filename, (len(sys.argv) == 1)):
+        print("Flow check is clean!")
+else:
+    print("Flow check failed!")

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

@@ -22,3 +22,27 @@
     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/"
+
+# 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!")

openfasoc/generators/ldo-gen/tools/check_gen_extensions

@@ -0,0 +1,6 @@
+.gds
+.spice
+.v
+_pex.spice
+.sdc
+.def

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

@@ -19,3 +19,27 @@
 # 	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/"
+
+# 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!")

openfasoc/generators/temp-sense-gen/Makefile

@@ -47,7 +47,6 @@ sky130hd_temp_verilog:
 sky130hd_temp:
 	@python3 tools/temp-sense-gen.py --specfile test.json --outputDir ./work $(inv) $(ninv) $(head) $(nhead) --prepex $(sim_pex) --platform sky130hd --mode macro
 	@python3 tools/parse_rpt.py
-	@tools/verify_op.sh
 	@@echo "=================================================================================="
 	@@echo "Thank you for using OpenFASOC"
 	@@echo "For more info, please read the latest documentation on openfasoc.readthedocs.io"
@@ -58,7 +57,6 @@ sky130hd_temp_full:
 	# add --pex to also run pex simulations
 	@python3 tools/temp-sense-gen.py --specfile test.json --outputDir ./work --platform sky130hd --mode full --prepex $(sim_pex) $(inv) $(ninv) $(head) $(nhead)
 	@python3 tools/parse_rpt.py
-	@tools/verify_op.sh
 	@@echo "=================================================================================="
 	@@echo "Thank you for using OpenFASOC"
 	@@echo "For more info, please read the latest documentation on openfasoc.readthedocs.io"

openfasoc/generators/temp-sense-gen/tools/check_gen_extensions

@@ -0,0 +1,6 @@
+.gds
+.spice
+.v
+_pex.spice
+.sdc
+.def

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

@@ -1,3 +1,8 @@
+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))
 
@@ -16,3 +21,10 @@
         raise ValueError("LVS failed!")
     else:
         print("LVS is clean!")
+
+json_filename = "test.json"
+
+if check_gen_files(json_filename, (len(sys.argv) == 1)):
+        print("Flow check is clean!")
+else:
+    print("Flow check failed!")