OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco/ra: use auto for std container iterators

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30898>
This commit is contained in:
Daniel Schürmann
2024-08-28 11:42:43 +02:00
committed by Marge Bot
parent 534031761a
commit 709f60e71d
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/amd/compiler/aco_register_allocation.cpp
View File

@@ -2171,8 +2171,7 @@ get_reg_phi(ra_ctx& ctx, IDSet& live_in, RegisterFile& register_file,
// TODO: somehow prevent phis fixed before the RA from being updated (shouldn't be a // TODO: somehow prevent phis fixed before the RA from being updated (shouldn't be a
// problem in practice since they can only be fixed to exec) // problem in practice since they can only be fixed to exec)
Instruction* prev_phi = NULL; Instruction* prev_phi = NULL;
std::vector<aco_ptr<Instruction>>::iterator phi_it; for (auto phi_it = instructions.begin(); phi_it != instructions.end(); ++phi_it) {
for (phi_it = instructions.begin(); phi_it != instructions.end(); ++phi_it) {
if ((*phi_it)->definitions[0].tempId() == pc.first.tempId()) if ((*phi_it)->definitions[0].tempId() == pc.first.tempId())
prev_phi = phi_it->get(); prev_phi = phi_it->get();
} }
@@ -2186,7 +2185,7 @@ get_reg_phi(ra_ctx& ctx, IDSet& live_in, RegisterFile& register_file,
} }
/* rename */ /* rename */
std::unordered_map<unsigned, Temp>::iterator orig_it = ctx.orig_names.find(pc.first.tempId()); auto orig_it = ctx.orig_names.find(pc.first.tempId());
Temp orig = orig_it != ctx.orig_names.end() ? orig_it->second : pc.first.getTemp(); Temp orig = orig_it != ctx.orig_names.end() ? orig_it->second : pc.first.getTemp();
add_rename(ctx, orig, pc.second.getTemp()); add_rename(ctx, orig, pc.second.getTemp());
@@ -2306,7 +2305,7 @@ read_variable(ra_ctx& ctx, Temp val, unsigned block_idx)
if (!ctx.assignments[val.id()].renamed) if (!ctx.assignments[val.id()].renamed)
return val; return val;
std::unordered_map<unsigned, Temp>::iterator it = ctx.renames[block_idx].find(val.id()); auto it = ctx.renames[block_idx].find(val.id());
if (it == ctx.renames[block_idx].end()) if (it == ctx.renames[block_idx].end())
return val; return val;
else else
@@ -2422,7 +2421,7 @@ handle_loop_phis(ra_ctx& ctx, const IDSet& live_in, uint32_t loop_header_idx,
/* Find the original name, since this operand might not use the original name if the phi /* Find the original name, since this operand might not use the original name if the phi
* was created after init_reg_file(). * was created after init_reg_file().
*/ */
std::unordered_map<unsigned, Temp>::iterator it = ctx.orig_names.find(op.tempId()); auto it = ctx.orig_names.find(op.tempId());
Temp orig = it != ctx.orig_names.end() ? it->second : op.getTemp(); Temp orig = it != ctx.orig_names.end() ? it->second : op.getTemp();
op.setTemp(read_variable(ctx, orig, preds[j])); op.setTemp(read_variable(ctx, orig, preds[j]));
@@ -2679,8 +2678,7 @@ get_affinities(ra_ctx& ctx)
if (!def.isTemp()) if (!def.isTemp())
continue; continue;
/* mark last-seen phi operand */ /* mark last-seen phi operand */
std::unordered_map<unsigned, unsigned>::iterator it = auto it = temp_to_phi_resources.find(def.tempId());
temp_to_phi_resources.find(def.tempId());
if (it != temp_to_phi_resources.end() && if (it != temp_to_phi_resources.end() &&
def.regClass() == phi_resources[it->second][0].regClass()) { def.regClass() == phi_resources[it->second][0].regClass()) {
phi_resources[it->second][0] = def.getTemp(); phi_resources[it->second][0] = def.getTemp();
@@ -2715,8 +2713,7 @@ get_affinities(ra_ctx& ctx)
continue; continue;
assert(instr->definitions[0].isTemp()); assert(instr->definitions[0].isTemp());
std::unordered_map<unsigned, unsigned>::iterator it = auto it = temp_to_phi_resources.find(instr->definitions[0].tempId());
temp_to_phi_resources.find(instr->definitions[0].tempId());
unsigned index = phi_resources.size(); unsigned index = phi_resources.size();
std::vector<Temp>* affinity_related; std::vector<Temp>* affinity_related;
if (it != temp_to_phi_resources.end()) { if (it != temp_to_phi_resources.end()) {
@@ -2907,8 +2904,7 @@ emit_parallel_copy_internal(ra_ctx& ctx, std::vector<std::pair<Operand, Definiti
/* it might happen that the operand is already renamed. we have to restore the /* it might happen that the operand is already renamed. we have to restore the
* original name. */ * original name. */
std::unordered_map<unsigned, Temp>::iterator it = auto it = ctx.orig_names.find(pc->operands[i].tempId());
ctx.orig_names.find(pc->operands[i].tempId());
Temp orig = it != ctx.orig_names.end() ? it->second : pc->operands[i].getTemp(); Temp orig = it != ctx.orig_names.end() ? it->second : pc->operands[i].getTemp();
add_rename(ctx, orig, pc->definitions[i].getTemp()); add_rename(ctx, orig, pc->definitions[i].getTemp());
} }
@@ -3015,8 +3011,7 @@ register_allocation(Program* program, ra_test_policy policy)
/* Handle all other instructions of the block */ /* Handle all other instructions of the block */
auto NonPhi = [](aco_ptr<Instruction>& instr) -> bool { return instr && !is_phi(instr); }; auto NonPhi = [](aco_ptr<Instruction>& instr) -> bool { return instr && !is_phi(instr); };
std::vector<aco_ptr<Instruction>>::iterator instr_it = auto instr_it = std::find_if(block.instructions.begin(), block.instructions.end(), NonPhi);
std::find_if(block.instructions.begin(), block.instructions.end(), NonPhi);
for (; instr_it != block.instructions.end(); ++instr_it) { for (; instr_it != block.instructions.end(); ++instr_it) {
aco_ptr<Instruction>& instr = *instr_it; aco_ptr<Instruction>& instr = *instr_it;
std::vector<std::pair<Operand, Definition>> parallelcopy; std::vector<std::pair<Operand, Definition>> parallelcopy;