fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-16 08:40:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: Remove ray_launch_size_addr_amd system value.

Browse source 
Not used anymore, so clean it up.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27664>
This commit is contained in:
Bas Nieuwenhuizen 2024-02-17 01:59:11 +01:00 • committed by Marge Bot
parent f933536517
commit c7b2ac3377
12 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -8292,13 +8292,6 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr)
emit_split_vector(ctx, dst, 3);
break;
}
case nir_intrinsic_load_ray_launch_size_addr_amd: {
Temp dst = get_ssa_temp(ctx, &instr->def);
Temp addr = get_arg(ctx, ctx->args->rt.launch_size_addr);
assert(addr.regClass() == s2);
bld.copy(Definition(dst), Operand(addr));
break;
}
case nir_intrinsic_load_local_invocation_id: {
Temp dst = get_ssa_temp(ctx, &instr->def);
if (ctx->options->gfx_level >= GFX11) {

1
src/amd/compiler/aco_instruction_selection_setup.cpp
View file

@ -469,7 +469,6 @@ init_context(isel_context* ctx, nir_shader* shader)
case nir_intrinsic_load_workgroup_id:
case nir_intrinsic_load_num_workgroups:
case nir_intrinsic_load_ray_launch_size:
case nir_intrinsic_load_ray_launch_size_addr_amd:
case nir_intrinsic_load_sbt_base_amd:
case nir_intrinsic_load_subgroup_id:
case nir_intrinsic_load_num_subgroups:

1
src/amd/vulkan/radv_shader.c
View file

@ -2663,7 +2663,6 @@ radv_create_rt_prolog(struct radv_device *device)
info.workgroup_size = info.wave_size;
info.user_data_0 = R_00B900_COMPUTE_USER_DATA_0;
info.cs.is_rt_shader = true;
info.cs.uses_ray_launch_size = true;
info.cs.uses_dynamic_rt_callable_stack = true;
info.cs.block_size[0] = 8;
info.cs.block_size[1] = device->physical_device->rt_wave_size == 64 ? 8 : 4;

1
src/amd/vulkan/radv_shader.h
View file

@ -471,7 +471,6 @@ struct radv_shader_info {
unsigned block_size[3];
bool is_rt_shader;
bool uses_ray_launch_size;
bool uses_dynamic_rt_callable_stack;
bool uses_rt;
bool uses_full_subgroups;

2
src/amd/vulkan/radv_shader_info.c
View file

@ -919,8 +919,6 @@ static void
gather_shader_info_cs(struct radv_device *device, const nir_shader *nir, const struct radv_shader_stage_key *stage_key,
struct radv_shader_info *info)
{
info->cs.uses_ray_launch_size = BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_RAY_LAUNCH_SIZE_ADDR_AMD);
unsigned default_wave_size = device->physical_device->cs_wave_size;
if (info->cs.uses_rt)
default_wave_size = device->physical_device->rt_wave_size;

4
src/compiler/nir/nir.c
View file

@ -2263,8 +2263,6 @@ nir_intrinsic_from_system_value(gl_system_value val)
return nir_intrinsic_load_ray_launch_id;
case SYSTEM_VALUE_RAY_LAUNCH_SIZE:
return nir_intrinsic_load_ray_launch_size;
case SYSTEM_VALUE_RAY_LAUNCH_SIZE_ADDR_AMD:
return nir_intrinsic_load_ray_launch_size_addr_amd;
case SYSTEM_VALUE_RAY_WORLD_ORIGIN:
return nir_intrinsic_load_ray_world_origin;
case SYSTEM_VALUE_RAY_WORLD_DIRECTION:
@ -2433,8 +2431,6 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin)
return SYSTEM_VALUE_RAY_LAUNCH_ID;
case nir_intrinsic_load_ray_launch_size:
return SYSTEM_VALUE_RAY_LAUNCH_SIZE;
case nir_intrinsic_load_ray_launch_size_addr_amd:
return SYSTEM_VALUE_RAY_LAUNCH_SIZE_ADDR_AMD;
case nir_intrinsic_load_ray_world_origin:
return SYSTEM_VALUE_RAY_WORLD_ORIGIN;
case nir_intrinsic_load_ray_world_direction:

1
src/compiler/nir/nir_divergence_analysis.c
View file

@ -132,7 +132,6 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr,
case nir_intrinsic_load_workgroup_size:
case nir_intrinsic_load_num_subgroups:
case nir_intrinsic_load_ray_launch_size:
case nir_intrinsic_load_ray_launch_size_addr_amd:
case nir_intrinsic_load_sbt_base_amd:
case nir_intrinsic_load_subgroup_size:
case nir_intrinsic_load_base_instance:

1
src/compiler/nir/nir_gather_info.c
View file

@ -664,7 +664,6 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader,
case nir_intrinsic_load_barycentric_model:
case nir_intrinsic_load_ray_launch_id:
case nir_intrinsic_load_ray_launch_size:
case nir_intrinsic_load_ray_launch_size_addr_amd:
case nir_intrinsic_load_ray_world_origin:
case nir_intrinsic_load_ray_world_direction:
case nir_intrinsic_load_ray_object_origin:

3
src/compiler/nir/nir_intrinsics.py
View file

@ -1582,9 +1582,6 @@ system_value("rt_arg_scratch_offset_amd", 1)
# Whether to call the anyhit shader for an intersection in an intersection shader.
system_value("intersection_opaque_amd", 1, bit_sizes=[1])
# Used for indirect ray tracing.
system_value("ray_launch_size_addr_amd", 1, bit_sizes=[64])
# pointer to the next resume shader
system_value("resume_shader_address_amd", 1, bit_sizes=[64], indices=[CALL_IDX])

1
src/compiler/nir/nir_opt_preamble.c
View file

@ -151,7 +151,6 @@ can_move_intrinsic(nir_intrinsic_instr *instr, opt_preamble_ctx *ctx)
case nir_intrinsic_load_work_dim:
case nir_intrinsic_load_num_workgroups:
case nir_intrinsic_load_ray_launch_size:
case nir_intrinsic_load_ray_launch_size_addr_amd:
case nir_intrinsic_load_sbt_base_amd:
case nir_intrinsic_load_is_indexed_draw:
case nir_intrinsic_load_viewport_scale:

1
src/compiler/shader_enums.c
View file

@ -368,7 +368,6 @@ gl_system_value_name(gl_system_value sysval)
ENUM(SYSTEM_VALUE_BARYCENTRIC_PULL_MODEL),
ENUM(SYSTEM_VALUE_RAY_LAUNCH_ID),
ENUM(SYSTEM_VALUE_RAY_LAUNCH_SIZE),
ENUM(SYSTEM_VALUE_RAY_LAUNCH_SIZE_ADDR_AMD),
ENUM(SYSTEM_VALUE_RAY_WORLD_ORIGIN),
ENUM(SYSTEM_VALUE_RAY_WORLD_DIRECTION),
ENUM(SYSTEM_VALUE_RAY_OBJECT_ORIGIN),

1
src/compiler/shader_enums.h
View file

@ -867,7 +867,6 @@ typedef enum
/*@{*/
SYSTEM_VALUE_RAY_LAUNCH_ID,
SYSTEM_VALUE_RAY_LAUNCH_SIZE,
SYSTEM_VALUE_RAY_LAUNCH_SIZE_ADDR_AMD,
SYSTEM_VALUE_RAY_WORLD_ORIGIN,
SYSTEM_VALUE_RAY_WORLD_DIRECTION,
SYSTEM_VALUE_RAY_OBJECT_ORIGIN,