llvm patch: fix definition of ppc64 SUBFC8 opcode

JuliaLang · May 31, 2016 · f9fd71b · f9fd71b · tkelman · Jun 1, 2016
1 parent 1c04bc6
commit f9fd71b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/deps/llvm-3.8.0_ppc64_SUBFC8.patch b/deps/llvm-3.8.0_ppc64_SUBFC8.patch
@@ -0,0 +1,31 @@
+diff --git a/lib/Target/PowerPC/PPCInstr64Bit.td b/lib/Target/PowerPC/PPCInstr64Bit.td
+index 52af293..e7eb8a1 100644
+--- a/lib/Target/PowerPC/PPCInstr64Bit.td
++++ b/lib/Target/PowerPC/PPCInstr64Bit.td
+@@ -514,11 +514,11 @@ let Defs = [CARRY] in {
+ def SUBFIC8: DForm_2< 8, (outs g8rc:$rD), (ins g8rc:$rA, s16imm64:$imm),
+                      "subfic $rD, $rA, $imm", IIC_IntGeneral,
+                      [(set i64:$rD, (subc imm64SExt16:$imm, i64:$rA))]>;
+-defm SUBFC8 : XOForm_1r<31, 8, 0, (outs g8rc:$rT), (ins g8rc:$rA, g8rc:$rB),
++}
++defm SUBFC8 : XOForm_1rc<31, 8, 0, (outs g8rc:$rT), (ins g8rc:$rA, g8rc:$rB),
+                         "subfc", "$rT, $rA, $rB", IIC_IntGeneral,
+                         [(set i64:$rT, (subc i64:$rB, i64:$rA))]>,
+                         PPC970_DGroup_Cracked;
+-}
+ defm SUBF8 : XOForm_1r<31, 40, 0, (outs g8rc:$rT), (ins g8rc:$rA, g8rc:$rB),
+                        "subf", "$rT, $rA, $rB", IIC_IntGeneral,
+                        [(set i64:$rT, (sub i64:$rB, i64:$rA))]>;
+diff --git a/lib/Target/PowerPC/PPCInstrInfo.cpp b/lib/Target/PowerPC/PPCInstrInfo.cpp
+index 313ab88..8dca286 100644
+--- a/lib/Target/PowerPC/PPCInstrInfo.cpp
++++ b/lib/Target/PowerPC/PPCInstrInfo.cpp
+@@ -1795,6 +1795,7 @@ bool PPCInstrInfo::optimizeCompareInstr(MachineInstr *CmpInstr,
+           MI->addOperand(*MI->getParent()->getParent(),
+                          MachineOperand::CreateReg(*ImpUses, false, true));
+   }
++  assert(MI->definesRegister(PPC::CR0));
+
+   // Modify the condition code of operands in OperandsToUpdate.
+   // Since we have SUB(r1, r2) and CMP(r2, r1), the condition code needs to
+
diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -420,6 +420,7 @@ $(LLVM_SRC_DIR)/llvm-D17326_unpack_load.patch-applied: $(LLVM_SRC_DIR)/llvm-D142
 $(eval $(call LLVM_PATCH,llvm-D17712))
 $(eval $(call LLVM_PATCH,llvm-PR26180))
 $(eval $(call LLVM_PATCH,llvm-PR27046))
+$(eval $(call LLVM_PATCH,llvm-3.8.0_ppc64_SUBFC8))
 endif # LLVM_VER
 
 ifeq ($(LLVM_VER),3.7.1)