From eacca4b1ecb97a49ea06d1369657caf39d1aafc6 Mon Sep 17 00:00:00 2001 From: Mel Henning Date: Fri, 30 May 2025 20:29:04 -0400 Subject: [PATCH] nak: Don't swap f2fp sources in legalize The order of these is important. Fixes: e19871bd6ad ("nak: Use F2FP for nir_op_pack_half_2x16_split on SM86+") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12717 Part-of: (cherry picked from commit aae67ab678adcb839dfd1e0c9c7a2dd86ebce38b) --- .pick_status.json | 2 +- src/nouveau/compiler/nak/sm70_encode.rs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 55edc2ceadd..5adaab6d494 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1424,7 +1424,7 @@ "description": "nak: Don't swap f2fp sources in legalize", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "e19871bd6ad0651a5b8ea8215eab686ace5d08e1", "notes": null diff --git a/src/nouveau/compiler/nak/sm70_encode.rs b/src/nouveau/compiler/nak/sm70_encode.rs index b87271f0fc0..b13e3a3fe90 100644 --- a/src/nouveau/compiler/nak/sm70_encode.rs +++ b/src/nouveau/compiler/nak/sm70_encode.rs @@ -1939,9 +1939,7 @@ impl SM70Op for OpF2F { impl SM70Op for OpF2FP { fn legalize(&mut self, b: &mut LegalizeBuilder) { let gpr = op_gpr(self); - let [src0, src1] = &mut self.srcs; - swap_srcs_if_not_reg(src0, src1, gpr); - + let [src0, _src1] = &mut self.srcs; b.copy_alu_src_if_not_reg(src0, gpr, SrcType::ALU); }