caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only search pips inside partition bounds

Browse Source
This commit is contained in:
SpaceCat-Chan 2022-11-27 20:24:15 +01:00 committed by Lofty
parent 686648c406
commit 88f88e48cb
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/route/awooter/rust/src/partition.rs
View File

@ -1,4 +1,4 @@
use std::{collections::HashMap, sync::atomic::AtomicUsize}; use std::{collections::HashMap, ops::RangeBounds, sync::atomic::AtomicUsize};
use colored::Colorize; use colored::Colorize;
use indicatif::{ParallelProgressIterator, ProgressBar, ProgressStyle}; use indicatif::{ParallelProgressIterator, ProgressBar, ProgressStyle};
@ -89,7 +89,15 @@ pub fn find_partition_point(
let mut nw; let mut nw;
while x_diff != 0 { while x_diff != 0 {
(ne, se, sw, nw) = partition(ctx, arcs, pips, x, y); (ne, se, sw, nw) = partition(
ctx,
arcs,
pips,
x,
y,
x_start..=x_finish,
y_start..=y_finish,
);
let north = ne.len() + nw.len(); let north = ne.len() + nw.len();
let south = se.len() + sw.len(); let south = se.len() + sw.len();
@ -125,7 +133,15 @@ pub fn find_partition_point(
y_diff >>= 1; y_diff >>= 1;
} }
(ne, se, sw, nw) = partition(ctx, arcs, pips, x, y); (ne, se, sw, nw) = partition(
ctx,
arcs,
pips,
x,
y,
x_start..=x_finish,
y_start..=y_finish,
);
let north = ne.len() + nw.len(); let north = ne.len() + nw.len();
let south = se.len() + sw.len(); let south = se.len() + sw.len();
@ -182,12 +198,14 @@ fn split_line_over_y(line: (npnr::Loc, npnr::Loc), y_location: i32) -> i32 {
} }
// A big thank you to @Spacecat-chan for fixing my broken and buggy partition code. // A big thank you to @Spacecat-chan for fixing my broken and buggy partition code.
fn partition( fn partition<R: RangeBounds<i32>>(
ctx: &npnr::Context, ctx: &npnr::Context,
arcs: &[Arc], arcs: &[Arc],
pips: &[npnr::PipId], pips: &[npnr::PipId],
x: i32, x: i32,
y: i32, y: i32,
x_bounds: R,
y_bounds: R,
) -> (Vec<Arc>, Vec<Arc>, Vec<Arc>, Vec<Arc>) { ) -> (Vec<Arc>, Vec<Arc>, Vec<Arc>, Vec<Arc>) {
let mut pips_n = HashMap::new(); let mut pips_n = HashMap::new();
let mut pips_e = HashMap::new(); let mut pips_e = HashMap::new();
@ -217,7 +235,7 @@ fn partition(
let mut west = 0; let mut west = 0;
for &pip in pips { for &pip in pips {
let loc = ctx.pip_location(pip); let loc = ctx.pip_location(pip);
if loc.x == x || loc.y == y { if (loc.x == x || loc.y == y) && x_bounds.contains(&loc.x) && y_bounds.contains(&loc.y) {
let dir = ctx.pip_direction(pip); let dir = ctx.pip_direction(pip);
// This pip seems internal; skip it. // This pip seems internal; skip it.