From 7d2e3f660c73260a1b74486f1292b3d6240ae1c0 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 29 Nov 2022 13:54:55 -0600 Subject: [PATCH] intel/fs: Support load_workgroup_id_zero_base Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/compiler/brw_fs_nir.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index b29fc4b561b..62f582668bb 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -191,6 +191,7 @@ emit_system_values_block(nir_block *block, fs_visitor *v) break; case nir_intrinsic_load_workgroup_id: + case nir_intrinsic_load_workgroup_id_zero_base: assert(gl_shader_stage_uses_workgroup(v->stage)); reg = &v->nir_system_values[SYSTEM_VALUE_WORKGROUP_ID]; if (reg->file == BAD_FILE) @@ -3741,10 +3742,18 @@ fs_visitor::nir_emit_cs_intrinsic(const fs_builder &bld, cs_payload().load_subgroup_id(bld, dest); break; - case nir_intrinsic_load_local_invocation_id: - case nir_intrinsic_load_workgroup_id: { - gl_system_value sv = nir_system_value_from_intrinsic(instr->intrinsic); - fs_reg val = nir_system_values[sv]; + case nir_intrinsic_load_local_invocation_id: { + fs_reg val = nir_system_values[SYSTEM_VALUE_LOCAL_INVOCATION_ID]; + assert(val.file != BAD_FILE); + dest.type = val.type; + for (unsigned i = 0; i < 3; i++) + bld.MOV(offset(dest, bld, i), offset(val, bld, i)); + break; + } + + case nir_intrinsic_load_workgroup_id: + case nir_intrinsic_load_workgroup_id_zero_base: { + fs_reg val = nir_system_values[SYSTEM_VALUE_WORKGROUP_ID]; assert(val.file != BAD_FILE); dest.type = val.type; for (unsigned i = 0; i < 3; i++)