Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor local.set register preservation #786

Merged
merged 1 commit into from
Nov 19, 2023
Merged

Refactor local.set register preservation #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/wasmi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ spin = { version = "0.9", default-features = false, features = [
"rwlock",
] }
smallvec = { version = "1.10.0", features = ["union"] }
multi-stash = { version = "0.2.0" }

[dev-dependencies]
wat = "1"
Expand Down
186 changes: 186 additions & 0 deletions crates/wasmi/src/engine/regmach/tests/op/local_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,3 +278,189 @@ fn preserve_result_1() {
])
.run()
}

#[test]
#[cfg_attr(miri, ignore)]
fn preserve_multiple_0() {
let wasm = wat2wasm(
r#"
(module
(func (param i32) (result i32)
(local.get 0)
(local.set 0 (i32.const 10))
)
)"#,
);
TranslationTest::new(wasm)
.expect_func_instrs([
Instruction::copy(Register::from_i16(1), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 10_i32),
Instruction::return_reg(Register::from_i16(1)),
])
.run()
}

#[test]
#[cfg_attr(miri, ignore)]
fn preserve_multiple_1() {
let wasm = wat2wasm(
r#"
(module
(func (param i32) (result i32 i32)
(local.get 0)
(local.get 0)
(local.set 0 (i32.const 10))
)
)"#,
);
TranslationTest::new(wasm)
.expect_func_instrs([
Instruction::copy(Register::from_i16(1), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 10_i32),
Instruction::return_reg2(1, 1),
])
.run()
}

#[test]
#[cfg_attr(miri, ignore)]
fn preserve_multiple_2() {
let wasm = wat2wasm(
r#"
(module
(func (param i32 i32) (result i32 i32)
(local.get 0)
(local.set 0 (i32.const 10))
(local.get 0)
(local.set 0 (i32.const 20))
)
)"#,
);
TranslationTest::new(wasm)
.expect_func_instrs([
Instruction::copy(Register::from_i16(3), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 10_i32),
Instruction::copy(Register::from_i16(2), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 20_i32),
Instruction::return_reg2(3, 2),
])
.run()
}

#[test]
#[cfg_attr(miri, ignore)]
fn preserve_multiple_3() {
let wasm = wat2wasm(
r#"
(module
(func (param i32) (result i32)
(local.get 0)
(local.set 0 (i32.const 10))
(drop)
(local.get 0)
(local.set 0 (i32.const 20))
)
)"#,
);
TranslationTest::new(wasm)
.expect_func_instrs([
Instruction::copy(Register::from_i16(1), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 10_i32),
Instruction::copy(Register::from_i16(1), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 20_i32),
Instruction::return_reg(1),
])
.run()
}

#[test]
#[cfg_attr(miri, ignore)]
fn preserve_multiple_4() {
let wasm = wat2wasm(
r#"
(module
(func (param i32) (result i32 i32)
(local.get 0)
(local.get 0)
(local.set 0 (i32.const 10))
(drop)
(drop)
(local.get 0)
(local.get 0)
(local.set 0 (i32.const 20))
)
)"#,
);
TranslationTest::new(wasm)
.expect_func_instrs([
Instruction::copy(Register::from_i16(1), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 10_i32),
Instruction::copy(Register::from_i16(1), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 20_i32),
Instruction::return_reg2(1, 1),
])
.run()
}

#[test]
#[cfg_attr(miri, ignore)]
fn preserve_multiple_5() {
let wasm = wat2wasm(
r#"
(module
(func (param i32 i32 i32) (result i32 i32 i32)
(local.get 0)
(local.get 1)
(local.get 2)
(local.set 2 (i32.const 11))
(local.set 1 (i32.const 22))
(local.set 0 (i32.const 33))
)
)"#,
);
TranslationTest::new(wasm)
.expect_func_instrs([
Instruction::copy(Register::from_i16(5), Register::from_i16(2)),
Instruction::copy_imm32(Register::from_i16(2), 11_i32),
Instruction::copy(Register::from_i16(4), Register::from_i16(1)),
Instruction::copy_imm32(Register::from_i16(1), 22_i32),
Instruction::copy(Register::from_i16(3), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 33_i32),
Instruction::return_reg3(3, 4, 5),
])
.run()
}

#[test]
#[cfg_attr(miri, ignore)]
fn preserve_multiple_6() {
let wasm = wat2wasm(
r#"
(module
(func (param i32 i32 i32) (result i32 i32 i32)
(local.get 0)
(local.get 1)
(local.get 2)
(local.set 2 (i32.const 11))
(local.set 0 (i32.const 22))
(local.set 1 (i32.const 33))
(drop) ;; drops above (local.get 2)
(local.get 1) ;; reuse dropped preservation slot
(local.set 1 (i32.const 44))
)
)"#,
);
TranslationTest::new(wasm)
.expect_func_instrs([
Instruction::copy(Register::from_i16(5), Register::from_i16(2)),
Instruction::copy_imm32(Register::from_i16(2), 11_i32),
Instruction::copy(Register::from_i16(4), Register::from_i16(0)),
Instruction::copy_imm32(Register::from_i16(0), 22_i32),
Instruction::copy(Register::from_i16(3), Register::from_i16(1)),
Instruction::copy_imm32(Register::from_i16(1), 33_i32),
Instruction::copy(Register::from_i16(5), Register::from_i16(1)),
Instruction::copy_imm32(Register::from_i16(1), 44_i32),
Instruction::return_reg3(4, 3, 5),
])
.run()
}
5 changes: 4 additions & 1 deletion crates/wasmi/src/engine/regmach/translator/stack/provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ impl ProviderStack {
let provider = &mut self.providers[provider_index];
debug_assert!(matches!(provider, TaggedProvider::Local(_)));
let preserved_register = match preserved {
Some(register) => register,
Some(register) => {
reg_alloc.bump_storage(register);
register
}
None => {
let register = reg_alloc.push_storage()?;
preserved = Some(register);
Expand Down
Loading
Loading