[llvm] 4c29521 - [SPIR-V] fix return type for OpAtomicCompareExchange (#154297)

[via llvm-commits]

Author: Simeon David Schaub
Date: 2025-08-20T13:19:45+01:00
New Revision: 4c295216e479ff837aaf8d16b56325d265a11664

URL: https://github.com/llvm/llvm-project/commit/4c295216e479ff837aaf8d16b56325d265a11664
DIFF: https://github.com/llvm/llvm-project/commit/4c295216e479ff837aaf8d16b56325d265a11664.diff

LOG: [SPIR-V] fix return type for OpAtomicCompareExchange (#154297)

fixes #152863

Tests were written with some help from Copilot

---------

Co-authored-by: Victor Lomuller <victor at codeplay.com>

Added: 
    llvm/test/CodeGen/SPIRV/AtomicCompareExchange64BitPhiNode.ll

Modified: 
    llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp b/llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp
index e6e86b71b2dcc..2abd9d36f7606 100644
--- a/llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp
@@ -802,10 +802,9 @@ static bool buildAtomicCompareExchangeInst(
     MRI->setRegClass(Tmp, GR->getRegClass(SpvDesiredTy));
   GR->assignSPIRVTypeToVReg(SpvDesiredTy, Tmp, MIRBuilder.getMF());
 
-  SPIRVType *IntTy = GR->getOrCreateSPIRVIntegerType(32, MIRBuilder);
   MIRBuilder.buildInstr(Opcode)
       .addDef(Tmp)
-      .addUse(GR->getSPIRVTypeID(IntTy))
+      .addUse(GR->getSPIRVTypeID(SpvDesiredTy))
       .addUse(ObjectPtr)
       .addUse(ScopeReg)
       .addUse(MemSemEqualReg)

diff  --git a/llvm/test/CodeGen/SPIRV/AtomicCompareExchange64BitPhiNode.ll b/llvm/test/CodeGen/SPIRV/AtomicCompareExchange64BitPhiNode.ll
new file mode 100644
index 0000000000000..93a7a3ab79dc4
--- /dev/null
+++ b/llvm/test/CodeGen/SPIRV/AtomicCompareExchange64BitPhiNode.ll
@@ -0,0 +1,30 @@
+; RUN: llc -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s --check-prefix=CHECK-SPIRV
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj | spirv-val %}
+
+; Regression test for issue https://github.com/llvm/llvm-project/issues/152863
+; Ensure OpAtomicCompareExchange returns the correct i64 type when used in phi nodes.
+; Previously, this would generate invalid SPIR-V where the atomic operation returned
+; uint (32-bit) but the phi node expected ulong (64-bit), causing validation errors.
+
+; CHECK-SPIRV-DAG: %[[#Long:]] = OpTypeInt 64 0
+; CHECK-SPIRV-DAG: %[[#Ptr:]] = OpTypePointer CrossWorkgroup %[[#Long]]
+; CHECK-SPIRV-DAG: %[[#Zero64:]] = OpConstantNull %[[#Long]]
+
+; Verify that both the phi node and atomic operation use the same i64 type
+; CHECK-SPIRV: %[[#ValuePhi:]] = OpPhi %[[#Long]] %[[#Zero64]] %[[#]] %[[#AtomicResult:]] %[[#]]
+; CHECK-SPIRV: %[[#AtomicResult]] = OpAtomicCompareExchange %[[#Long]] %[[#]] %[[#]] %[[#]] %[[#]] %[[#Zero64]] %[[#ValuePhi]]
+
+target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
+target triple = "spirv64-unknown-unknown"
+
+declare i64 @_Z14atomic_cmpxchgPU8CLglobalVlll(ptr addrspace(1), i64, i64)
+
+define spir_kernel void @test_atomic_cmpxchg_phi(ptr addrspace(1) %ptr) {
+conversion:
+  br label %L6
+
+L6:                                               ; preds = %L6, %conversion
+  %value_phi = phi i64 [ 0, %conversion ], [ %1, %L6 ]
+  %1 = call i64 @_Z14atomic_cmpxchgPU8CLglobalVlll(ptr addrspace(1) %ptr, i64 %value_phi, i64 0)
+  br label %L6
+}