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

Use hashset to avoid linear scan in conflict-bundle-set deduplication

Browse Source
This commit is contained in:
Chris Fallin
2021-06-09 23:53:54 -07:00
parent 4ba7b2f57e
commit fcbf384d74
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ion/mod.rs
View File

@@ -818,8 +818,8 @@ enum RedundantMoveState {
} }
#[derive(Clone, Debug, Default)] #[derive(Clone, Debug, Default)]
struct RedundantMoveEliminator { struct RedundantMoveEliminator {
allocs: HashMap<Allocation, RedundantMoveState>, allocs: FxHashMap<Allocation, RedundantMoveState>,
reverse_allocs: HashMap<Allocation, SmallVec<[Allocation; 4]>>, reverse_allocs: FxHashMap<Allocation, SmallVec<[Allocation; 4]>>,
} }
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
struct RedundantMoveAction { struct RedundantMoveAction {
@@ -2634,6 +2634,7 @@ impl<'a, F: Function> Env<'a, F> {
) -> AllocRegResult { ) -> AllocRegResult {
log::debug!("try_to_allocate_bundle_to_reg: {:?} -> {:?}", bundle, reg); log::debug!("try_to_allocate_bundle_to_reg: {:?} -> {:?}", bundle, reg);
let mut conflicts = smallvec![]; let mut conflicts = smallvec![];
let mut conflict_set = FxHashSet::default();
let mut max_conflict_weight = 0; let mut max_conflict_weight = 0;
// Traverse the BTreeMap in order by requesting the whole // Traverse the BTreeMap in order by requesting the whole
// range spanned by the bundle and iterating over that // range spanned by the bundle and iterating over that
@@ -2729,8 +2730,9 @@ impl<'a, F: Function> Env<'a, F> {
// conflicts list. // conflicts list.
let conflict_bundle = self.ranges[preg_range.index()].bundle; let conflict_bundle = self.ranges[preg_range.index()].bundle;
log::debug!(" -> conflict bundle {:?}", conflict_bundle); log::debug!(" -> conflict bundle {:?}", conflict_bundle);
if !conflicts.iter().any(|b| *b == conflict_bundle) { if !conflict_set.contains(&conflict_bundle) {
conflicts.push(conflict_bundle); conflicts.push(conflict_bundle);
conflict_set.insert(conflict_bundle);
max_conflict_weight = std::cmp::max( max_conflict_weight = std::cmp::max(
max_conflict_weight, max_conflict_weight,
self.bundles[conflict_bundle.index()].cached_spill_weight(), self.bundles[conflict_bundle.index()].cached_spill_weight(),