fix track dir bug in router

ucb-substrate · Jan 2, 2024 · f7ff06f · f7ff06f
1 parent 6e754a6
commit f7ff06f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/libs/atoll/src/grid.rs b/libs/atoll/src/grid.rs
@@ -831,14 +831,15 @@ impl<L: AtollLayer + Clone> RoutingState<L> {
         // via down
         if coord.layer > 0 {
             let next_layer = coord.layer - 1;
-            let interp_dir = routing_dir.track_dir();
+            let interp_dir = !routing_dir.track_dir();
             let pp = self.grid_to_rel_physical(coord);
             let dn =
                 self.grid
                     .point_to_grid(pp, next_layer, RoundingMode::Down, RoundingMode::Down);
             let up = self
                 .grid
                 .point_to_grid(pp, next_layer, RoundingMode::Up, RoundingMode::Up);
+            println!("coord = {coord:?}, pp = {pp:?}, dn = {dn:?}, up = {up:?}, interp dir = {interp_dir:?}");
             assert_eq!(dn.coord(!interp_dir), coord.coord(!interp_dir) as i64);
             assert_eq!(up.coord(!interp_dir), coord.coord(!interp_dir) as i64);
             assert!(dn.x >= 0 && dn.y >= 0);

diff --git a/tests/src/atoll/mod.rs b/tests/src/atoll/mod.rs
@@ -161,6 +161,7 @@ impl Tile<Sky130Pdk> for Sky130NmosTileAutoroute {
             instances.push(schematic);
         }
 
+        cell.set_top_layer(2);
         cell.set_router(GreedyBfsRouter);
         cell.set_via_maker(Sky130ViaMaker);