fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

brw: Pass brw_shader in fold_instruction

Browse source 
Will be used later for the general instruction transforming
function.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36730>
This commit is contained in:
Caio Oliveira 2025-08-19 12:35:38 -07:00 • committed by Marge Bot
parent 8f16cac492
commit 5d0160a87f
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/intel/compiler/brw_opt_algebraic.cpp
View file

@ -87,7 +87,7 @@ brw_imm_for_type(uint64_t value, enum brw_reg_type type)
* Converts a MAD to an ADD by folding the multiplicand sources.
*/
static void
fold_multiplicands_of_MAD(brw_inst *inst)
fold_multiplicands_of_MAD(brw_shader &s, brw_inst *inst)
{
assert(inst->opcode == BRW_OPCODE_MAD);
assert (inst->src[1].file == IMM &&
@ -133,8 +133,9 @@ fold_multiplicands_of_MAD(brw_inst *inst)
}
bool
brw_opt_constant_fold_instruction(const intel_device_info *devinfo, brw_inst *inst)
brw_opt_constant_fold_instruction(brw_shader &s, brw_inst *inst)
{
const intel_device_info *devinfo = s.devinfo;
brw_reg result;
result.file = BAD_FILE;
@ -187,10 +188,10 @@ brw_opt_constant_fold_instruction(const intel_device_info *devinfo, brw_inst *in
!brw_type_is_vector_imm(inst->src[0].type) &&
!brw_type_is_vector_imm(inst->src[1].type) &&
!brw_type_is_vector_imm(inst->src[2].type)) {
fold_multiplicands_of_MAD(inst);
fold_multiplicands_of_MAD(s, inst);
assert(inst->opcode == BRW_OPCODE_ADD);
ASSERTED bool folded = brw_opt_constant_fold_instruction(devinfo, inst);
ASSERTED bool folded = brw_opt_constant_fold_instruction(s, inst);
assert(folded);
return true;
@ -331,7 +332,7 @@ brw_opt_algebraic(brw_shader &s)
bool progress = false;
foreach_block_and_inst_safe(block, brw_inst, inst, s.cfg) {
if (brw_opt_constant_fold_instruction(devinfo, inst)) {
if (brw_opt_constant_fold_instruction(s, inst)) {
progress = true;
continue;
}
@ -680,7 +681,7 @@ brw_opt_algebraic(brw_shader &s)
inst->src[2].file == IMM &&
!brw_type_is_vector_imm(inst->src[1].type) &&
!brw_type_is_vector_imm(inst->src[2].type)) {
fold_multiplicands_of_MAD(inst);
fold_multiplicands_of_MAD(s, inst);
/* This could result in (x + 0). For floats, we want to leave this
* as an ADD so that a subnormal x will get flushed to zero.

4
src/intel/compiler/brw_opt_copy_propagation.cpp
View file

@ -1440,7 +1440,7 @@ opt_copy_propagation_local(brw_shader &s, linear_ctx *lin_ctx,
if (constant_progress) {
commute_immediates(inst);
brw_opt_constant_fold_instruction(devinfo, inst);
brw_opt_constant_fold_instruction(s, inst);
progress = true;
}
@ -1992,7 +1992,7 @@ brw_opt_copy_propagation_defs(brw_shader &s)
if (constant_progress) {
commute_immediates(inst);
brw_opt_constant_fold_instruction(s.compiler->devinfo, inst);
brw_opt_constant_fold_instruction(s, inst);
}
}

2
src/intel/compiler/brw_shader.h
View file

@ -340,7 +340,7 @@ bool brw_opt_cmod_propagation(brw_shader &s);
bool brw_opt_combine_constants(brw_shader &s);
bool brw_opt_combine_convergent_txf(brw_shader &s);
bool brw_opt_compact_virtual_grfs(brw_shader &s);
bool brw_opt_constant_fold_instruction(const intel_device_info *devinfo, brw_inst *inst);
bool brw_opt_constant_fold_instruction(brw_shader &s, brw_inst *inst);
bool brw_opt_copy_propagation(brw_shader &s);
bool brw_opt_copy_propagation_defs(brw_shader &s);
bool brw_opt_cse_defs(brw_shader &s);