Merge pull request #3040 from jeffng-or/klayout-script-mods

KLayout mods based on new info

Author: maliberty

flow/scripts/klayout/src/KLayoutTechFileGenerator.rb

@@ -42,9 +42,6 @@ def initialize(name, description, layer_properties_file)
     #  1) KLayout only writes out one mapping per layer, so we only add the
     #     first occurrence of the layer into the map. This is usually datatype
     #     == 0
-    #  2) KLayout doesn't support layers that start with a number in its maps,
-    #     so we prepend an "a" to the layer name. These layers are typically
-    #     not seen in the LEF, so it should be a no-op
     #
     def get_layer_map(sorted_layer_map)
         layer_map = LayerMap.new()
@@ -53,7 +50,9 @@ def get_layer_map(sorted_layer_map)
             layer_list.each do |layer_info|
                 gds_info = layer_info.gds
                 if layer_name.match?(/\A\d/)
-                    layer_name = "a" + layer_name
+                    # single quote escaping required for layers that start
+                    # with a digit
+                    layer_name = "'" + layer_name + "'"
                 end
                 map_str = sprintf("%s:%d/%d", layer_name, gds_info.layer,
                                   gds_info.datatype)
@@ -73,13 +72,12 @@ def add_via_connectivity(lef_file, sorted_layer_map)
         via_data = LEFViaData.new()
         via_data.read_file(lef_file)
         connectivity = @tech.component("connectivity")
-        # Generally works, except it adds an extra definition for the first
-        # connection
-        via_data.get_map().each do | key, layer_stack |
+        via_data.get_map().each do | via_name, layer_stack |
             lower_layer = layer_stack[0]
             via_layer = layer_stack[1]
             upper_layer = layer_stack[2]
             connection = NetTracerConnectivity.new
+            connection.name = via_name
             connection.connection(lower_layer, via_layer, upper_layer)
             connectivity.add(connection)
         end

flow/scripts/klayout/src/LEFViaData.rb

@@ -62,7 +62,8 @@ def read_via(fh, via_name)
         layer_stack = []
         while (line = fh.gets)
             if line.match("^\s*END")
-                key = layer_stack.join("_")
+                #key = layer_stack.join("_")
+                key = via_name
                 @via_map[key] = layer_stack
                 return
             end

flow/scripts/klayout/test/KLayoutLayerMapGeneratorTest.rb

@@ -24,16 +24,18 @@ def setup
     def test_basic
         data_str = <<~LM_TEXT
 # Bogus sample layer map
-M1               drawing                99       0                                                               # M1
-M1               net                99       23                                                               # M1_NET
-M1               net2               99       23                                                               # M1_NET
+M1               drawing            99       0                                                               # M1
+M1               net                99       23                                                              # M1_NET
+M1               net2               99       23                                                              # M1_NET
+1Layer           drawing            123      99                                                              # 1Layer
 LM_TEXT
 
         data_stream = StringIO.new(data_str)
         @rep.read(data_stream)
         layer_map = @rep.get_map()
         assert(layer_map)
-        assert(layer_map.length == 2)
+        assert(layer_map.length == 3)
+        # Test M1 entry
         layer_list = layer_map["M1"]
         assert(layer_list.length == 1)
         entry = layer_list[0]
@@ -42,6 +44,7 @@ def test_basic
         assert(entry.cds_lpp.purpose_name == "drawing")
         assert(entry.gds.layer == 99)
         assert(entry.gds.datatype == 0)
+        # Test M1 NET entry
         layer_list = layer_map["M1_NET"]
         assert(layer_list.length == 2)
         layer_list.each do | entry |
@@ -51,5 +54,13 @@ def test_basic
             assert(entry.gds.layer == 99)
             assert(entry.gds.datatype == 23)
         end
+        # Test 1Layer entry
+        layer_list = layer_map["1Layer"]
+        assert(layer_list.length == 1)
+        entry = layer_list[0]
+        assert(entry.cds_lpp.layer_name == "1Layer")
+        assert(entry.cds_lpp.purpose_name == "drawing")
+        assert(entry.gds.layer == 123)
+        assert(entry.gds.datatype == 99)
     end
 end

flow/scripts/klayout/test/LEFViaDataTest.rb

@@ -38,16 +38,20 @@ def test_basic
  RECT -0.02 -0.02 0.02 0.02 ;
 END VIA89
 VIA_TEXT
-        
+
+        exp_layers = {
+            "VIA9Pad" => [ "M9", "Pad", "V9" ],
+            "VIA89" => [ "M8", "V8", "M9" ],
+        }
+            
         data_stream = StringIO.new(data_str)
         @rep.read(data_stream)
         via_map = @rep.get_map()
         assert(via_map)
         assert(via_map.length == 2,
                sprintf("via map length is not 2: %d", via_map.length))
-        via_map.each do | key, layer_list |
-            tokens = key.split("_")
-            assert(tokens.sort == layer_list.sort)
+        via_map.each do | via_name, layer_list |
+            assert(exp_layers[via_name].sort == layer_list.sort)
         end
     end
 end