[llvm] 7cdf432 - [LiveIntervals] Fix early-clobber handling in handleMoveUp
Jay Foad via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 19 02:17:16 PDT 2020
Author: Jay Foad
Date: 2020-06-19T10:17:04+01:00
New Revision: 7cdf4326a8f290da3804cc92b9dccf45195079dc
URL: https://github.com/llvm/llvm-project/commit/7cdf4326a8f290da3804cc92b9dccf45195079dc
DIFF: https://github.com/llvm/llvm-project/commit/7cdf4326a8f290da3804cc92b9dccf45195079dc.diff
LOG: [LiveIntervals] Fix early-clobber handling in handleMoveUp
Without this fix, handleMoveUp can create an invalid live range like
this:
[98904e,98908r:0)[98908e,227504r:1)
where the two segments overlap, but only because we have lost the "e"
(early-clobber) on the end point of the first segment.
Differential Revision: https://reviews.llvm.org/D82110
Added:
Modified:
llvm/lib/CodeGen/LiveIntervals.cpp
llvm/unittests/MI/LiveIntervalTest.cpp
Removed:
################################################################################
diff --git a/llvm/lib/CodeGen/LiveIntervals.cpp b/llvm/lib/CodeGen/LiveIntervals.cpp
index b830c93d43f4..2bbe036e8425 100644
--- a/llvm/lib/CodeGen/LiveIntervals.cpp
+++ b/llvm/lib/CodeGen/LiveIntervals.cpp
@@ -1342,7 +1342,7 @@ class LiveIntervals::HMEditor {
OldIdxOut->start = NewIdxDef;
OldIdxVNI->def = NewIdxDef;
if (OldIdxIn != E && SlotIndex::isEarlierInstr(NewIdx, OldIdxIn->end))
- OldIdxIn->end = NewIdx.getRegSlot();
+ OldIdxIn->end = NewIdxDef;
}
} else if (OldIdxIn != E
&& SlotIndex::isEarlierInstr(NewIdxOut->start, NewIdx)
diff --git a/llvm/unittests/MI/LiveIntervalTest.cpp b/llvm/unittests/MI/LiveIntervalTest.cpp
index ea8476db1e65..5c974ea7461e 100644
--- a/llvm/unittests/MI/LiveIntervalTest.cpp
+++ b/llvm/unittests/MI/LiveIntervalTest.cpp
@@ -443,6 +443,21 @@ TEST(LiveIntervalTest, DeadSubRegMoveUp) {
});
}
+TEST(LiveIntervalTest, EarlyClobberSubRegMoveUp) {
+ // handleMoveUp had a bug where moving an early-clobber subreg def into the
+ // middle of an earlier segment resulted in an invalid live range.
+ liveIntervalTest(R"MIR(
+ %4:sreg_32 = IMPLICIT_DEF
+ %6:sreg_32 = IMPLICIT_DEF
+ undef early-clobber %9.sub0:sreg_64 = WWM %4:sreg_32, implicit $exec
+ %5:sreg_32 = S_FLBIT_I32_B32 %9.sub0:sreg_64
+ early-clobber %9.sub1:sreg_64 = WWM %6:sreg_32, implicit $exec
+ %7:sreg_32 = S_FLBIT_I32_B32 %9.sub1:sreg_64
+)MIR", [](MachineFunction &MF, LiveIntervals &LIS) {
+ testHandleMove(MF, LIS, 4, 3);
+ });
+}
+
TEST(LiveIntervalTest, TestMoveSubRegDefAcrossUseDef) {
liveIntervalTest(R"MIR(
%1:vreg_64 = IMPLICIT_DEF
More information about the llvm-commits
mailing list