fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

brw/cmod: Allow FIXED_GRF

Browse source 
Later commits will call cmod prop after register allocation. At that
time, there is only FIXED_GRF.

No shader-db or fossil-db changes on any Intel platform.

v2: FIXED_GRF uses subnr instead of offset. Add a unit test to
demonstrate the issue.

Reviewed-by: Caio Oliveira <caio.oliveira@intel.com> [v1]
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38315>
This commit is contained in:
Ian Romanick 2025-02-26 10:04:34 -08:00
parent d7227b11a1
commit 24cd8aa3b8
2 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/intel/compiler/brw/brw_opt_cmod_propagation.cpp
View file

@ -244,8 +244,7 @@ opt_cmod_propagation_local(const intel_device_info *devinfo, bblock_t *block)
inst->opcode != BRW_OPCODE_MOV) || inst->opcode != BRW_OPCODE_MOV) ||
inst->predicate != BRW_PREDICATE_NONE || inst->predicate != BRW_PREDICATE_NONE ||
!inst->dst.is_null() || !inst->dst.is_null() ||
(inst->src[0].file != VGRF && inst->src[0].file != ATTR && !inst->src[0].is_grf())
inst->src[0].file != UNIFORM))
continue; continue;
/* An ABS source modifier can only be handled when processing a compare /* An ABS source modifier can only be handled when processing a compare
@ -295,7 +294,10 @@ opt_cmod_propagation_local(const intel_device_info *devinfo, bblock_t *block)
if (scan_inst->predicate || if (scan_inst->predicate ||
!scan_inst->dst.is_contiguous() || !scan_inst->dst.is_contiguous() ||
scan_inst->dst.offset != inst->src[0].offset || (scan_inst->dst.file != FIXED_GRF &&
scan_inst->dst.offset != inst->src[0].offset) ||
(scan_inst->dst.file == FIXED_GRF &&
scan_inst->dst.subnr != inst->src[0].subnr) ||
scan_inst->exec_size != inst->exec_size || scan_inst->exec_size != inst->exec_size ||
scan_inst->group != inst->group) scan_inst->group != inst->group)
break; break;

29
src/intel/compiler/brw/test_opt_cmod_propagation.cpp
View file

@ -2609,3 +2609,32 @@ TEST_F(cmod_propagation_test, different_group)
EXPECT_NO_PROGRESS(brw_opt_cmod_propagation, bld); EXPECT_NO_PROGRESS(brw_opt_cmod_propagation, bld);
} }
TEST_F(cmod_propagation_test, fixed_grf_partial_overlap)
{
brw_builder bld = make_shader();
brw_reg src0 = brw_make_reg(FIXED_GRF, 92, 0, 0, 0, BRW_TYPE_D,
BRW_VERTICAL_STRIDE_8,
BRW_WIDTH_4,
BRW_HORIZONTAL_STRIDE_2,
BRW_SWIZZLE_XYZW,
WRITEMASK_XYZW);
brw_reg src1 = brw_make_reg(FIXED_GRF, 92, 4, 0, 0, BRW_TYPE_D,
BRW_VERTICAL_STRIDE_8,
BRW_WIDTH_4,
BRW_HORIZONTAL_STRIDE_2,
BRW_SWIZZLE_XYZW,
WRITEMASK_XYZW);
brw_reg dst = brw_make_reg(FIXED_GRF, 94, 0, 0, 0, BRW_TYPE_D,
BRW_VERTICAL_STRIDE_8,
BRW_WIDTH_8,
BRW_HORIZONTAL_STRIDE_1,
BRW_SWIZZLE_XYZW,
WRITEMASK_XYZW);
bld.CMP(dst, src0, brw_imm_d(0), BRW_CONDITIONAL_NZ);
bld.CMP(bld.null_reg_d(), src1, brw_imm_d(0), BRW_CONDITIONAL_L);
EXPECT_NO_PROGRESS(brw_opt_cmod_propagation, bld);
}