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

use new arc type in partitioner

Browse Source
This commit is contained in:
SpaceCat-Chan 2022-11-27 20:47:16 +01:00 committed by Lofty
parent 88f88e48cb
commit 38908e64fb
3 changed files with 125 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/route/awooter/rust/src/lib.rs
View File

@ -23,9 +23,7 @@ pub extern "C" fn npnr_router_awooter(ctx: Option<NonNull<npnr::Context>>) -> bo
})
}
type Arc = ((npnr::WireId, npnr::Loc), (npnr::WireId, npnr::Loc));
fn extract_arcs_from_nets(ctx: &npnr::Context, nets: npnr::Nets) -> Vec<Arc> {
fn extract_arcs_from_nets(ctx: &npnr::Context, nets: npnr::Nets) -> Vec<route::Arc> {
let mut arcs = vec![];
for (name, net) in nets.iter() {
let net = unsafe { net.as_mut().unwrap() };
@ -42,7 +40,13 @@ fn extract_arcs_from_nets(ctx: &npnr::Context, nets: npnr::Nets) -> Vec<Arc> {
let sink = sink_ref.cell().unwrap();
let sink = sink.location();
for sink_wire in ctx.sink_wires(net, *sink_ref) {
arcs.push(((source_wire, source), (sink_wire, sink)))
arcs.push(route::Arc::new(
source_wire,
source,
sink_wire,
sink,
net.index(),
))
}
}
}
@ -166,23 +170,39 @@ fn route(ctx: &mut npnr::Context) -> bool {
let mut invalid_arcs_in_sw = 0;
let mut invalid_arcs_in_nw = 0;
for ((_, source), (_, sink)) in ne {
if source.x > x_part || source.y > y_part || sink.x > x_part || sink.y > y_part {
for arc in &ne {
if arc.get_source_loc().x > x_part
|| arc.get_source_loc().y > y_part
|| arc.get_sink_loc().x > x_part
|| arc.get_sink_loc().y > y_part
{
invalid_arcs_in_ne += 1;
}
}
for ((_, source), (_, sink)) in se {
if source.x < x_part || source.y > y_part || sink.x < x_part || sink.y > y_part {
for arc in &se {
if arc.get_source_loc().x < x_part
|| arc.get_source_loc().y > y_part
|| arc.get_sink_loc().x < x_part
|| arc.get_sink_loc().y > y_part
{
invalid_arcs_in_se += 1;
}
}
for ((_, source), (_, sink)) in sw {
if source.x < x_part || source.y < y_part || sink.x < x_part || sink.y < y_part {
for arc in &sw {
if arc.get_source_loc().x < x_part
|| arc.get_source_loc().y < y_part
|| arc.get_sink_loc().x < x_part
|| arc.get_sink_loc().y < y_part
{
invalid_arcs_in_sw += 1;
}
}
for ((_, source), (_, sink)) in nw {
if source.x > x_part || source.y < y_part || sink.x > x_part || sink.y < y_part {
for arc in &nw {
if arc.get_source_loc().x > x_part
|| arc.get_source_loc().y < y_part
|| arc.get_sink_loc().x > x_part
|| arc.get_sink_loc().y < y_part
{
invalid_arcs_in_nw += 1;
}
}

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

@ -4,7 +4,7 @@ use colored::Colorize;
use indicatif::{ParallelProgressIterator, ProgressBar, ProgressStyle};
use rayon::prelude::*;
use crate::{npnr, Arc};
use crate::{npnr, route::Arc};
pub enum Segment {
Northeast,
@ -303,7 +303,9 @@ fn partition<R: RangeBounds<i32>>(
.progress_chars("━╸ "),
);
let find_best_pip = |pips: &Vec<(npnr::PipId, AtomicUsize)>, source_wire: npnr::WireId, sink_wire: npnr::WireId| {
let find_best_pip = |pips: &Vec<(npnr::PipId, AtomicUsize)>,
source_wire: npnr::WireId,
sink_wire: npnr::WireId| {
let (selected_pip, pip_uses) = pips
.iter()
.min_by_key(|(pip, uses)| {
@ -319,21 +321,25 @@ fn partition<R: RangeBounds<i32>>(
let mut explored_pips = AtomicUsize::new(0);
let partition_coords = Coord::new(x, y);
let arcs = arcs
.into_par_iter()
.progress_with(progress)
.flat_map(|&((source_wire, source), (sink_wire, sink_loc))| {
let source_is_north = source.x < x;
let source_is_east = source.y < y;
let sink_is_north = sink_loc.x < x;
let sink_is_east = sink_loc.y < y;
.flat_map(|arc| {
let source_loc = arc.get_source_loc();
let source_coords: Coord = source_loc.into();
let source_is_north = source_coords.is_north_of(&partition_coords);
let source_is_east = source_coords.is_east_of(&partition_coords);
let sink_loc = arc.get_sink_loc();
let sink_coords: Coord = sink_loc.into();
let sink_is_north = sink_coords.is_north_of(&partition_coords);
let sink_is_east = sink_coords.is_east_of(&partition_coords);
if source_is_north == sink_is_north && source_is_east == sink_is_east {
let arc = ((source_wire, source), (sink_wire, sink_loc));
let source = Coord::new(source.x, source.y);
let seg = source.segment_from(&Coord::new(x, y));
vec![(seg, arc)]
let seg = source_coords.segment_from(&Coord::new(x, y));
vec![(seg, arc.clone())]
} else if source_is_north != sink_is_north && source_is_east == sink_is_east {
let middle = (x, (source.y + sink_loc.y) / 2);
let middle = (x, (source_coords.y + sink_coords.y) / 2);
let middle = (
middle.0.clamp(1, ctx.grid_dim_x() - 1),
middle.1.clamp(1, ctx.grid_dim_y() - 1),
@ -343,14 +349,10 @@ fn partition<R: RangeBounds<i32>>(
false => pips_n.get(&middle).unwrap(),
};
let selected_pip = find_best_pip(pips, source_wire, sink_wire);
let selected_pip = find_best_pip(pips, arc.get_source_wire(), arc.get_sink_wire());
explored_pips.fetch_add(pips.len(), std::sync::atomic::Ordering::Relaxed);
let pip_loc = ctx.pip_location(selected_pip);
let pip_src_wire = ctx.pip_src_wire(selected_pip);
let pip_dst_wire = ctx.pip_dst_wire(selected_pip);
let src_to_pip = ((source_wire, source), (pip_src_wire, pip_loc));
let pip_to_dst = ((pip_dst_wire, pip_loc), (sink_wire, sink_loc));
let (src_to_pip, pip_to_dst) = arc.split(ctx, selected_pip);
let (seg1, seg2) = match (source_is_north, source_is_east) {
(true, true) => (Segment::Northeast, Segment::Southeast),
(true, false) => (Segment::Northwest, Segment::Southwest),
@ -360,7 +362,7 @@ fn partition<R: RangeBounds<i32>>(
part_horiz.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
vec![(seg1, src_to_pip), (seg2, pip_to_dst)]
} else if source_is_north == sink_is_north && source_is_east != sink_is_east {
let middle = ((source.x + sink_loc.x) / 2, y);
let middle = ((source_coords.x + sink_coords.x) / 2, y);
let middle = (
middle.0.clamp(1, ctx.grid_dim_x() - 1),
middle.1.clamp(1, ctx.grid_dim_y() - 1),
@ -370,14 +372,10 @@ fn partition<R: RangeBounds<i32>>(
false => pips_e.get(&middle).unwrap(),
};
let selected_pip = find_best_pip(pips, source_wire, sink_wire);
let selected_pip = find_best_pip(pips, arc.get_source_wire(), arc.get_sink_wire());
explored_pips.fetch_add(pips.len(), std::sync::atomic::Ordering::Relaxed);
let pip_loc = ctx.pip_location(selected_pip);
let pip_src_wire = ctx.pip_src_wire(selected_pip);
let pip_dst_wire = ctx.pip_dst_wire(selected_pip);
let src_to_pip = ((source_wire, source), (pip_src_wire, pip_loc));
let pip_to_dst = ((pip_dst_wire, pip_loc), (sink_wire, sink_loc));
let (src_to_pip, pip_to_dst) = arc.split(ctx, selected_pip);
let (seg1, seg2) = match (source_is_north, source_is_east) {
(true, true) => (Segment::Northeast, Segment::Northwest),
(true, false) => (Segment::Northwest, Segment::Northeast),
@ -387,7 +385,7 @@ fn partition<R: RangeBounds<i32>>(
part_vert.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
vec![(seg1, src_to_pip), (seg2, pip_to_dst)]
} else {
let middle = (x, split_line_over_x((source, sink_loc), x));
let middle = (x, split_line_over_x((source_loc, sink_loc), x));
let middle = (
middle.0.clamp(1, ctx.grid_dim_x() - 1),
middle.1.clamp(1, ctx.grid_dim_y() - 1),
@ -397,10 +395,10 @@ fn partition<R: RangeBounds<i32>>(
false => pips_e.get(&middle).unwrap(),
};
let horiz_pip = find_best_pip(pips, source_wire, sink_wire);
let horiz_pip = find_best_pip(pips, arc.get_source_wire(), arc.get_sink_wire());
explored_pips.fetch_add(pips.len(), std::sync::atomic::Ordering::Relaxed);
let middle = (split_line_over_y((source, sink_loc), y), y);
let middle = (split_line_over_y((source_loc, sink_loc), y), y);
let middle = (
middle.0.clamp(1, ctx.grid_dim_x() - 1),
middle.1.clamp(1, ctx.grid_dim_y() - 1),
@ -410,28 +408,19 @@ fn partition<R: RangeBounds<i32>>(
false => pips_n.get(&middle).unwrap(),
};
let vert_pip = find_best_pip(pips, source_wire, sink_wire);
let vert_pip = find_best_pip(pips, arc.get_source_wire(), arc.get_sink_wire());
explored_pips.fetch_add(pips.len(), std::sync::atomic::Ordering::Relaxed);
let horiz_loc = ctx.pip_location(horiz_pip);
let horiz_src_wire = ctx.pip_src_wire(horiz_pip);
let horiz_dst_wire = ctx.pip_dst_wire(horiz_pip);
let horiz_is_east = horiz_loc.y < y;
let vert_loc = ctx.pip_location(vert_pip);
let vert_src_wire = ctx.pip_src_wire(vert_pip);
let vert_dst_wire = ctx.pip_dst_wire(vert_pip);
let horiz_loc: Coord = ctx.pip_location(horiz_pip).into();
let horiz_is_east = horiz_loc.is_east_of(&partition_coords);
let (src_to_mid1, mid1_to_mid2, mid2_to_dst) = if horiz_is_east == source_is_east {
(
((source_wire, source), (horiz_src_wire, horiz_loc)),
((horiz_dst_wire, horiz_loc), (vert_src_wire, vert_loc)),
((vert_dst_wire, vert_loc), (sink_wire, sink_loc)),
)
let (a, b) = arc.split(ctx, horiz_pip);
let (b, c) = b.split(ctx, vert_pip);
(a, b, c)
} else {
(
((source_wire, source), (vert_src_wire, vert_loc)),
((vert_dst_wire, vert_loc), (horiz_src_wire, horiz_loc)),
((horiz_dst_wire, horiz_loc), (sink_wire, sink_loc)),
)
let (a, b) = arc.split(ctx, vert_pip);
let (b, c) = b.split(ctx, horiz_pip);
(a, b, c)
};
let (seg1, seg2, seg3) = match (source_is_north, source_is_east, horiz_is_east) {
(true, true, true) => {

54
common/route/awooter/rust/src/route.rs
View File

@ -1,7 +1,11 @@
use std::collections::{BinaryHeap, HashMap};
use crate::{npnr::{self, NetIndex, PipId}, partition};
use crate::{
npnr::{self, NetIndex, PipId},
partition,
};
#[derive(Clone)]
pub struct Arc {
source_wire: npnr::WireId,
source_loc: npnr::Loc,
@ -11,29 +15,54 @@ pub struct Arc {
}
impl Arc {
pub fn new(source_wire: npnr::WireId, source_loc: npnr::Loc, sink_wire: npnr::WireId, sink_loc: npnr::Loc, net: NetIndex) -> Self {
pub fn new(
source_wire: npnr::WireId,
source_loc: npnr::Loc,
sink_wire: npnr::WireId,
sink_loc: npnr::Loc,
net: NetIndex,
) -> Self {
Self {
source_wire, source_loc, sink_wire, sink_loc, net
source_wire,
source_loc,
sink_wire,
sink_loc,
net,
}
}
pub fn split(&mut self, ctx: &npnr::Context, pip: npnr::PipId) -> (Self, Self) {
pub fn split(&self, ctx: &npnr::Context, pip: npnr::PipId) -> (Self, Self) {
let pip_src = ctx.pip_src_wire(pip);
let pip_dst = ctx.pip_dst_wire(pip);
(Self {
(
Self {
source_wire: self.source_wire,
source_loc: self.source_loc,
sink_wire: pip_src,
sink_loc: ctx.pip_location(pip),
net: self.net
net: self.net,
},
Self {
source_wire: pip_dst,
source_loc: ctx.pip_location(pip),
sink_wire: self.sink_wire,
sink_loc: self.sink_loc,
net: self.net
})
net: self.net,
},
)
}
pub fn get_source_loc(&self) -> npnr::Loc {
self.source_loc
}
pub fn get_sink_loc(&self) -> npnr::Loc {
self.sink_loc
}
pub fn get_source_wire(&self) -> npnr::WireId {
self.source_wire
}
pub fn get_sink_wire(&self) -> npnr::WireId {
self.sink_wire
}
}
@ -46,11 +75,7 @@ struct QueuedWire {
impl QueuedWire {
pub fn new(cost: f32, togo: f32, wire: npnr::WireId) -> Self {
Self {
cost,
togo,
wire,
}
Self { cost, togo, wire }
}
}
@ -162,7 +187,8 @@ impl Router {
visited.insert(sink, pip);
let delay = source.cost + ctx.pip_delay(pip) + ctx.wire_delay(sink) + ctx.delay_epsilon();
let delay =
source.cost + ctx.pip_delay(pip) + ctx.wire_delay(sink) + ctx.delay_epsilon();
let qw = QueuedWire::new(delay, ctx.estimate_delay(sink, arc.sink_wire), sink);
queue.push(qw);
}