freedreno/ir3: fix the param order of cmpxchg
authorHyunjun Ko <zzoon@igalia.com>
Fri, 7 Sep 2018 08:11:45 +0000 (17:11 +0900)
committerRob Clark <robdclark@gmail.com>
Thu, 27 Sep 2018 20:05:49 +0000 (16:05 -0400)
According to the following definition,
int AtomicCompSwap(inout int mem, uint compare, uint data);

the preceding one in atomic_comp_swap of NIR is compare and data is
followed, while src0 for cmpxchg needs vec2(data, compare)
So for ssbo/image deref comp_swap, that should be reversed.

Fixes: dEQP-GLES31.functional.image_load_store.*.atomic.comp_swap*
src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c

index 79314140d874beaea8583306ef478e982e192ddc..8f749f4110e39738909cca17def31c02c4b72631 100644 (file)
@@ -1626,8 +1626,8 @@ emit_intrinsic_atomic_ssbo(struct ir3_context *ctx, nir_intrinsic_instr *intr)
        case nir_intrinsic_ssbo_atomic_comp_swap:
                /* for cmpxchg, src0 is [ui]vec2(data, compare): */
                src0 = create_collect(ctx, (struct ir3_instruction*[]){
-                       src0,
                        get_src(ctx, &intr->src[3])[0],
+                       src0,
                }, 2);
                atomic = ir3_ATOMIC_CMPXCHG_G(b, ssbo, 0, src0, 0, src1, 0, src2, 0);
                break;
@@ -2095,8 +2095,8 @@ emit_intrinsic_atomic_image(struct ir3_context *ctx, nir_intrinsic_instr *intr)
        case nir_intrinsic_image_deref_atomic_comp_swap:
                /* for cmpxchg, src0 is [ui]vec2(data, compare): */
                src0 = create_collect(ctx, (struct ir3_instruction*[]){
-                       src0,
                        get_src(ctx, &intr->src[4])[0],
+                       src0,
                }, 2);
                atomic = ir3_ATOMIC_CMPXCHG_G(b, image, 0, src0, 0, src1, 0, src2, 0);
                break;