RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-21 03:53:04 +02:00
Code Issues Projects Releases Wiki Activity

[NewGVN] Introduce a definesNoMemory() helper and use it.

Browse Source 
This is nice as is, but it will be used in my next patch to
fix a bug. Suggested by Daniel Berlin.

llvm-svn: 302714
This commit is contained in:
Davide Italiano 2017-05-10 19:57:43 +00:00
parent 0603cde0c8
commit 4f4a6d751d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,6 +317,9 @@ public:
--StoreCount; --StoreCount;
} }
// True if this class has no memory members.
bool definesNoMemory() const { return StoreCount == 0 && memory_empty(); }
// Return true if two congruence classes are equivalent to each other. This // Return true if two congruence classes are equivalent to each other. This
// means // means
// that every field but the ID number and the dead field are equivalent. // that every field but the ID number and the dead field are equivalent.
@ -1850,8 +1853,7 @@ const MemoryAccess *NewGVN::getNextMemoryLeader(CongruenceClass *CC) const {
// TODO: If this ends up to slow, we can maintain a next memory leader like we // TODO: If this ends up to slow, we can maintain a next memory leader like we
// do for regular leaders. // do for regular leaders.
// Make sure there will be a leader to find // Make sure there will be a leader to find
assert((CC->getStoreCount() > 0 || !CC->memory_empty()) && assert(!CC->definesNoMemory() && "Can't get next leader if there is none");
"Can't get next leader if there is none");
if (CC->getStoreCount() > 0) { if (CC->getStoreCount() > 0) {
if (auto *NL = dyn_cast_or_null<StoreInst>(CC->getNextLeader().first)) if (auto *NL = dyn_cast_or_null<StoreInst>(CC->getNextLeader().first))
return MSSA->getMemoryAccess(NL); return MSSA->getMemoryAccess(NL);
@ -1923,7 +1925,7 @@ void NewGVN::moveMemoryToNewCongruenceClass(Instruction *I,
setMemoryClass(InstMA, NewClass); setMemoryClass(InstMA, NewClass);
// Now, fixup the old class if necessary // Now, fixup the old class if necessary
if (OldClass->getMemoryLeader() == InstMA) { if (OldClass->getMemoryLeader() == InstMA) {
if (OldClass->getStoreCount() != 0 || !OldClass->memory_empty()) { if (!OldClass->definesNoMemory()) {
OldClass->setMemoryLeader(getNextMemoryLeader(OldClass)); OldClass->setMemoryLeader(getNextMemoryLeader(OldClass));
DEBUG(dbgs() << "Memory class leader change for class " DEBUG(dbgs() << "Memory class leader change for class "
<< OldClass->getID() << " to " << OldClass->getID() << " to "