summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorckoenig <ckoenig@91177308-0d34-0410-b5e6-96231b3b80d8>2013-02-16 11:27:35 +0000
committerTom Stellard <thomas.stellard@amd.com>2013-02-19 14:58:29 +0000
commit6ed8c0f164e977a4d298f5abc3a587178e14caab (patch)
tree6f05165e8d05416b03228de1f2d973dc6bffae8e
parentba7b51db0d356d51c32aef0240603f2dc1e552da (diff)
R600/structurizer: improve PHI value finding
Using the new NearestCommonDominator class. This is a candidate for the stable branch. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Tom Stellard <thomas.stellard@amd.com> git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175346 91177308-0d34-0410-b5e6-96231b3b80d8 (cherry picked from commit fe8baf459f6e9f52ef8e5cc630e567f38ad196fa)
-rw-r--r--lib/Target/R600/AMDGPUStructurizeCFG.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Target/R600/AMDGPUStructurizeCFG.cpp b/lib/Target/R600/AMDGPUStructurizeCFG.cpp
index ad628c16858..eb63e556209 100644
--- a/lib/Target/R600/AMDGPUStructurizeCFG.cpp
+++ b/lib/Target/R600/AMDGPUStructurizeCFG.cpp
@@ -533,12 +533,18 @@ void AMDGPUStructurizeCFG::setPhiValues() {
Updater.AddAvailableValue(&Func->getEntryBlock(), Undef);
Updater.AddAvailableValue(To, Undef);
+ NearestCommonDominator Dominator(DT);
+ Dominator.addBlock(To, false);
for (BBValueVector::iterator VI = PI->second.begin(),
VE = PI->second.end(); VI != VE; ++VI) {
Updater.AddAvailableValue(VI->first, VI->second);
+ Dominator.addBlock(VI->first);
}
+ if (!Dominator.wasResultExplicitMentioned())
+ Updater.AddAvailableValue(Dominator.getResult(), Undef);
+
for (BBVector::iterator FI = From.begin(), FE = From.end();
FI != FE; ++FI) {