Add regalloc3 as an option for Cranelift's register allocator

Author: Amanieu

Cargo.lock

@@ -619,3 +619,6 @@ debug = "line-tables-only"
 inherits = "release"
 codegen-units = 1
 lto = true
+
+[patch.crates-io]
+regalloc2 = { git = "https://github.com/Amanieu/regalloc2.git", branch = "regalloc3" }

Cargo.toml

@@ -43,7 +43,7 @@ pub(crate) fn define() -> SettingGroup {
             have adequate support for the kinds of allocations required by exception
             handling (https://github.com/bytecodealliance/regalloc2/issues/217).
         "#,
-        vec!["backtracking"],
+        vec!["backtracking", "regalloc3"],
     );
 
     settings.add_enum(

cranelift/codegen/meta/src/shared/settings.rs

@@ -1987,6 +1987,9 @@ fn emit_return_call_common_sequence<T>(
     // Hard-coded register which doesn't conflict with function arguments or
     // callee-saved registers.
     let tmp = Writable::from_reg(regs::r11());
+    for pair in &call_info.uses {
+        debug_assert_ne!(pair.preg, regs::r11());
+    }
 
     for inst in
         X64ABIMachineSpec::gen_clobber_restore(CallConv::Tail, &info.flags, state.frame_layout())

cranelift/codegen/src/isa/x64/inst/emit.rs

@@ -66,6 +66,7 @@ pub fn compile<B: LowerBackend + TargetIsa>(
 
         options.algorithm = match b.flags().regalloc_algorithm() {
             RegallocAlgorithm::Backtracking => Algorithm::Ion,
+            RegallocAlgorithm::Regalloc3 => Algorithm::Regalloc3,
             // Note: single-pass is currently disabled
             // (https://github.com/bytecodealliance/regalloc2/issues/217).
         };

cranelift/codegen/src/machinst/compile.rs

@@ -482,6 +482,7 @@ impl WasmtimeOptionValue for wasmtime::RegallocAlgorithm {
     fn parse(val: Option<&str>) -> Result<Self> {
         match String::parse(val)?.as_str() {
             "backtracking" => Ok(wasmtime::RegallocAlgorithm::Backtracking),
+            "regalloc3" => Ok(wasmtime::RegallocAlgorithm::Regalloc3),
             other => bail!(
                 "unknown regalloc algorithm`{}`, only backtracking,single-pass accepted",
                 other

crates/cli-flags/src/opt.rs

@@ -806,6 +806,7 @@ impl OptLevel {
 enum RegallocAlgorithm {
     Backtracking,
     SinglePass,
+    Regalloc3,
 }
 
 impl RegallocAlgorithm {
@@ -819,6 +820,7 @@ impl RegallocAlgorithm {
             // `arbitrary` mappings, we keep the `RegallocAlgorithm`
             // enum as it is and remap here to `Backtracking`.
             RegallocAlgorithm::SinglePass => wasmtime::RegallocAlgorithm::Backtracking,
+            RegallocAlgorithm::Regalloc3 => wasmtime::RegallocAlgorithm::Regalloc3,
         }
     }
 }

crates/fuzzing/src/generators/config.rs

@@ -1296,6 +1296,7 @@ impl Config {
     pub fn cranelift_regalloc_algorithm(&mut self, algo: RegallocAlgorithm) -> &mut Self {
         let val = match algo {
             RegallocAlgorithm::Backtracking => "backtracking",
+            RegallocAlgorithm::Regalloc3 => "regalloc3",
         };
         self.compiler_config
             .settings
@@ -2873,6 +2874,9 @@ pub enum RegallocAlgorithm {
     /// results in better register utilization, producing fewer spills
     /// and moves, but can cause super-linear compile runtime.
     Backtracking,
+
+    /// New experimental register allocator.
+    Regalloc3,
 }
 
 /// Select which profiling technique to support.