T0b1/regalloc2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split-at-first-conflict: first conflict is first of (start of our range), (start of conflict range), not just the latter; otherwise we have a too-early split sometimes

Browse Source
This commit is contained in:
Chris Fallin
2021-06-07 12:27:58 -07:00
parent 0eaa0fde06
commit 2be7bdbc22
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ion/mod.rs
View File

@@ -619,7 +619,7 @@ impl Requirement {
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq, Eq)]
enum AllocRegResult { enum AllocRegResult {
Allocated(Allocation), Allocated(Allocation),
Conflict(LiveBundleVec), Conflict(LiveBundleVec, ProgPoint),
ConflictWithFixed(u32, ProgPoint), ConflictWithFixed(u32, ProgPoint),
ConflictHighCost, ConflictHighCost,
} }
@@ -2530,6 +2530,8 @@ impl<'a, F: Function> Env<'a, F> {
from_key, from_key,
self.pregs[reg.index()].allocations.btree self.pregs[reg.index()].allocations.btree
); );
let mut first_conflict: Option<ProgPoint> = None;
'ranges: for entry in bundle_ranges { 'ranges: for entry in bundle_ranges {
log::debug!(" -> range LR {:?}: {:?}", entry.index, entry.range); log::debug!(" -> range LR {:?}: {:?}", entry.index, entry.range);
let key = LiveRangeKey::from_range(&entry.range); let key = LiveRangeKey::from_range(&entry.range);
@@ -2606,6 +2608,13 @@ impl<'a, F: Function> Env<'a, F> {
return AllocRegResult::ConflictHighCost; return AllocRegResult::ConflictHighCost;
} }
} }
if first_conflict.is_none() {
first_conflict = Some(ProgPoint::from_index(std::cmp::max(
preg_key.from,
key.from,
)));
}
} else { } else {
log::debug!(" -> conflict with fixed reservation"); log::debug!(" -> conflict with fixed reservation");
// range from a direct use of the PReg (due to clobber). // range from a direct use of the PReg (due to clobber).
@@ -2618,7 +2627,7 @@ impl<'a, F: Function> Env<'a, F> {
} }
if conflicts.len() > 0 { if conflicts.len() > 0 {
return AllocRegResult::Conflict(conflicts); return AllocRegResult::Conflict(conflicts, first_conflict.unwrap());
} }
// We can allocate! Add our ranges to the preg's BTree. // We can allocate! Add our ranges to the preg's BTree.
@@ -3290,11 +3299,12 @@ impl<'a, F: Function> Env<'a, F> {
alloc.as_reg().unwrap(); alloc.as_reg().unwrap();
return Ok(()); return Ok(());
} }
AllocRegResult::Conflict(bundles) => { AllocRegResult::Conflict(bundles, first_conflict_point) => {
log::debug!(" -> conflict with bundles {:?}", bundles); log::debug!(
" -> conflict with bundles {:?}, first conflict at {:?}",
let first_conflict_point = bundles,
self.bundles[bundles[0].index()].ranges[0].range.from; first_conflict_point
);
let conflict_cost = self.maximum_spill_weight_in_bundle_set(&bundles); let conflict_cost = self.maximum_spill_weight_in_bundle_set(&bundles);