From 448b22da823a449074030000725cb859d7ce9588 Mon Sep 17 00:00:00 2001
From: srinivamd <52507740+srinivamd@users.noreply.github.com>
Date: Wed, 20 May 2026 23:50:47 -0700
Subject: [PATCH] Replace deprecated __hip_atomic_* builtins with
 __scoped_atomic_* equivalents

---
 .../gpu/kernels/include/migraphx/kernels/atomic.hpp    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/targets/gpu/kernels/include/migraphx/kernels/atomic.hpp b/src/targets/gpu/kernels/include/migraphx/kernels/atomic.hpp
index a4f85dc3ba0..cc4ca9fc677 100644
--- a/src/targets/gpu/kernels/include/migraphx/kernels/atomic.hpp
+++ b/src/targets/gpu/kernels/include/migraphx/kernels/atomic.hpp
@@ -54,6 +54,15 @@ MIGRAPHX_DEVICE_CONSTEXPR void cas(rank<1>, T& x, T y, Op op)
     MIGRAPHX_ATOMIC_CAS_WARNING();
     using storage    = conditional_t<sizeof(T) == 4, uint32_t, uint64_t>;
     storage* address = reinterpret_cast<storage*>(&x);
+#if __has_builtin(__scoped_atomic_load_n)
+    storage expected = __scoped_atomic_load_n(address, __ATOMIC_RELAXED, __MEMORY_SCOPE_DEVICE);
+    while(not __scoped_atomic_compare_exchange(address,
+                                               &expected,
+                                               bit_cast<storage>(op(bit_cast<T>(expected), y)),
+                                               __ATOMIC_RELAXED,
+                                               __ATOMIC_RELAXED,
+                                               __MEMORY_SCOPE_DEVICE))
+#else
     storage expected = __hip_atomic_load(address, __ATOMIC_RELAXED, __HIP_MEMORY_SCOPE_AGENT);
     while(not __hip_atomic_compare_exchange_strong(address,
                                                    &expected,
@@ -61,6 +70,7 @@ MIGRAPHX_DEVICE_CONSTEXPR void cas(rank<1>, T& x, T y, Op op)
                                                    __ATOMIC_RELAXED,
                                                    __ATOMIC_RELAXED,
                                                    __HIP_MEMORY_SCOPE_AGENT))
+#endif
     {
     }
 }