[llvm] r319646 - [TwoAddressInstructionPass] Bugfix in handling of sunk instructions.
Jonas Paulsson via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 4 02:03:14 PST 2017
Author: jonpa
Date: Mon Dec 4 02:03:14 2017
New Revision: 319646
URL: http://llvm.org/viewvc/llvm-project?rev=319646&view=rev
Log:
[TwoAddressInstructionPass] Bugfix in handling of sunk instructions.
An instruction returned by TII->convertToThreeAddress() may contain a %noreg
(undef) operand, which is not expected by tryInstructionTransform(). So if
this MI is sunk to a lower point in MBB, it must be skipped when later
encountered.
A new set SunkInstrs is used for this purpose.
Note: there is no test supplied here, as this was triggered on SystemZ while
working on a review of instruction flags. A test case for this bugfix will be
included in the upcoming SystemZ commit.
Review: Quentin Colombet
https://reviews.llvm.org/D40711
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=319646&r1=319645&r2=319646&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp (original)
+++ llvm/trunk/lib/CodeGen/TwoAddressInstructionPass.cpp Mon Dec 4 02:03:14 2017
@@ -110,6 +110,10 @@ class TwoAddressInstructionPass : public
// Set of already processed instructions in the current block.
SmallPtrSet<MachineInstr*, 8> Processed;
+ // Set of instructions converted to three-address by target and then sunk
+ // down current basic block.
+ SmallPtrSet<MachineInstr*, 8> SunkInstrs;
+
// A map from virtual registers to physical registers which are likely targets
// to be coalesced to due to copies from physical registers to virtual
// registers. e.g. v1024 = move r0.
@@ -756,6 +760,8 @@ TwoAddressInstructionPass::convertInstTo
mi = NewMI;
nmi = std::next(mi);
}
+ else
+ SunkInstrs.insert(NewMI);
// Update source and destination register maps.
SrcRegMap.erase(RegA);
@@ -1674,10 +1680,13 @@ bool TwoAddressInstructionPass::runOnMac
SrcRegMap.clear();
DstRegMap.clear();
Processed.clear();
+ SunkInstrs.clear();
for (MachineBasicBlock::iterator mi = MBB->begin(), me = MBB->end();
mi != me; ) {
MachineBasicBlock::iterator nmi = std::next(mi);
- if (mi->isDebugValue()) {
+ // Don't revisit an instruction previously converted by target. It may
+ // contain undef register operands (%noreg), which are not handled.
+ if (mi->isDebugValue() || SunkInstrs.count(&*mi)) {
mi = nmi;
continue;
}
More information about the llvm-commits
mailing list