[llvm] r247059 - AMDGPU: Fix s_barrier flags

[Matt Arsenault via llvm-commits]

Author: arsenm
Date: Tue Sep  8 14:54:25 2015
New Revision: 247059

URL: http://llvm.org/viewvc/llvm-project?rev=247059&view=rev
Log:
AMDGPU: Fix s_barrier flags

This should be convergent. This is not a
barrier in the isBarrier sense, nor
hasCtrlDep.

Modified:
    llvm/trunk/lib/Target/AMDGPU/SIInstructions.td

Modified: llvm/trunk/lib/Target/AMDGPU/SIInstructions.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIInstructions.td?rev=247059&r1=247058&r2=247059&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIInstructions.td (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIInstructions.td Tue Sep  8 14:54:25 2015
@@ -480,10 +480,9 @@ def S_BARRIER : SOPP <0x0000000a, (ins),
   [(int_AMDGPU_barrier_local)]
 > {
   let simm16 = 0;
-  let isBarrier = 1;
-  let hasCtrlDep = 1;
   let mayLoad = 1;
   let mayStore = 1;
+  let isConvergent = 1;
 }
 
 def S_WAITCNT : SOPP <0x0000000c, (ins WAIT_FLAG:$simm16), "s_waitcnt $simm16">;