From 283eef8ac00685865d11c23d0d4f9d4e446b0614 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 27 May 2026 10:43:49 -0400 Subject: [PATCH] jay: legalize shuffle(ugpr) for now fixes sascha descriptorindexing .. we'll probably want to revert once divergence analysis & isel agree but until the multipolygon + anv circus settles this is better than blowing up. See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41670 for context. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/intel/compiler/jay/jay_lower_pre_ra.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/intel/compiler/jay/jay_lower_pre_ra.c b/src/intel/compiler/jay/jay_lower_pre_ra.c index c16a9d03d98..0e20c1d5847 100644 --- a/src/intel/compiler/jay/jay_lower_pre_ra.c +++ b/src/intel/compiler/jay/jay_lower_pre_ra.c @@ -194,6 +194,16 @@ jay_lower_pre_ra(jay_shader *s) jay_foreach_inst_in_func(f, block, I) { jay_builder b = { .shader = s, .func = f }; + /* Shuffle(UGPR) can result from copyprop if there's a mismatch between + * isel and divergence analysis (e.g. because multipolygon is + * disabled). Legalize. + */ + if (I->op == JAY_OPCODE_SHUFFLE && I->src[0].file == UGPR) { + assert(!I->predication); + I->op = JAY_OPCODE_MOV; + jay_shrink_sources(I, 1); + } + /* lower_immediates must be last since it consumes I */ lower_contiguous_sources(&b, I); lower_immediates(&b, I, constants);