diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2013-04-26 16:14:20 -0400 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2013-04-29 10:46:48 -0400 |
| commit | 8b7851d2aedc778263a77ebd72e454b25b2a1ba0 (patch) | |
| tree | b8dc249952c036edfaa24e98382da3736aac1741 | |
| parent | ad3ab9db741faa7444fd0b15e75a9534de0af037 (diff) | |
R600: Use correct CF_END instruction on Northern Island GPUsbfgminer-perf
| -rw-r--r-- | lib/Target/R600/R600ControlFlowFinalizer.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/R600/cf_end.ll | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/Target/R600/R600ControlFlowFinalizer.cpp b/lib/Target/R600/R600ControlFlowFinalizer.cpp index 9471cec90de..2bb7df67405 100644 --- a/lib/Target/R600/R600ControlFlowFinalizer.cpp +++ b/lib/Target/R600/R600ControlFlowFinalizer.cpp @@ -97,7 +97,7 @@ private: 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; } diff --git a/test/CodeGen/R600/cf_end.ll b/test/CodeGen/R600/cf_end.ll index 67d5e3e781c..56cd7de3821 100644 --- a/test/CodeGen/R600/cf_end.ll +++ b/test/CodeGen/R600/cf_end.ll @@ -1,6 +1,9 @@ -; RUN: llc < %s -march=r600 -mcpu=redwood --show-mc-encoding | FileCheck %s +; RUN: llc < %s -march=r600 -mcpu=redwood --show-mc-encoding | FileCheck --check-prefix=EG-CHECK %s +; RUN: llc < %s -march=r600 -mcpu=caicos --show-mc-encoding | FileCheck --check-prefix=EG-CHECK %s +; RUN: llc < %s -march=r600 -mcpu=cayman --show-mc-encoding | FileCheck --check-prefix=CM-CHECK %s -; CHECK: CF_END ; encoding: [0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x80] +; EG-CHECK: CF_END ; encoding: [0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x80] +; CM-CHECK: CF_END ; encoding: [0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x88] define void @eop() { ret void } |