[SYCL][NFC] Drop leftover host device symbols

Host device had been removed a while ago, but we still exported some
`__spirv` symbols which were even referenced on some code paths.

This commit prepares for their removal in the next ABI-breaking window

Author: AlexeySachkov

sycl/include/sycl/detail/spirv.hpp

@@ -1225,21 +1225,25 @@ EnableIfGenericShuffle<T> ShuffleUp(GroupT g, T x, uint32_t delta) {
 template <typename Group>
 typename std::enable_if_t<
     ext::oneapi::experimental::is_fixed_topology_group_v<Group>>
-ControlBarrier(Group, memory_scope FenceScope, memory_order Order) {
+ControlBarrier(Group, [[maybe_unused]] memory_scope FenceScope,
+               [[maybe_unused]] memory_order Order) {
+#ifdef __SYCL_DEVICE_ONLY__
   __spirv_ControlBarrier(group_scope<Group>::value, getScope(FenceScope),
                          getMemorySemanticsMask(Order) |
                              __spv::MemorySemanticsMask::SubgroupMemory |
                              __spv::MemorySemanticsMask::WorkgroupMemory |
                              __spv::MemorySemanticsMask::CrossWorkgroupMemory);
+#endif
 }
 
 template <typename Group>
 typename std::enable_if_t<
     ext::oneapi::experimental::is_user_constructed_group_v<Group>>
-ControlBarrier(Group g, memory_scope FenceScope, memory_order Order) {
+ControlBarrier(Group g, [[maybe_unused]] memory_scope FenceScope,
+               [[maybe_unused]] memory_order Order) {
 #if defined(__NVPTX__)
   __nvvm_bar_warp_sync(detail::ExtractMask(detail::GetMask(g))[0]);
-#else
+#elif defined(__SYCL_DEVICE_ONLY__)
   (void)g;
   // SPIR-V does not define an instruction to synchronize partial groups.
   // However, most (possibly all?) of the current SPIR-V targets execute

sycl/source/CMakeLists.txt

@@ -330,7 +330,6 @@ set(SYCL_COMMON_SOURCES
     "queue.cpp"
     "sampler.cpp"
     "stream.cpp"
-    "spirv_ops.cpp"
     "virtual_mem.cpp"
     "detail/memory_pool_impl.cpp"
     "detail/async_alloc.cpp"
@@ -341,6 +340,7 @@ set(SYCL_COMMON_SOURCES
 )
 
 set(SYCL_NON_PREVIEW_SOURCES "${SYCL_COMMON_SOURCES}"
+  "spirv_ops.cpp"
 )
 
 

sycl/source/detail/platform_util.cpp

@@ -131,6 +131,7 @@ uint32_t PlatformUtil::getNativeVectorWidth(PlatformUtil::TypeIndex TIndex) {
   return 0;
 }
 
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
 void PlatformUtil::prefetch(const char *Ptr, size_t NumBytes) {
   if (!Ptr)
     return;
@@ -150,6 +151,7 @@ void PlatformUtil::prefetch(const char *Ptr, size_t NumBytes) {
 #endif
   }
 }
+#endif
 
 } // namespace detail
 } // namespace _V1

sycl/source/detail/platform_util.hpp

@@ -43,7 +43,9 @@ struct PlatformUtil {
 
   static uint64_t getMemCacheSize();
 
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
   static void prefetch(const char *Ptr, size_t NumBytes);
+#endif
 };
 
 } // namespace detail

sycl/source/ld-version-script.txt

@@ -18,10 +18,13 @@
     _ZN10__host_std*;
 
     /* Export SPIR-V built-ins for host device */
+    /* #ifndef __INTEL_PREVIEW_BREAKING_CHANGES */
+    /* TODO: drop those in the next ABI-breaking window */
     _Z23__spirv_GroupWaitEvents*;
     _Z22__spirv_ControlBarrier*;
     _Z21__spirv_MemoryBarrier*;
     _Z20__spirv_ocl_prefetch*;
+    /* #endif // __INTEL_PREVIEW_BREAKING_CHANGES */
 
     /* Export offload image hooks */
     __sycl_register_lib;