perf(mir): Reserve enough space for the merged blocks before appending
This commit is contained in:
parent
33513fad80
commit
2440998666
@ -95,6 +95,7 @@ pub fn simplify(mut self) {
|
|||||||
|
|
||||||
let mut start = START_BLOCK;
|
let mut start = START_BLOCK;
|
||||||
|
|
||||||
|
let mut merged_blocks = Vec::new();
|
||||||
loop {
|
loop {
|
||||||
let mut changed = false;
|
let mut changed = false;
|
||||||
|
|
||||||
@ -118,10 +119,23 @@ pub fn simplify(mut self) {
|
|||||||
while inner_changed {
|
while inner_changed {
|
||||||
inner_changed = false;
|
inner_changed = false;
|
||||||
inner_changed |= self.simplify_branch(&mut terminator);
|
inner_changed |= self.simplify_branch(&mut terminator);
|
||||||
inner_changed |= self.merge_successor(bb, &mut terminator);
|
inner_changed |= self.merge_successor(&mut merged_blocks, &mut terminator);
|
||||||
changed |= inner_changed;
|
changed |= inner_changed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let merged_block_count =
|
||||||
|
merged_blocks.iter().map(|&i| self.basic_blocks[i].statements.len()).sum();
|
||||||
|
|
||||||
|
if merged_block_count > 0 {
|
||||||
|
let mut statements = std::mem::take(&mut self.basic_blocks[bb].statements);
|
||||||
|
statements.reserve(merged_block_count);
|
||||||
|
for &from in &merged_blocks {
|
||||||
|
statements.append(&mut self.basic_blocks[from].statements);
|
||||||
|
}
|
||||||
|
self.basic_blocks[bb].statements = statements;
|
||||||
|
}
|
||||||
|
merged_blocks.clear();
|
||||||
|
|
||||||
self.basic_blocks[bb].terminator = Some(terminator);
|
self.basic_blocks[bb].terminator = Some(terminator);
|
||||||
|
|
||||||
changed |= inner_changed;
|
changed |= inner_changed;
|
||||||
@ -196,7 +210,7 @@ fn collapse_goto_chain(&mut self, start: &mut BasicBlock, changed: &mut bool) {
|
|||||||
// merge a block with 1 `goto` predecessor to its parent
|
// merge a block with 1 `goto` predecessor to its parent
|
||||||
fn merge_successor(
|
fn merge_successor(
|
||||||
&mut self,
|
&mut self,
|
||||||
merge_into: BasicBlock,
|
merged_blocks: &mut Vec<BasicBlock>,
|
||||||
terminator: &mut Terminator<'tcx>,
|
terminator: &mut Terminator<'tcx>,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
let target = match terminator.kind {
|
let target = match terminator.kind {
|
||||||
@ -214,8 +228,7 @@ fn merge_successor(
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let (from, to) = self.basic_blocks.pick2_mut(target, merge_into);
|
merged_blocks.push(target);
|
||||||
to.statements.append(&mut from.statements);
|
|
||||||
self.pred_count[target] = 0;
|
self.pred_count[target] = 0;
|
||||||
|
|
||||||
true
|
true
|
||||||
|
Loading…
Reference in New Issue
Block a user