commit d8b2da11360419a9f1d569468a9b2a8ca3dace20
author Tom Stellard <thomas.stellard@amd.com> Mon Apr 29 22:23:58 2013 +0000
committer Tom Stellard <thomas.stellard@amd.com> Mon Apr 29 22:23:58 2013 +0000
tree 590be3f65f287e7148f76ae11ef75e22e729a9f4
parent 015f586bc9665192b6814e91bf47552265ee0617

R600: Use correct CF_END instruction on Northern Island GPUs

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

lib/Target/R600/R600ControlFlowFinalizer.cpp

diff --git a/lib/Target/R600/R600ControlFlowFinalizer.cpp b/lib/Target/R600/R600ControlFlowFinalizer.cpp
index 9271b39..94736ad 100644
--- a/lib/Target/R600/R600ControlFlowFinalizer.cpp
+++ b/lib/Target/R600/R600ControlFlowFinalizer.cpp
@@ -123,7 +123,7 @@
       Opcode = isEg ? AMDGPU::POP_EG : AMDGPU::POP_R600;
       break;
     case CF_END:
-      if (ST.device()->getGeneration() == AMDGPUDeviceInfo::HD6XXX) {
+      if (ST.device()->getDeviceFlag() == OCL_DEVICE_CAYMAN) {
         Opcode = AMDGPU::CF_END_CM;
         break;
       }