[SYCL] Add missing change past #4694

Signed-off-by: Sergey Kanaev <[email protected]>

Author: Sergey Kanaev

sycl/include/CL/sycl/detail/assert_happened.hpp

@@ -12,7 +12,7 @@
 
 #include <cstdint>
 
-#ifdef __SYCL_DEVICE_ONLY__
+#if defined(__SYCL_DEVICE_ONLY__) && __SYCL_USE_FALLBACK_ASSERT
 // Reads Flag of AssertHappened on device
 SYCL_EXTERNAL __attribute__((weak)) extern "C" void
 __devicelib_assert_read(void *);

sycl/include/CL/sycl/detail/defines_elementary.hpp

@@ -133,4 +133,11 @@ __SYCL_WARNING("DPCPP does not support C++ version earlier than C++17. Some "
 #warning: DPCPP does not support C++ version earlier than C++17. Some features might not be available.
 #endif
 
+// Helper macro to identify if fallback assert is needed
+#if defined(SYCL_FALLBACK_ASSERT)
+#define __SYCL_USE_FALLBACK_ASSERT SYCL_FALLBACK_ASSERT
+#else
+#define __SYCL_USE_FALLBACK_ASSERT 0
+#endif
+
 #endif

sycl/include/CL/sycl/queue.hpp

@@ -65,13 +65,6 @@
 #define _KERNELFUNCPARAM(a) const KernelType &a
 #endif
 
-// Helper macro to identify if fallback assert is needed
-// FIXME remove __NVPTX__ condition once devicelib supports CUDA
-#if defined(SYCL_FALLBACK_ASSERT)
-#define __SYCL_USE_FALLBACK_ASSERT SYCL_FALLBACK_ASSERT
-#else
-#define __SYCL_USE_FALLBACK_ASSERT 0
-#endif
 
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {