namespace aco {
struct ssa_state {
+ bool checked_preds_for_uniform;
+ bool all_preds_uniform;
+
bool needs_init;
uint64_t cur_undef_operands;
unsigned phi_block_idx;
unsigned loop_nest_depth;
std::map<unsigned, unsigned> writes;
- std::vector<unsigned> latest;
+ std::vector<Operand> latest;
+ std::vector<bool> visited;
};
Operand get_ssa(Program *program, unsigned block_idx, ssa_state *state, bool before_write)
auto it = state->writes.find(block_idx);
if (it != state->writes.end())
return Operand(Temp(it->second, program->lane_mask));
- if (state->latest[block_idx])
- return Operand(Temp(state->latest[block_idx], program->lane_mask));
+ if (state->visited[block_idx])
+ return state->latest[block_idx];
}
+ state->visited[block_idx] = true;
+
Block& block = program->blocks[block_idx];
size_t pred = block.linear_preds.size();
if (pred == 0 || block.loop_nest_depth < state->loop_nest_depth) {
return Operand(program->lane_mask);
} else if (block.loop_nest_depth > state->loop_nest_depth) {
Operand op = get_ssa(program, block_idx - 1, state, false);
- assert(!state->latest[block_idx]);
- state->latest[block_idx] = op.tempId();
+ state->latest[block_idx] = op;
return op;
} else if (pred == 1 || block.kind & block_kind_loop_exit) {
Operand op = get_ssa(program, block.linear_preds[0], state, false);
- assert(!state->latest[block_idx]);
- state->latest[block_idx] = op.tempId();
+ state->latest[block_idx] = op;
return op;
} else if (block.kind & block_kind_loop_header &&
!(program->blocks[state->phi_block_idx].kind & block_kind_loop_exit)) {
return Operand(program->lane_mask);
} else {
- unsigned res = program->allocateId();
- assert(!state->latest[block_idx]);
- state->latest[block_idx] = res;
+ Temp res = Temp(program->allocateId(), program->lane_mask);
+ state->latest[block_idx] = Operand(res);
+
+ Operand ops[pred];
+ for (unsigned i = 0; i < pred; i++)
+ ops[i] = get_ssa(program, block.linear_preds[i], state, false);
+
+ bool all_undef = true;
+ for (unsigned i = 0; i < pred; i++)
+ all_undef = all_undef && ops[i].isUndefined();
+ if (all_undef) {
+ state->latest[block_idx] = ops[0];
+ return ops[0];
+ }
aco_ptr<Pseudo_instruction> phi{create_instruction<Pseudo_instruction>(aco_opcode::p_linear_phi, Format::PSEUDO, pred, 1)};
for (unsigned i = 0; i < pred; i++)
- phi->operands[i] = get_ssa(program, block.linear_preds[i], state, false);
- phi->definitions[0] = Definition(Temp{res, program->lane_mask});
+ phi->operands[i] = ops[i];
+ phi->definitions[0] = Definition(res);
block.instructions.emplace(block.instructions.begin(), std::move(phi));
- return Operand(Temp(res, program->lane_mask));
+ return Operand(res);
}
}
if (it == block->instructions.crend()) {
assert(block->instructions.back()->format == Format::PSEUDO_BRANCH);
block->instructions.insert(std::prev(block->instructions.end()), std::move(instr));
- }
- else
+ } else {
block->instructions.insert(std::prev(it.base()), std::move(instr));
+ }
+}
+
+void build_merge_code(Program *program, Block *block, Definition dst, Operand prev, Operand cur)
+{
+ Builder bld(program);
+
+ auto IsLogicalEnd = [] (const aco_ptr<Instruction>& instr) -> bool {
+ return instr->opcode == aco_opcode::p_logical_end;
+ };
+ auto it = std::find_if(block->instructions.rbegin(), block->instructions.rend(), IsLogicalEnd);
+ assert(it != block->instructions.rend());
+ bld.reset(&block->instructions, std::prev(it.base()));
+
+ if (prev.isUndefined()) {
+ bld.sop1(Builder::s_mov, dst, cur);
+ return;
+ }
+
+ bool prev_is_constant = prev.isConstant() && prev.constantValue64(true) + 1u < 2u;
+ bool cur_is_constant = cur.isConstant() && cur.constantValue64(true) + 1u < 2u;
+
+ if (!prev_is_constant) {
+ if (!cur_is_constant) {
+ Temp tmp1 = bld.tmp(bld.lm), tmp2 = bld.tmp(bld.lm);
+ bld.sop2(Builder::s_andn2, Definition(tmp1), bld.def(s1, scc), prev, Operand(exec, bld.lm));
+ bld.sop2(Builder::s_and, Definition(tmp2), bld.def(s1, scc), cur, Operand(exec, bld.lm));
+ bld.sop2(Builder::s_or, dst, bld.def(s1, scc), tmp1, tmp2);
+ } else if (cur.constantValue64(true)) {
+ bld.sop2(Builder::s_or, dst, bld.def(s1, scc), prev, Operand(exec, bld.lm));
+ } else {
+ bld.sop2(Builder::s_andn2, dst, bld.def(s1, scc), prev, Operand(exec, bld.lm));
+ }
+ } else if (prev.constantValue64(true)) {
+ if (!cur_is_constant)
+ bld.sop2(Builder::s_orn2, dst, bld.def(s1, scc), cur, Operand(exec, bld.lm));
+ else if (cur.constantValue64(true))
+ bld.sop1(Builder::s_mov, dst, program->wave_size == 64 ? Operand(UINT64_MAX) : Operand(UINT32_MAX));
+ else
+ bld.sop1(Builder::s_not, dst, bld.def(s1, scc), Operand(exec, bld.lm));
+ } else {
+ if (!cur_is_constant)
+ bld.sop2(Builder::s_and, dst, bld.def(s1, scc), cur, Operand(exec, bld.lm));
+ else if (cur.constantValue64(true))
+ bld.sop1(Builder::s_mov, dst, Operand(exec, bld.lm));
+ else
+ bld.sop1(Builder::s_mov, dst, program->wave_size == 64 ? Operand((uint64_t)0u) : Operand(0u));
+ }
}
void lower_divergent_bool_phi(Program *program, ssa_state *state, Block *block, aco_ptr<Instruction>& phi)
{
Builder bld(program);
+ if (!state->checked_preds_for_uniform) {
+ state->all_preds_uniform = !(block->kind & block_kind_merge);
+ for (unsigned pred : block->logical_preds)
+ state->all_preds_uniform = state->all_preds_uniform && (program->blocks[pred].kind & block_kind_uniform);
+ state->checked_preds_for_uniform = true;
+ }
+
+ if (state->all_preds_uniform) {
+ assert(block->logical_preds.size() == block->linear_preds.size());
+ phi->opcode = aco_opcode::p_linear_phi;
+ return;
+ }
+
state->latest.resize(program->blocks.size());
+ state->visited.resize(program->blocks.size());
uint64_t undef_operands = 0;
for (unsigned i = 0; i < phi->operands.size(); i++)
state->writes.clear();
state->needs_init = false;
}
- std::fill(state->latest.begin(), state->latest.end(), 0);
+ std::fill(state->latest.begin(), state->latest.end(), Operand(program->lane_mask));
+ std::fill(state->visited.begin(), state->visited.end(), false);
for (unsigned i = 0; i < phi->operands.size(); i++) {
if (phi->operands[i].isUndefined())
state->writes[block->logical_preds[i]] = program->allocateId();
}
+ bool uniform_merge = block->kind & block_kind_loop_header;
+
for (unsigned i = 0; i < phi->operands.size(); i++) {
Block *pred = &program->blocks[block->logical_preds[i]];
+ bool need_get_ssa = !uniform_merge;
+ if (block->kind & block_kind_loop_header && !(pred->kind & block_kind_uniform))
+ uniform_merge = false;
+
if (phi->operands[i].isUndefined())
continue;
- Operand cur = get_ssa(program, pred->index, state, true);
+ Operand cur(bld.lm);
+ if (need_get_ssa)
+ cur = get_ssa(program, pred->index, state, true);
assert(cur.regClass() == bld.lm);
+
Temp new_cur = {state->writes.at(pred->index), program->lane_mask};
assert(new_cur.regClass() == bld.lm);
- if (cur.isUndefined()) {
- insert_before_logical_end(pred, bld.sop1(aco_opcode::s_mov_b64, Definition(new_cur), phi->operands[i]).get_ptr());
- } else {
- Temp tmp1 = bld.tmp(bld.lm), tmp2 = bld.tmp(bld.lm);
- insert_before_logical_end(pred,
- bld.sop2(Builder::s_andn2, Definition(tmp1), bld.def(s1, scc),
- cur, Operand(exec, bld.lm)).get_ptr());
- insert_before_logical_end(pred,
- bld.sop2(Builder::s_and, Definition(tmp2), bld.def(s1, scc),
- phi->operands[i].getTemp(), Operand(exec, bld.lm)).get_ptr());
- insert_before_logical_end(pred,
- bld.sop2(Builder::s_or, Definition(new_cur), bld.def(s1, scc),
- tmp1, tmp2).get_ptr());
- }
+ if (i == 1 && (block->kind & block_kind_merge) && phi->operands[0].isConstant())
+ cur = phi->operands[0];
+ build_merge_code(program, pred, Definition(new_cur), cur, phi->operands[i]);
}
unsigned num_preds = block->linear_preds.size();
ssa_state state;
for (Block& block : program->blocks) {
+ state.checked_preds_for_uniform = false;
state.needs_init = true;
for (aco_ptr<Instruction>& phi : block.instructions) {
if (phi->opcode == aco_opcode::p_phi) {
projects / mesa.git / blobdiff