[llvm] r247110 - [WebAssembly] Implement WebAssemblyInstrInfo::copyPhysReg

[Dan Gohman via llvm-commits]

Author: djg
Date: Tue Sep  8 19:52:47 2015
New Revision: 247110

URL: http://llvm.org/viewvc/llvm-project?rev=247110&view=rev
Log:
[WebAssembly] Implement WebAssemblyInstrInfo::copyPhysReg

Modified:
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp
    llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.h
    llvm/trunk/test/CodeGen/WebAssembly/phi.ll

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp?rev=247110&r1=247109&r2=247110&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp Tue Sep  8 19:52:47 2015
@@ -269,28 +269,32 @@ void WebAssemblyAsmPrinter::EmitInstruct
     OS << "(setlocal @" << TargetRegisterInfo::virtReg2Index(Reg) << ' ';
   }
 
-  OS << '(' << OpcodeName(TII, MI);
-  for (const MachineOperand &MO : MI->uses())
-    switch (MO.getType()) {
-    default:
-      llvm_unreachable("unexpected machine operand type");
-    case MachineOperand::MO_Register: {
-      if (MO.isImplicit())
-        continue;
-      unsigned Reg = MO.getReg();
-      OS << " @" << TargetRegisterInfo::virtReg2Index(Reg);
-    } break;
-    case MachineOperand::MO_Immediate: {
-      OS << ' ' << MO.getImm();
-    } break;
-    case MachineOperand::MO_FPImmediate: {
-      OS << ' ' << toString(MO.getFPImm()->getValueAPF());
-    } break;
-    case MachineOperand::MO_GlobalAddress: {
-      OS << ' ' << toSymbol(MO.getGlobal()->getName());
-    } break;
-    }
-  OS << ')';
+  if (MI->getOpcode() == WebAssembly::COPY) {
+    OS << '@' << TargetRegisterInfo::virtReg2Index(MI->getOperand(1).getReg());
+  } else {
+    OS << '(' << OpcodeName(TII, MI);
+    for (const MachineOperand &MO : MI->uses())
+      switch (MO.getType()) {
+      default:
+        llvm_unreachable("unexpected machine operand type");
+      case MachineOperand::MO_Register: {
+        if (MO.isImplicit())
+          continue;
+        unsigned Reg = MO.getReg();
+        OS << " @" << TargetRegisterInfo::virtReg2Index(Reg);
+      } break;
+      case MachineOperand::MO_Immediate: {
+        OS << ' ' << MO.getImm();
+      } break;
+      case MachineOperand::MO_FPImmediate: {
+        OS << ' ' << toString(MO.getFPImm()->getValueAPF());
+      } break;
+      case MachineOperand::MO_GlobalAddress: {
+        OS << ' ' << toSymbol(MO.getGlobal()->getName());
+      } break;
+      }
+    OS << ')';
+  }
 
   if (NumDefs != 0)
     OS << ')';

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp?rev=247110&r1=247109&r2=247110&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.cpp Tue Sep  8 19:52:47 2015
@@ -29,3 +29,11 @@ using namespace llvm;
 
 WebAssemblyInstrInfo::WebAssemblyInstrInfo(const WebAssemblySubtarget &STI)
     : RI(STI.getTargetTriple()) {}
+
+void WebAssemblyInstrInfo::copyPhysReg(MachineBasicBlock &MBB,
+                                       MachineBasicBlock::iterator I,
+                                       DebugLoc DL, unsigned DestReg,
+                                       unsigned SrcReg, bool KillSrc) const {
+  BuildMI(MBB, I, DL, get(WebAssembly::COPY), DestReg)
+      .addReg(SrcReg, KillSrc ? RegState::Kill : 0);
+}

Modified: llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.h?rev=247110&r1=247109&r2=247110&view=diff
==============================================================================
--- llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.h (original)
+++ llvm/trunk/lib/Target/WebAssembly/WebAssemblyInstrInfo.h Tue Sep  8 19:52:47 2015
@@ -33,6 +33,10 @@ public:
   explicit WebAssemblyInstrInfo(const WebAssemblySubtarget &STI);
 
   const WebAssemblyRegisterInfo &getRegisterInfo() const { return RI; }
+
+  void copyPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
+                   DebugLoc DL, unsigned DestReg, unsigned SrcReg,
+                   bool KillSrc) const override;
 };
 
 } // end namespace llvm

Modified: llvm/trunk/test/CodeGen/WebAssembly/phi.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/phi.ll?rev=247110&r1=247109&r2=247110&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/phi.ll (original)
+++ llvm/trunk/test/CodeGen/WebAssembly/phi.ll Tue Sep  8 19:52:47 2015
@@ -8,6 +8,8 @@
 target datalayout = "e-p:32:32-i64:64-v128:8:128-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
+; Basic phi triangle.
+
 ; CHECK-LABEL: test0
 ; CHECK: (setlocal [[REG:@.*]] (argument 0))
 ; CHECK: (setlocal [[REG]] (sdiv [[REG]] {{.*}}))
@@ -23,3 +25,27 @@ done:
   %s = phi i32 [ %a, %true ], [ %p, %entry ]
   ret i32 %s
 }
+
+; Swap phis.
+
+; CHECK-LABEL: test1
+; CHECK: BB0_1:
+; CHECK: (setlocal [[REG0:@.*]] [[REG1:@.*]])
+; CHECK: (setlocal [[REG1]] [[REG2:@.*]])
+; CHECK: (setlocal [[REG2]] [[REG0]])
+define i32 @test1(i32 %n) {
+entry:
+  br label %loop
+
+loop:
+  %a = phi i32 [ 0, %entry ], [ %b, %loop ]
+  %b = phi i32 [ 1, %entry ], [ %a, %loop ]
+  %i = phi i32 [ 0, %entry ], [ %i.next, %loop ]
+
+  %i.next = add i32 %i, 1
+  %t = icmp slt i32 %i.next, %n
+  br i1 %t, label %loop, label %exit
+
+exit:
+  ret i32 %a
+}