[SYCLomatic][DPCT] Decouple sycl version check from oneDPL (#596)

Signed-off-by: Dan Hoeflinger <[email protected]>

Author: danhoeflinger

clang/runtime/dpct-rt/include/dpl_extras/memory.h.inc

@@ -68,14 +68,27 @@ struct make_allocatable<void>
 };
 // DPCT_LABEL_END
 
+// DPCT_LABEL_BEGIN|_DPCT_LIBSYCL_VERSION|dpct::detail
+// DPCT_DEPENDENCY_EMPTY
+// DPCT_CODE
+#if defined(__LIBSYCL_MAJOR_VERSION) && defined(__LIBSYCL_MINOR_VERSION) &&    \
+    defined(__LIBSYCL_PATCH_VERSION)
+#define _DPCT_LIBSYCL_VERSION                                                  \
+  (__LIBSYCL_MAJOR_VERSION * 10000 + __LIBSYCL_MINOR_VERSION * 100 +           \
+   __LIBSYCL_PATCH_VERSION)
+#else
+#define _DPCT_LIBSYCL_VERSION 0
+#endif
+// DPCT_LABEL_END
+
 // DPCT_LABEL_BEGIN|__buffer_allocator|dpct::detail
 // DPCT_DEPENDENCY_BEGIN
 // DplExtrasMemory|make_allocatable
 // DPCT_DEPENDENCY_END
 // DPCT_CODE
 template <typename _DataT>
 using __buffer_allocator =
-#if _ONEDPL_LIBSYCL_VERSION >= 50707
+#if _DPCT_LIBSYCL_VERSION >= 60000
     sycl::buffer_allocator<typename make_allocatable<_DataT>::type>;
 #else
     sycl::buffer_allocator;

clang/test/dpct/helper_files_ref/include/dpl_extras/memory.h

@@ -28,9 +28,18 @@ struct make_allocatable<void>
   using type = dpct::byte_t;
 };
 
+#if defined(__LIBSYCL_MAJOR_VERSION) && defined(__LIBSYCL_MINOR_VERSION) &&    \
+    defined(__LIBSYCL_PATCH_VERSION)
+#define _DPCT_LIBSYCL_VERSION                                                  \
+  (__LIBSYCL_MAJOR_VERSION * 10000 + __LIBSYCL_MINOR_VERSION * 100 +           \
+   __LIBSYCL_PATCH_VERSION)
+#else
+#define _DPCT_LIBSYCL_VERSION 0
+#endif
+
 template <typename _DataT>
 using __buffer_allocator =
-#if _ONEDPL_LIBSYCL_VERSION >= 50707
+#if _DPCT_LIBSYCL_VERSION >= 60000
     sycl::buffer_allocator<typename make_allocatable<_DataT>::type>;
 #else
     sycl::buffer_allocator;