Merge pull request #106 from d-m-bailey/extract-once

Eliminates duplicate extraction for LVS and OEB checks.

Author: jdicorpo

src/cf_precheck/be_checks/run_cvc

@@ -75,20 +75,22 @@ export RESULTS_DIR=$WORK_ROOT/ext
 if [[ $EXTRACT_LAYOUT == yes ]]; then
 	env RUN_DIR=$RESULTS_DIR CIFIN_STYLE= EXTRACT_STYLE= LOG_FILE=ext.log $LVS_ROOT/run_extract
 	ext_status=$?
+	gzip -c -f $RESULTS_DIR/$DESIGN_NAME.gds.spice > $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz
 fi
 
 echo " "
 echo "Running CVC..."
 
 # Create cdl file from extracted spice file if it doesn't exist
-if [[ ! -f $RESULTS_DIR/$DESIGN_NAME.cdl.gz || $RESULTS_DIR/$DESIGN_NAME.gds.spice -nt $RESULTS_DIR/$DESIGN_NAME.cdl.gz ]]; then
-	if [[ ! -f $RESULTS_DIR/$DESIGN_NAME.gds.spice ]]; then
-		echo "Could not create cdl file from $RESULTS_DIR/$DESIGN_NAME.gds.spice"
+if [[ ! -f $WORK_ROOT/$DESIGN_NAME.cdl.gz || $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz -nt $WORK_ROOT/$DESIGN_NAME.cdl.gz ]]; then
+	if [[ ! -f $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz ]]; then
+		echo "Could not create cdl file from $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz"
 		exit 2
 	else
-		echo "Creating $RESULTS_DIR/$DESIGN_NAME.cdl"
-		$LVS_ROOT/tech/$PDK/spi2cdl $RESULTS_DIR/$DESIGN_NAME.gds.spice |
-			gzip -c >$RESULTS_DIR/$DESIGN_NAME.cdl.gz
+		echo "Creating $WORK_ROOT/$DESIGN_NAME.cdl.gz"
+		gunzip -c $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz |
+			$LVS_ROOT/tech/$PDK/spi2cdl - |
+			gzip -c >$WORK_ROOT/$DESIGN_NAME.cdl.gz
 	fi
 fi
 

src/cf_precheck/be_checks/run_full_lvs

@@ -296,6 +296,7 @@ if [[ $WORK_ROOT != $LOG_ROOT ]]; then
 fi
 if [[ $WORK_ROOT != $SIGNOFF_ROOT ]]; then
 	cp $WORK_ROOT/lvs.report $WORK_ROOT/lvs.unflattened $SIGNOFF_ROOT/.
+	gzip -c $WORK_ROOT/ext/$TOP_LAYOUT.gds.spice > $SIGNOFF_ROOT/$TOP_LAYOUT.gds.spice.gz
 fi
 
 # Set exit code

src/cf_precheck/be_checks/run_oeb_check

@@ -83,20 +83,22 @@ export RESULTS_DIR=$WORK_ROOT/ext
 if [[ $EXTRACT_LAYOUT == yes ]]; then
 	env RUN_DIR=$RESULTS_DIR CIFIN_STYLE= EXTRACT_STYLE= LOG_FILE=ext.log $LVS_ROOT/run_extract
 	ext_status=$?
+	gzip -c -f $RESULTS_DIR/$DESIGN_NAME.gds.spice > $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz
 fi
 
 echo " "
 echo "Running CVC for oeb check..."
 
 # Create cdl file from extracted spice file if it doesn't exist
-if [[ ! -f $RESULTS_DIR/$DESIGN_NAME.cdl.gz || $RESULTS_DIR/$DESIGN_NAME.gds.spice -nt $RESULTS_DIR/$DESIGN_NAME.cdl.gz ]]; then
-	if [[ ! -f $RESULTS_DIR/$DESIGN_NAME.gds.spice ]]; then
-		echo "Could not create cdl file from $RESULTS_DIR/$DESIGN_NAME.gds.spice"
+if [[ ! -f $WORK_ROOT/$DESIGN_NAME.cdl.gz || $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz -nt $WORK_ROOT/$DESIGN_NAME.cdl.gz ]]; then
+	if [[ ! -f $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz ]]; then
+		echo "Could not create cdl file from $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz"
 		exit 2
 	else
