diff options
| author | Marek Olšák <[email protected]> | 2019-11-06 19:06:09 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-11-27 19:28:23 -0500 |
| commit | 756fc9f1bb09910e65509b522aa0dbc04fb13642 (patch) | |
| tree | cbcfef0cc948bd829aff2784d34d6230a280bde2 /src | |
| parent | 42318f9197c3a5e6c715c1b8260275717251848f (diff) | |
radeonsi/nir: implement subgroup system values for SPIR-V
Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_scan.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_compute.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader_nir.c | 5 |
4 files changed, 11 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h index c446ee5e65a..ca8d90a8016 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_scan.h +++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h @@ -126,6 +126,7 @@ struct tgsi_shader_info boolean uses_block_id[3]; boolean uses_block_size; boolean uses_grid_size; + boolean uses_subgroup_info; boolean writes_position; boolean writes_psize; boolean writes_clipvertex; diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 4cadf3e808d..7abea1927cd 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -198,6 +198,7 @@ static void si_create_compute_state_async(void *job, int thread_index) S_00B84C_TGID_X_EN(sel->info.uses_block_id[0]) | S_00B84C_TGID_Y_EN(sel->info.uses_block_id[1]) | S_00B84C_TGID_Z_EN(sel->info.uses_block_id[2]) | + S_00B84C_TG_SIZE_EN(sel->info.uses_subgroup_info) | S_00B84C_TIDIG_COMP_CNT(sel->info.uses_thread_id[2] ? 2 : sel->info.uses_thread_id[1] ? 1 : 0) | S_00B84C_LDS_SIZE(shader->config.lds_size); diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index bad2bfdf130..b9a70a382cd 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -4904,13 +4904,17 @@ static void create_function(struct si_shader_context *ctx) &ctx->cs_user_data); } + /* Hardware SGPRs. */ for (i = 0; i < 3; i++) { if (shader->selector->info.uses_block_id[i]) { ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, &ctx->args.workgroup_ids[i]); } } + if (shader->selector->info.uses_subgroup_info) + ac_add_arg(&ctx->args, AC_ARG_SGPR, 1, AC_ARG_INT, &ctx->args.tg_size); + /* Hardware VGPRs. */ ac_add_arg(&ctx->args, AC_ARG_VGPR, 3, AC_ARG_INT, &ctx->args.local_invocation_ids); break; diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index 850be07ac40..342abe36dd0 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -236,6 +236,11 @@ static void scan_instruction(const struct nir_shader *nir, case nir_intrinsic_load_num_work_groups: info->uses_grid_size = true; break; + case nir_intrinsic_load_local_invocation_index: + case nir_intrinsic_load_subgroup_id: + case nir_intrinsic_load_num_subgroups: + info->uses_subgroup_info = true; + break; case nir_intrinsic_load_local_group_size: /* The block size is translated to IMM with a fixed block size. */ if (info->properties[TGSI_PROPERTY_CS_FIXED_BLOCK_WIDTH] == 0) |