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

awooter: properly parallelise

Browse Source
This commit is contained in:
Lofty 2022-11-26 19:17:43 +00:00
parent c00fba75e9
commit 1077cd3654
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,8 @@ use colored::Colorize;
use indicatif::{ProgressBar, ProgressStyle}; use indicatif::{ProgressBar, ProgressStyle};
use rayon::prelude::*; use rayon::prelude::*;
use crate::npnr::PortRef;
#[macro_use] #[macro_use]
mod npnr; mod npnr;
@ -312,11 +314,10 @@ fn partition_nets(
let arcs = nets let arcs = nets
.users_by_name(*name) .users_by_name(*name)
.unwrap() .unwrap()
.iter() .par_iter()
.flat_map(|sink| { .flat_map(|sink| {
let sink = unsafe { sink.as_ref().unwrap() }; ctx.sink_wires(net, (*sink) as *const PortRef)
ctx.sink_wires(net, sink) .into_par_iter()
.into_iter()
.map(move |sink_wire| (sink, sink_wire)) .map(move |sink_wire| (sink, sink_wire))
}) })
.flat_map(|(sink, sink_wire)| { .flat_map(|(sink, sink_wire)| {
@ -682,7 +683,6 @@ fn route(ctx: &mut npnr::Context) -> bool {
let mut y1 = 0; let mut y1 = 0;
for sink in nets.users_by_name(*name).unwrap().iter() { for sink in nets.users_by_name(*name).unwrap().iter() {
let sink = unsafe { sink.as_ref().unwrap() };
let cell = sink.cell().unwrap().location(); let cell = sink.cell().unwrap().location();
x0 = x0.min(cell.x); x0 = x0.min(cell.x);
y0 = y0.min(cell.y); y0 = y0.min(cell.y);

6
common/route/awooter/rust/src/npnr.rs
View File

@ -319,7 +319,7 @@ extern "C" {
/// Store for the nets of a context. /// Store for the nets of a context.
pub struct Nets<'a> { pub struct Nets<'a> {
nets: HashMap<IdString, *mut NetInfo>, nets: HashMap<IdString, *mut NetInfo>,
users: HashMap<IdString, &'a [*mut PortRef]>, users: HashMap<IdString, &'a [&'a mut PortRef]>,
_data: PhantomData<&'a Context>, _data: PhantomData<&'a Context>,
} }
@ -347,7 +347,7 @@ impl<'a> Nets<'a> {
// Leaking memory is the most convenient FFI I could think of. // Leaking memory is the most convenient FFI I could think of.
let len = let len =
unsafe { npnr_netinfo_users_leak(net, &mut users_ptr as *mut *mut *mut PortRef) }; unsafe { npnr_netinfo_users_leak(net, &mut users_ptr as *mut *mut *mut PortRef) };
let users_slice = unsafe { slice::from_raw_parts(users_ptr, len as usize) }; let users_slice = unsafe { slice::from_raw_parts(users_ptr as *mut &mut PortRef, len as usize) };
nets.insert(name, net); nets.insert(name, net);
users.insert(name, users_slice); users.insert(name, users_slice);
} }
@ -360,7 +360,7 @@ impl<'a> Nets<'a> {
} }
/// Find net users given a net's name. /// Find net users given a net's name.
pub fn users_by_name(&self, net: IdString) -> Option<&&[*mut PortRef]> { pub fn users_by_name(&self, net: IdString) -> Option<&&[&mut PortRef]> {
self.users.get(&net) self.users.get(&net)
} }