Check for single top-level structure in vlsiLayout. Don't allow dff_inv and dff_buf to have same names.

compiler/modules/dff_buf.py

@@ -12,11 +12,13 @@ class dff_buf(design.design):
     with two inverters, of variable size, to provide q
     and qbar. This is to enable driving large fanout loads.
     """
-
+    unique_id = 1
+    
     def __init__(self, inv1_size=2, inv2_size=4, name=""):
 
         if name=="":
-            name = "dff_buf_{0}_{1}".format(inv1_size, inv2_size)
+            name = "dff_buf_{0}".format(dff_buf.unique_id)
+            dff_buf.unique_id += 1
         design.design.__init__(self, name)
         debug.info(1, "Creating {}".format(self.name))
 

compiler/modules/dff_buf_array.py

@@ -11,13 +11,15 @@ class dff_buf_array(design.design):
     This is a simple row (or multiple rows) of flops.
     Unlike the data flops, these are never spaced out.
     """
-
+    unique_id = 1
+    
     def __init__(self, rows, columns, inv1_size=2, inv2_size=4, name=""):
         self.rows = rows
         self.columns = columns
 
         if name=="":
-            name = "dff_buf_array_{0}x{1}".format(rows, columns)
+            name = "dff_buf_array_{0}x{1}_{2}".format(rows, columns, dff_buf_array.unique_id)
+            dff_buf_array.unique_id += 1
         design.design.__init__(self, name)
         debug.info(1, "Creating {}".format(self.name))
         self.inv1_size = inv1_size

compiler/modules/dff_inv.py

@@ -11,11 +11,13 @@ class dff_inv(design.design):
     This is a simple DFF with an inverted output. Some DFFs
     do not have Qbar, so this will create it.
     """
-
+    unique_id = 1
+    
     def __init__(self, inv_size=2, name=""):
 
         if name=="":
-            name = "dff_inv_{0}".format(inv_size)
+            name = "dff_inv_{0}".format(dff_inv.unique_id)
+            dff_inv.unique_id += 1
         design.design.__init__(self, name)
         debug.info(1, "Creating {}".format(self.name))
         self.inv_size = inv_size

compiler/modules/dff_inv_array.py

@@ -11,13 +11,15 @@ class dff_inv_array(design.design):
     This is a simple row (or multiple rows) of flops.
     Unlike the data flops, these are never spaced out.
     """
-
+    unique_id = 1
+    
     def __init__(self, rows, columns, inv_size=2, name=""):
         self.rows = rows
         self.columns = columns
 
         if name=="":
-            name = "dff_inv_array_{0}x{1}".format(rows, columns)
+            name = "dff_inv_array_{0}x{1}_{2}".format(rows, columns, dff_inv_array.unique_id)
+            dff_inv_array.unique_id += 1
         design.design.__init__(self, name)
         debug.info(1, "Creating {}".format(self.name))
         self.inv_size = inv_size