aco: rename aco_instruction_selection_setup.cpp -> aco_isel_setup.cpp

Also remove unused includes.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34977>
This commit is contained in:
Daniel Schürmann 2025-05-14 15:26:56 +02:00 committed by Marge Bot
parent bade93c447
commit 85a4ec32e8
3 changed files with 8 additions and 9 deletions

View file

@ -137,9 +137,9 @@ get_arg(isel_context* ctx, struct ac_arg arg)
return ctx->arg_temps[arg.arg_index];
}
/* aco_isel_setup.cpp */
void init_context(isel_context* ctx, nir_shader* shader);
void cleanup_context(isel_context* ctx);
isel_context setup_isel_context(Program* program, unsigned shader_count,
struct nir_shader* const* shaders, ac_shader_config* config,
const struct aco_compiler_options* options,

View file

@ -6,12 +6,10 @@
#include "aco_instruction_selection.h"
#include "common/nir/ac_nir.h"
#include "common/sid.h"
#include "nir_control_flow.h"
#include "nir_builder.h"
#include "nir_control_flow.h"
#include "ac_nir.h"
#include <vector>
namespace aco {
@ -126,14 +124,15 @@ sanitize_cf_list(nir_function_impl* impl, struct exec_list* cf_list)
assert(!nir_loop_has_continue_construct(loop));
progress |= sanitize_cf_list(impl, &loop->body);
/* NIR seems to allow this, and even though the loop exit has no predecessors, SSA defs from the
* loop header are live. Handle this without complicating the ACO IR by creating a dummy break.
/* NIR seems to allow this, and even though the loop exit has no predecessors, SSA defs
* from the loop header are live. Handle this without complicating the ACO IR by creating a
* dummy break.
*/
if (nir_cf_node_cf_tree_next(&loop->cf_node)->predecessors->entries == 0) {
nir_builder b = nir_builder_create(impl);
b.cursor = nir_after_block_before_jump(nir_loop_last_block(loop));
nir_def *cond = nir_imm_false(&b);
nir_def* cond = nir_imm_false(&b);
/* We don't use block divergence information, so just this is enough. */
cond->divergent = false;

View file

@ -35,7 +35,7 @@ libaco_files = files(
'aco_dominance.cpp',
'aco_instruction_selection.cpp',
'aco_instruction_selection.h',
'aco_instruction_selection_setup.cpp',
'aco_isel_setup.cpp',
'aco_interface.cpp',
'aco_interface.h',
'aco_ir.cpp',