diff options
| author | Dan Gohman <dan433584@gmail.com> | 2015-11-23 19:30:43 +0000 |
|---|---|---|
| committer | Dan Gohman <dan433584@gmail.com> | 2015-11-23 19:30:43 +0000 |
| commit | aa0a4bd05b4e99b6f749112604bb942d42988814 (patch) | |
| tree | c57861e9d550298d358fb0a0523b14f111c2e387 | |
| parent | 941ad901462adf558966847041f79cd7af70ebf8 (diff) | |
| download | bcm5719-llvm-aa0a4bd05b4e99b6f749112604bb942d42988814.tar.gz bcm5719-llvm-aa0a4bd05b4e99b6f749112604bb942d42988814.zip | |
[WebAssembly] Don't use set_local instructions explicitly.
The current approach to using get_local and set_local is to use them
implicitly, as register uses and defs. Introduce new copy instructions
which are themselves no-ops except for the get_local and set_local
that they imply, so that we use get_local and set_local consistently.
llvm-svn: 253905
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp | 12 | ||||
| -rw-r--r-- | llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td | 8 | ||||
| -rw-r--r-- | llvm/test/CodeGen/WebAssembly/phi.ll | 6 |
3 files changed, 17 insertions, 9 deletions
diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp index 97e848709c3..2f1d5eb5287 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp @@ -37,19 +37,19 @@ void WebAssemblyInstrInfo::copyPhysReg(MachineBasicBlock &MBB, const TargetRegisterClass *RC = MBB.getParent()->getRegInfo().getRegClass(SrcReg); - unsigned SetLocalOpcode; + unsigned CopyLocalOpcode; if (RC == &WebAssembly::I32RegClass) - SetLocalOpcode = WebAssembly::SET_LOCAL_I32; + CopyLocalOpcode = WebAssembly::COPY_LOCAL_I32; else if (RC == &WebAssembly::I64RegClass) - SetLocalOpcode = WebAssembly::SET_LOCAL_I64; + CopyLocalOpcode = WebAssembly::COPY_LOCAL_I64; else if (RC == &WebAssembly::F32RegClass) - SetLocalOpcode = WebAssembly::SET_LOCAL_F32; + CopyLocalOpcode = WebAssembly::COPY_LOCAL_F32; else if (RC == &WebAssembly::F64RegClass) - SetLocalOpcode = WebAssembly::SET_LOCAL_F64; + CopyLocalOpcode = WebAssembly::COPY_LOCAL_F64; else llvm_unreachable("Unexpected register class"); - BuildMI(MBB, I, DL, get(SetLocalOpcode), DestReg) + BuildMI(MBB, I, DL, get(CopyLocalOpcode), DestReg) .addReg(SrcReg, KillSrc ? RegState::Kill : 0); } diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td b/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td index 1fa79020a2e..5922f95f039 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td +++ b/llvm/lib/Target/WebAssembly/WebAssemblyInstrInfo.td @@ -98,6 +98,14 @@ multiclass LOCAL<WebAssemblyRegClass vt> { // TODO: set_local returns its operand value def SET_LOCAL_#vt : I<(outs), (ins i32imm:$regno, vt:$src), [], "set_local\t$regno, $src">; + + // COPY_LOCAL is not an actual instruction in wasm, but since we allow + // get_local and set_local to be implicit, we can have a COPY_LOCAL which + // is actually a no-op because all the work is done in the implied + // get_local and set_local. + let isAsCheapAsAMove = 1 in + def COPY_LOCAL_#vt : I<(outs vt:$res), (ins vt:$src), [], + "copy_local\t$res, $src">; } defm : LOCAL<I32>; defm : LOCAL<I64>; diff --git a/llvm/test/CodeGen/WebAssembly/phi.ll b/llvm/test/CodeGen/WebAssembly/phi.ll index 8db0958c30f..13ce6da8244 100644 --- a/llvm/test/CodeGen/WebAssembly/phi.ll +++ b/llvm/test/CodeGen/WebAssembly/phi.ll @@ -26,9 +26,9 @@ done: ; CHECK-LABEL: test1: ; CHECK: BB1_1: -; CHECK: set_local $[[NUM0:[0-9]+]], $[[NUM1:[0-9]+]]{{$}} -; CHECK: set_local $[[NUM1]], $[[NUM2:[0-9]+]]{{$}} -; CHECK: set_local $[[NUM2]], $[[NUM0]]{{$}} +; CHECK: copy_local $[[NUM0:[0-9]+]], $[[NUM1:[0-9]+]]{{$}} +; CHECK: copy_local $[[NUM1]], $[[NUM2:[0-9]+]]{{$}} +; CHECK: copy_local $[[NUM2]], $[[NUM0]]{{$}} define i32 @test1(i32 %n) { entry: br label %loop |
