From 3d8aeaa732ef6be9651f645d33164bccb15e3116 Mon Sep 17 00:00:00 2001
From: Matt Guthaus <mrg@ucsc.edu>
Date: Thu, 25 Oct 2018 09:07:00 -0700
Subject: [PATCH] Run delay and setup/hold tests in netlist_only mode

---
 compiler/tests/21_hspice_delay_test.py      | 5 +----
 compiler/tests/21_hspice_setuphold_test.py  | 6 ++----
 compiler/tests/21_ngspice_delay_test.py     | 3 ---
 compiler/tests/21_ngspice_setuphold_test.py | 6 ++----
 compiler/tests/27_worst_case_delay_test.py  | 1 +
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/compiler/tests/21_hspice_delay_test.py b/compiler/tests/21_hspice_delay_test.py
index 62352b69..a5aca3e8 100755
--- a/compiler/tests/21_hspice_delay_test.py
+++ b/compiler/tests/21_hspice_delay_test.py
@@ -17,16 +17,13 @@ class timing_sram_test(openram_test):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
         OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
-
+        OPTS.netlist_only = True
         
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
         import characterizer
         reload(characterizer)
         from characterizer import delay
-        if not OPTS.spice_exe:
-            debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1)
-
         from sram import sram
         from sram_config import sram_config
         c = sram_config(word_size=1,
diff --git a/compiler/tests/21_hspice_setuphold_test.py b/compiler/tests/21_hspice_setuphold_test.py
index 2969f95e..9bfdb24b 100755
--- a/compiler/tests/21_hspice_setuphold_test.py
+++ b/compiler/tests/21_hspice_setuphold_test.py
@@ -17,15 +17,13 @@ class timing_setup_test(openram_test):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
         OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
-
+        OPTS.netlist_only = True
+        
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
         import characterizer
         reload(characterizer)
         from characterizer import setup_hold
-        if not OPTS.spice_exe:
-            debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1)
-            
         import sram
         import tech
         slews = [tech.spice["rise_time"]*2]
diff --git a/compiler/tests/21_ngspice_delay_test.py b/compiler/tests/21_ngspice_delay_test.py
index 37572318..45a9b7f6 100755
--- a/compiler/tests/21_ngspice_delay_test.py
+++ b/compiler/tests/21_ngspice_delay_test.py
@@ -24,9 +24,6 @@ class timing_sram_test(openram_test):
         import characterizer
         reload(characterizer)
         from characterizer import delay
-        if not OPTS.spice_exe:
-            debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1)
-
         from sram import sram
         from sram_config import sram_config
         c = sram_config(word_size=1,
diff --git a/compiler/tests/21_ngspice_setuphold_test.py b/compiler/tests/21_ngspice_setuphold_test.py
index d86fcb23..d58bfc50 100755
--- a/compiler/tests/21_ngspice_setuphold_test.py
+++ b/compiler/tests/21_ngspice_setuphold_test.py
@@ -17,15 +17,13 @@ class timing_setup_test(openram_test):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
         OPTS.spice_name="ngspice"
         OPTS.analytical_delay = False
-
+        OPTS.netlist_only = True
+        
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
         import characterizer
         reload(characterizer)
         from characterizer import setup_hold
-        if not OPTS.spice_exe:
-            debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1)
-        
         import sram
         import tech
         slews = [tech.spice["rise_time"]*2]
diff --git a/compiler/tests/27_worst_case_delay_test.py b/compiler/tests/27_worst_case_delay_test.py
index cf999e45..42a07bef 100755
--- a/compiler/tests/27_worst_case_delay_test.py
+++ b/compiler/tests/27_worst_case_delay_test.py
@@ -19,6 +19,7 @@ class worst_case_timing_sram_test(openram_test):
         globals.init_openram("config_20_{0}".format(OPTS.tech_name))
         OPTS.spice_name="hspice"
         OPTS.analytical_delay = False
+        OPTS.netlist_only = True
         OPTS.trim_netlist = False
         OPTS.check_lvsdrc = True