commit dfef7cbfc6a96d129b99750f554c7dbc000d3228
author Vincent Lejeune <vljn@ovi.com> Tue Oct 01 19:32:58 2013 +0000
committer Vincent Lejeune <vljn@ovi.com> Tue Oct 01 19:32:58 2013 +0000
tree ff3bd94d5ccb1187757284832161119cd2c94486
parent c6c37d74a272f49f811fe747aa71f372600dfd9e

R600: add a pass that merges clauses.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191790 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/R600/AMDGPUTargetMachine.cpp

diff --git a/lib/Target/R600/AMDGPUTargetMachine.cpp b/lib/Target/R600/AMDGPUTargetMachine.cpp
index 2119ed3..66585e4 100644
--- a/lib/Target/R600/AMDGPUTargetMachine.cpp
+++ b/lib/Target/R600/AMDGPUTargetMachine.cpp
@@ -168,10 +168,11 @@
 bool AMDGPUPassConfig::addPreSched2() {
   const AMDGPUSubtarget &ST = TM->getSubtarget<AMDGPUSubtarget>();
 
-  if (ST.getGeneration() <= AMDGPUSubtarget::NORTHERN_ISLANDS) {
+  if (ST.getGeneration() <= AMDGPUSubtarget::NORTHERN_ISLANDS)
     addPass(createR600EmitClauseMarkers(*TM));
-  }
   addPass(&IfConverterID);
+  if (ST.getGeneration() <= AMDGPUSubtarget::NORTHERN_ISLANDS)
+    addPass(createR600ClauseMergePass(*TM));
   return false;
 }