summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
diff options
context:
space:
mode:
authorVincent Lejeune <vljn@ovi.com>2013-10-01 19:32:58 +0000
committerVincent Lejeune <vljn@ovi.com>2013-10-01 19:32:58 +0000
commita4da6fb53577d16b61fab965284dbf4cb5a31ff2 (patch)
tree60685edac6824872e825fc3ae79b3d46e72df5fb /llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
parent0b342d6f743b16e2157088b1cc41b32e42e9d743 (diff)
downloadbcm5719-llvm-a4da6fb53577d16b61fab965284dbf4cb5a31ff2.tar.gz
bcm5719-llvm-a4da6fb53577d16b61fab965284dbf4cb5a31ff2.zip
R600: add a pass that merges clauses.
llvm-svn: 191790
Diffstat (limited to 'llvm/lib/Target/R600/AMDGPUTargetMachine.cpp')
-rw-r--r--llvm/lib/Target/R600/AMDGPUTargetMachine.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp b/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
index 2119ed363d9..66585e432e3 100644
--- a/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
+++ b/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
@@ -168,10 +168,11 @@ bool AMDGPUPassConfig::addPostRegAlloc() {
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;
}
OpenPOWER on IntegriCloud