From bf18939180afcd8d0c8c422f86b170e036544be6 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Tue, 17 Feb 2009 06:41:03 +0000 Subject: [PATCH] A couple of places where reused use operands should be marked kill. This is exposed by recent availability fallthrough changes. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@64745 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/VirtRegMap.cpp | 11 ++ .../CodeGen/ARM/2008-11-19-ScavengerAssert.ll | 2 +- test/CodeGen/ARM/2009-02-16-SpillerBug.ll | 117 ++++++++++++++++++ 3 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 test/CodeGen/ARM/2009-02-16-SpillerBug.ll diff --git a/lib/CodeGen/VirtRegMap.cpp b/lib/CodeGen/VirtRegMap.cpp index f288dcc87cf..e2dc636e691 100644 --- a/lib/CodeGen/VirtRegMap.cpp +++ b/lib/CodeGen/VirtRegMap.cpp @@ -1599,6 +1599,12 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM, PotentialDeadStoreSlots.push_back(ReuseSlot); } + + // Assumes this is the last use. IsKill will be unset if reg is reused + // unless it's a two-address operand. + if (ti == -1) + MI.getOperand(i).setIsKill(); + continue; } // CanReuse @@ -1764,6 +1770,11 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM, DefMO = NextMII->findRegisterDefOperand(DestReg); DefMO->setSubReg(SubIdx); } + + // Mark is killed. + MachineOperand *KillOpnd = NextMII->findRegisterUseOperand(InReg); + KillOpnd->setIsKill(); + BackTracked = true; } else { DOUT << "Removing now-noop copy: " << MI; diff --git a/test/CodeGen/ARM/2008-11-19-ScavengerAssert.ll b/test/CodeGen/ARM/2008-11-19-ScavengerAssert.ll index 0a73b3fc257..bb16a94f485 100644 --- a/test/CodeGen/ARM/2008-11-19-ScavengerAssert.ll +++ b/test/CodeGen/ARM/2008-11-19-ScavengerAssert.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin9 -; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin9 -stats |& grep asm-printer | grep 186 +; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin9 -stats |& grep asm-printer | grep 185 %"struct.Adv5::Ekin<3>" = type <{ i8 }> %"struct.Adv5::X::Energyflux<3>" = type { double } diff --git a/test/CodeGen/ARM/2009-02-16-SpillerBug.ll b/test/CodeGen/ARM/2009-02-16-SpillerBug.ll new file mode 100644 index 00000000000..48e663dd806 --- /dev/null +++ b/test/CodeGen/ARM/2009-02-16-SpillerBug.ll @@ -0,0 +1,117 @@ +; RUN: llvm-as < %s | llc -march=arm -mattr=+v6,+vfp2 + +target triple = "arm-apple-darwin9" + %struct.FILE_POS = type { i8, i8, i16, i32 } + %struct.FIRST_UNION = type { %struct.FILE_POS } + %struct.FOURTH_UNION = type { %struct.STYLE } + %struct.GAP = type { i8, i8, i16 } + %struct.LIST = type { %struct.rec*, %struct.rec* } + %struct.SECOND_UNION = type { { i16, i8, i8 } } + %struct.STYLE = type { { %struct.GAP }, { %struct.GAP }, i16, i16, i32 } + %struct.THIRD_UNION = type { { [2 x i32], [2 x i32] } } + %struct.head_type = type { [2 x %struct.LIST], %struct.FIRST_UNION, %struct.SECOND_UNION, %struct.THIRD_UNION, %struct.FOURTH_UNION, %struct.rec*, { %struct.rec* }, %struct.rec*, %struct.rec*, %struct.rec*, %struct.rec*, %struct.rec*, %struct.rec*, %struct.rec*, %struct.rec*, i32 } + %struct.rec = type { %struct.head_type } +@no_file_pos = external global %struct.FILE_POS ; <%struct.FILE_POS*> [#uses=1] +@"\01LC13423" = external constant [23 x i8] ; <[23 x i8]*> [#uses=1] +@"\01LC18972" = external constant [13 x i8] ; <[13 x i8]*> [#uses=1] + +define fastcc void @FlushGalley(%struct.rec* %hd) nounwind { +entry: + br label %RESUME + +RESUME: ; preds = %bb520.preheader, %entry + br label %bb396 + +bb122: ; preds = %bb396 + switch i32 0, label %bb394 [ + i32 1, label %bb131 + i32 2, label %bb244 + i32 4, label %bb244 + i32 5, label %bb244 + i32 6, label %bb244 + i32 7, label %bb244 + i32 11, label %bb244 + i32 12, label %bb244 + i32 15, label %bb244 + i32 17, label %bb244 + i32 18, label %bb244 + i32 19, label %bb244 + i32 20, label %bb396 + i32 21, label %bb396 + i32 22, label %bb396 + i32 23, label %bb396 + i32 24, label %bb244 + i32 25, label %bb244 + i32 26, label %bb244 + i32 27, label %bb244 + i32 28, label %bb244 + i32 29, label %bb244 + i32 30, label %bb244 + i32 31, label %bb244 + i32 32, label %bb244 + i32 33, label %bb244 + i32 34, label %bb244 + i32 35, label %bb244 + i32 36, label %bb244 + i32 37, label %bb244 + i32 38, label %bb244 + i32 39, label %bb244 + i32 40, label %bb244 + i32 41, label %bb244 + i32 42, label %bb244 + i32 43, label %bb244 + i32 44, label %bb244 + i32 45, label %bb244 + i32 46, label %bb244 + i32 50, label %bb244 + i32 51, label %bb244 + i32 94, label %bb244 + i32 95, label %bb244 + i32 96, label %bb244 + i32 97, label %bb244 + i32 98, label %bb244 + i32 99, label %bb244 + ] + +bb131: ; preds = %bb122 + br label %bb396 + +bb244: ; preds = %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122, %bb122 + %0 = icmp eq %struct.rec* %stop_link.3, null ; [#uses=1] + br i1 %0, label %bb435, label %bb433 + +bb394: ; preds = %bb122 + call void (i32, i32, i8*, i32, %struct.FILE_POS*, ...)* @Error(i32 1, i32 3, i8* getelementptr ([23 x i8]* @"\01LC13423", i32 0, i32 0), i32 0, %struct.FILE_POS* @no_file_pos, i8* getelementptr ([13 x i8]* @"\01LC18972", i32 0, i32 0), i8* null) nounwind + br label %bb396 + +bb396: ; preds = %bb394, %bb131, %bb122, %bb122, %bb122, %bb122, %RESUME + %stop_link.3 = phi %struct.rec* [ null, %RESUME ], [ %stop_link.3, %bb394 ], [ %stop_link.3, %bb122 ], [ %stop_link.3, %bb122 ], [ %stop_link.3, %bb122 ], [ %stop_link.3, %bb122 ], [ %link.1, %bb131 ] ; <%struct.rec*> [#uses=7] + %headers_seen.1 = phi i32 [ 0, %RESUME ], [ %headers_seen.1, %bb394 ], [ 1, %bb122 ], [ 1, %bb122 ], [ 1, %bb122 ], [ 1, %bb122 ], [ %headers_seen.1, %bb131 ] ; [#uses=2] + %link.1 = load %struct.rec** null ; <%struct.rec*> [#uses=2] + %1 = icmp eq %struct.rec* %link.1, %hd ; [#uses=1] + br i1 %1, label %bb398, label %bb122 + +bb398: ; preds = %bb396 + unreachable + +bb433: ; preds = %bb244 + call fastcc void @Promote(%struct.rec* %hd, %struct.rec* %stop_link.3, %struct.rec* null, i32 1) nounwind + br label %bb435 + +bb435: ; preds = %bb433, %bb244 + br i1 false, label %bb491, label %bb499 + +bb491: ; preds = %bb435 + br label %bb499 + +bb499: ; preds = %bb499, %bb491, %bb435 + %2 = icmp eq %struct.rec* null, null ; [#uses=1] + br i1 %2, label %bb520.preheader, label %bb499 + +bb520.preheader: ; preds = %bb499 + br label %RESUME +} + +declare fastcc void @Promote(%struct.rec*, %struct.rec*, %struct.rec* nocapture, i32) nounwind + +declare void @Error(i32, i32, i8*, i32, %struct.FILE_POS*, ...) nounwind