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

aco: don't attempt to spill dead phis

Browse Source 
These don't affect register pressure.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30182>
This commit is contained in:
Daniel Schürmann
2024-08-13 12:31:24 +02:00
committed by Marge Bot
parent e5d920e0b9
commit 541cfb21ba
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_lower_to_cssa.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ collect_parallelcopies(cssa_ctx& ctx)
/* if the definition is not temp, it is the exec mask.
* We can reload the exec mask directly from the spill slot.
*/
if (!def.isTemp())
if (!def.isTemp() || def.isKill())
continue;
Block::edge_vec& preds =
src/amd/compiler/aco_spill.cpp
+6 -5
View File
@@ -391,7 +391,7 @@ init_live_in_vars(spill_ctx& ctx, Block* block, unsigned block_idx)
for (aco_ptr<Instruction>& phi : block->instructions) {
if (!is_phi(phi))
break;
if (!phi->definitions[0].isTemp())
if (!phi->definitions[0].isTemp() || phi->definitions[0].isKill())
continue;
Temp var = phi->definitions[0].getTemp();
if (var.type() == type && !ctx.spills_entry[block_idx].count(var) &&
@@ -486,7 +486,7 @@ init_live_in_vars(spill_ctx& ctx, Block* block, unsigned block_idx)
for (aco_ptr<Instruction>& phi : block->instructions) {
if (!is_phi(phi))
break;
if (!phi->definitions[0].isTemp())
if (!phi->definitions[0].isTemp() || phi->definitions[0].isKill())
continue;
Block::edge_vec& preds =
@@ -596,6 +596,7 @@ add_coupling_code(spill_ctx& ctx, Block* block, IDSet& live_in)
Block::edge_vec& preds =
phi->opcode == aco_opcode::p_phi ? block->logical_preds : block->linear_preds;
uint32_t def_spill_id = ctx.spills_entry[block_idx][phi->definitions[0].getTemp()];
phi->definitions[0].setKill(true);
for (unsigned i = 0; i < phi->operands.size(); i++) {
if (phi->operands[i].isUndefined())
@@ -717,11 +718,11 @@ add_coupling_code(spill_ctx& ctx, Block* block, IDSet& live_in)
for (aco_ptr<Instruction>& phi : block->instructions) {
if (!is_phi(phi))
break;
if (phi->definitions[0].isKill())
continue;
assert(!phi->definitions[0].isTemp() ||
!ctx.spills_entry[block_idx].count(phi->definitions[0].getTemp()) ||
std::all_of(phi->operands.begin(), phi->operands.end(),
[](Operand op) { return op.isUndefined(); }));
!ctx.spills_entry[block_idx].count(phi->definitions[0].getTemp()));
Block::edge_vec& preds =
phi->opcode == aco_opcode::p_phi ? block->logical_preds : block->linear_preds;