export text to GDS

Author: rahulk29

core/compiler/src/gds.rs

@@ -1,8 +1,9 @@
 use std::{io::BufReader, ops::Deref, path::Path};
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use gds21::{
-    GdsBoundary, GdsElement, GdsLayerSpec, GdsLibrary, GdsPoint, GdsStrans, GdsStruct, GdsStructRef,
+    GdsBoundary, GdsElement, GdsLayerSpec, GdsLibrary, GdsPoint, GdsStrans, GdsStruct,
+    GdsStructRef, GdsTextElem,
 };
 use indexmap::IndexMap;
 use regex::Regex;
@@ -141,6 +142,21 @@ impl CompiledData {
                         }));
                     }
                 }
+                SolvedValue::Text(text) => {
+                    let GdsLayerSpec {
+                        layer,
+                        xtype: texttype,
+                    } = exporter.map[&text.layer];
+                    let x = text.x as i32;
+                    let y = text.y as i32;
+                    ocell.elems.push(GdsElement::GdsTextElem(GdsTextElem {
+                        string: text.text.clone(),
+                        layer,
+                        texttype,
+                        xy: GdsPoint::new(x, y),
+                        ..Default::default()
+                    }));
+                }
                 SolvedValue::Instance(i) => {
                     self.cell_to_gds(exporter, i.cell)?;
                     ocell.elems.push(GdsElement::GdsStructRef(GdsStructRef {

core/compiler/src/lib.rs

@@ -19,7 +19,7 @@ mod tests {
     use approx::assert_relative_eq;
     use const_format::concatcp;
 
-    use crate::compile::{CellArg, CompileInput, compile};
+    use crate::compile::{compile, CellArg, CompileInput};
     const EPSILON: f64 = 1e-10;
 
     const EXAMPLES_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../../examples");
@@ -672,15 +672,24 @@ mod tests {
             CompileInput {
                 cell: &["top"],
                 args: Vec::new(),
-                lyp_file: &PathBuf::from(BASIC_LYP),
+                lyp_file: &PathBuf::from(SKY130_LYP),
             },
         );
         println!("{cells:#?}");
+
+        let work_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("build/argon_text");
+        cells
+            .to_gds(
+                GdsMap::from_lyp(SKY130_LYP).expect("failed to create GDS map"),
+                work_dir.join("layout.gds"),
+            )
+            .expect("Failed to write to GDS");
+
         let cells = cells.unwrap_valid();
         let cell = &cells.cells[&cells.top];
-        assert_eq!(cell.objects.len(), 1);
+        assert_eq!(cell.objects.len(), 2);
         let t = cell.objects.iter().find_map(|(_, v)| v.get_text()).unwrap();
-        assert_eq!(t.layer, "met1");
+        assert_eq!(t.layer, "met1.label");
         assert_eq!(t.text, "mytext");
         assert_relative_eq!(t.x, 0., epsilon = EPSILON);
         assert_relative_eq!(t.y, 10., epsilon = EPSILON);

examples/text/lib.ar

@@ -1,3 +1,4 @@
 cell top() {
-    text("mytext", "met1", 0., 10.);
+    rect("met1.drawing", x0=-100., y0=-100., x1=100., y1=100.);
+    text("mytext", "met1.label", 0., 10.);
 }