diff options
| -rw-r--r-- | src/amd/compiler/aco_instruction_selection_setup.cpp | 3 | ||||
| -rw-r--r-- | src/amd/compiler/aco_live_var_analysis.cpp | 16 | ||||
| -rw-r--r-- | src/amd/compiler/aco_validate.cpp | 4 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/amd/compiler/aco_instruction_selection_setup.cpp b/src/amd/compiler/aco_instruction_selection_setup.cpp index 12c2910a8a0..b3c7ff059ad 100644 --- a/src/amd/compiler/aco_instruction_selection_setup.cpp +++ b/src/amd/compiler/aco_instruction_selection_setup.cpp @@ -1007,9 +1007,6 @@ setup_isel_context(Program* program, program->sgpr_limit = 104; } - /* TODO: we don't have to allocate VCC if we don't need it */ - program->needs_vcc = true; - calc_min_waves(program); program->vgpr_limit = get_addr_vgpr_from_waves(program, program->min_waves); program->sgpr_limit = get_addr_sgpr_from_waves(program, program->min_waves); diff --git a/src/amd/compiler/aco_live_var_analysis.cpp b/src/amd/compiler/aco_live_var_analysis.cpp index 1f02e67bc1a..eb965e4e05c 100644 --- a/src/amd/compiler/aco_live_var_analysis.cpp +++ b/src/amd/compiler/aco_live_var_analysis.cpp @@ -87,6 +87,8 @@ void process_live_temps_per_block(Program *program, live& lives, Block* block, if (!definition.isTemp()) { continue; } + if ((definition.isFixed() || definition.hasHint()) && definition.physReg() == vcc) + program->needs_vcc = true; const Temp temp = definition.getTemp(); size_t n = 0; @@ -120,9 +122,10 @@ void process_live_temps_per_block(Program *program, live& lives, Block* block, for (unsigned i = 0; i < insn->operands.size(); ++i) { Operand& operand = insn->operands[i]; - if (!operand.isTemp()) { + if (!operand.isTemp()) continue; - } + if (operand.isFixed() && operand.physReg() == vcc) + program->needs_vcc = true; const Temp temp = operand.getTemp(); const bool inserted = temp.is_linear() ? live_sgprs.insert(temp).second @@ -161,6 +164,8 @@ void process_live_temps_per_block(Program *program, live& lives, Block* block, assert(is_phi(insn)); assert(insn->definitions.size() == 1 && insn->definitions[0].isTemp()); Definition& definition = insn->definitions[0]; + if ((definition.isFixed() || definition.hasHint()) && definition.physReg() == vcc) + program->needs_vcc = true; const Temp temp = definition.getTemp(); size_t n = 0; @@ -205,9 +210,10 @@ void process_live_temps_per_block(Program *program, live& lives, Block* block, : block->linear_preds; for (unsigned i = 0; i < preds.size(); ++i) { Operand &operand = insn->operands[i]; - if (!operand.isTemp()) { + if (!operand.isTemp()) continue; - } + if (operand.isFixed() && operand.physReg() == vcc) + program->needs_vcc = true; /* check if we changed an already processed block */ const bool inserted = live_temps[preds[i]].insert(operand.getTemp()).second; if (inserted) { @@ -364,6 +370,8 @@ live live_var_analysis(Program* program, std::vector<uint16_t> phi_sgpr_ops(program->blocks.size()); RegisterDemand new_demand; + program->needs_vcc = false; + /* this implementation assumes that the block idx corresponds to the block's position in program->blocks vector */ for (Block& block : program->blocks) worklist.insert(block.index); diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp index a479083a54c..0e9b6c20ab0 100644 --- a/src/amd/compiler/aco_validate.cpp +++ b/src/amd/compiler/aco_validate.cpp @@ -390,6 +390,8 @@ bool validate_ra(Program *program, const struct radv_nir_compiler_options *optio if ((op.getTemp().type() == RegType::vgpr && op.physReg() + op.size() > 256 + program->config->num_vgprs) || (op.getTemp().type() == RegType::sgpr && op.physReg() + op.size() > program->config->num_sgprs && op.physReg() < program->sgpr_limit)) err |= ra_fail(output, loc, assignments.at(op.tempId()).firstloc, "Operand %d has an out-of-bounds register assignment", i); + if (op.physReg() == vcc && !program->needs_vcc) + err |= ra_fail(output, loc, Location(), "Operand %d fixed to vcc but needs_vcc=false", i); if (!assignments[op.tempId()].firstloc.block) assignments[op.tempId()].firstloc = loc; if (!assignments[op.tempId()].defloc.block) @@ -407,6 +409,8 @@ bool validate_ra(Program *program, const struct radv_nir_compiler_options *optio if ((def.getTemp().type() == RegType::vgpr && def.physReg() + def.size() > 256 + program->config->num_vgprs) || (def.getTemp().type() == RegType::sgpr && def.physReg() + def.size() > program->config->num_sgprs && def.physReg() < program->sgpr_limit)) err |= ra_fail(output, loc, assignments.at(def.tempId()).firstloc, "Definition %d has an out-of-bounds register assignment", i); + if (def.physReg() == vcc && !program->needs_vcc) + err |= ra_fail(output, loc, Location(), "Definition %d fixed to vcc but needs_vcc=false", i); if (!assignments[def.tempId()].firstloc.block) assignments[def.tempId()].firstloc = loc; assignments[def.tempId()].defloc = loc; |