RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

[MemorySSA] Add all MemoryPhis before filling their values.

Browse Source 
Summary:
Add all MemoryPhis in IDF before filling in their incomign values.
Otherwise, a new Phi can be added that needs to become the incoming
value of another Phi.
Test fails the verification in verifyPrevDefInPhis.

Reviewers: george.burgess.iv

Subscribers: jlebar, Prazek, zzheng, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D63353

llvm-svn: 363590
This commit is contained in:
Alina Sbirlea 2019-06-17 18:16:53 +00:00
parent 34b508a4fa
commit fb04ae0293
2 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Analysis/MemorySSAUpdater.cpp
View File

@ -960,15 +960,25 @@ void MemorySSAUpdater::applyInsertUpdates(ArrayRef<CFGUpdate> Updates,
BlocksToProcess.end()); BlocksToProcess.end());
IDFs.setDefiningBlocks(DefiningBlocks); IDFs.setDefiningBlocks(DefiningBlocks);
IDFs.calculate(IDFBlocks); IDFs.calculate(IDFBlocks);
SmallSetVector<MemoryPhi *, 4> PhisToFill;
// First create all needed Phis.
for (auto *BBIDF : IDFBlocks)
if (!MSSA->getMemoryAccess(BBIDF)) {
auto *IDFPhi = MSSA->createMemoryPhi(BBIDF);
InsertedPhis.push_back(IDFPhi);
PhisToFill.insert(IDFPhi);
}
// Then update or insert their correct incoming values.
for (auto *BBIDF : IDFBlocks) { for (auto *BBIDF : IDFBlocks) {
if (auto *IDFPhi = MSSA->getMemoryAccess(BBIDF)) { auto *IDFPhi = MSSA->getMemoryAccess(BBIDF);
assert(IDFPhi && "Phi must exist");
if (!PhisToFill.count(IDFPhi)) {
// Update existing Phi. // Update existing Phi.
// FIXME: some updates may be redundant, try to optimize and skip some. // FIXME: some updates may be redundant, try to optimize and skip some.
for (unsigned I = 0, E = IDFPhi->getNumIncomingValues(); I < E; ++I) for (unsigned I = 0, E = IDFPhi->getNumIncomingValues(); I < E; ++I)
IDFPhi->setIncomingValue(I, GetLastDef(IDFPhi->getIncomingBlock(I))); IDFPhi->setIncomingValue(I, GetLastDef(IDFPhi->getIncomingBlock(I)));
} else { } else {
IDFPhi = MSSA->createMemoryPhi(BBIDF);
InsertedPhis.push_back(IDFPhi);
for (auto &Pair : children<GraphDiffInvBBPair>({GD, BBIDF})) { for (auto &Pair : children<GraphDiffInvBBPair>({GD, BBIDF})) {
BasicBlock *Pi = Pair.second; BasicBlock *Pi = Pair.second;
IDFPhi->addIncoming(GetLastDef(Pi), Pi); IDFPhi->addIncoming(GetLastDef(Pi), Pi);

51
test/Analysis/MemorySSA/update_unroll.ll Normal file
View File

@ -0,0 +1,51 @@
; RUN: opt -enable-mssa-loop-dependency -verify-memoryssa -loop-rotate -S %s | FileCheck %s
; REQUIRES: asserts
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-grtev4-linux-gnu"
; Check verification passes after loop rotate, when adding phis in blocks
; receiving incoming edges and adding phis in IDF blocks.
; CHECK-LABEL: @f
define void @f() align 32 {
entry:
br label %while.cond.outer
while.cond80.while.cond.loopexit_crit_edge: ; preds = %if.else99
br label %while.cond.outer
while.cond.outer: ; preds = %while.cond80.while.cond.loopexit_crit_edge, %entry
br i1 undef, label %while.cond.outer.return.loopexit2_crit_edge, label %while.body.lr.ph
while.body.lr.ph: ; preds = %while.cond.outer
br label %while.body
while.body: ; preds = %while.body.lr.ph
br i1 undef, label %if.then42, label %if.end61
if.then42: ; preds = %while.body
br label %return.loopexit2
if.end61: ; preds = %while.body
br label %while.body82
while.body82: ; preds = %if.end61
br i1 undef, label %return.loopexit, label %if.else99
if.else99: ; preds = %while.body82
store i32 0, i32* inttoptr (i64 44 to i32*), align 4
br label %while.cond80.while.cond.loopexit_crit_edge
return.loopexit: ; preds = %while.body82
br label %return
while.cond.outer.return.loopexit2_crit_edge: ; preds = %while.cond.outer
br label %return.loopexit2
return.loopexit2: ; preds = %while.cond.outer.return.loopexit2_crit_edge, %if.then42
br label %return
return: ; preds = %return.loopexit2, %return.loopexit
ret void
}