Merge branch 'supply_router' into dev

compiler/base/design.py

@@ -57,6 +57,12 @@ class design(hierarchy_design):
                                                   self.cell_name,
                                                   GDS["unit"])
 
+            # Convert names back to the original names
+            # so that copying will use the new names
+            for pin_name in self.pin_map:
+                for index1, pin in enumerate(self.pin_map[pin_name]):
+                    self.pin_map[pin_name][index1].name = self.get_original_pin_name(pin.name)
+
             self.width = width
             self.height = height
 

compiler/base/hierarchy_layout.py

@@ -1235,7 +1235,6 @@ class layout():
         self.add_power_pin(new_name, pin.center(), start_layer=start_layer)
 
     def add_power_pin(self, name, loc, directions=None, start_layer="m1"):
-
         # Hack for min area
         if OPTS.tech_name == "sky130":
             min_area = drc["minarea_{}".format(self.pwr_grid_layer)]