Skywater changes.

Default 1 thread and no temp subdirectory.
Add skywater setup/hold golden data
Add CLI option for simulation threads (-m)
Add compatibility mode option and nomodcheck for ngspice to speed up sky130 model loading.
Make subdir when using default /tmp dir.
Pass num_threads so temp subdirs are created.

compiler/modules/bank.py

@@ -526,13 +526,16 @@ class bank(design.design):
                                                  height=self.dff.height)
         elif self.col_addr_size == 2:
             self.column_decoder = factory.create(module_type="hierarchical_predecode2x4",
+                                                 column_decoder=True,
                                                  height=self.dff.height)
 
         elif self.col_addr_size == 3:
             self.column_decoder = factory.create(module_type="hierarchical_predecode3x8",
+                                                 column_decoder=True,
                                                  height=self.dff.height)
         elif self.col_addr_size == 4:
             self.column_decoder = factory.create(module_type="hierarchical_predecode4x16",
+                                                 column_decoder=True,
                                                  height=self.dff.height)
         else:
             # No error checking before?

compiler/modules/hierarchical_predecode.py

@@ -18,19 +18,17 @@ class hierarchical_predecode(design.design):
     """
     Pre 2x4 and 3x8 and TBD 4x16 decoder shared code.
     """
-    def __init__(self, name, input_number, height=None):
+    def __init__(self, name, input_number, column_decoder=False, height=None):
         self.number_of_inputs = input_number
 
         b = factory.create(module_type=OPTS.bitcell)
 
         if not height:
             self.cell_height = b.height
-            self.column_decoder = False
         else:
             self.cell_height = height
-            # If we are pitch matched to the bitcell, it's a predecoder
-            # otherwise it's a column decoder (out of pgates)
-            self.column_decoder = (height != b.height)
+            
+        self.column_decoder = column_decoder
 
         self.number_of_outputs = int(math.pow(2, self.number_of_inputs))
         super().__init__(name)
@@ -87,8 +85,15 @@ class hierarchical_predecode(design.design):
 
         self.bus_layer = layer_props.hierarchical_predecode.bus_layer
         self.bus_directions = layer_props.hierarchical_predecode.bus_directions
-        self.bus_pitch = getattr(self, self.bus_layer + "_pitch")
-        self.bus_space = layer_props.hierarchical_predecode.bus_space_factor * getattr(self, self.bus_layer + "_space")
+
+        if self.column_decoder:
+            # Column decoders may be routed on M2/M3 if there's a write mask
+            self.bus_pitch = self.m3_pitch
+            self.bus_space = self.m3_space
+        else:
+            self.bus_pitch = getattr(self, self.bus_layer + "_pitch")
+            self.bus_space = getattr(self, self.bus_layer + "_space")
+        self.bus_space = layer_props.hierarchical_predecode.bus_space_factor * self.bus_space
         self.input_layer = layer_props.hierarchical_predecode.input_layer
         self.output_layer = layer_props.hierarchical_predecode.output_layer
         self.output_layer_pitch = getattr(self, self.output_layer + "_pitch")

compiler/modules/hierarchical_predecode2x4.py

@@ -13,8 +13,8 @@ class hierarchical_predecode2x4(hierarchical_predecode):
     """
     Pre 2x4 decoder used in hierarchical_decoder.
     """
-    def __init__(self, name, height=None):
-        super().__init__( name, 2, height)
+    def __init__(self, name, column_decoder=False, height=None):
+        super().__init__(name, 2, column_decoder, height)
 
         self.create_netlist()
         if not OPTS.netlist_only:

compiler/modules/hierarchical_predecode3x8.py

@@ -13,8 +13,8 @@ class hierarchical_predecode3x8(hierarchical_predecode):
     """
     Pre 3x8 decoder used in hierarchical_decoder.
     """
-    def __init__(self, name, height=None):
-        super().__init__(name, 3, height)
+    def __init__(self, name, column_decoder=False, height=None):
+        super().__init__(name, 3, column_decoder, height)
 
         self.create_netlist()
         if not OPTS.netlist_only:

compiler/modules/hierarchical_predecode4x16.py

@@ -13,8 +13,8 @@ class hierarchical_predecode4x16(hierarchical_predecode):
     """
     Pre 4x16 decoder used in hierarchical_decoder.
     """
-    def __init__(self, name, height=None):
-        super().__init__(name, 4, height)
+    def __init__(self, name, column_decoder=False, height=None):
+        super().__init__(name, 4, column_decoder, height)
 
         self.create_netlist()
         if not OPTS.netlist_only: