fix merge conflicts

ucb-substrate · Dec 28, 2023 · 9f40537 · 9f40537
2 parents f4cd5dc + cfc2191
commit 9f40537
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pdks/sky130pdk/src/atoll/mod.rs b/pdks/sky130pdk/src/atoll/mod.rs
@@ -4,10 +4,10 @@ use crate::layers::Sky130Layers;
 use crate::mos::{MosParams, Nfet01v8};
 use crate::Sky130Pdk;
 use arcstr::ArcStr;
-use atoll::grid::{AbstractLayer, AtollLayer, LayerStack, PdkLayer, RoutingGrid};
+use atoll::grid::{AbstractLayer, LayerStack, PdkLayer, RoutingGrid};
 use atoll::RoutingDir;
 use serde::{Deserialize, Serialize};
-use std::ops::{Deref, DerefMut};
+
 use substrate::block::Block;
 use substrate::geometry::bbox::Bbox;
 use substrate::geometry::dir::Dir;
@@ -17,7 +17,7 @@ use substrate::io::layout::IoShape;
 use substrate::io::{Array, InOut, Input, Io, MosIoSchematic, Signal};
 use substrate::layout::element::Shape;
 use substrate::layout::{CellBuilder, ExportsLayoutData, Layout};
-use substrate::pdk::layers::{Layer, LayerId};
+use substrate::pdk::layers::Layer;
 use substrate::schematic::{ExportsNestedData, Schematic};
 
 impl Sky130Layers {
@@ -36,8 +36,7 @@ impl Sky130Layers {
                         offset: 85,
                         endcap: 0,
                     },
-                }
-                .into(),
+                },
                 PdkLayer {
                     id: self.met1.drawing.id(),
                     inner: AbstractLayer {
@@ -47,8 +46,7 @@ impl Sky130Layers {
                         offset: 130,
                         endcap: 100,
                     },
-                }
-                .into(),
+                },
                 PdkLayer {
                     id: self.met2.drawing.id(),
                     inner: AbstractLayer {
@@ -58,8 +56,7 @@ impl Sky130Layers {
                         offset: 150,
                         endcap: 130,
                     },
-                }
-                .into(),
+                },
                 PdkLayer {
                     id: self.met3.drawing.id(),
                     inner: AbstractLayer {
@@ -69,8 +66,7 @@ impl Sky130Layers {
                         offset: 200,
                         endcap: 150,
                     },
-                }
-                .into(),
+                },
                 PdkLayer {
                     id: self.met4.drawing.id(),
                     inner: AbstractLayer {
@@ -80,8 +76,7 @@ impl Sky130Layers {
                         offset: 600,
                         endcap: 200,
                     },
-                }
-                .into(),
+                },
                 PdkLayer {
                     id: self.met5.drawing.id(),
                     inner: AbstractLayer {
@@ -91,8 +86,7 @@ impl Sky130Layers {
                         offset: 900,
                         endcap: 600,
                     },
-                }
-                .into(),
+                },
             ],
             offset_x: 0,
             offset_y: 0,

diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml
@@ -20,6 +20,7 @@ derive_builder = "0.12"
 slotmap = "1"
 downcast-rs = "1"
 indexmap = { version = "2", features = ["serde"] }
+num = "0.4"
 
 config = { version = "0.2.5", registry = "substrate", path = "../config" }
 examples = { version = "0.5.1", registry = "substrate", path = "../docs/examples" }

diff --git a/substrate/src/layout/tracks.rs b/substrate/src/layout/tracks.rs
@@ -1,6 +1,7 @@
 //! Routing track management.
 
 use geometry::span::Span;
+use num::integer::div_floor;
 use serde::{Deserialize, Serialize};
 
 /// A uniform set of tracks.
@@ -69,9 +70,15 @@ impl UniformTracks {
     /// Converts a geometric coordinate to the index of the nearest track.
     pub fn to_track_idx(&self, coord: i64, mode: RoundingMode) -> i64 {
         match mode {
-            RoundingMode::Down => (coord - self.offset) / self.pitch(),
-            RoundingMode::Up => (coord - self.offset + self.pitch() - 1) / self.pitch(),
-            RoundingMode::Nearest => (coord - self.offset + self.pitch() / 2) / self.pitch(),
+            RoundingMode::Down => div_floor(coord - self.offset + self.line / 2, self.pitch()),
+            RoundingMode::Up => div_floor(
+                coord - self.offset + self.pitch() - 1 + self.line / 2,
+                self.pitch(),
+            ),
+            RoundingMode::Nearest => div_floor(
+                coord - self.offset + self.pitch() / 2 + self.line / 2,
+                self.pitch(),
+            ),
         }
     }
 }
@@ -258,4 +265,14 @@ mod tests {
     fn uniform_tracks_requires_even_spacing() {
         UniformTracks::new(320, 645);
     }
+
+    #[test]
+    fn uniform_tracks_to_track_idx() {
+        let tracks = UniformTracks::with_offset(260, 140, 130);
+        assert_eq!(tracks.to_track_idx(-20, RoundingMode::Down), -1);
+        assert_eq!(tracks.to_track_idx(-550, RoundingMode::Down), -2);
+        assert_eq!(tracks.to_track_idx(-200, RoundingMode::Down), -1);
+        assert_eq!(tracks.to_track_idx(-20, RoundingMode::Up), 0);
+        assert_eq!(tracks.to_track_idx(-550, RoundingMode::Up), -1);
+    }
 }