RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-01-23 20:57:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LiveInterval: Fix Distribute() failing on liveranges with unused VNInfos

Browse Source 
This fixes http://llvm.org/PR26991

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@264345 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matthias Braun 2016-03-24 21:41:38 +00:00
parent 84ad430763
commit afb111acf7
2 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/CodeGen/LiveInterval.cpp
View File

@ -1483,15 +1483,20 @@ void ConnectedVNInfoEqClasses::Distribute(LiveInterval &LI, LiveInterval *LIV[],
SubRanges.resize(NumComponents-1, nullptr);
for (unsigned I = 0; I < NumValNos; ++I) {
const VNInfo &VNI = *SR.valnos[I];
const VNInfo *MainRangeVNI = LI.getVNInfoAt(VNI.def);
assert(MainRangeVNI != nullptr
&& "SubRange def must have corresponding main range def");
unsigned ComponentNum = getEqClass(MainRangeVNI);
VNIMapping.push_back(ComponentNum);
if (ComponentNum > 0 && SubRanges[ComponentNum-1] == nullptr) {
SubRanges[ComponentNum-1]
= LIV[ComponentNum-1]->createSubRange(Allocator, SR.LaneMask);
unsigned ComponentNum;
if (VNI.isUnused()) {
ComponentNum = 0;
} else {
const VNInfo *MainRangeVNI = LI.getVNInfoAt(VNI.def);
assert(MainRangeVNI != nullptr
&& "SubRange def must have corresponding main range def");
ComponentNum = getEqClass(MainRangeVNI);
if (ComponentNum > 0 && SubRanges[ComponentNum-1] == nullptr) {
SubRanges[ComponentNum-1]
= LIV[ComponentNum-1]->createSubRange(Allocator, SR.LaneMask);
}
}
VNIMapping.push_back(ComponentNum);
}
DistributeRange(SR, SubRanges.data(), VNIMapping);
}

53
test/CodeGen/AMDGPU/coalescer_distribute.ll Normal file
View File

@ -0,0 +1,53 @@
; RUN: llc -o /dev/null %s
; This testcase produces a situation with unused value numbers in subregister
; liveranges that get distributed by ConnectedVNInfoEqClasses.
target triple = "amdgcn--"
define spir_kernel void @hoge() {
bb:
%tmp = tail call i32 @llvm.r600.read.tidig.x()
br i1 undef, label %bb2, label %bb23
bb2:
br i1 undef, label %bb6, label %bb8
bb6:
%tmp7 = or i64 undef, undef
br label %bb8
bb8:
%tmp9 = phi i64 [ %tmp7, %bb6 ], [ undef, %bb2 ]
%tmp10 = icmp eq i32 %tmp, 0
br i1 %tmp10, label %bb11, label %bb23
bb11:
br i1 undef, label %bb20, label %bb17
bb17:
br label %bb20
bb20:
%tmp21 = phi i64 [ undef, %bb17 ], [ %tmp9, %bb11 ]
%tmp22 = trunc i64 %tmp21 to i32
br label %bb23
bb23:
%tmp24 = phi i32 [ %tmp22, %bb20 ], [ undef, %bb8 ], [ undef, %bb ]
br label %bb25
bb25:
%tmp26 = phi i32 [ %tmp24, %bb23 ], [ undef, %bb25 ]
br i1 undef, label %bb25, label %bb30
bb30:
br i1 undef, label %bb32, label %bb34
bb32:
%tmp33 = zext i32 %tmp26 to i64
br label %bb34
bb34:
ret void
}
declare i32 @llvm.r600.read.tidig.x()