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

brw/algebraic: Fix ADD constant folding

Browse Source 
Some callers of brw_constant_fold_instruction depend on the result being
a MOV of immediate when progress is made. Previously `ADD dst:D src0:D
0:D` would be converted to `MOV dst:D src0:D`. There was also no
handling for `ADD dst:D imm0:D imm1:D`.

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Fixes: 2cc1575a31 ("brw/algebraic: Refactor constant folding out of brw_fs_opt_algebraic")
(cherry picked from commit 086e83ccd9)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32730>
This commit is contained in:
Ian Romanick
2024-12-10 13:22:21 -08:00
committed by Dylan Baker
parent f5eb332773
commit 21e9a5e373
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -484,7 +484,7 @@
"description": "brw/algebraic: Fix ADD constant folding",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "2cc1575a31d2483e71c473d19618ddbd1ea9e1a4",
"notes": null

35
src/intel/compiler/brw_fs_opt_algebraic.cpp
View File

@@ -71,26 +71,22 @@ brw_constant_fold_instruction(const intel_device_info *devinfo, fs_inst *inst)
switch (inst->opcode) {
case BRW_OPCODE_ADD:
if (inst->src[1].file != IMM)
if (inst->src[0].file != IMM || inst->src[1].file != IMM)
break;
if (brw_type_is_int(inst->src[1].type) &&
inst->src[1].is_zero()) {
inst->opcode = BRW_OPCODE_MOV;
inst->resize_sources(1);
progress = true;
break;
}
if (brw_type_is_int(inst->src[0].type)) {
const uint64_t src0 = src_as_uint(inst->src[0]);
const uint64_t src1 = src_as_uint(inst->src[1]);
if (inst->src[0].file == IMM) {
inst->src[0] = brw_imm_for_type(src0 + src1, inst->dst.type);
} else {
assert(inst->src[0].type == BRW_TYPE_F);
inst->opcode = BRW_OPCODE_MOV;
inst->src[0].f += inst->src[1].f;
inst->resize_sources(1);
progress = true;
break;
}
inst->opcode = BRW_OPCODE_MOV;
inst->resize_sources(1);
progress = true;
break;
@@ -242,6 +238,18 @@ brw_fs_opt_algebraic(fs_visitor &s)
foreach_block_and_inst_safe(block, fs_inst, inst, s.cfg) {
switch (inst->opcode) {
case BRW_OPCODE_ADD:
if (brw_constant_fold_instruction(devinfo, inst)) {
progress = true;
} else if (brw_type_is_int(inst->src[1].type) &&
inst->src[1].is_zero()) {
inst->opcode = BRW_OPCODE_MOV;
inst->resize_sources(1);
progress = true;
}
break;
case BRW_OPCODE_MOV:
if ((inst->conditional_mod == BRW_CONDITIONAL_Z ||
inst->conditional_mod == BRW_CONDITIONAL_NZ) &&
@@ -277,7 +285,6 @@ brw_fs_opt_algebraic(fs_visitor &s)
break;
case BRW_OPCODE_MUL:
case BRW_OPCODE_ADD:
case BRW_OPCODE_AND:
if (brw_constant_fold_instruction(devinfo, inst))
progress = true;