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

bugfix with clean-spill opt: avoid if liverange starts at start of block (this is like a def) or if has starts-at-def flag.

Browse Source
This commit is contained in:
Chris Fallin
2021-05-26 18:08:41 -07:00
parent e521811b88
commit 13bde99d7d
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/ion/mod.rs
View File

@@ -3656,6 +3656,12 @@ impl<'a, F: Function> Env<'a, F> {
if clean_spillslot.is_some() { if clean_spillslot.is_some() {
if self.cfginfo.insn_block[range.from.inst().index()] if self.cfginfo.insn_block[range.from.inst().index()]
!= self.cfginfo.insn_block[range.to.prev().inst().index()] != self.cfginfo.insn_block[range.to.prev().inst().index()]
|| range.from
== self.cfginfo.block_entry
[self.cfginfo.insn_block[range.from.inst().index()].index()]
{
clean_spillslot = None;
} else if self.ranges[entry.index.index()].has_flag(LiveRangeFlag::StartsAtDef)
{ {
clean_spillslot = None; clean_spillslot = None;
} else { } else {
@@ -4335,25 +4341,26 @@ impl<'a, F: Function> Env<'a, F> {
self.stats.edits_count = self.edits.len(); self.stats.edits_count = self.edits.len();
// Add debug annotations. // Add debug annotations.
#[cfg(debug)] if self.annotations_enabled && log::log_enabled!(log::Level::Debug) {
{ for i in 0..self.edits.len() {
if log::log_enabled!(log::Level::Debug) { let &(pos, _, ref edit) = &self.edits[i];
for i in 0..self.edits.len() { match edit {
let &(pos, _, ref edit) = &self.edits[i]; &Edit::Move { from, to, to_vreg } => {
match edit { self.annotate(
&Edit::Move { from, to, to_vreg } => { ProgPoint::from_index(pos),
self.annotate( format!("move {} -> {} ({:?})", from, to, to_vreg),
ProgPoint::from_index(pos), );
format!("move {} -> {} ({:?})", from, to, to_vreg), }
); &Edit::BlockParams {
} ref vregs,
&Edit::BlockParams { ref allocs,
ref vregs, } => {
ref allocs, let s = format!("blockparams vregs:{:?} allocs:{:?}", vregs, allocs);
} => { self.annotate(ProgPoint::from_index(pos), s);
let s = format!("blockparams vregs:{:?} allocs:{:?}", vregs, allocs); }
self.annotate(ProgPoint::from_index(pos), s); &Edit::DefAlloc { alloc, vreg } => {
} let s = format!("defalloc {:?} := {:?}", alloc, vreg);
self.annotate(ProgPoint::from_index(pos), s);
} }
} }
} }