From 423c47de991643269a7c76ea37efe59b237fa6e7 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 22 Jun 2021 14:18:17 +0300 Subject: [PATCH] nir: drop the btd_resume_intel intrinsic This is now 100% equivalent to the new rt_resume intrinsic. Signed-off-by: Lionel Landwerlin Reviewed-by: Jason Ekstrand Part-of: --- src/compiler/nir/nir_intrinsics.py | 2 -- src/intel/compiler/brw_nir_lower_rt_intrinsics.c | 4 ++-- src/intel/compiler/brw_nir_lower_shader_calls.c | 6 ------ src/intel/compiler/brw_nir_rt_builder.h | 6 ------ 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index ff0543fa7cb..a671d539fa3 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -1281,8 +1281,6 @@ system_value("btd_resume_sbt_addr_intel", 1, bit_sizes=[64]) intrinsic("btd_spawn_intel", src_comp=[1, 1]) # RANGE=stack_size intrinsic("btd_stack_push_intel", indices=[RANGE]) -# BASE=call_idx RANGE=stack_size -intrinsic("btd_resume_intel", indices=[BASE, RANGE]) # src[] = { } intrinsic("btd_retire_intel") diff --git a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c b/src/intel/compiler/brw_nir_lower_rt_intrinsics.c index 05efaab59db..06b3374d69a 100644 --- a/src/intel/compiler/brw_nir_lower_rt_intrinsics.c +++ b/src/intel/compiler/brw_nir_lower_rt_intrinsics.c @@ -118,13 +118,13 @@ lower_rt_intrinsics_impl(nir_function_impl *impl, break; } - case nir_intrinsic_btd_resume_intel: + case nir_intrinsic_rt_resume: /* This is the first "interesting" instruction */ assert(block == nir_start_block(impl)); assert(!seen_scratch_base_ptr_load); found_resume = true; - int32_t stack_size = nir_intrinsic_range(intrin); + int32_t stack_size = nir_intrinsic_stack_size(intrin); if (stack_size > 0) { stack_base_offset = nir_iadd_imm(b, stack_base_offset, -stack_size); diff --git a/src/intel/compiler/brw_nir_lower_shader_calls.c b/src/intel/compiler/brw_nir_lower_shader_calls.c index 74fc69be8c0..4f88f10ee0a 100644 --- a/src/intel/compiler/brw_nir_lower_shader_calls.c +++ b/src/intel/compiler/brw_nir_lower_shader_calls.c @@ -243,12 +243,6 @@ brw_nir_lower_shader_calls(nir_shader *shader) break; } - case nir_intrinsic_rt_resume: - brw_nir_btd_resume(b, - nir_intrinsic_call_idx(call), - nir_intrinsic_stack_size(call) /* offset */); - break; - default: unreachable("Invalid intrinsic"); } diff --git a/src/intel/compiler/brw_nir_rt_builder.h b/src/intel/compiler/brw_nir_rt_builder.h index 88912dbf5e9..ea47fff373e 100644 --- a/src/intel/compiler/brw_nir_rt_builder.h +++ b/src/intel/compiler/brw_nir_rt_builder.h @@ -63,12 +63,6 @@ brw_nir_btd_retire(nir_builder *b) nir_btd_retire_intel(b); } -static inline void -brw_nir_btd_resume(nir_builder *b, uint32_t call_idx, unsigned stack_size) -{ - nir_btd_resume_intel(b, .base = call_idx, .range = stack_size); -} - /** This is a pseudo-op which does a bindless return * * It loads the return address from the stack and calls btd_spawn to spawn the