fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 20:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r600: fix cs atomic operations when the shader is called multiple times

Browse source 
This change is useful when the compute shader is called multiple
times with the atomic operations enabled. It fixes some data
coherency issues. This is done by moving
evergreen_emit_atomic_buffer_setup() after r600_flush_emit().

This change is also a partial fix for compute_shader.pipeline-compute-chain.
In this specific case, it makes the memory barrier working.

This change was tested on cayman and barts; it makes these tests
fully deterministic:
khr-gl4[2-6]/shader_atomic_counters/advanced-usage-many-dispatches: fail pass
khr-gles31/core/shader_atomic_counters/advanced-usage-many-dispatches: fail pass
deqp-gles31/functional/synchronization/inter_call/without_memory_barrier/atomic_counter_dispatch_.*_calls_.*_invocations: fail pass

Cc: mesa-stable
Signed-off-by: Patrick Lerda <patrick9876@free.fr>
(cherry picked from commit dad942b468)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40359>
This commit is contained in:
Patrick Lerda 2026-02-23 13:32:21 +01:00 • committed by Eric Engestrom
parent b1775f660a
commit 6f28830365
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4424,7 +4424,7 @@
"description": "r600: fix cs atomic operations when the shader is called multiple times",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

1
src/gallium/drivers/r600/ci/r600-turks-fails.txt
View file

@ -15,7 +15,6 @@ KHR-GLES31.core.gpu_shader5.texture_gather_offset_color_clamp_to_edge,Fail
KHR-GLES31.core.layout_binding.image2D_layout_binding_imageLoad_ComputeShader,Fail
KHR-GLES31.core.shader_atomic_counters.advanced-usage-many-dispatches,Fail
KHR-GLES31.core.shader_atomic_counters.advanced-usage-many-draw-calls2,Fail
KHR-GLES31.core.shader_atomic_counters.advanced-usage-multi-stage,Fail

1
src/gallium/drivers/r600/ci/r600-turks-flakes.txt
View file

@ -1,6 +1,5 @@
# Sometimes passes.
KHR-GLES31.core.compute_shader.pipeline-compute-chain
KHR-GLES31.core.shader_atomic_counters.advanced-usage-many-dispatches
KHR-GLES31.core.shader_atomic_counters.advanced-usage-many-draw-calls2
# Occasional "args_equal: Assertion `l.size() == r.size()' failed."

12
src/gallium/drivers/r600/evergreen_compute.c
View file

@ -350,12 +350,6 @@ static void compute_emit_cs(struct r600_context *rctx,
}
r600_update_driver_const_buffers(rctx, true);
evergreen_emit_atomic_buffer_setup(rctx, true, combined_atomics, global_atomic_count);
if (global_atomic_count) {
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_CS_PARTIAL_FLUSH) | EVENT_INDEX(4));
}
/* Initialize all the compute-related registers.
*
* See evergreen_init_atom_start_compute_cs() in this file for the list
@ -375,6 +369,12 @@ static void compute_emit_cs(struct r600_context *rctx,
rctx->b.flags |= R600_CONTEXT_WAIT_3D_IDLE | R600_CONTEXT_FLUSH_AND_INV;
r600_flush_emit(rctx);
evergreen_emit_atomic_buffer_setup(rctx, true, combined_atomics, global_atomic_count);
if (global_atomic_count) {
radeon_emit(cs, PKT3(PKT3_EVENT_WRITE, 0, 0));
radeon_emit(cs, EVENT_TYPE(EVENT_TYPE_CS_PARTIAL_FLUSH) | EVENT_INDEX(4));
}
uint32_t rat_mask;
rat_mask = evergreen_construct_rat_mask(rctx, &rctx->cb_misc_state, 0);