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

Revert "try using bitmap instead of indexset"

Browse Source 
This reverts commit 84a1e58b97.
This commit is contained in:
T0b1
2023-04-16 14:24:26 +02:00
parent 74873feb96
commit f5f984c81a
1 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/ion/fast_alloc.rs
View File

@@ -144,8 +144,8 @@ struct FastAllocState<'a, F: Function> {
pub vregs: Vec<VRegData>, pub vregs: Vec<VRegData>,
pub pregs: Vec<PRegData>, pub pregs: Vec<PRegData>,
pub blocks: Vec<BlockData>, pub blocks: Vec<BlockData>,
pub liveins: Vec<BlockBitmap>, pub liveins: Vec<IndexSet>,
pub liveouts: Vec<BlockBitmap>, pub liveouts: Vec<IndexSet>,
pub cur_stack_slot_idx: u32, pub cur_stack_slot_idx: u32,
pub reftype_vregs_in_pregs_count: u32, pub reftype_vregs_in_pregs_count: u32,
@@ -1093,7 +1093,6 @@ fn calc_use_positions_and_live_bitmaps<'a, F: Function>(
calc_live_bitmaps(state, const_state) calc_live_bitmaps(state, const_state)
} }
#[derive(Clone, Debug)]
struct BlockBitmap { struct BlockBitmap {
storage: SmallVec<[u64; 2]>, storage: SmallVec<[u64; 2]>,
} }
@@ -1123,28 +1122,6 @@ impl BlockBitmap {
let bit = 1u64 << (idx % 64); let bit = 1u64 << (idx % 64);
(self.storage[idx] & bit) != 0 (self.storage[idx] & bit) != 0
} }
fn is_empty(&self) -> bool {
for &b in self.storage.iter() {
if b != 0 {
return false;
}
}
return true;
}
pub fn union_with(&mut self, other: &Self) -> bool {
let mut changed = 0;
for (word_idx, &bits) in other.storage.iter().enumerate() {
if bits == 0 {
continue;
}
let self_word = &mut self.storage[word_idx];
changed |= bits & !*self_word;
*self_word |= bits;
}
changed != 0
}
} }
// currently, copy from liveranges.rs // currently, copy from liveranges.rs
@@ -1154,12 +1131,8 @@ fn calc_live_bitmaps<'a, F: Function>(
state: &mut FastAllocState<'a, F>, state: &mut FastAllocState<'a, F>,
const_state: &ReadOnlyData, const_state: &ReadOnlyData,
) -> Result<(), RegAllocError> { ) -> Result<(), RegAllocError> {
state state.liveins.resize(state.blocks.len(), IndexSet::new());
.liveins state.liveouts.resize(state.blocks.len(), IndexSet::new());
.resize(state.blocks.len(), BlockBitmap::init(state.vregs.len()));
state
.liveouts
.resize(state.blocks.len(), BlockBitmap::init(state.vregs.len()));
// Run a worklist algorithm to precisely compute liveins and // Run a worklist algorithm to precisely compute liveins and
// liveouts. // liveouts.
@@ -1186,7 +1159,7 @@ fn calc_live_bitmaps<'a, F: Function>(
if state.func.is_branch(insns.last()) { if state.func.is_branch(insns.last()) {
for i in 0..state.func.block_succs(block).len() { for i in 0..state.func.block_succs(block).len() {
for &param in state.func.branch_blockparams(block, insns.last(), i) { for &param in state.func.branch_blockparams(block, insns.last(), i) {
live.set(param.vreg()); live.set(param.vreg(), true);
} }
} }
} }
@@ -1198,14 +1171,14 @@ fn calc_live_bitmaps<'a, F: Function>(
continue; continue;
} }
if op.pos() == *pos { if op.pos() == *pos {
let was_live = live.is_set(op.vreg().vreg()); let was_live = live.get(op.vreg().vreg());
trace!("op {:?} was_live = {}", op, was_live); trace!("op {:?} was_live = {}", op, was_live);
match op.kind() { match op.kind() {
OperandKind::Use => { OperandKind::Use => {
live.set(op.vreg().vreg()); live.set(op.vreg().vreg(), true);
} }
OperandKind::Def => { OperandKind::Def => {
live.un_set(op.vreg().vreg()); live.set(op.vreg().vreg(), false);
} }
} }
} }
@@ -1213,7 +1186,7 @@ fn calc_live_bitmaps<'a, F: Function>(
} }
} }
for &blockparam in state.func.block_params(block) { for &blockparam in state.func.block_params(block) {
live.un_set(blockparam.vreg()); live.set(blockparam.vreg(), false);
} }
for &pred in state.func.block_preds(block) { for &pred in state.func.block_preds(block) {