RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-02-03 09:14:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NewGVN: Fix PR 33116, the memoryphi version of bug 32838.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@303521 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Berlin 2017-05-21 23:41:58 +00:00
parent 06366afa19
commit cc24c88dcf
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Transforms/Scalar/NewGVN.cpp
View File

@ -61,7 +61,6 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SparseBitVector.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/TinyPtrVector.h"
#include "llvm/Analysis/AliasAnalysis.h"
@ -1224,7 +1223,6 @@ const Expression *NewGVN::performSymbolicStoreEvaluation(Instruction *I) const {
// If we bypassed the use-def chains, make sure we add a use.
if (StoreRHS != StoreAccess->getDefiningAccess())
addMemoryUsers(StoreRHS, StoreAccess);
StoreRHS = lookupMemoryLeader(StoreRHS);
// If we are defined by ourselves, use the live on entry def.
if (StoreRHS == StoreAccess)
@ -1596,7 +1594,7 @@ const Expression *NewGVN::performSymbolicPHIEvaluation(Instruction *I) const {
// See if all arguments are the same.
// We track if any were undef because they need special handling.
bool HasUndef = false;
bool CycleFree = isCycleFree(cast<PHINode>(I));
bool CycleFree = isCycleFree(I);
auto Filtered = make_filter_range(E->operands(), [&](Value *Arg) {
if (Arg == nullptr)
return false;
@ -2709,11 +2707,12 @@ void NewGVN::updateProcessedCount(const Value *V) {
// Evaluate MemoryPhi nodes symbolically, just like PHI nodes
void NewGVN::valueNumberMemoryPhi(MemoryPhi *MP) {
// If all the arguments are the same, the MemoryPhi has the same value as the
// argument.
// Filter out unreachable blocks and self phis from our operands.
// argument. Filter out unreachable blocks and self phis from our operands.
// TODO: We could do cycle-checking on the memory phis to allow valueizing for
// self-phi checking.
const BasicBlock *PHIBlock = MP->getBlock();
auto Filtered = make_filter_range(MP->operands(), [&](const Use &U) {
return lookupMemoryLeader(cast<MemoryAccess>(U)) != MP &&
return cast<MemoryAccess>(U) != MP &&
!isMemoryAccessTOP(cast<MemoryAccess>(U)) &&
ReachableEdges.count({MP->getIncomingBlock(U), PHIBlock});
});

39
test/Transforms/NewGVN/pr33116.ll Normal file
View File

@ -0,0 +1,39 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt -S -newgvn %s | FileCheck %s
@a = external global i32
define void @b() {
; CHECK-LABEL: @b(
; CHECK-NEXT: br i1 false, label [[C:%.*]], label [[WHILE_D:%.*]]
; CHECK: while.d:
; CHECK-NEXT: br label [[F:%.*]]
; CHECK: f:
; CHECK-NEXT: br i1 undef, label [[IF_E:%.*]], label [[C]]
; CHECK: c:
; CHECK-NEXT: br i1 undef, label [[IF_G:%.*]], label [[IF_E]]
; CHECK: if.g:
; CHECK-NEXT: store i32 undef, i32* @a
; CHECK-NEXT: br label [[WHILE_D]]
; CHECK: if.e:
; CHECK-NEXT: br label [[F]]
;
br i1 false, label %c, label %while.d
while.d: ; preds = %if.g, %0
br label %f
f: ; preds = %if.e, %while.d
br i1 undef, label %if.e, label %c
c: ; preds = %f, %0
br i1 undef, label %if.g, label %if.e
if.g: ; preds = %c
store i32 undef, i32* @a
br label %while.d
if.e: ; preds = %c, %f
br label %f
}