Merge pull request #49 from DavidAguilo/main

Continuation: Made parser capable of handling USEMINSPACING and MASKS in rectangles
dan-fritchman · Jul 10, 2024 · dc82242 · dc82242
2 parents ef6a881 + a5f8839
commit dc82242
Show file tree

Hide file tree

Showing 10 changed files with 366 additions and 92 deletions.
diff --git a/layout21converters/resources/macro.golden.yaml b/layout21converters/resources/macro.golden.yaml
@@ -9,6 +9,7 @@ macros:
                 geometries:
                   - Shape:
                       Rect:
+                        - ~
                         - x: "88.4"
                           y: "0.0"
                         - x: "88.78"

diff --git a/layout21converters/resources/macro.yaml b/layout21converters/resources/macro.yaml
@@ -9,6 +9,7 @@ macros:
                 geometries:
                   - Shape:
                       Rect:
+                        - ~
                         - x: "88.4"
                           y: "0.0"
                         - x: "88.78"

diff --git a/layout21raw/src/lef.rs b/layout21raw/src/lef.rs
@@ -133,7 +133,7 @@ impl<'lib> LefExporter<'lib> {
         // Conver to a [LefShape]
         let inner: lef21::LefShape = match shape {
             Shape::Rect(ref r) => {
-                lef21::LefShape::Rect(self.export_point(&r.p0)?, self.export_point(&r.p1)?)
+                lef21::LefShape::Rect(None, self.export_point(&r.p0)?, self.export_point(&r.p1)?)
             }
             Shape::Polygon(ref poly) => {
                 let points = poly
@@ -379,7 +379,7 @@ impl LefImporter {
     ) -> LayoutResult<Shape> {
         use lef21::LefShape::{Path, Polygon, Rect};
         match lefshape {
-            Rect(ref p0, ref p1) => self.import_rect((p0, p1)),
+            Rect(_, ref p0, ref p1) => self.import_rect((p0, p1)),
             Polygon(ref pts) => self.import_polygon(pts),
             Path(ref pts) => self.import_path(pts, layer),
         }

diff --git a/lef21/resources/geoms1.yaml b/lef21/resources/geoms1.yaml
@@ -2,58 +2,212 @@
 layer_name: some_layers_name
 geometries:
   - Shape:
-      Rect: [["1.065000", "1.075000"], ["1.705000", "1.325000"]]
+      Rect:
+        - ~
+        - x: "1.065000"
+          y: "1.075000"
+        - x: "1.705000"
+          y: "1.325000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "1.495000"
+          y: "0.615000"
+        - x: "3.335000"
+          y: "0.785000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "1.495000"
+          y: "0.785000"
+        - x: "1.705000"
+          y: "1.075000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "1.495000"
+          y: "1.325000"
+        - x: "1.705000"
+          y: "1.495000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "1.495000"
+          y: "1.495000"
+        - x: "1.785000"
+          y: "2.465000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "2.180000"
+          y: "0.255000"
+        - x: "2.420000"
+          y: "0.615000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "3.070000"
+          y: "1.915000"
+        - x: "4.515000"
+          y: "2.085000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "3.070000"
+          y: "2.085000"
+        - x: "3.400000"
+          y: "2.465000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "3.090000"
+          y: "0.255000"
+        - x: "3.335000"
+          y: "0.615000"
+  - Shape:
+      Rect:
+        - ~
+        - x: "4.090000"
+          y: "2.085000"
+        - x: "4.515000"
+          y: "2.465000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "1.065000"
+          y: "1.075000"
+        - x: "1.705000"
+          y: "1.325000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "1.495000"
+          y: "0.615000"
+        - x: "3.335000"
+          y: "0.785000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "1.495000"
+          y: "0.785000"
+        - x: "1.705000"
+          y: "1.075000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "1.495000"
+          y: "1.325000"
+        - x: "1.705000"
+          y: "1.495000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "1.495000"
+          y: "1.495000"
+        - x: "1.785000"
+          y: "2.465000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "2.180000"
+          y: "0.255000"
+        - x: "2.420000"
+          y: "0.615000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "3.070000"
+          y: "1.915000"
+        - x: "4.515000"
+          y: "2.085000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "3.070000"
+          y: "2.085000"
+        - x: "3.400000"
+          y: "2.465000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "3.090000"
+          y: "0.255000"
+        - x: "3.335000"
+          y: "0.615000"
+  - Shape:
+      Rect:
+        - mask: "1"
+        - x: "4.090000"
+          y: "2.085000"
+        - x: "4.515000"
+          y: "2.465000"
+  - Shape:
+      Rect:
+        - mask: "2"
+        - x: "1.065000"
+          y: "1.075000"
+        - x: "1.705000"
+          y: "1.325000"
   - Shape:
       Rect:
-        - - "1.495000"
-          - "0.615000"
-        - - "3.335000"
-          - "0.785000"
+        - mask: "2"
+        - x: "1.495000"
+          y: "0.615000"
+        - x: "3.335000"
+          y: "0.785000"
   - Shape:
       Rect:
-        - - "1.495000"
-          - "0.785000"
-        - - "1.705000"
-          - "1.075000"
+        - mask: "2"
+        - x: "1.495000"
+          y: "0.785000"
+        - x: "1.705000"
+          y: "1.075000"
   - Shape:
       Rect:
-        - - "1.495000"
-          - "1.325000"
-        - - "1.705000"
-          - "1.495000"
+        - mask: "2"
+        - x: "1.495000"
+          y: "1.325000"
+        - x: "1.705000"
+          y: "1.495000"
   - Shape:
       Rect:
-        - - "1.495000"
-          - "1.495000"
-        - - "1.785000"
-          - "2.465000"
+        - mask: "2"
+        - x: "1.495000"
+          y: "1.495000"
+        - x: "1.785000"
+          y: "2.465000"
   - Shape:
       Rect:
-        - - "2.180000"
-          - "0.255000"
-        - - "2.420000"
-          - "0.615000"
+        - mask: "2"
+        - x: "2.180000"
+          y: "0.255000"
+        - x: "2.420000"
+          y: "0.615000"
   - Shape:
       Rect:
-        - - "3.070000"
-          - "1.915000"
-        - - "4.515000"
-          - "2.085000"
+        - mask: "2"
+        - x: "3.070000"
+          y: "1.915000"
+        - x: "4.515000"
+          y: "2.085000"
   - Shape:
       Rect:
-        - - "3.070000"
-          - "2.085000"
-        - - "3.400000"
-          - "2.465000"
+        - mask: "2"
+        - x: "3.070000"
+          y: "2.085000"
+        - x: "3.400000"
+          y: "2.465000"
   - Shape:
       Rect:
-        - - "3.090000"
-          - "0.255000"
-        - - "3.335000"
-          - "0.615000"
+        - mask: "2"
+        - x: "3.090000"
+          y: "0.255000"
+        - x: "3.335000"
+          y: "0.615000"
   - Shape:
       Rect:
-        - - "4.090000"
-          - "2.085000"
-        - - "4.515000"
-          - "2.465000"
+        - mask: "2"
+        - x: "4.090000"
+          y: "2.085000"
+        - x: "4.515000"
+          y: "2.465000"