AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Rename WORK_GROUP (and similar) to WORKGROUP

Browse Source 
Be consistent with other usages in Vulkan and SPIR-V, and the recently
added workgroup_size field.

Acked-by: Emma Anholt <emma@anholt.net>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11190>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2021-06-04 12:04:15 -07:00
committed by Marge Bot
parent a71a780598
commit c8a7bd0dc8
61 changed files with 176 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microsoft/clc/clc_compiler.c
+5 -5
View File
@@ -351,10 +351,10 @@ clc_lower_64bit_semantics(nir_shader *nir)
case nir_intrinsic_load_global_invocation_id_zero_base:
case nir_intrinsic_load_base_global_invocation_id:
case nir_intrinsic_load_local_invocation_id:
case nir_intrinsic_load_work_group_id:
case nir_intrinsic_load_work_group_id_zero_base:
case nir_intrinsic_load_base_work_group_id:
case nir_intrinsic_load_num_work_groups:
case nir_intrinsic_load_workgroup_id:
case nir_intrinsic_load_workgroup_id_zero_base:
case nir_intrinsic_load_base_workgroup_id:
case nir_intrinsic_load_num_workgroups:
break;
default:
continue;
@@ -1322,7 +1322,7 @@ clc_to_dxil(struct clc_context *ctx,
nir_lower_compute_system_values_options compute_options = {
.has_base_global_invocation_id = (conf && conf->support_global_work_id_offsets),
.has_base_work_group_id = (conf && conf->support_work_group_id_offsets),
.has_base_workgroup_id = (conf && conf->support_workgroup_id_offsets),
};
NIR_PASS_V(nir, nir_lower_compute_system_values, &compute_options);
src/microsoft/clc/clc_compiler.h
+1 -1
View File
@@ -233,7 +233,7 @@ struct clc_runtime_kernel_conf {
struct clc_runtime_arg_info *args;
unsigned lower_bit_size;
unsigned support_global_work_id_offsets;
unsigned support_work_group_id_offsets;
unsigned support_workgroup_id_offsets;
};
struct clc_dxil_object *
src/microsoft/clc/clc_nir.c
+7 -7
View File
@@ -84,8 +84,8 @@ lower_load_local_group_size(nir_builder *b, nir_intrinsic_instr *intr)
}
static bool
lower_load_num_work_groups(nir_builder *b, nir_intrinsic_instr *intr,
nir_variable *var)
lower_load_num_workgroups(nir_builder *b, nir_intrinsic_instr *intr,
nir_variable *var)
{
b->cursor = nir_after_instr(&intr->instr);
@@ -102,7 +102,7 @@ lower_load_num_work_groups(nir_builder *b, nir_intrinsic_instr *intr,
}
static bool
lower_load_base_work_group_id(nir_builder *b, nir_intrinsic_instr *intr,
lower_load_base_workgroup_id(nir_builder *b, nir_intrinsic_instr *intr,
nir_variable *var)
{
b->cursor = nir_after_instr(&intr->instr);
@@ -149,11 +149,11 @@ clc_nir_lower_system_values(nir_shader *nir, nir_variable *var)
case nir_intrinsic_load_workgroup_size:
lower_load_local_group_size(&b, intr);
break;
case nir_intrinsic_load_num_work_groups:
lower_load_num_work_groups(&b, intr, var);
case nir_intrinsic_load_num_workgroups:
lower_load_num_workgroups(&b, intr, var);
break;
case nir_intrinsic_load_base_work_group_id:
lower_load_base_work_group_id(&b, intr, var);
case nir_intrinsic_load_base_workgroup_id:
lower_load_base_workgroup_id(&b, intr, var);
break;
default: break;
}
src/microsoft/clc/compute_test.cpp
+2 -2
View File
@@ -467,7 +467,7 @@ ComputeTest::run_shader_with_raw_args(Shader shader,
compile_args.work_props.global_offset_x != 0 ||
compile_args.work_props.global_offset_y != 0 ||
compile_args.work_props.global_offset_z != 0;
conf.support_work_group_id_offsets =
conf.support_workgroup_id_offsets =
compile_args.work_props.group_id_offset_x != 0 ||
compile_args.work_props.group_id_offset_y != 0 ||
compile_args.work_props.group_id_offset_z != 0;
@@ -493,7 +493,7 @@ ComputeTest::run_shader_with_raw_args(Shader shader,
std::vector<uint8_t> argsbuf(dxil->metadata.kernel_inputs_buf_size);
std::vector<ComPtr<ID3D12Resource>> argres(shader.dxil->kernel->num_args);
clc_work_properties_data work_props = compile_args.work_props;
if (!conf.support_work_group_id_offsets) {
if (!conf.support_workgroup_id_offsets) {
work_props.group_count_total_x = compile_args.x / conf.local_size[0];
work_props.group_count_total_y = compile_args.y / conf.local_size[1];
work_props.group_count_total_z = compile_args.z / conf.local_size[2];
src/microsoft/compiler/nir_to_dxil.c
+5 -5
View File
@@ -2264,7 +2264,7 @@ emit_load_local_invocation_id(struct ntd_context *ctx,
}
static bool
emit_load_local_work_group_id(struct ntd_context *ctx,
emit_load_local_workgroup_id(struct ntd_context *ctx,
nir_intrinsic_instr *intr)
{
assert(intr->dest.is_ssa);
@@ -3354,9 +3354,9 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
return emit_load_global_invocation_id(ctx, intr);
case nir_intrinsic_load_local_invocation_id:
return emit_load_local_invocation_id(ctx, intr);
case nir_intrinsic_load_work_group_id:
case nir_intrinsic_load_work_group_id_zero_base:
return emit_load_local_work_group_id(ctx, intr);
case nir_intrinsic_load_workgroup_id:
case nir_intrinsic_load_workgroup_id_zero_base:
return emit_load_local_workgroup_id(ctx, intr);
case nir_intrinsic_load_ssbo:
return emit_load_ssbo(ctx, intr);
case nir_intrinsic_store_ssbo:
@@ -3455,7 +3455,7 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
case nir_intrinsic_load_vulkan_descriptor:
return emit_load_vulkan_descriptor(ctx, intr);
case nir_intrinsic_load_num_work_groups:
case nir_intrinsic_load_num_workgroups:
case nir_intrinsic_load_workgroup_size:
default:
NIR_INSTR_UNSUPPORTED(&intr->instr);