ac/radeonsi: add workgroup_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 22956bc86bf28ad15a38aeb8a525b5e8e9e4aa9d..4b1c921f606d531410a5134b497f0071a5abee71 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 workgroup_ids[3];
        LLVMValueRef local_invocation_ids;
        LLVMValueRef tg_size;
 
@@ -786,10 +785,10 @@ static void create_function(struct nir_to_llvm_context *ctx,
                }
 
                for (int i = 0; i < 3; i++) {
-                       ctx->workgroup_ids[i] = NULL;
+                       ctx->abi.workgroup_ids[i] = NULL;
                        if (ctx->shader_info->info.cs.uses_block_id[i]) {
                                add_arg(&args, ARG_SGPR, ctx->ac.i32,
-                                       &ctx->workgroup_ids[i]);
+                                       &ctx->abi.workgroup_ids[i]);
                        }
                }
 
@@ -4299,8 +4298,8 @@ static void visit_intrinsic(struct ac_nir_context *ctx,
                LLVMValueRef values[3];
 
                for (int i = 0; i < 3; i++) {
-                       values[i] = ctx->nctx->workgroup_ids[i] ?
-                                   ctx->nctx->workgroup_ids[i] : ctx->ac.i32_0;
+                       values[i] = ctx->abi->workgroup_ids[i] ?
+                                   ctx->abi->workgroup_ids[i] : ctx->ac.i32_0;
                }
 
                result = ac_build_gather_values(&ctx->ac, values, 3);

diff --git a/src/amd/common/ac_shader_abi.h b/src/amd/common/ac_shader_abi.h
index d9bb5a1e32989cfcde0cc40826e50478ee5512de..3d3dcc2e8e7d1695aeb2535a029c87cef939fcb7 100644 (file)
--- a/src/amd/common/ac_shader_abi.h
+++ b/src/amd/common/ac_shader_abi.h
@@ -54,6 +54,7 @@ struct ac_shader_abi {
        LLVMValueRef ancillary;
        LLVMValueRef sample_coverage;
        LLVMValueRef prim_mask;
+       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 1294af30128abac5879cac2e5e70552d5a6a03bf..c421d4405e00cf336bb461e531ba4cd4331c253c 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2152,9 +2152,8 @@ void si_load_system_value(struct si_shader_context *ctx,
 
                for (int i = 0; i < 3; i++) {
                        values[i] = ctx->i32_0;
-                       if (ctx->param_block_id[i] >= 0) {
-                               values[i] = LLVMGetParam(ctx->main_fn,
-                                                        ctx->param_block_id[i]);
+                       if (ctx->abi.workgroup_ids[i]) {
+                               values[i] = ctx->abi.workgroup_ids[i];
                        }
                }
                value = lp_build_gather_values(&ctx->gallivm, values, 3);
@@ -4882,9 +4881,9 @@ static void create_function(struct si_shader_context *ctx)
                        ctx->param_block_size = add_arg(&fninfo, ARG_SGPR, v3i32);
 
                for (i = 0; i < 3; i++) {
-                       ctx->param_block_id[i] = -1;
+                       ctx->abi.workgroup_ids[i] = NULL;
                        if (shader->selector->info.uses_block_id[i])
-                               ctx->param_block_id[i] = add_arg(&fninfo, ARG_SGPR, ctx->i32);
+                               add_arg_assign(&fninfo, ARG_SGPR, ctx->i32, &ctx->abi.workgroup_ids[i]);
                }
 
                ctx->param_thread_id = add_arg(&fninfo, ARG_VGPR, v3i32);

diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h
index 00b9b8d16a59dbca3cb66d509469b1bcab13ffd8..20618cb936f02acadb7365c606e3a51a03afb914 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_block_id[3];
        int param_thread_id;
 
        LLVMTargetMachineRef tm;