Use #include_next

Signed-off-by: Andrew Savonichev <[email protected]>

Author: Andrew Savonichev

libdevice/cmake/modules/SYCLLibdevice.cmake

@@ -112,10 +112,10 @@ add_custom_command(
                 ${CMAKE_CURRENT_SOURCE_DIR}/include/devicelib.h
                 ${include_dir}/CL/sycl/devicelib
         COMMAND ${CMAKE_COMMAND} -E copy
-                ${CMAKE_CURRENT_SOURCE_DIR}/include/devicelib-assert.h
+                ${CMAKE_CURRENT_SOURCE_DIR}/include/assert.h
                 ${include_dir}/CL/sycl/devicelib
         DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/include/devicelib.h
-                ${CMAKE_CURRENT_SOURCE_DIR}/include/devicelib-assert.h)
+                ${CMAKE_CURRENT_SOURCE_DIR}/include/assert.h)
 
 add_custom_target(libsycldevice-obj DEPENDS
   ${devicelib-obj-complex}
@@ -141,7 +141,7 @@ else()
 endif()
 
 install(FILES ${include_dir}/CL/sycl/devicelib/devicelib.h
-              ${include_dir}/CL/sycl/devicelib/devicelib-assert.h
+              ${include_dir}/CL/sycl/devicelib/assert.h
         DESTINATION include/sycl/CL/sycl/devicelib
         COMPONENT libsycldevice)
 

libdevice/include/devicelib-assert.h renamed to libdevice/include/assert.h

@@ -6,9 +6,16 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __DEVICELIB_ASSERT_H__
+#define __DEVICELIB_ASSERT_H__
+
+#include_next "assert.h"
 #include "devicelib.h"
-#include <cstddef>
-#include <cstdint>
+
+#ifdef __DEVICELIB_DEVICE_ONLY__
+
+#include <stddef.h>
+#include <stdint.h>
 
 DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_x();
 DEVICE_EXTERNAL size_t __spirv_GlobalInvocationId_y();
@@ -64,3 +71,6 @@ EXTERN_C inline void _wassert(const wchar_t *wexpr, const wchar_t *wfile,
 }
 
 #endif
+
+#endif // __DEVICELIB_DEVICE_ONLY__
+#endif // __DEVICELIB_ASSERT_H__

libdevice/include/devicelib.h

@@ -6,6 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef __DEVICELIB_H__
+#define __DEVICELIB_H__
+
 #ifndef _WIN32
 #include <features.h> // for GLIBC macro
 #endif
@@ -40,3 +43,9 @@
 #endif // CL_SYCL_LANGUAGE_VERSION
 
 #define DEVICE_EXTERN_C DEVICE_EXTERNAL EXTERN_C
+
+#ifdef __SYCL_DEVICE_ONLY__
+#define __DEVICELIB_DEVICE_ONLY__ 1
+#endif
+
+#endif // __DEVICELIB_H__

sycl/include/CL/sycl/builtins.hpp

@@ -1546,8 +1546,4 @@ detail::enable_if_t<detail::is_genfloatf<T>::value, T> tan(T x) __NOEXC {
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)
 
-#ifdef __SYCL_DEVICE_ONLY__
-#include "devicelib/devicelib-assert.h"
-#endif // __SYCL_DEVICE_ONLY__
-
 #undef __NOEXC

sycl/test/devicelib/assert.cpp

@@ -1,5 +1,5 @@
 // REQUIRES: cpu,linux
-// RUN: %clangxx -fsycl %s -o %t.out
+// RUN: %clangxx -fsycl %s -o %t.out -I%sycl_include/CL/sycl/devicelib
 // (see the other RUN lines below; it is a bit complicated)
 //
 // assert() call in device code guarantees nothing: on some devices it behaves