From c8469a04e7ab048b49237392afb353aa41be895a Mon Sep 17 00:00:00 2001
From: Robertkq <robertvuia06@gmail.com>
Date: Fri, 26 Jun 2026 19:59:25 +0300
Subject: [PATCH] Add removal guard for device::atomic64 use-cases

---
 sycl/include/sycl/info/device.hpp  | 3 +++
 sycl/source/detail/device_impl.hpp | 2 ++
 sycl/source/device.cpp             | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/sycl/include/sycl/info/device.hpp b/sycl/include/sycl/info/device.hpp
index 75541c6f6c4a2..dcecfd89f5031 100644
--- a/sycl/include/sycl/info/device.hpp
+++ b/sycl/include/sycl/info/device.hpp
@@ -412,10 +412,13 @@ struct __SYCL2020_DEPRECATED("deprecated in SYCL 2020, use "
 };
 
 // Extensions/deprecated
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
 struct __SYCL_DEPRECATED("use sycl::aspect::atomic64 instead") atomic64
     : device_traits<UR_DEVICE_INFO_ATOMIC_64> {
   using return_type = bool;
 };
+#endif
+
 struct reference_count : device_traits<UR_DEVICE_INFO_REFERENCE_COUNT> {
   using return_type = uint32_t;
 };
diff --git a/sycl/source/detail/device_impl.hpp b/sycl/source/detail/device_impl.hpp
index 280a6d053c788..41fcf5ecb62d8 100644
--- a/sycl/source/detail/device_impl.hpp
+++ b/sycl/source/detail/device_impl.hpp
@@ -1248,7 +1248,9 @@ class device_impl {
     CASE(int64_extended_atomics) {
       return has_extension("cl_khr_int64_extended_atomics");
     }
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
     CASE(atomic64) { return get_info<info::device::atomic64>(); }
+#endif
     CASE(image) { return get_info<info::device::image_support>(); }
     CASE(online_compiler) {
       return get_info<info::device::is_compiler_available>();
diff --git a/sycl/source/device.cpp b/sycl/source/device.cpp
index 16d6d13b7664b..e118387b3cd89 100644
--- a/sycl/source/device.cpp
+++ b/sycl/source/device.cpp
@@ -279,7 +279,9 @@ __SYCL_DEVICE_INFO_INST(partition_affinity_domains,
 __SYCL_DEVICE_INFO_INST(partition_type_property, info::partition_property)
 __SYCL_DEVICE_INFO_INST(partition_type_affinity_domain,
                         info::partition_affinity_domain)
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
 __SYCL_DEVICE_INFO_INST(atomic64, bool)
+#endif
 __SYCL_DEVICE_INFO_INST(reference_count, uint32_t)
 __SYCL_DEVICE_INFO_INST(usm_device_allocations, bool)
 __SYCL_DEVICE_INFO_INST(usm_host_allocations, bool)