[llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaISelPattern.cpp AlphaInstrInfo.td

[Andrew Lenharth]

Changes in directory llvm/lib/Target/Alpha:

AlphaISelPattern.cpp updated: 1.61 -> 1.62
AlphaInstrInfo.td updated: 1.31 -> 1.32
---
Log message:

FP 0.0 setcc optimization, and generate short branch sequence for setcc(FP) rather than stack usage

---
Diffs of the changes:  (+37 -19)

 AlphaISelPattern.cpp |   48 +++++++++++++++++++++++++++++++-----------------
 AlphaInstrInfo.td    |    8 ++++++--
 2 files changed, 37 insertions(+), 19 deletions(-)


Index: llvm/lib/Target/Alpha/AlphaISelPattern.cpp
diff -u llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.61 llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.62
--- llvm/lib/Target/Alpha/AlphaISelPattern.cpp:1.61	Fri Mar 11 11:48:04 2005
+++ llvm/lib/Target/Alpha/AlphaISelPattern.cpp	Mon Mar 14 13:23:45 2005
@@ -1253,8 +1253,20 @@
           case ISD::SETNE: Opc = Alpha::CMPTEQ; inv = true; break;
           }
           
-          Tmp1 = SelectExpr(N.getOperand(0));
-          Tmp2 = SelectExpr(N.getOperand(1));
+          //FIXME: check for constant 0.0
+          ConstantFPSDNode *CN;
+          if ((CN = dyn_cast<ConstantFPSDNode>(SetCC->getOperand(0)))
+              && (CN->isExactlyValue(+0.0) || CN->isExactlyValue(-0.0)))
+            Tmp1 = Alpha::F31;
+          else
+            Tmp1 = SelectExpr(N.getOperand(0));
+          
+          if ((CN = dyn_cast<ConstantFPSDNode>(SetCC->getOperand(1)))
+          && (CN->isExactlyValue(+0.0) || CN->isExactlyValue(-0.0)))
+            Tmp2 = Alpha::F31;
+          else
+            Tmp2 = SelectExpr(N.getOperand(1));
+
           //Can only compare doubles, and dag won't promote for me
           if (SetCC->getOperand(0).getValueType() == MVT::f32)
           {
@@ -1280,22 +1292,24 @@
           
           //now arrange for Result (int) to have a 1 or 0
           
-          // Spill the FP to memory and reload it from there.
-          unsigned Size = MVT::getSizeInBits(MVT::f64)/8;
-          MachineFunction *F = BB->getParent();
-          int FrameIdx = F->getFrameInfo()->CreateStackObject(Size, 8);
-          unsigned Tmp4 = MakeReg(MVT::f64);
-          BuildMI(BB, Alpha::CVTTQ, 1, Tmp4).addReg(Tmp3);
-          BuildMI(BB, Alpha::STT, 3).addReg(Tmp4).addFrameIndex(FrameIdx).addReg(Alpha::F31);
-          unsigned Tmp5 = MakeReg(MVT::i64);
-          BuildMI(BB, Alpha::LDQ, 2, Tmp5).addFrameIndex(FrameIdx).addReg(Alpha::F31);
+          BuildMI(BB, Alpha::CC2INT, 1, Result).addReg(Tmp3);
+
+//           // Spill the FP to memory and reload it from there.
+//           unsigned Size = MVT::getSizeInBits(MVT::f64)/8;
+//           MachineFunction *F = BB->getParent();
+//           int FrameIdx = F->getFrameInfo()->CreateStackObject(Size, 8);
+//           unsigned Tmp4 = MakeReg(MVT::f64);
+//           BuildMI(BB, Alpha::CVTTQ, 1, Tmp4).addReg(Tmp3);
+//           BuildMI(BB, Alpha::STT, 3).addReg(Tmp4).addFrameIndex(FrameIdx).addReg(Alpha::F31);
+//           unsigned Tmp5 = MakeReg(MVT::i64);
+//           BuildMI(BB, Alpha::LDQ, 2, Tmp5).addFrameIndex(FrameIdx).addReg(Alpha::F31);
 	  
-          //now, set result based on Tmp5
-          //Set Tmp6 if fp cmp was false
-          unsigned Tmp6 = MakeReg(MVT::i64);
-          BuildMI(BB, Alpha::CMPEQ, 2, Tmp6).addReg(Tmp5).addReg(Alpha::R31);
-          //and invert
-          BuildMI(BB, Alpha::CMPEQ, 2, Result).addReg(Tmp6).addReg(Alpha::R31);
+//           //now, set result based on Tmp5
+//           //Set Tmp6 if fp cmp was false
+//           unsigned Tmp6 = MakeReg(MVT::i64);
+//           BuildMI(BB, Alpha::CMPEQ, 2, Tmp6).addReg(Tmp5).addReg(Alpha::R31);
+//           //and invert
+//           BuildMI(BB, Alpha::CMPEQ, 2, Result).addReg(Tmp6).addReg(Alpha::R31);
           
         }
         //       else


Index: llvm/lib/Target/Alpha/AlphaInstrInfo.td
diff -u llvm/lib/Target/Alpha/AlphaInstrInfo.td:1.31 llvm/lib/Target/Alpha/AlphaInstrInfo.td:1.32
--- llvm/lib/Target/Alpha/AlphaInstrInfo.td:1.31	Fri Mar 11 11:48:05 2005
+++ llvm/lib/Target/Alpha/AlphaInstrInfo.td	Mon Mar 14 13:23:45 2005
@@ -43,11 +43,11 @@
 
 let isCall = 1,
     Defs = [R0, R1, R2, R3, R4, R5, R6, R7, R8, R16, R17, R18, R19,
-            R20, R21, R22, R23, R24, R25, R26, R27, R29,
+            R20, R21, R22, R23, R24, R25, R26, R27, R28, R29,
             F0, F1,
             F10, F11, F12, F13, F14, F15, F16, F17, F18, F19,
             F20, F21, F22, F23, F24, F25, F26, F27, F28, F29, F30],
-    Uses = [R27, R29] in
+    Uses = [R29] in
       def CALL : PseudoInstAlpha< (ops s64imm:$TARGET), "jsr $TARGET">; //Jump to subroutine
 
 let isReturn = 1, isTerminator = 1 in
@@ -87,6 +87,10 @@
   def DIVQ  : PseudoInstAlpha<(ops GPRC:$RA, GPRC:$RB), "divq $RA,$RB,$$27">; //signed division
 }
 
+//This is an improvement on the old style setcc (FP)
+def CC2INT : PseudoInstAlpha<(ops GPRC:$RES, FPRC:$COND), 
+  "lda $RES,1($$31)\n\tfbeq $COND, 42f\n\tbis $$31,$$31,$RES\n42:\n">;
+
 //***********************
 //Real instructions
 //***********************