[AMDGPU] Require waitcnt before barrier for all targets; adjust tests.

Differential Revision: https://reviews.llvm.org/D33576

llvm-svn: 304217
This commit is contained in:
Mark Searles 2017-05-30 16:22:43 +00:00
parent 95b64a9826
commit 00ce96f6ee
2 changed files with 2 additions and 3 deletions

View File

@ -730,7 +730,7 @@ public:
/// \returns True if waitcnt instruction is needed before barrier instruction,
/// false otherwise.
bool needWaitcntBeforeBarrier() const {
return getGeneration() < GFX9;
return true;
}
/// \returns true if the flat_scratch register should be initialized with the

View File

@ -3,9 +3,8 @@
; GCN-LABEL: {{^}}test_barrier:
; GFX8: buffer_store_dword
; GFX8: s_waitcnt
; GFX9: flat_store_dword
; GFX9-NOT: s_waitcnt
; GCN: s_waitcnt
; GCN: s_barrier
define amdgpu_kernel void @test_barrier(i32 addrspace(1)* %out, i32 %size) #0 {
entry: