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

Fix heuristic-cost function overflow with high loop depth (found by @Amanieu).

Browse Source
This commit is contained in:
Chris Fallin
2021-07-28 12:37:32 -07:00
parent 66d6821c7b
commit 4c193a9499
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ion/dump.rs
View File

@@ -1,7 +1,7 @@
//! Debugging output. //! Debugging output.
use super::Env; use super::Env;
use crate::{Function, ProgPoint, Block}; use crate::{Block, Function, ProgPoint};
impl<'a, F: Function> Env<'a, F> { impl<'a, F: Function> Env<'a, F> {
pub fn dump_state(&self) { pub fn dump_state(&self) {

4
src/ion/liveranges.rs
View File

@@ -32,7 +32,9 @@ use std::convert::TryFrom;
pub fn spill_weight_from_policy(policy: OperandPolicy, loop_depth: usize, is_def: bool) -> u32 { pub fn spill_weight_from_policy(policy: OperandPolicy, loop_depth: usize, is_def: bool) -> u32 {
// A bonus of 1000 for one loop level, 4000 for two loop levels, // A bonus of 1000 for one loop level, 4000 for two loop levels,
// 16000 for three loop levels, etc. Avoids exponentiation. // 16000 for three loop levels, etc. Avoids exponentiation.
let hot_bonus = std::cmp::min(16000, 1000 * (1 << (2 * loop_depth))); // Bound `loop_depth` at 2 so that `hot_bonus` is at most 16000.
let loop_depth = std::cmp::min(2, loop_depth);
let hot_bonus = 1000 * (1 << (2 * loop_depth));
let def_bonus = if is_def { 2000 } else { 0 }; let def_bonus = if is_def { 2000 } else { 0 };
let policy_bonus = match policy { let policy_bonus = match policy {
OperandPolicy::Any => 1000, OperandPolicy::Any => 1000,