[llvm-commits] [llvm] r156280 - in /llvm/trunk: lib/Target/Mips/MipsISelLowering.cpp test/CodeGen/Mips/inlineasm-cnstrnt-bad-J.ll test/CodeGen/Mips/inlineasm_constraint.ll

[Eric Christopher]

Author: echristo
Date: Sun May  6 22:13:42 2012
New Revision: 156280

URL: http://llvm.org/viewvc/llvm-project?rev=156280&view=rev
Log:
Support the 'J' constraint.

Patch by Jack Carter.

Added:
    llvm/trunk/test/CodeGen/Mips/inlineasm-cnstrnt-bad-J.ll
Modified:
    llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
    llvm/trunk/test/CodeGen/Mips/inlineasm_constraint.ll

Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=156280&r1=156279&r2=156280&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Sun May  6 22:13:42 2012
@@ -3040,6 +3040,7 @@
       weight = CW_Register;
     break;
   case 'I': // signed 16 bit immediate
+  case 'J': // integer zero
     if (isa<ConstantInt>(CallOperandVal))
       weight = CW_Constant;
     break;
@@ -3102,6 +3103,16 @@
       }
     }
     return;
+  case 'J': // integer zero
+    if (ConstantSDNode *C = dyn_cast<ConstantSDNode>(Op)) {
+      EVT Type = Op.getValueType();
+      int64_t Val = C->getZExtValue();
+      if (Val == 0) {
+        Result = DAG.getTargetConstant(0, Type);
+        break;
+      }
+    }
+    return;
   }
 
   if (Result.getNode()) {

Added: llvm/trunk/test/CodeGen/Mips/inlineasm-cnstrnt-bad-J.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/inlineasm-cnstrnt-bad-J.ll?rev=156280&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/Mips/inlineasm-cnstrnt-bad-J.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/inlineasm-cnstrnt-bad-J.ll Sun May  6 22:13:42 2012
@@ -0,0 +1,16 @@
+;
+;This is a negative test. The constant value given for the constraint (J)
+;is non-zero (3).
+;
+; RUN: not llc -march=mipsel < %s  2> %t
+; RUN: FileCheck --check-prefix=CHECK-ERRORS < %t %s
+
+define i32 @main() nounwind {
+entry:
+
+;CHECK-ERRORS:	error: invalid operand for inline asm constraint 'J'
+
+  tail call i32 asm "addi $0,$1,$2", "=r,r,J"(i32 1024, i32 3) nounwind
+  ret i32 0
+}
+

Modified: llvm/trunk/test/CodeGen/Mips/inlineasm_constraint.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/inlineasm_constraint.ll?rev=156280&r1=156279&r2=156280&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Mips/inlineasm_constraint.ll (original)
+++ llvm/trunk/test/CodeGen/Mips/inlineasm_constraint.ll Sun May  6 22:13:42 2012
@@ -15,6 +15,12 @@
 ; CHECK: #NO_APP
    tail call i32 asm sideeffect "addi $0,$1,$2", "=r,r,I"(i32 7, i32 -3) nounwind
 
+; Now J with 0
+; CHECK: #APP
+; CHECK: addi ${{[0-9]+}},${{[0-9]+}},0
+; CHECK: #NO_APP
+  tail call i32 asm sideeffect "addi $0,$1,$2\0A\09 ", "=r,r,J"(i32 7, i16 0) nounwind
+
   ret i32 0
 }