diff options
| author | Alyssa Rosenzweig <alyssa@rosenzweig.io> | 2023-05-15 10:31:50 -0400 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-05-16 22:36:21 +0000 |
| commit | c853ae660f731606510637b64ed552eb8054b6b2 (patch) | |
| tree | 17e174f99de76e4d4dd143a0647b6d9d29a5af77 | |
| parent | 44d89774e0fae6cd4736a89051a8fffb57f4e6fa (diff) | |
| download | mesa-c853ae660f731606510637b64ed552eb8054b6b2.tar.gz | |
nir/lower_task_shader: Drop legacy atomics
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23036>
| -rw-r--r-- | src/compiler/nir/nir_lower_task_shader.c | 50 |
1 files changed, 4 insertions, 46 deletions
diff --git a/src/compiler/nir/nir_lower_task_shader.c b/src/compiler/nir/nir_lower_task_shader.c index 67151b79b03..f36202991ee 100644 --- a/src/compiler/nir/nir_lower_task_shader.c +++ b/src/compiler/nir/nir_lower_task_shader.c @@ -151,24 +151,10 @@ static nir_intrinsic_op shared_opcode_for_task_payload(nir_intrinsic_op task_payload_op) { switch (task_payload_op) { -#define OP(O) case nir_intrinsic_task_payload_##O: return nir_intrinsic_shared_##O; - OP(atomic) - OP(atomic_swap) - OP(atomic_exchange) - OP(atomic_comp_swap) - OP(atomic_add) - OP(atomic_imin) - OP(atomic_umin) - OP(atomic_imax) - OP(atomic_umax) - OP(atomic_and) - OP(atomic_or) - OP(atomic_xor) - OP(atomic_fadd) - OP(atomic_fmin) - OP(atomic_fmax) - OP(atomic_fcomp_swap) -#undef OP + case nir_intrinsic_task_payload_atomic: + return nir_intrinsic_shared_atomic; + case nir_intrinsic_task_payload_atomic_swap: + return nir_intrinsic_shared_atomic_swap; case nir_intrinsic_load_task_payload: return nir_intrinsic_load_shared; case nir_intrinsic_store_task_payload: @@ -365,20 +351,6 @@ lower_task_intrin(nir_builder *b, switch (intrin->intrinsic) { case nir_intrinsic_task_payload_atomic: case nir_intrinsic_task_payload_atomic_swap: - case nir_intrinsic_task_payload_atomic_add: - case nir_intrinsic_task_payload_atomic_imin: - case nir_intrinsic_task_payload_atomic_umin: - case nir_intrinsic_task_payload_atomic_imax: - case nir_intrinsic_task_payload_atomic_umax: - case nir_intrinsic_task_payload_atomic_and: - case nir_intrinsic_task_payload_atomic_or: - case nir_intrinsic_task_payload_atomic_xor: - case nir_intrinsic_task_payload_atomic_exchange: - case nir_intrinsic_task_payload_atomic_comp_swap: - case nir_intrinsic_task_payload_atomic_fadd: - case nir_intrinsic_task_payload_atomic_fmin: - case nir_intrinsic_task_payload_atomic_fmax: - case nir_intrinsic_task_payload_atomic_fcomp_swap: case nir_intrinsic_store_task_payload: case nir_intrinsic_load_task_payload: if (s->payload_in_shared) @@ -407,20 +379,6 @@ requires_payload_in_shared(nir_shader *shader, bool atomics, bool small_types) switch (intrin->intrinsic) { case nir_intrinsic_task_payload_atomic: case nir_intrinsic_task_payload_atomic_swap: - case nir_intrinsic_task_payload_atomic_add: - case nir_intrinsic_task_payload_atomic_imin: - case nir_intrinsic_task_payload_atomic_umin: - case nir_intrinsic_task_payload_atomic_imax: - case nir_intrinsic_task_payload_atomic_umax: - case nir_intrinsic_task_payload_atomic_and: - case nir_intrinsic_task_payload_atomic_or: - case nir_intrinsic_task_payload_atomic_xor: - case nir_intrinsic_task_payload_atomic_exchange: - case nir_intrinsic_task_payload_atomic_comp_swap: - case nir_intrinsic_task_payload_atomic_fadd: - case nir_intrinsic_task_payload_atomic_fmin: - case nir_intrinsic_task_payload_atomic_fmax: - case nir_intrinsic_task_payload_atomic_fcomp_swap: if (atomics) return true; break; |