-		echo "Creating $RESULTS_DIR/$DESIGN_NAME.cdl"
-		$LVS_ROOT/tech/$PDK/spi2cdl $RESULTS_DIR/$DESIGN_NAME.gds.spice |
-			gzip -c >$RESULTS_DIR/$DESIGN_NAME.cdl.gz
+		echo "Creating $WORK_ROOT/$DESIGN_NAME.cdl.gz"
+		gunzip -c $SIGNOFF_ROOT/$DESIGN_NAME.gds.spice.gz |
+			$LVS_ROOT/tech/$PDK/spi2cdl - |
+			gzip -c >$WORK_ROOT/$DESIGN_NAME.cdl.gz
 	fi
 fi
 

src/cf_precheck/be_checks/tech/sky130A/cvcrc

@@ -1,5 +1,5 @@
 CVC_TOP = $DESIGN_NAME
-CVC_NETLIST = $RESULTS_DIR/$CVC_TOP.cdl.gz
+CVC_NETLIST = $WORK_ROOT/$CVC_TOP.cdl.gz
 CVC_MODE = $CVC_TOP
 CVC_MODEL_FILE = $LVS_ROOT/tech/$PDK/cvc.models
 CVC_POWER_FILE = $WORK_ROOT/cvc.power.$CVC_TOP

src/cf_precheck/be_checks/tech/sky130B/cvcrc

@@ -1,5 +1,5 @@
 CVC_TOP = $DESIGN_NAME
-CVC_NETLIST = $RESULTS_DIR/$CVC_TOP.cdl.gz
+CVC_NETLIST = $WORK_ROOT/$CVC_TOP.cdl.gz
 CVC_MODE = $CVC_TOP
 CVC_MODEL_FILE = $LVS_ROOT/tech/$PDK/cvc.models
 CVC_POWER_FILE = $WORK_ROOT/cvc.power.$CVC_TOP

src/cf_precheck/check_manager.py

@@ -58,8 +58,8 @@ def run(self) -> bool:
     (KlayoutZeroArea.__ref__, KlayoutZeroArea),
     (SpikeCheck.__ref__, SpikeCheck),
     (IllegalCellnameCheck.__ref__, IllegalCellnameCheck),
-    (Oeb.__ref__, Oeb),
     (Lvs.__ref__, Lvs),
+    (Oeb.__ref__, Oeb),
 ])
 
 

src/cf_precheck/config.py

@@ -185,21 +185,22 @@ def run_be_check(
     log_path = f"{output_directory}/logs"
     report_path = f"{output_directory}/outputs/reports"
     log_file_path = f"{log_path}/{check}_check.log"
-    tmp_dir = f"{output_directory}/tmp"
-
-    for d in [log_path, tmp_dir, f"{output_directory}/outputs", report_path]:
-        os.makedirs(d, exist_ok=True)
 
     if check == "LVS":
         be_script = "run_be_checks"
         extra_args = "--nooeb"
+        tmp_dir = f"{output_directory}/tmp"
     elif check == "OEB":
         be_script = "run_oeb_check"
-        extra_args = ""
+        extra_args = "--noextract" if (Path(report_path) / f"{design_name}.gds.spice.gz").exists() else ""
+        tmp_dir = f"{output_directory}/tmp_oeb"
     else:
         logging.error(f"Unknown backend check: {check}")
         return False
 
+    for d in [log_path, tmp_dir, f"{output_directory}/outputs", report_path]:
+        os.makedirs(d, exist_ok=True)
+
     be_checks_dir = str(Path(__file__).parent / "be_checks")
 
     be_env: dict = {}
@@ -229,7 +230,7 @@ def run_be_check(
 
     be_env.update(os.environ)
     with open(log_file_path, "w") as be_log:
-        logging.info(f"Running: {be_script}")
+        logging.info(f"Running: {be_script} {extra_args}")
         logging.info(f"{check} output directory: {output_directory}")
         p = subprocess.run(be_cmd, stderr=be_log, stdout=be_log, env=be_env)
         stat = p.returncode