[llvm-commits] [llvm] r170064 - in /llvm/trunk/lib/Target/R600: R600ExpandSpecialInstrs.cpp SILowerLiteralConstants.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Wed Dec 12 18:59:38 2012
New Revision: 170064

URL: http://llvm.org/viewvc/llvm-project?rev=170064&view=rev
Log:
Avoid setIsInsideBundle in Target/R600.

This function is going to be removed.

Modified:
    llvm/trunk/lib/Target/R600/R600ExpandSpecialInstrs.cpp
    llvm/trunk/lib/Target/R600/SILowerLiteralConstants.cpp

Modified: llvm/trunk/lib/Target/R600/R600ExpandSpecialInstrs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/R600ExpandSpecialInstrs.cpp?rev=170064&r1=170063&r2=170064&view=diff
==============================================================================
--- llvm/trunk/lib/Target/R600/R600ExpandSpecialInstrs.cpp (original)
+++ llvm/trunk/lib/Target/R600/R600ExpandSpecialInstrs.cpp Wed Dec 12 18:59:38 2012
@@ -318,7 +318,8 @@
         MachineInstr *NewMI =
           TII->buildDefaultInstruction(MBB, I, Opcode, DstReg, Src0, Src1);
 
-        NewMI->setIsInsideBundle(Chan != 0);
+        if (Chan != 0)
+          NewMI->bundleWithPred();
         if (Mask) {
           TII->addFlag(NewMI, 0, MO_FLAG_MASK);
         }

Modified: llvm/trunk/lib/Target/R600/SILowerLiteralConstants.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/R600/SILowerLiteralConstants.cpp?rev=170064&r1=170063&r2=170064&view=diff
==============================================================================
--- llvm/trunk/lib/Target/R600/SILowerLiteralConstants.cpp (original)
+++ llvm/trunk/lib/Target/R600/SILowerLiteralConstants.cpp Wed Dec 12 18:59:38 2012
@@ -89,15 +89,15 @@
           } else {
             LoadLiteralOpcode = AMDGPU::SI_LOAD_LITERAL_F32;
           }
-          MachineInstr *First =
-            BuildMI(MBB, I, MBB.findDebugLoc(I), TII->get(MovOpcode),
-                    MI.getOperand(0).getReg())
-                    .addReg(AMDGPU::SI_LITERAL_CONSTANT);
-          MachineInstr *Last =
-            BuildMI(MBB, I, MBB.findDebugLoc(I), TII->get(LoadLiteralOpcode))
-                    .addOperand(MI.getOperand(1));
-          Last->setIsInsideBundle();
-          llvm::finalizeBundle(MBB, First, Last);
+          MIBundleBuilder Bundle(MBB, I);
+          Bundle
+            .append(BuildMI(MF, MBB.findDebugLoc(I), TII->get(MovOpcode),
+                            MI.getOperand(0).getReg())
+                    .addReg(AMDGPU::SI_LITERAL_CONSTANT))
+            .append(BuildMI(MF, MBB.findDebugLoc(I),
+                            TII->get(LoadLiteralOpcode))
+                    .addOperand(MI.getOperand(1)));
+          llvm::finalizeBundle(MBB, Bundle.begin());
           MI.eraseFromParent();
           break;
         }