Remove dynamic bitcell multiple detection.

Check for decoder bitcell multiple in tech file or assume 1.
PEP8 fixes.

compiler/modules/hierarchical_decoder.py

@@ -12,6 +12,7 @@ from sram_factory import factory
 from vector import vector
 from globals import OPTS
 from errors import drc_error
+from tech import cell_properties
 
 
 class hierarchical_decoder(design.design):
@@ -26,7 +27,13 @@ class hierarchical_decoder(design.design):
         self.pre2x4_inst = []
         self.pre3x8_inst = []
 
-        (self.cell_height, self.cell_multiple) = self.find_decoder_height()
+        b = factory.create(module_type="bitcell")
+        try:
+            self.cell_multiple = cell_properties.bitcell.decoder_bitcell_multiple
+        except AttributeError:
+            self.cell_multiple = 1
+        self.cell_height = self.cell_multiple * b.height
+        
         self.num_outputs = num_outputs
         # We may have more than one bitcell per decoder row
         self.rows = math.ceil(num_outputs / self.cell_multiple)
@@ -38,11 +45,12 @@ class hierarchical_decoder(design.design):
             self.create_layout()
 
     def find_decoder_height(self):
-            
+        """
+        Dead code. This would dynamically determine the bitcell multiple,
+        but I just decided to hard code it in the tech file if it is not 1
+        because a DRC tool would be required even to run in front-end mode.
+        """
         b = factory.create(module_type="bitcell")
-        # Old behavior
-        if OPTS.netlist_only:
-            return (b.height, 1)
 
         # Search for the smallest multiple that works
         cell_multiple = 1

compiler/tests/30_openram_back_end_test.py

@@ -64,9 +64,9 @@ class openram_back_end_test(openram_test):
         
         # assert an error until we actually check a resul
         for extension in ["gds", "v", "lef", "sp"]:
-            filename = "{0}/{1}.{2}".format(out_path,out_file,extension)
-            debug.info(1,"Checking for file: " + filename)
-            self.assertEqual(os.path.exists(filename),True)
+            filename = "{0}/{1}.{2}".format(out_path, out_file, extension)
+            debug.info(1, "Checking for file: " + filename)
+            self.assertEqual(os.path.exists(filename), True)
 
         # Make sure there is any .lib file
         import glob
@@ -79,18 +79,17 @@ class openram_back_end_test(openram_test):
             self.assertTrue(len(datasheets)>0)
         
         # grep any errors from the output
-        output_log = open("{0}/output.log".format(out_path),"r")
+        output_log = open("{0}/output.log".format(out_path), "r")
         output = output_log.read()
         output_log.close()
-        self.assertEqual(len(re.findall('ERROR',output)),0)
-        self.assertEqual(len(re.findall('WARNING',output)),0)
-
+        self.assertEqual(len(re.findall('ERROR', output)), 0)
+        self.assertEqual(len(re.findall('WARNING', output)), 0)
 
         # now clean up the directory
         if OPTS.purge_temp:
             if os.path.exists(out_path):
                 shutil.rmtree(out_path, ignore_errors=True)
-            self.assertEqual(os.path.exists(out_path),False)
+            self.assertEqual(os.path.exists(out_path), False)
  
         globals.end_openram()
 

compiler/tests/30_openram_front_end_test.py

@@ -64,9 +64,9 @@ class openram_front_end_test(openram_test):
         
         # assert an error until we actually check a result
         for extension in ["v", "lef", "sp", "gds"]:
-            filename = "{0}/{1}.{2}".format(out_path,out_file,extension)
-            debug.info(1,"Checking for file: " + filename)
-            self.assertEqual(os.path.exists(filename),True)
+            filename = "{0}/{1}.{2}".format(out_path, out_file, extension)
+            debug.info(1, "Checking for file: " + filename)
+            self.assertEqual(os.path.exists(filename), True)
 
         # Make sure there is any .lib file
         import glob
@@ -79,18 +79,17 @@ class openram_front_end_test(openram_test):
             self.assertTrue(len(datasheets)>0)
         
         # grep any errors from the output
-        output_log = open("{0}/output.log".format(out_path),"r")
+        output_log = open("{0}/output.log".format(out_path), "r")
         output = output_log.read()
         output_log.close()
-        self.assertEqual(len(re.findall('ERROR',output)),0)
-        self.assertEqual(len(re.findall('WARNING',output)),0)
-
+        self.assertEqual(len(re.findall('ERROR', output)), 0)
+        self.assertEqual(len(re.findall('WARNING', output)), 0)
 
         # now clean up the directory
         if OPTS.purge_temp:
             if os.path.exists(out_path):
                 shutil.rmtree(out_path, ignore_errors=True)
-            self.assertEqual(os.path.exists(out_path),False)
+            self.assertEqual(os.path.exists(out_path), False)
 
         globals.end_openram()