From b510925bdb3d980eafdcba2068d08a00a51b1f04 Mon Sep 17 00:00:00 2001
From: mrg <mrg@ucsc.edu>
Date: Wed, 7 Apr 2021 15:19:12 -0700
Subject: [PATCH] Enable pruning by default (except on unit tests)

---
 compiler/options.py                                       | 2 +-
 compiler/tests/22_psram_1bank_2mux_func_test.py           | 3 ++-
 compiler/tests/22_psram_1bank_4mux_func_test.py           | 3 ++-
 compiler/tests/22_psram_1bank_8mux_func_test.py           | 3 ++-
 compiler/tests/22_psram_1bank_nomux_func_test.py          | 3 ++-
 compiler/tests/22_sram_1bank_2mux_func_test.py            | 3 ++-
 compiler/tests/22_sram_1bank_2mux_global_func_test.py     | 3 ++-
 compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py  | 1 +
 compiler/tests/22_sram_1bank_4mux_func_test.py            | 3 ++-
 compiler/tests/22_sram_1bank_8mux_func_test.py            | 3 ++-
 compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py    | 2 ++
 compiler/tests/22_sram_1bank_nomux_func_test.py           | 1 +
 compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py | 1 +
 compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py    | 2 ++
 compiler/tests/22_sram_wmask_func_test.py                 | 1 +
 15 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/compiler/options.py b/compiler/options.py
index 551c3950..67ac14d7 100644
--- a/compiler/options.py
+++ b/compiler/options.py
@@ -102,7 +102,7 @@ class options(optparse.Values):
     # This determines whether LVS and DRC is checked for every submodule.
     inline_lvsdrc = False
     # Remove noncritical memory cells for characterization speed-up
-    trim_netlist = False
+    trim_netlist = True
     # Run with extracted parasitics
     use_pex = False
     # Output config with all options
diff --git a/compiler/tests/22_psram_1bank_2mux_func_test.py b/compiler/tests/22_psram_1bank_2mux_func_test.py
index ef42fec1..f5f4cd8f 100755
--- a/compiler/tests/22_psram_1bank_2mux_func_test.py
+++ b/compiler/tests/22_psram_1bank_2mux_func_test.py
@@ -23,7 +23,8 @@ class psram_1bank_2mux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
-
+        OPTS.trim_netlist = False
+        
         OPTS.bitcell = "pbitcell"
         OPTS.replica_bitcell="replica_pbitcell"
         OPTS.dummy_bitcell="dummy_pbitcell"
diff --git a/compiler/tests/22_psram_1bank_4mux_func_test.py b/compiler/tests/22_psram_1bank_4mux_func_test.py
index 7e4e11b9..f422728b 100755
--- a/compiler/tests/22_psram_1bank_4mux_func_test.py
+++ b/compiler/tests/22_psram_1bank_4mux_func_test.py
@@ -24,7 +24,8 @@ class psram_1bank_4mux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
-
+        OPTS.trim_netlist = False
+        
         OPTS.bitcell = "pbitcell"
         OPTS.replica_bitcell="replica_pbitcell"
         OPTS.dummy_bitcell="dummy_pbitcell"
diff --git a/compiler/tests/22_psram_1bank_8mux_func_test.py b/compiler/tests/22_psram_1bank_8mux_func_test.py
index d44f1326..f0247808 100755
--- a/compiler/tests/22_psram_1bank_8mux_func_test.py
+++ b/compiler/tests/22_psram_1bank_8mux_func_test.py
@@ -24,7 +24,8 @@ class psram_1bank_8mux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
-
+        OPTS.trim_netlist = False
+        
         OPTS.bitcell = "pbitcell"
         OPTS.replica_bitcell="replica_pbitcell"
         OPTS.dummy_bitcell="dummy_pbitcell"
diff --git a/compiler/tests/22_psram_1bank_nomux_func_test.py b/compiler/tests/22_psram_1bank_nomux_func_test.py
index a6b666d3..203fd0ac 100755
--- a/compiler/tests/22_psram_1bank_nomux_func_test.py
+++ b/compiler/tests/22_psram_1bank_nomux_func_test.py
@@ -23,7 +23,8 @@ class psram_1bank_nomux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
-
+        OPTS.trim_netlist = False
+        
         OPTS.bitcell = "pbitcell"
         OPTS.replica_bitcell="replica_pbitcell"
         OPTS.dummy_bitcell="dummy_pbitcell"
