From: Dave Airlie <airl...@redhat.com> The nir->llvm conversion was using the wrong srcs.
Fixes: tests/spec/arb_compute_shader/execution/shared-atomics.shader_test Signed-off-by: Dave Airlie <airl...@redhat.com> --- src/amd/common/ac_nir_to_llvm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index bc72d2a6f1..f0361530dc 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -3991,10 +3991,10 @@ visit_store_shared(struct ac_nir_context *ctx, static LLVMValueRef visit_var_atomic(struct ac_nir_context *ctx, const nir_intrinsic_instr *instr, - LLVMValueRef ptr) + LLVMValueRef ptr, int src_idx) { LLVMValueRef result; - LLVMValueRef src = get_src(ctx, instr->src[0]); + LLVMValueRef src = get_src(ctx, instr->src[src_idx]); if (instr->intrinsic == nir_intrinsic_var_atomic_comp_swap || instr->intrinsic == nir_intrinsic_shared_atomic_comp_swap) { @@ -4574,8 +4574,8 @@ static void visit_intrinsic(struct ac_nir_context *ctx, case nir_intrinsic_shared_atomic_xor: case nir_intrinsic_shared_atomic_exchange: case nir_intrinsic_shared_atomic_comp_swap: { - LLVMValueRef ptr = get_memory_ptr(ctx, instr->src[1]); - result = visit_var_atomic(ctx, instr, ptr); + LLVMValueRef ptr = get_memory_ptr(ctx, instr->src[0]); + result = visit_var_atomic(ctx, instr, ptr, 1); break; } case nir_intrinsic_var_atomic_add: @@ -4589,7 +4589,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx, case nir_intrinsic_var_atomic_exchange: case nir_intrinsic_var_atomic_comp_swap: { LLVMValueRef ptr = build_gep_for_deref(ctx, instr->variables[0]); - result = visit_var_atomic(ctx, instr, ptr); + result = visit_var_atomic(ctx, instr, ptr, 0); break; } case nir_intrinsic_interp_var_at_centroid: -- 2.14.3 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev