fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pco: use nir_cf_{extract,reinsert} instead of inlining compute instance check

Browse source 
Signed-off-by: Simon Perretta <simon.perretta@imgtec.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36412>
This commit is contained in:
Simon Perretta 2025-07-30 16:47:40 +01:00 • committed by Marge Bot
parent aed7e7add1
commit 6bca263a3b
1 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/imagination/pco/pco_nir_compute.c
View file

@ -21,28 +21,16 @@
#include <stdbool.h>
#include <stdio.h>
#define INST_CHK_FUNC "@pco_inst_chk"
/**
* \brief Inserts the instance check.
*
* \param[in,out] shader NIR shader.
* \param[in,out] entrypoint NIR shader entrypoint.
* \return The cursor position for where to re-insert the entrypoint.
*/
static void insert_instance_check(nir_shader *shader)
static nir_cursor insert_instance_check(nir_function_impl *entrypoint)
{
/* Get original entrypoint. */
nir_function *orig_entrypoint = nir_shader_get_entrypoint(shader)->function;
/* Create a function for the instance check which will serve as the new
* entrypoint.
*/
nir_function *inst_chk_func = nir_function_create(shader, INST_CHK_FUNC);
inst_chk_func->is_entrypoint = true;
orig_entrypoint->is_entrypoint = false;
nir_builder b = nir_builder_create(nir_function_impl_create(inst_chk_func));
b.cursor = nir_after_cf_list(&b.impl->body);
nir_builder b = nir_builder_at(nir_before_impl(entrypoint));
nir_cursor cursor;
/* If the current instance index is greater than the total workgroup size,
* we don't execute.
@ -58,10 +46,11 @@ static void insert_instance_check(nir_shader *shader)
nir_def *cond_inst_valid = nir_ilt(&b, flat_id, flat_size);
nir_if *nif = nir_push_if(&b, cond_inst_valid);
{
nir_call(&b, orig_entrypoint);
cursor = b.cursor;
}
nir_pop_if(&b, nif);
nir_jump(&b, nir_jump_return);
return cursor;
}
/**
@ -77,22 +66,21 @@ bool pco_nir_compute_instance_check(nir_shader *shader)
if (shader->info.internal)
return false;
/* Check we haven't already done this. */
nir_foreach_function (function, shader) {
if (function->name && !strcmp(function->name, INST_CHK_FUNC))
return false;
}
nir_function_impl *entrypoint = nir_shader_get_entrypoint(shader);
insert_instance_check(shader);
if (nir_cf_list_is_empty_block(&entrypoint->body))
return false;
/* Re-inline. */
NIR_PASS(_, shader, nir_lower_variable_initializers, nir_var_function_temp);
NIR_PASS(_, shader, nir_lower_returns);
NIR_PASS(_, shader, nir_inline_functions);
NIR_PASS(_, shader, nir_copy_prop);
NIR_PASS(_, shader, nir_opt_deref);
nir_remove_non_entrypoints(shader);
NIR_PASS(_, shader, nir_lower_variable_initializers, ~0);
/* Extract the entire entrypoint. */
nir_cf_list cf_list;
nir_cf_extract(&cf_list,
nir_before_impl(entrypoint),
nir_after_impl(entrypoint));
nir_cursor cursor = insert_instance_check(entrypoint);
/* Re-insert the entrypoint inside the instance check. */
nir_cf_reinsert(&cf_list, cursor);
return true;
}