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

Fuzzbug fixes for simpler splitting

Browse Source
This commit is contained in:
Chris Fallin
2021-05-22 14:26:49 -07:00
parent 466ea2cd9a
commit 4b46c6388a
1 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/ion/mod.rs
View File

@@ -1285,20 +1285,20 @@ impl<'a, F: Function> Env<'a, F> {
if live.get(pinned_vreg.vreg()) { if live.get(pinned_vreg.vreg()) {
let pinned_lr = vreg_ranges[pinned_vreg.vreg()]; let pinned_lr = vreg_ranges[pinned_vreg.vreg()];
let orig_start = self.ranges[pinned_lr.index()].range.from; let orig_start = self.ranges[pinned_lr.index()].range.from;
self.ranges[pinned_lr.index()].range.from = progpoint.next();
let new_lr = self.add_liverange_to_vreg(
VRegIndex::new(pinned_vreg.vreg()),
CodeRange {
from: orig_start,
to: progpoint,
},
);
vreg_ranges[pinned_vreg.vreg()] = new_lr;
log::debug!( log::debug!(
" -> live with LR {:?}; truncating to start at {:?}", " -> live with LR {:?}; truncating to start at {:?}",
pinned_lr, pinned_lr,
progpoint.next() progpoint.next()
); );
self.ranges[pinned_lr.index()].range.from = progpoint.next();
let new_lr = self.add_liverange_to_vreg(
VRegIndex::new(pinned_vreg.vreg()),
CodeRange {
from: orig_start,
to: progpoint.prev(),
},
);
vreg_ranges[pinned_vreg.vreg()] = new_lr;
log::debug!(" -> created LR {:?} with remaining range from {:?} to {:?}", new_lr, orig_start, progpoint); log::debug!(" -> created LR {:?} with remaining range from {:?} to {:?}", new_lr, orig_start, progpoint);
// Add an edit right now to indicate that at // Add an edit right now to indicate that at
@@ -1325,16 +1325,21 @@ impl<'a, F: Function> Env<'a, F> {
}, },
); );
} else { } else {
let new_lr = self.add_liverange_to_vreg( if inst > self.cfginfo.block_entry[block.index()].inst() {
VRegIndex::new(pinned_vreg.vreg()), let new_lr = self.add_liverange_to_vreg(
CodeRange { VRegIndex::new(pinned_vreg.vreg()),
from: self.cfginfo.block_entry[block.index()], CodeRange {
to: progpoint, from: self.cfginfo.block_entry[block.index()],
}, to: ProgPoint::before(inst),
); },
vreg_ranges[pinned_vreg.vreg()] = new_lr; );
live.set(pinned_vreg.vreg(), true); vreg_ranges[pinned_vreg.vreg()] = new_lr;
log::debug!(" -> was not live; created new LR {:?}", new_lr); live.set(pinned_vreg.vreg(), true);
log::debug!(
" -> was not live; created new LR {:?}",
new_lr
);
}
// Add an edit right now to indicate that at // Add an edit right now to indicate that at
// this program point, the given // this program point, the given
@@ -2536,13 +2541,19 @@ impl<'a, F: Function> Env<'a, F> {
break; break;
} }
} }
// Minimal if this is the only range in the bundle, and if // Minimal if the range covers only one instruction. Note
// the range covers only one instruction. Note that it // that it could cover just one ProgPoint,
// could cover just one ProgPoint, i.e. X.Before..X.After, // i.e. X.Before..X.After, or two ProgPoints,
// or two ProgPoints, i.e. X.Before..X+1.Before. // i.e. X.Before..X+1.Before.
log::debug!(" -> first range has range {:?}", first_range_data.range); log::debug!(" -> first range has range {:?}", first_range_data.range);
minimal = self.bundles[bundle.index()].ranges.len() == 1 let bundle_start = self.bundles[bundle.index()]
&& first_range_data.range.from.inst() == first_range_data.range.to.prev().inst(); .ranges
.first()
.unwrap()
.range
.from;
let bundle_end = self.bundles[bundle.index()].ranges.last().unwrap().range.to;
minimal = bundle_start.inst() == bundle_end.prev().inst();
log::debug!(" -> minimal: {}", minimal); log::debug!(" -> minimal: {}", minimal);
} }
@@ -2662,7 +2673,6 @@ impl<'a, F: Function> Env<'a, F> {
.next(), .next(),
), ),
}; };
assert!(split_at < bundle_end);
log::debug!( log::debug!(
"split point is at bundle start; advancing to {:?}", "split point is at bundle start; advancing to {:?}",
split_at split_at