Author: evancheng
Date: Wed Feb 6 13:16:53 2008
New Revision: 46821
URL: http://llvm.org/viewvc/llvm-project?rev=46821&view=rev
Log:
Fix a number of local register allocator issues: PR1609.
Added:
llvm/trunk/test/CodeGen/ARM/2008-02-04-LocalRegAllocBug.ll
Modified:
llvm/trunk/lib/CodeGen/RegAllocLocal.cpp
Modified: llvm/trunk/lib/CodeGen/RegAllocLocal.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegAllocLocal.cpp?rev=46821&r1=46820&r2=46821&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/RegAllocLocal.cpp (original)
+++ llvm/trunk/lib/CodeGen/RegAllocLocal.cpp Wed Feb 6 13:16:53 2008
@@ -29,6 +29,7 @@
#include "llvm/ADT/IndexedMap.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
#include <algorithm>
using namespace llvm;
@@ -296,16 +297,24 @@
std::pair<MachineInstr*, unsigned> &LastUse = getVirtRegLastUse(VirtReg);
if (LastUse.first)
LastUse.first->getOperand(LastUse.second).setIsKill();
- }
-
- // Otherwise, there is a virtual register corresponding to this physical
- // register. We only need to spill it into its stack slot if it has been
- // modified.
- if (isVirtRegModified(VirtReg)) {
+ } else {
+ // Otherwise, there is a virtual register corresponding to this physical
+ // register. We only need to spill it into its stack slot if it has been
+ // modified.
const TargetRegisterClass *RC = MF->getRegInfo().getRegClass(VirtReg);
int FrameIndex = getStackSpaceFor(VirtReg, RC);
DOUT << " to stack slot #" << FrameIndex;
TII->storeRegToStackSlot(MBB, I, PhysReg, true, FrameIndex, RC);
+
+ // If the instruction reads the register that's spilled, (e.g. this can
+ // happen if it is a move to a physical register), then the spill
+ // instruction is not a kill.
+ if (I != MBB.end() && I->findRegisterUseOperandIdx(PhysReg) != -1) {
+ MachineBasicBlock::iterator StoreMI = prior(I);
+ int Idx = StoreMI->findRegisterUseOperandIdx(PhysReg, true);
+ assert(Idx != -1 && "Unrecognized spill instruction!");
+ StoreMI->getOperand(Idx).setIsKill(false);
+ }
++NumStores; // Update statistics
}
@@ -494,12 +503,6 @@
// If we can fold this spill into this instruction, do so now.
SmallVector<unsigned, 2> Ops;
Ops.push_back(OpNum);
- if (MachineInstr* FMI = TII->foldMemoryOperand(MI, Ops, FrameIndex)) {
- ++NumFolded;
- // Update kill/dead flags.
- FMI->copyKillDeadInfo(MI);
- return MBB.insert(MBB.erase(MI), FMI);
- }
// It looks like we can't fold this virtual register load into this
// instruction. Force some poor hapless value out of the register file to
@@ -775,9 +778,8 @@
// Finally, if this is a noop copy instruction, zap it.
unsigned SrcReg, DstReg;
- if (TII.isMoveInstr(*MI, SrcReg, DstReg) && SrcReg == DstReg) {
+ if (TII.isMoveInstr(*MI, SrcReg, DstReg) && SrcReg == DstReg)
MBB.erase(MI);
- }
}
MachineBasicBlock::iterator MI = MBB.getFirstTerminator();
Added: llvm/trunk/test/CodeGen/ARM/2008-02-04-LocalRegAllocBug.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2008-02-04-LocalRegAllocBug.ll?rev=46821&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2008-02-04-LocalRegAllocBug.ll (added)
+++ llvm/trunk/test/CodeGen/ARM/2008-02-04-LocalRegAllocBug.ll Wed Feb 6
13:16:53 2008
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi -regalloc=local
+; PR1609
+
+ %struct.encode_aux_nearestmatch = type { i32*, i32*, i32*, i32*, i32,
i32 }
+ %struct.encode_aux_pigeonhole = type { float, float, i32, i32, i32*,
i32, i32*, i32*, i32* }
+ %struct.encode_aux_threshmatch = type { float*, i32*, i32, i32 }
+ %struct.oggpack_buffer = type { i32, i32, i8*, i8*, i32 }
+ %struct.static_codebook = type { i32, i32, i32*, i32, i32, i32, i32,
i32, i32*, %struct.encode_aux_nearestmatch*, %struct.encode_aux_threshmatch*,
%struct.encode_aux_pigeonhole*, i32 }
+
+define i32 @vorbis_staticbook_pack(%struct.static_codebook* %c,
%struct.oggpack_buffer* %opb) {
+entry:
+ %opb_addr = alloca %struct.oggpack_buffer* ;
<%struct.oggpack_buffer**> [#uses=1]
+ %tmp1 = load %struct.oggpack_buffer** %opb_addr, align 4
; <%struct.oggpack_buffer*> [#uses=1]
+ call void @oggpack_write( %struct.oggpack_buffer* %tmp1, i32 5653314,
i32 24 ) nounwind
+ call void @oggpack_write( %struct.oggpack_buffer* null, i32 0, i32 24 )
nounwind
+ unreachable
+}
+
+declare void @oggpack_write(%struct.oggpack_buffer*, i32, i32)
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
