OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: drop the btd_resume_intel intrinsic

Browse Source 
This is now 100% equivalent to the new rt_resume intrinsic.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8637>
This commit is contained in:
Lionel Landwerlin
2021-06-22 14:18:17 +03:00
committed by Marge Bot
parent 4d9fcf2799
commit 423c47de99
4 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir_intrinsics.py
View File

@@ -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")

4
src/intel/compiler/brw_nir_lower_rt_intrinsics.c
View File

@@ -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);

6
src/intel/compiler/brw_nir_lower_shader_calls.c
View File

@@ -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");
}

6
src/intel/compiler/brw_nir_rt_builder.h
View File

@@ -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