Merge remote-tracking branch 'private/dev' into dev

compiler/base/hierarchy_layout.py

@@ -498,7 +498,7 @@ class layout():
                        offset=offset + vector(0.5 * width,
                                               0.5 * height))
 
-    def add_label(self, text, layer, offset=[0, 0], zoom=-1):
+    def add_label(self, text, layer, offset=[0, 0], zoom=None):
         """Adds a text label on the given layer,offset, and zoom level"""
         debug.info(5, "add label " + str(text) + " " + layer + " " + str(offset))
         lpp = techlayer[layer]

compiler/tests/skip_tests_sky130.txt

@@ -3,7 +3,6 @@
 04_precharge_pbitcell_test.py
 04_replica_pbitcell_test.py
 04_column_mux_pbitcell_test.py
-05_bitcell_1rw_1r_array_test.py
 05_bitcell_array_test.py
 05_dummy_array_test.py
 05_pbitcell_array_test.py

compiler/verify/magic.py

@@ -173,7 +173,6 @@ def write_drc_script(cell_name, gds_name, extract, final_verification, output_pa
     f.write("drc catchup\n")
     f.write('puts "Finished drc catchup"\n')
     f.write("drc count total\n")
-    f.write("drc count\n")
     f.write("quit -noprompt\n")
     f.write("EOF\n")
     f.write("magic_retcode=$?\n")