fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 11:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

brw: Use brw_inst::block in Combine Constants

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33815>
This commit is contained in:
Caio Oliveira 2025-02-27 23:25:08 -08:00 • committed by Marge Bot
parent 07d0af763d
commit b0b0fa8624
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/intel/compiler/brw_opt_combine_constants.cpp
View file

@ -764,7 +764,6 @@ brw_combine_constants(struct value *candidates, unsigned num_candidates)
struct brw_inst_box {
brw_inst *inst;
unsigned ip;
bblock_t *block;
};
/** A box for putting fs_regs in a linked list. */
@ -867,7 +866,7 @@ new_value(struct table *table, void *mem_ctx)
*/
static unsigned
box_instruction(struct table *table, void *mem_ctx, brw_inst *inst,
unsigned ip, bblock_t *block)
unsigned ip)
{
/* It is common for box_instruction to be called consecutively for each
* source of an instruction. As a result, the most common case for finding
@ -893,7 +892,6 @@ box_instruction(struct table *table, void *mem_ctx, brw_inst *inst,
brw_inst_box *ib = &table->boxes[idx];
ib->inst = inst;
ib->block = block;
ib->ip = ip;
return idx;
@ -1108,13 +1106,12 @@ static void
add_candidate_immediate(struct table *table, brw_inst *inst, unsigned ip,
unsigned i,
bool allow_one_constant,
bblock_t *block,
const struct intel_device_info *devinfo,
void *const_ctx)
{
struct value *v = new_value(table, const_ctx);
unsigned box_idx = box_instruction(table, const_ctx, inst, ip, block);
unsigned box_idx = box_instruction(table, const_ctx, inst, ip);
v->value.u64 = inst->src[i].d64;
v->bit_size = brw_type_size_bits(inst->src[i].type);
@ -1319,7 +1316,7 @@ brw_opt_combine_constants(brw_shader &s)
case SHADER_OPCODE_INT_REMAINDER:
case SHADER_OPCODE_POW:
if (inst->src[0].file == IMM) {
add_candidate_immediate(&table, inst, ip, 0, false, block,
add_candidate_immediate(&table, inst, ip, 0, false,
devinfo, const_ctx);
}
break;
@ -1342,9 +1339,9 @@ brw_opt_combine_constants(brw_shader &s)
/* MAD can have either src0 or src2 be immediate. Add both as
* candidates, but mark them "allow one constant."
*/
add_candidate_immediate(&table, inst, ip, 0, true, block,
add_candidate_immediate(&table, inst, ip, 0, true,
devinfo, const_ctx);
add_candidate_immediate(&table, inst, ip, 2, true, block,
add_candidate_immediate(&table, inst, ip, 2, true,
devinfo, const_ctx);
} else {
for (int i = 0; i < inst->sources; i++) {
@ -1354,7 +1351,7 @@ brw_opt_combine_constants(brw_shader &s)
if (can_promote_src_as_imm(devinfo, inst, i))
continue;
add_candidate_immediate(&table, inst, ip, i, false, block,
add_candidate_immediate(&table, inst, ip, i, false,
devinfo, const_ctx);
}
}
@ -1368,7 +1365,7 @@ brw_opt_combine_constants(brw_shader &s)
if (inst->src[i].file != IMM)
continue;
add_candidate_immediate(&table, inst, ip, i, false, block,
add_candidate_immediate(&table, inst, ip, i, false,
devinfo, const_ctx);
}
@ -1386,12 +1383,12 @@ brw_opt_combine_constants(brw_shader &s)
inst->conditional_mod == BRW_CONDITIONAL_L) {
assert(inst->src[1].file == IMM);
add_candidate_immediate(&table, inst, ip, 0, true, block,
add_candidate_immediate(&table, inst, ip, 0, true,
devinfo, const_ctx);
add_candidate_immediate(&table, inst, ip, 1, true, block,
add_candidate_immediate(&table, inst, ip, 1, true,
devinfo, const_ctx);
} else {
add_candidate_immediate(&table, inst, ip, 0, false, block,
add_candidate_immediate(&table, inst, ip, 0, false,
devinfo, const_ctx);
}
}
@ -1405,7 +1402,7 @@ brw_opt_combine_constants(brw_shader &s)
case BRW_OPCODE_SHL:
case BRW_OPCODE_SHR:
if (inst->src[0].file == IMM) {
add_candidate_immediate(&table, inst, ip, 0, false, block,
add_candidate_immediate(&table, inst, ip, 0, false,
devinfo, const_ctx);
}
break;
@ -1462,15 +1459,15 @@ brw_opt_combine_constants(brw_shader &s)
assert(imm->inst == NULL);
imm->inst = ib->inst;
imm->block = ib->block;
imm->block = ib->inst->block;
imm->first_use_ip = ib->ip;
imm->last_use_ip = ib->ip;
imm->used_in_single_block = true;
} else {
bblock_t *intersection = idom.intersect(ib->block,
bblock_t *intersection = idom.intersect(ib->inst->block,
imm->block);
if (ib->block != imm->block)
if (ib->inst->block != imm->block)
imm->used_in_single_block = false;
if (imm->first_use_ip > ib->ip) {
@ -1482,7 +1479,7 @@ brw_opt_combine_constants(brw_shader &s)
* here.
*/
imm->inst = ib->inst;
imm->block = ib->block;
imm->block = ib->inst->block;
}
if (imm->last_use_ip < ib->ip)