From 1ce80653b2d0c9a51f4f3aeed3630bb5d09e9755 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 21 Sep 2023 08:38:09 +0200 Subject: [PATCH] nir: rename atomic_add_gs_invocation_count_amd to make it more generic It will be re-used to implement mesh/tash shader invocations queries. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/common/ac_nir.c | 2 +- src/amd/vulkan/nir/radv_nir_lower_abi.c | 2 +- src/compiler/nir/nir_intrinsics.py | 4 ++-- src/gallium/drivers/radeonsi/si_nir_lower_abi.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/common/ac_nir.c b/src/amd/common/ac_nir.c index 1ef9016..0e9709a 100644 --- a/src/amd/common/ac_nir.c +++ b/src/amd/common/ac_nir.c @@ -942,7 +942,7 @@ ac_nir_gs_shader_query(nir_builder *b, if (count) nir_atomic_add_gs_emit_prim_count_amd(b, count); - nir_atomic_add_gs_invocation_count_amd(b, num_active_threads); + nir_atomic_add_shader_invocation_count_amd(b, num_active_threads); } nir_pop_if(b, if_pipeline_query); } diff --git a/src/amd/vulkan/nir/radv_nir_lower_abi.c b/src/amd/vulkan/nir/radv_nir_lower_abi.c index 857e476..8329d53 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_abi.c +++ b/src/amd/vulkan/nir/radv_nir_lower_abi.c @@ -390,7 +390,7 @@ lower_abi_instr(nir_builder *b, nir_intrinsic_instr *intrin, void *state) nir_imm_int(b, RADV_SHADER_QUERY_PRIM_XFB_OFFSET(nir_intrinsic_stream_id(intrin))), nir_imm_int(b, 0x100)); break; - case nir_intrinsic_atomic_add_gs_invocation_count_amd: + case nir_intrinsic_atomic_add_shader_invocation_count_amd: nir_gds_atomic_add_amd(b, 32, intrin->src[0].ssa, nir_imm_int(b, RADV_SHADER_QUERY_GS_INVOCATION_OFFSET), nir_imm_int(b, 0x100)); break; diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index 576f984..65ad47a 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -1605,9 +1605,9 @@ intrinsic("atomic_add_gs_emit_prim_count_amd", [1]) intrinsic("atomic_add_gen_prim_count_amd", [1], indices=[STREAM_ID]) intrinsic("atomic_add_xfb_prim_count_amd", [1], indices=[STREAM_ID]) -# Atomically add current wave's invocation count to query result +# Atomically add current shader's invocation count to query result # src[] = { invocation_count }. -intrinsic("atomic_add_gs_invocation_count_amd", [1]) +intrinsic("atomic_add_shader_invocation_count_amd", [1]) # LDS offset for scratch section in NGG shader system_value("lds_ngg_scratch_base_amd", 1) diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c index 233f1c4..5f99e28 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c @@ -470,7 +470,7 @@ static bool lower_intrinsic(nir_builder *b, nir_instr *instr, struct lower_abi_s break; } case nir_intrinsic_atomic_add_gs_emit_prim_count_amd: - case nir_intrinsic_atomic_add_gs_invocation_count_amd: { + case nir_intrinsic_atomic_add_shader_invocation_count_amd: { nir_def *buf = si_nir_load_internal_binding(b, args, SI_GS_QUERY_EMULATED_COUNTERS_BUF, 4); -- 2.7.4