ir3: Disable copy prop for immediate ldlw offsets
authorBrian Ho <brian@brkho.com>
Fri, 3 Apr 2020 18:53:55 +0000 (11:53 -0700)
committerMarge Bot <eric+marge@anholt.net>
Fri, 3 Apr 2020 19:44:46 +0000 (19:44 +0000)
Immediate offsets are currently collapsed for ldlw, but ldlw does
behave correctly with immediate values. For example,
`ldlw.u32 r0.x, l[4], 1` actually means to use the value of
regid 4 (r1.x) as the offset when we actually want it to use the
imm value of 4 as the offset.

This commit disables copy prop for ldlw offsets so the same
intrinsic gets compiled to:
  mov.u32u32 r0.y, 0x00000004
  ldlw.u32 r0.x, l[r0.y], 1

Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4439>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4439>

src/freedreno/ir3/ir3_cp.c

index 14a5ae8d06c4f521b10029afb84ec8bd3eca84aa..5cac9c6b2d49566207531226aac0878ce2c32b65 100644 (file)
@@ -229,6 +229,9 @@ static bool valid_flags(struct ir3_instruction *instr, unsigned n,
                        if (instr->opc == OPC_STLW && n == 0)
                                return false;
 
+                       if (instr->opc == OPC_LDLW && n == 0)
+                               return false;
+
                        /* disallow CP into anything but the SSBO slot argument for
                         * atomics:
                         */