Apply CR comments

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

Author: Andrew Savonichev

libdevice/cmake/modules/SYCLLibdevice.cmake

@@ -33,7 +33,7 @@ if (WIN32)
                              ${CMAKE_CURRENT_SOURCE_DIR}/msvc_wrapper.cpp
                              -o ${devicelib-obj-file}
                      MAIN_DEPENDENCY msvc_wrapper.cpp
-                     DEPENDS wrapper.h device.h spirv_vars.h clang
+                     DEPENDS wrapper.h device.h spirv_vars.h clang clang-offload-bundler
                      VERBATIM)
 else()
   set(devicelib-obj-file ${binary_dir}/libsycl-glibc.o)
@@ -43,7 +43,7 @@ else()
                              ${CMAKE_CURRENT_SOURCE_DIR}/glibc_wrapper.cpp
                              -o ${devicelib-obj-file}
                      MAIN_DEPENDENCY glibc_wrapper.cpp
-                     DEPENDS wrapper.h device.h spirv_vars.h clang
+                     DEPENDS wrapper.h device.h spirv_vars.h clang clang-offload-bundler
                      VERBATIM)
 endif()
 
@@ -54,7 +54,7 @@ add_custom_command(OUTPUT ${devicelib-obj-complex}
                            ${CMAKE_CURRENT_SOURCE_DIR}/complex_wrapper.cpp
                            -o ${devicelib-obj-complex}
                    MAIN_DEPENDENCY complex_wrapper.cpp
-                   DEPENDS device_complex.h device.h clang
+                   DEPENDS device_complex.h device.h clang clang-offload-bundler
                    VERBATIM)
 
 set(devicelib-obj-complex-fp64 ${binary_dir}/libsycl-complex-fp64.o)
@@ -64,7 +64,7 @@ add_custom_command(OUTPUT ${devicelib-obj-complex-fp64}
                            ${CMAKE_CURRENT_SOURCE_DIR}/complex_wrapper_fp64.cpp
                            -o ${devicelib-obj-complex-fp64}
                    MAIN_DEPENDENCY complex_wrapper_fp64.cpp
-                   DEPENDS device_complex.h device.h clang
+                   DEPENDS device_complex.h device.h clang clang-offload-bundler
                    VERBATIM)
 
 set(devicelib-obj-cmath ${binary_dir}/libsycl-cmath.o)
@@ -74,7 +74,7 @@ add_custom_command(OUTPUT ${devicelib-obj-cmath}
                            ${CMAKE_CURRENT_SOURCE_DIR}/cmath_wrapper.cpp
                            -o ${devicelib-obj-cmath}
                    MAIN_DEPENDENCY cmath_wrapper.cpp
-                   DEPENDS device_math.h device.h clang
+                   DEPENDS device_math.h device.h clang clang-offload-bundler
                    VERBATIM)
 
 set(devicelib-obj-cmath-fp64 ${binary_dir}/libsycl-cmath-fp64.o)
@@ -84,7 +84,7 @@ add_custom_command(OUTPUT ${devicelib-obj-cmath-fp64}
                            ${CMAKE_CURRENT_SOURCE_DIR}/cmath_wrapper_fp64.cpp
                            -o ${devicelib-obj-cmath-fp64}
                    MAIN_DEPENDENCY cmath_wrapper_fp64.cpp
-                   DEPENDS device_math.h device.h clang
+                   DEPENDS device_math.h device.h clang clang-offload-bundler
                    VERBATIM)
 
 add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-cassert.spv
@@ -102,7 +102,7 @@ add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-cassert.o
                            ${CMAKE_CURRENT_SOURCE_DIR}/fallback-cassert.cpp
                            -o ${binary_dir}/libsycl-fallback-cassert.o
                    MAIN_DEPENDENCY fallback-cassert.cpp
-                   DEPENDS wrapper.h device.h clang spirv_vars.h
+                   DEPENDS wrapper.h device.h clang spirv_vars.h clang-offload-bundler
                    VERBATIM)
 
 add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-complex.spv
@@ -111,7 +111,7 @@ add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-complex.spv
                            ${CMAKE_CURRENT_SOURCE_DIR}/fallback-complex.cpp
                            -o ${binary_dir}/libsycl-fallback-complex.spv
                    MAIN_DEPENDENCY fallback-complex.cpp
-                   DEPENDS device_math.h device_complex.h device.h clang llvm-spirv
+                   DEPENDS device_math.h device_complex.h device.h clang llvm-spirv clang-offload-bundler
                    VERBATIM)
 
 add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-complex.o
@@ -120,7 +120,7 @@ add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-complex.o
                            ${CMAKE_CURRENT_SOURCE_DIR}/fallback-complex.cpp
                            -o ${binary_dir}/libsycl-fallback-complex.o
                    MAIN_DEPENDENCY fallback-complex.cpp
-                   DEPENDS device_math.h device_complex.h device.h clang
+                   DEPENDS device_math.h device_complex.h device.h clang clang-offload-bundler
                    VERBATIM)
 
 add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-complex-fp64.spv
@@ -138,7 +138,7 @@ add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-complex-fp64.o
                            ${CMAKE_CURRENT_SOURCE_DIR}/fallback-complex-fp64.cpp
                            -o ${binary_dir}/libsycl-fallback-complex-fp64.o
                    MAIN_DEPENDENCY fallback-complex-fp64.cpp
-                   DEPENDS device_math.h device_complex.h device.h clang
+                   DEPENDS device_math.h device_complex.h device.h clang clang-offload-bundler
                    VERBATIM)
 
 add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-cmath.spv
@@ -156,7 +156,7 @@ add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-cmath.o
                            ${CMAKE_CURRENT_SOURCE_DIR}/fallback-cmath.cpp
                            -o ${binary_dir}/libsycl-fallback-cmath.o
                    MAIN_DEPENDENCY fallback-cmath.cpp
-                   DEPENDS device_math.h device.h clang
+                   DEPENDS device_math.h device.h clang clang-offload-bundler
                    VERBATIM)
 
 add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-cmath-fp64.spv
@@ -174,7 +174,7 @@ add_custom_command(OUTPUT ${binary_dir}/libsycl-fallback-cmath-fp64.o
                            ${CMAKE_CURRENT_SOURCE_DIR}/fallback-cmath-fp64.cpp
                            -o ${binary_dir}/libsycl-fallback-cmath-fp64.o
                    MAIN_DEPENDENCY fallback-cmath-fp64.cpp
-                   DEPENDS device_math.h device.h clang
+                   DEPENDS device_math.h device.h clang clang-offload-bundler
                    VERBATIM)
 
 add_custom_target(libsycldevice-obj DEPENDS

sycl/doc/extensions/C-CXX-StandardLibrary/C-CXX-StandardLibrary.rst

@@ -280,6 +280,7 @@ Every set of functions is implemented in a separate fallback
 library. For example, a fallback for `cl_intel_devicelib_cassert`
 extension is provided as `libsycl-fallback-cassert.spv`
 
-For AOT compilation, fallback libraries are also provided as object
-files (e.g. `libsycl-fallback-cassert.o`). Device code in these object
-files is identical to the the `*.spv` files.
+For AOT compilation, fallback libraries are provided as object files
+(e.g. `libsycl-fallback-cassert.o`) which contain device code in LLVM
+IR format. Device code in these object files is equivalent to device
+code in the `*.spv` files.