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

Move the nop lowering to ISLE, and remove the final return from lower.rs (#4809)

Browse Source 
Lower nop in ISLE in the x64 backend, and remove the final Ok(()) from the lower function to assert that all cases that aren't handled in ISLE will panic.
This commit is contained in:
Trevor Elliott
2022-08-30 09:14:20 -07:00
committed by GitHub
parent 3d9d759380
commit b033aba61b
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cranelift/codegen/src/isa/x64/lower.isle
View File

@@ -3758,3 +3758,9 @@
;; SHUFPS xmm_y, xmm_xmp, 0x88 ;; SHUFPS xmm_y, xmm_xmp, 0x88
(x64_shufps dst zeros 0x88))) (x64_shufps dst zeros 0x88)))
;; Rules for `nop` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(rule (lower (nop))
(invalid_reg))

9
cranelift/codegen/src/isa/x64/lower.rs
View File

@@ -459,7 +459,8 @@ fn lower_insn_to_regs(
| Opcode::Isplit | Opcode::Isplit
| Opcode::TlsValue | Opcode::TlsValue
| Opcode::SqmulRoundSat | Opcode::SqmulRoundSat
| Opcode::Uunarrow => { | Opcode::Uunarrow
| Opcode::Nop => {
let ty = if outputs.len() > 0 { let ty = if outputs.len() > 0 {
Some(ctx.output_ty(insn, 0)) Some(ctx.output_ty(insn, 0))
} else { } else {
@@ -572,15 +573,9 @@ fn lower_insn_to_regs(
| Opcode::BrTable => { | Opcode::BrTable => {
panic!("Branch opcode reached non-branch lowering logic!"); panic!("Branch opcode reached non-branch lowering logic!");
} }
Opcode::Nop => {
// Nothing.
} }
} }
Ok(())
}
//============================================================================= //=============================================================================
// Lowering-backend trait implementation. // Lowering-backend trait implementation.