fix substrate doctest

ucb-substrate · Oct 30, 2023 · dfc7560 · dfc7560
1 parent c23c1b7
commit dfc7560
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
@@ -21,6 +21,7 @@ serde = { version = "1", features = ["derive"] }
 substrate = { version = "<=0.6.1", registry = "substrate", path = "../substrate" }
 sky130pdk = { version = "<=0.6.1", registry = "substrate", path = "../pdks/sky130pdk" }
 spectre = { version = "<=0.6.1", registry = "substrate", path = "../tools/spectre" }
+spice = { version = "<=0.4.0", registry = "substrate", path = "../libs/spice" }
 
 [lib]
 proc-macro = true
diff --git a/libs/scir/src/netlist.rs b/libs/scir/src/netlist.rs
@@ -306,7 +306,7 @@ impl<'a, S: HasSpiceLikeNetlist, W: Write> NetlisterInstance<'a, S, W> {
             if signal == &sig_info.name && slice.range().is_none() {
                 // Ground renaming cannot apply to buses.
                 // TODO assert that the ground port has width 1.
-                return Ok(arcstr::format!("{}", replace_with));
+                return Ok(replace_with.clone());
             }
         }
         let mut buf = Vec::new();

diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml
@@ -38,4 +38,5 @@ toml = "0.8"
 approx = "0.5"
 sky130pdk = { version = "<=0.6.1", registry = "substrate", path = "../pdks/sky130pdk" }
 spectre = { version = "<=0.6.1", registry = "substrate", path = "../tools/spectre" }
+spice = { version = "<=0.4.0", registry = "substrate", path = "../libs/spice" }
 
diff --git a/substrate/src/schematic/conv.rs b/substrate/src/schematic/conv.rs
@@ -243,17 +243,28 @@ impl<S: Schema> RawLib<S> {
                     };
 
                     if let Some(concat_index) = concat_index {
-                        // TODO: Handle primitive case.
-                        let child_cell = self.scir.cell(inst.child().into_cell()?);
-                        let port = child_cell.port(name);
-                        let port_slice = child_cell.signal(port.signal()).slice();
-                        let tail = port_slice
-                            .slice_one()
-                            .unwrap_or_else(|| port_slice.index(concat_index));
-                        signals.push(ConvertedNodePath::Cell(scir::SliceOnePath::new(
-                            instances.clone(),
-                            tail,
-                        )));
+                        match inst.child() {
+                            ChildId::Cell(id) => {
+                                let child_cell = self.scir.cell(id);
+                                let port = child_cell.port(name);
+                                let port_slice = child_cell.signal(port.signal()).slice();
+                                let tail = port_slice
+                                    .slice_one()
+                                    .unwrap_or_else(|| port_slice.index(concat_index));
+                                signals.push(ConvertedNodePath::Cell(scir::SliceOnePath::new(
+                                    instances.clone(),
+                                    tail,
+                                )));
+                            }
+                            ChildId::Primitive(id) => {
+                                signals.push(ConvertedNodePath::Primitive {
+                                    id,
+                                    instances: instances.clone(),
+                                    port: name.clone(),
+                                    index: concat_index,
+                                });
+                            }
+                        }
                     }
                 }
                 port_index += part.width();