fixed merge conflict

compiler/base/hierarchy_layout.py

@@ -214,7 +214,13 @@ class layout():
             return self.pin_map[text]
         else:
             return set()
-    
+
+    def get_pin_names(self):
+        """ 
+        Return a pin list of all pins
+        """
+        return self.pin_map.keys()
+        
     def copy_layout_pin(self, instance, pin_name, new_name=""):
         """ 
         Create a copied version of the layout pin at the current level.
@@ -226,6 +232,16 @@ class layout():
                 new_name = pin.name
             self.add_layout_pin(new_name, pin.layer, pin.ll(), pin.width(), pin.height())
 
+    def copy_layout_pins(self, instance, prefix=""):
+        """ 
+        Create a copied version of the layout pin at the current level.
+        You can optionally rename the pin to a new name. 
+        """
+        for pin_name in self.pin_map.keys():
+            pins=instance.get_pins(pin_name)
+            for pin in pins:
+                self.add_layout_pin(prefix+pin_name, pin.layer, pin.ll(), pin.width(), pin.height())
+            
     def add_layout_pin_segment_center(self, text, layer, start, end):
         """ 
         Creates a path like pin with center-line convention 
@@ -880,10 +896,10 @@ class layout():
         """
         self.create_channel_route(netlist, offset, layer_stack, pitch, vertical=False)
 
-    def add_boundary(self):
+    def add_boundary(self, offset=vector(0,0)):
         """ Add boundary for debugging dimensions """
         self.add_rect(layer="boundary",
-                      offset=vector(0,0),
+                      offset=offset,
                       height=self.height,
                       width=self.width)
         

compiler/base/hierarchy_spice.py

@@ -114,6 +114,12 @@ class spice():
                 output_list.append(pin)
         return output_list
 
+
+    def copy_pins(self, other_module, suffix=""):
+        """ This will copy all of the pins from the other module and add an optional suffix."""
+        for pin in other_module.pins:
+            self.add_pin(pin+suffix, other_module.get_pin_type(pin))
+
     def get_inouts(self):
         """ These use pin types to determine pin lists. These
         may be over-ridden by submodules that didn't use pin directions yet."""