AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco/isel: move cf_info into separate struct cf_context

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33206>
This commit is contained in:
Daniel Schürmann
2025-01-23 10:07:01 +01:00
committed by Marge Bot
parent 61fa007e48
commit 0c5a91b9f2
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_instruction_selection.cpp
+11 -11
View File
@@ -10277,10 +10277,10 @@ end_uniform_if(isel_context* ctx, if_context* ic, bool logical_else)
static void
end_empty_exec_skip(isel_context* ctx)
{
if (ctx->cf_info.skipping_empty_exec) {
begin_uniform_if_else(ctx, &ctx->cf_info.empty_exec_skip, false);
end_uniform_if(ctx, &ctx->cf_info.empty_exec_skip, false);
ctx->cf_info.skipping_empty_exec = false;
if (ctx->skipping_empty_exec) {
begin_uniform_if_else(ctx, &ctx->empty_exec_skip, false);
end_uniform_if(ctx, &ctx->empty_exec_skip, false);
ctx->skipping_empty_exec = false;
}
}
@@ -10331,8 +10331,8 @@ begin_empty_exec_skip(isel_context* ctx, nir_instr* after_instr, nir_block* bloc
/* Don't nest these skipping branches. It is not worth the complexity. */
end_empty_exec_skip(ctx);
begin_uniform_if_then(ctx, &ctx->cf_info.empty_exec_skip, Temp());
ctx->cf_info.skipping_empty_exec = true;
begin_uniform_if_then(ctx, &ctx->empty_exec_skip, Temp());
ctx->skipping_empty_exec = true;
ctx->cf_info.exec = exec_info();
ctx->program->should_repair_ssa = true;
@@ -10415,9 +10415,9 @@ visit_cf_list(isel_context* ctx, struct exec_list* list)
if (nir_cf_list_is_empty_block(list))
return;
bool skipping_empty_exec_old = ctx->cf_info.skipping_empty_exec;
if_context empty_exec_skip_old = std::move(ctx->cf_info.empty_exec_skip);
ctx->cf_info.skipping_empty_exec = false;
bool skipping_empty_exec_old = ctx->skipping_empty_exec;
if_context empty_exec_skip_old = std::move(ctx->empty_exec_skip);
ctx->skipping_empty_exec = false;
foreach_list_typed (nir_cf_node, node, node, list) {
switch (node->type) {
@@ -10429,8 +10429,8 @@ visit_cf_list(isel_context* ctx, struct exec_list* list)
}
end_empty_exec_skip(ctx);
ctx->cf_info.skipping_empty_exec = skipping_empty_exec_old;
ctx->cf_info.empty_exec_skip = std::move(empty_exec_skip_old);
ctx->skipping_empty_exec = skipping_empty_exec_old;
ctx->empty_exec_skip = std::move(empty_exec_skip_old);
}
static void
src/amd/compiler/aco_instruction_selection.h
+19 -17
View File
@@ -60,6 +60,22 @@ struct exec_info {
}
};
struct cf_context {
struct {
unsigned header_idx;
Block* exit;
bool has_divergent_continue = false;
bool has_divergent_branch = false;
} parent_loop;
struct {
bool is_divergent = false;
} parent_if;
bool has_branch;
bool had_divergent_discard = false;
struct exec_info exec;
};
struct if_context {
Temp cond;
@@ -87,24 +103,10 @@ struct isel_context {
std::unordered_map<unsigned, std::array<Temp, NIR_MAX_VEC_COMPONENTS>> allocated_vec;
std::vector<Temp> unended_linear_vgprs;
Stage stage;
struct {
bool has_branch;
struct {
unsigned header_idx;
Block* exit;
bool has_divergent_continue = false;
bool has_divergent_branch = false;
} parent_loop;
struct {
bool is_divergent = false;
} parent_if;
bool had_divergent_discard = false;
struct exec_info exec;
bool skipping_empty_exec = false;
if_context empty_exec_skip;
} cf_info;
cf_context cf_info;
bool skipping_empty_exec = false;
if_context empty_exec_skip;
/* NIR range analysis. */
struct hash_table* range_ht;