diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2015-01-06 19:52:07 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2015-01-06 19:52:07 +0000 |
| commit | bac89f3dd285221109d1907d352d290b25c1c63c (patch) | |
| tree | 329ad505e7f6512064f69a5e8bb4eff4c00db8e1 | |
| parent | fad04531a9ce9fa816f65ec8fc902e4392cfcb4b (diff) | |
R600/SI: Insert s_waitcnt before s_barrier instructions.
This ensures that all memory operations are complete when all threads
reach the barrier.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225290 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/R600/SIInsertWaits.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll | 2 | ||||
| -rw-r--r-- | test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/lib/Target/R600/SIInsertWaits.cpp b/lib/Target/R600/SIInsertWaits.cpp index 2e56508e2fa..181b11643bf 100644 --- a/lib/Target/R600/SIInsertWaits.cpp +++ b/lib/Target/R600/SIInsertWaits.cpp @@ -428,7 +428,11 @@ bool SIInsertWaits::runOnMachineFunction(MachineFunction &MF) { for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end(); I != E; ++I) { - Changes |= insertWait(MBB, I, handleOperands(*I)); + // Wait for everything before a barrier. + if (I->getOpcode() == AMDGPU::S_BARRIER) + Changes |= insertWait(MBB, I, LastIssued); + else + Changes |= insertWait(MBB, I, handleOperands(*I)); pushInstruction(MBB, I); } diff --git a/test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll b/test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll index 31e170948a0..a11d9ae7af0 100644 --- a/test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll +++ b/test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll @@ -3,6 +3,8 @@ ; FUNC-LABEL: {{^}}test_barrier_global: ; EG: GROUP_BARRIER +; SI: buffer_store_dword +; SI: s_waitcnt ; SI: s_barrier define void @test_barrier_global(i32 addrspace(1)* %out) { diff --git a/test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll b/test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll index 94b3cbc86eb..76c2453d089 100644 --- a/test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll +++ b/test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll @@ -3,6 +3,9 @@ ; FUNC-LABEL: {{^}}test_barrier_local: ; EG: GROUP_BARRIER + +; SI: buffer_store_dword +; SI: s_waitcnt ; SI: s_barrier define void @test_barrier_local(i32 addrspace(1)* %out) { |