diff --git a/compiler/tests/22_sram_1bank_2mux_func_test.py b/compiler/tests/22_sram_1bank_2mux_func_test.py
index ba9e4129..cca6aeeb 100755
--- a/compiler/tests/22_sram_1bank_2mux_func_test.py
+++ b/compiler/tests/22_sram_1bank_2mux_func_test.py
@@ -24,7 +24,8 @@ class sram_1bank_2mux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
-
+        OPTS.trim_netlist = False
+        
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
         import characterizer
diff --git a/compiler/tests/22_sram_1bank_2mux_global_func_test.py b/compiler/tests/22_sram_1bank_2mux_global_func_test.py
index f5f875b9..14de7ba8 100755
--- a/compiler/tests/22_sram_1bank_2mux_global_func_test.py
+++ b/compiler/tests/22_sram_1bank_2mux_global_func_test.py
@@ -24,7 +24,8 @@ class sram_1bank_2mux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
-
+        OPTS.trim_netlist = False
+        
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
         import characterizer
diff --git a/compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py b/compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py
index 2242a002..c84c70a5 100755
--- a/compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py
+++ b/compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py
@@ -24,6 +24,7 @@ class sram_1bank_2mux_sparecols_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
+        OPTS.trim_netlist = False
 
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
diff --git a/compiler/tests/22_sram_1bank_4mux_func_test.py b/compiler/tests/22_sram_1bank_4mux_func_test.py
index 8633f7fa..4f7035cc 100755
--- a/compiler/tests/22_sram_1bank_4mux_func_test.py
+++ b/compiler/tests/22_sram_1bank_4mux_func_test.py
@@ -24,7 +24,8 @@ class sram_1bank_4mux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
-
+        OPTS.trim_netlist = False
+        
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
         import characterizer
diff --git a/compiler/tests/22_sram_1bank_8mux_func_test.py b/compiler/tests/22_sram_1bank_8mux_func_test.py
index 1f50b579..cc6456cf 100755
--- a/compiler/tests/22_sram_1bank_8mux_func_test.py
+++ b/compiler/tests/22_sram_1bank_8mux_func_test.py
@@ -24,7 +24,8 @@ class sram_1bank_8mux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
-
+        OPTS.trim_netlist = False
+        
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
         import characterizer
diff --git a/compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py b/compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py
index af465e62..c0518957 100755
--- a/compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py
+++ b/compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py
@@ -23,6 +23,8 @@ class psram_1bank_nomux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
+        OPTS.trim_netlist = False
+
         OPTS.num_rw_ports = 1
         OPTS.num_w_ports = 0
         OPTS.num_r_ports = 1
diff --git a/compiler/tests/22_sram_1bank_nomux_func_test.py b/compiler/tests/22_sram_1bank_nomux_func_test.py
index 4c2910f5..ff33ead5 100755
--- a/compiler/tests/22_sram_1bank_nomux_func_test.py
+++ b/compiler/tests/22_sram_1bank_nomux_func_test.py
@@ -24,6 +24,7 @@ class sram_1bank_nomux_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
+        OPTS.trim_netlist = False
 
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
diff --git a/compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py b/compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py
index eec158d6..0d649ace 100755
--- a/compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py
+++ b/compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py
@@ -24,6 +24,7 @@ class sram_1bank_nomux_sparecols_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
+        OPTS.trim_netlist = False
 
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload
diff --git a/compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py b/compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py
index 775597e1..6808462e 100755
--- a/compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py
+++ b/compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py
@@ -23,6 +23,8 @@ class sram_wmask_1w_1r_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
+        OPTS.trim_netlist = False
+
         OPTS.num_rw_ports = 1
         OPTS.num_w_ports = 0
         OPTS.num_r_ports = 1
diff --git a/compiler/tests/22_sram_wmask_func_test.py b/compiler/tests/22_sram_wmask_func_test.py
index 3927bca2..f41b3d98 100755
--- a/compiler/tests/22_sram_wmask_func_test.py
+++ b/compiler/tests/22_sram_wmask_func_test.py
@@ -24,6 +24,7 @@ class sram_wmask_func_test(openram_test):
         globals.init_openram(config_file)
         OPTS.analytical_delay = False
         OPTS.netlist_only = True
+        OPTS.trim_netlist = False
 
         # This is a hack to reload the characterizer __init__ with the spice version
         from importlib import reload