[llvm-commits] [llvm] r51563 - /llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp
Bill Wendling
isanbard at gmail.com
Sun May 25 22:49:49 PDT 2008
Author: void
Date: Mon May 26 00:49:49 2008
New Revision: 51563
URL: http://llvm.org/viewvc/llvm-project?rev=51563&view=rev
Log:
The enabling of remat in 2-address conversion breaks this test:
Running /Users/void/llvm/llvm.src/test/CodeGen/X86/dg.exp ...
FAIL: /Users/void/llvm/llvm.src/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll
Failed with exit(1) at line 1
while running: llvm-as < /Users/void/llvm/llvm.src/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll | llc -march=x86 -mattr=+sse2 -stats |& grep {1 .*folded into instructions}
child process exited abnormally
Make this conditional for now.
Modified:
llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp
Modified: llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp?rev=51563&r1=51562&r2=51563&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp (original)
+++ llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp Mon May 26 00:49:49 2008
@@ -37,6 +37,7 @@
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/TargetMachine.h"
+#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Debug.h"
#include "llvm/ADT/SmallPtrSet.h"
@@ -49,6 +50,10 @@
STATISTIC(NumConvertedTo3Addr, "Number of instructions promoted to 3-address");
STATISTIC(Num3AddrSunk, "Number of 3-address instructions sunk");
+static cl::opt<bool>
+EnableReMat("2-addr-remat", cl::init(false), cl::Hidden,
+ cl::desc("Two-addr conversion should remat when possible."));
+
namespace {
class VISIBILITY_HIDDEN TwoAddressInstructionPass
: public MachineFunctionPass {
@@ -326,7 +331,7 @@
const TargetRegisterClass* rc = MF.getRegInfo().getRegClass(regA);
MachineInstr *Orig = MRI->getVRegDef(regB);
- if (Orig && TII->isTriviallyReMaterializable(Orig)) {
+ if (EnableReMat && Orig && TII->isTriviallyReMaterializable(Orig)) {
TII->reMaterialize(*mbbi, mi, regA, Orig);
ReMattedInstrs.insert(Orig);
} else {
@@ -367,33 +372,35 @@
}
}
- SmallPtrSet<MachineInstr*, 8>::iterator I = ReMattedInstrs.begin();
- SmallPtrSet<MachineInstr*, 8>::iterator E = ReMattedInstrs.end();
-
- for (; I != E; ++I) {
- MachineInstr *MI = *I;
- bool InstrDead = true;
-
- for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
- const MachineOperand &MO = MI->getOperand(i);
- if (!MO.isRegister())
- continue;
- unsigned MOReg = MO.getReg();
- if (!MOReg)
- continue;
- if (MO.isDef()) {
- if (MO.isImplicit())
+ if (EnableReMat) {
+ SmallPtrSet<MachineInstr*, 8>::iterator I = ReMattedInstrs.begin();
+ SmallPtrSet<MachineInstr*, 8>::iterator E = ReMattedInstrs.end();
+
+ for (; I != E; ++I) {
+ MachineInstr *MI = *I;
+ bool InstrDead = true;
+
+ for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
+ const MachineOperand &MO = MI->getOperand(i);
+ if (!MO.isRegister())
continue;
-
- if (MRI->use_begin(MOReg) != MRI->use_end()) {
- InstrDead = false;
- break;
+ unsigned MOReg = MO.getReg();
+ if (!MOReg)
+ continue;
+ if (MO.isDef()) {
+ if (MO.isImplicit())
+ continue;
+
+ if (MRI->use_begin(MOReg) != MRI->use_end()) {
+ InstrDead = false;
+ break;
+ }
}
}
- }
- if (InstrDead && MI->getNumOperands() > 0)
- MI->eraseFromParent();
+ if (InstrDead && MI->getNumOperands() > 0)
+ MI->eraseFromParent();
+ }
}
return MadeChange;
More information about the llvm-commits
mailing list