Simple speedup in bundle merge: set bundle while everything is in cache (same pass), and only check non-overlap with debug assertions enabled. Alloc time on clang.wasm: 9.1s old backtracking RA vs. 7.2s with this regalloc2 RA.
This commit is contained in:
@@ -2051,6 +2051,7 @@ impl<'a, F: Function> Env<'a, F> {
|
||||
while idx_from < ranges_from.len() || idx_to < ranges_to.len() {
|
||||
if idx_from < ranges_from.len() && idx_to < ranges_to.len() {
|
||||
if ranges_from[idx_from].range.from <= ranges_to[idx_to].range.from {
|
||||
self.ranges[ranges_from[idx_from].index.index()].bundle = to;
|
||||
merged.push(ranges_from[idx_from]);
|
||||
idx_from += 1;
|
||||
} else {
|
||||
@@ -2058,6 +2059,9 @@ impl<'a, F: Function> Env<'a, F> {
|
||||
idx_to += 1;
|
||||
}
|
||||
} else if idx_from < ranges_from.len() {
|
||||
for entry in &ranges_from[idx_from..] {
|
||||
self.ranges[entry.index.index()].bundle = to;
|
||||
}
|
||||
merged.extend_from_slice(&ranges_from[idx_from..]);
|
||||
break;
|
||||
} else {
|
||||
@@ -2066,6 +2070,9 @@ impl<'a, F: Function> Env<'a, F> {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
{
|
||||
log::debug!("merging: merged = {:?}", merged);
|
||||
let mut last_range = None;
|
||||
for entry in &merged {
|
||||
@@ -2094,7 +2101,7 @@ impl<'a, F: Function> Env<'a, F> {
|
||||
to.index(),
|
||||
entry.index.index(),
|
||||
);
|
||||
self.ranges[entry.index.index()].bundle = to;
|
||||
}
|
||||
}
|
||||
|
||||
self.bundles[to.index()].ranges = merged;
|
||||
|
||||
Reference in New Issue
Block a user