ac/radeonsi: add local_invocation_ids to the abi

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c
index 4b1c921f606d531410a5134b497f0071a5abee71..dcfeae85665fec65c6889e68115a4a5069171f3e 100644 (file)
--- a/src/amd/common/ac_nir_to_llvm.c
+++ b/src/amd/common/ac_nir_to_llvm.c
@@ -91,7 +91,6 @@ struct nir_to_llvm_context {
        LLVMValueRef push_constants;
        LLVMValueRef view_index;
        LLVMValueRef num_work_groups;
-       LLVMValueRef local_invocation_ids;
        LLVMValueRef tg_size;
 
        LLVMValueRef vertex_buffers;
@@ -795,7 +794,7 @@ static void create_function(struct nir_to_llvm_context *ctx,
                if (ctx->shader_info->info.cs.uses_local_invocation_idx)
                        add_arg(&args, ARG_SGPR, ctx->ac.i32, &ctx->tg_size);
                add_arg(&args, ARG_VGPR, ctx->ac.v3i32,
-                       &ctx->local_invocation_ids);
+                       &ctx->abi.local_invocation_ids);
                break;
        case MESA_SHADER_VERTEX:
                declare_global_input_sgprs(ctx, stage, has_previous_stage,
@@ -4314,7 +4313,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
                break;
        }
        case nir_intrinsic_load_local_invocation_id: {
-               result = ctx->nctx->local_invocation_ids;
+               result = ctx->abi->local_invocation_ids;
                break;
        }
        case nir_intrinsic_load_base_instance:

diff --git a/src/amd/common/ac_shader_abi.h b/src/amd/common/ac_shader_abi.h
index 3d3dcc2e8e7d1695aeb2535a029c87cef939fcb7..9a35ff925b4630ceae9a83b6d7817cb14348ad07 100644 (file)
--- a/src/amd/common/ac_shader_abi.h
+++ b/src/amd/common/ac_shader_abi.h
@@ -54,6 +54,8 @@ struct ac_shader_abi {
        LLVMValueRef ancillary;
        LLVMValueRef sample_coverage;
        LLVMValueRef prim_mask;
+       /* CS */
+       LLVMValueRef local_invocation_ids;
        LLVMValueRef workgroup_ids[3];
 
        /* For VS and PS: pre-loaded shader inputs.

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index c421d4405e00cf336bb461e531ba4cd4331c253c..c518e35ab1ab8d2cae677f020e4ee5ce3b23833a 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2161,7 +2161,7 @@ void si_load_system_value(struct si_shader_context *ctx,
        }
 
        case TGSI_SEMANTIC_THREAD_ID:
-               value = LLVMGetParam(ctx->main_fn, ctx->param_thread_id);
+               value = ctx->abi.local_invocation_ids;
                break;
 
        case TGSI_SEMANTIC_HELPER_INVOCATION:
@@ -4886,7 +4886,7 @@ static void create_function(struct si_shader_context *ctx)
                                add_arg_assign(&fninfo, ARG_SGPR, ctx->i32, &ctx->abi.workgroup_ids[i]);
                }
 
-               ctx->param_thread_id = add_arg(&fninfo, ARG_VGPR, v3i32);
+               add_arg_assign(&fninfo, ARG_VGPR, v3i32, &ctx->abi.local_invocation_ids);
                break;
        default:
                assert(0 && "unimplemented shader");

diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h
index 20618cb936f02acadb7365c606e3a51a03afb914..aed6ea07f0bfc1e3267357cea7204406c80f9b99 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader_internal.h
+++ b/src/gallium/drivers/radeonsi/si_shader_internal.h
@@ -186,7 +186,6 @@ struct si_shader_context {
        /* CS */
        int param_grid_size;
        int param_block_size;
-       int param_thread_id;
 
        LLVMTargetMachineRef tm;