diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 1ea38cf9467..ff5ecb2103d 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -9103,10 +9103,6 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr) break; } case nir_intrinsic_bvh64_intersect_ray_amd: visit_bvh64_intersect_ray_amd(ctx, instr); break; - case nir_intrinsic_load_rt_dynamic_callable_stack_base_amd: - bld.copy(Definition(get_ssa_temp(ctx, &instr->def)), - get_arg(ctx, ctx->args->rt.dynamic_callable_stack_base)); - break; case nir_intrinsic_load_resume_shader_address_amd: { bld.pseudo(aco_opcode::p_resume_shader_address, Definition(get_ssa_temp(ctx, &instr->def)), bld.def(s1, scc), Operand::c32(nir_intrinsic_call_idx(instr))); diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp index 44b12ebc597..5fe46c2e93c 100644 --- a/src/amd/compiler/aco_instruction_selection_setup.cpp +++ b/src/amd/compiler/aco_instruction_selection_setup.cpp @@ -503,7 +503,6 @@ init_context(isel_context* ctx, nir_shader* shader) case nir_intrinsic_gds_atomic_add_amd: case nir_intrinsic_bvh64_intersect_ray_amd: case nir_intrinsic_load_vector_arg_amd: - case nir_intrinsic_load_rt_dynamic_callable_stack_base_amd: case nir_intrinsic_ordered_xfb_counter_add_gfx11_amd: case nir_intrinsic_cmat_muladd_amd: case nir_intrinsic_unit_test_divergent_amd: type = RegType::vgpr; break; diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index 44cb65e85ec..ecd88303c15 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -224,7 +224,6 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state) case nir_intrinsic_load_tess_level_outer_default: case nir_intrinsic_load_scalar_arg_amd: case nir_intrinsic_load_smem_amd: - case nir_intrinsic_load_rt_dynamic_callable_stack_base_amd: case nir_intrinsic_load_resume_shader_address_amd: case nir_intrinsic_load_global_const_block_intel: case nir_intrinsic_load_reloc_const_intel: diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index 035f298e7b7..4ebd319cabe 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -1623,9 +1623,6 @@ system_value("intersection_opaque_amd", 1, bit_sizes=[1]) # pointer to the next resume shader system_value("resume_shader_address_amd", 1, bit_sizes=[64], indices=[CALL_IDX]) -# Scratch base of callable stack for ray tracing. -system_value("rt_dynamic_callable_stack_base_amd", 1) - # Ray Tracing Traversal inputs system_value("sbt_offset_amd", 1) system_value("sbt_stride_amd", 1)