RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 04:32:44 +01:00
Code Issues Projects Releases Wiki Activity

[RS4GC] Fix hang on infinite loop

Browse Source 
meetBDVState utility may sets the base pointer for the conflict state.
At this moment the base for conflict state does not have any meaning but
is used in comparison of BDV states. This comparison is used as an indicator
of progress done on iteration and RS4GC pass uses infinite loop to reach
fixed point.
As a result for added test on each iteration state for some phi nodes is updated
with other base value for conflict state and it indicates as a progress while
for conflict state there is no any progress more possible.
In reality the base value is transferred from one state to another and pass
detects the progress on these states.

The test is very fragile. The traversal order of states and operands of phi nodes
plays important role.

Reviewers: reames, dantrushin
Reviewed By: reames
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D99058
This commit is contained in:
Serguei Katkov 2021-03-22 10:30:41 +07:00
parent dcceebd05b
commit 16d6334a66
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Transforms/Scalar/RewriteStatepointsForGC.cpp
View File

@ -782,8 +782,9 @@ static BDVState meetBDVState(const BDVState &LHS, const BDVState &RHS) {
if (LHS.getStatus() == BDVState::Base && RHS.getStatus() == BDVState::Base &&
LHS.getBaseValue() != RHS.getBaseValue()) {
NewStatus = BDVState::Conflict;
BaseValue = nullptr;
}
if (NewStatus == BDVState::Conflict)
BaseValue = nullptr;
return BDVState(LHS.getOriginalValue(), NewStatus, BaseValue);
}

63
test/Transforms/RewriteStatepointsForGC/meetBDVState-hangs.ll Normal file
View File

@ -0,0 +1,63 @@
; RUN: opt -S -rewrite-statepoints-for-gc < %s | FileCheck %s
; Regression test to incorrectly testing fixed state causing infinite loop.
; CHECK: test
target triple = "x86_64-unknown-linux-gnu"
declare void @bar(i8 addrspace(1)* nocapture readonly)
declare noalias i8 addrspace(1)* @foo()
define i8 addrspace(1)* @test(i1 %c, i1 %c1, i1 %c2, i1 %c3, i1 %c4, i1 %c5, i1 %c.exit) gc "statepoint-example" {
entry:
br i1 %c, label %ph.L, label %ph.R
ph.L:
%ph.L.p.b = call noalias nonnull i8 addrspace(1)* @foo()
%ph.L.p = getelementptr i8, i8 addrspace(1)* %ph.L.p.b, i64 8
br label %ph.M
ph.R:
%ph.R.p = call noalias nonnull i8 addrspace(1)* @foo()
br label %ph.M
ph.M:
%ph.M.p = phi i8 addrspace(1)* [ %ph.L.p, %ph.L ], [ %ph.R.p, %ph.R ]
br label %header
header:
%header.p = phi i8 addrspace(1)* [ %ph.M.p, %ph.M ], [ %backedge.p, %backedge]
br i1 %c1, label %loop.M, label %loop.R
loop.R:
br i1 %c2, label %loop.R.M, label %loop.R.R
loop.R.R:
%loop.R.R.p = call noalias nonnull i8 addrspace(1)* @foo()
br label %loop.R.M
loop.R.M:
%loop.R.M.p = phi i8 addrspace(1)* [ %header.p, %loop.R ], [ %loop.R.R.p, %loop.R.R ]
br label %loop.M
loop.M:
%loop.M.p = phi i8 addrspace(1)* [ %loop.R.M.p, %loop.R.M ], [ %header.p, %header ]
br i1 %c4, label %backedge, label %pre.backedge.R
pre.backedge.R:
br i1 %c5, label %pre.backedge.R.L, label %pre.backedge.R.R
pre.backedge.R.L:
%pre.backedge.R.L.p.b = call noalias nonnull i8 addrspace(1)* @foo()
%pre.backedge.R.L.p = getelementptr i8, i8 addrspace(1)* %pre.backedge.R.L.p.b, i64 8
br label %pre.backedge.R.M
pre.backedge.R.R:
%pre.backedge.R.R.p = call noalias nonnull i8 addrspace(1)* @foo()
br label %pre.backedge.R.M
pre.backedge.R.M:
%pre.backedge.R.M.p = phi i8 addrspace(1)* [ %pre.backedge.R.L.p, %pre.backedge.R.L ], [ %pre.backedge.R.R.p, %pre.backedge.R.R ]
br label %backedge
backedge:
%backedge.p = phi i8 addrspace(1)* [ %pre.backedge.R.M.p, %pre.backedge.R.M ], [ %loop.M.p, %loop.M ]
br i1 %c.exit, label %header, label %exit
exit: ; preds = %3, %1
call void @bar(i8 addrspace(1)* align 8 %header.p) [ "deopt"() ]
ret i8 addrspace(1)* %header.p
}