summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorMatt Arsenault <Matthew.Arsenault@amd.com>2016-01-22 21:30:43 +0000
committerMatt Arsenault <Matthew.Arsenault@amd.com>2016-01-22 21:30:43 +0000
commit10ca39ca8bfab89e0c4e6ec3aa349099cea85eb4 (patch)
tree392b3239166344376798eed5f4f61f92b6324971 /llvm/lib
parentbef34e21c7c199a5c4cf1a95a9e4ee9a405b26f3 (diff)
downloadbcm5719-llvm-10ca39ca8bfab89e0c4e6ec3aa349099cea85eb4.tar.gz
bcm5719-llvm-10ca39ca8bfab89e0c4e6ec3aa349099cea85eb4.zip
AMDGPU: Add new name for barrier intrinsic
llvm-svn: 258558
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/AMDGPU/SIInstructions.td8
1 files changed, 7 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIInstructions.td b/llvm/lib/Target/AMDGPU/SIInstructions.td
index 701fff0b92c..5bb1b8da6b7 100644
--- a/llvm/lib/Target/AMDGPU/SIInstructions.td
+++ b/llvm/lib/Target/AMDGPU/SIInstructions.td
@@ -481,7 +481,7 @@ def S_CBRANCH_EXECNZ : SOPP <
let hasSideEffects = 1 in {
def S_BARRIER : SOPP <0x0000000a, (ins), "s_barrier",
- [(int_AMDGPU_barrier_local)]
+ [(int_amdgcn_s_barrier)]
> {
let SchedRW = [WriteBarrier];
let simm16 = 0;
@@ -2167,11 +2167,17 @@ def : Pat <
// SOPP Patterns
//===----------------------------------------------------------------------===//
+// FIXME: These should be removed eventually
def : Pat <
(int_AMDGPU_barrier_global),
(S_BARRIER)
>;
+def : Pat <
+ (int_AMDGPU_barrier_local),
+ (S_BARRIER)
+>;
+
//===----------------------------------------------------------------------===//
// VOP1 Patterns
//===----------------------------------------------------------------------===//
OpenPOWER on IntegriCloud