SYCL: Use sycl::bit_cast from oneAPI 2024.0.0 on (kokkos#6300)

* SYCL: Use sycl::bit_cast from oneAPI 2024.0.0 on * Avoid importing sycl::bit_cast into Kokkos namespace
masterleinad · Aug 1, 2023 · 23870b3 · 23870b3
1 parent 78e8a32
commit 23870b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/core/src/Kokkos_BitManipulation.hpp b/core/src/Kokkos_BitManipulation.hpp
@@ -100,9 +100,8 @@ inline constexpr bool is_standard_unsigned_integer_type_v =
 namespace Kokkos {
 
 //<editor-fold desc="[bit.cast], bit_cast">
-// FIXME_SYCL intel/llvm has unqualified calls to bit_cast which are ambiguous
-// if we declare our own bit_cast function
-#ifdef KOKKOS_ENABLE_SYCL
+#if defined(KOKKOS_ENABLE_SYCL) && defined(__INTEL_LLVM_COMPILER) && \
+    __INTEL_LLVM_COMPILER < 20240000
 using sycl::detail::bit_cast;
 #else
 template <class To, class From>
@@ -111,9 +110,14 @@ KOKKOS_FUNCTION std::enable_if_t<sizeof(To) == sizeof(From) &&
                                      std::is_trivially_copyable_v<From>,
                                  To>
 bit_cast(From const& from) noexcept {
+#if defined(KOKKOS_ENABLE_SYCL) && defined(__INTEL_LLVM_COMPILER) && \
+    __INTEL_LLVM_COMPILER >= 20240000
+  return sycl::bit_cast<To>(from);
+#else
   To to;
   memcpy(&to, &from, sizeof(To));
   return to;
+#endif
 }
 #endif
 //</editor-fold>

diff --git a/core/unit_test/TestBitManipulation.cpp b/core/unit_test/TestBitManipulation.cpp
@@ -500,8 +500,8 @@ constexpr X test_bit_cast(...) {
   return {};
 }
 
-// FIXME_SYCL The SYCL implementation is unconstrained
-#ifndef KOKKOS_ENABLE_SYCL
+#if !defined(KOKKOS_ENABLE_SYCL) || \
+    (defined(__INTEL_LLVM_COMPILER) && __INTEL_LLVM_COMPILER >= 20240000)
 namespace TypesNotTheSameSize {
 struct To {
   char a;