Merge remote-tracking branch 'origin/sycl' into host_prof_pr

Author: againull

clang/test/Driver/sycl-post-link-options.cpp

@@ -21,3 +21,11 @@
 // RUN:   --sycl-post-link-options="-O2 -device-globals -O0" \
 // RUN:   --linker-path=/usr/bin/ld %t.o -o a.out 2>&1 | FileCheck --check-prefix OPTIONS_POSTLINK_JIT_NEW %s
 // OPTIONS_POSTLINK_JIT_NEW: sycl-post-link{{.*}} -spec-const=native -properties -split=auto -emit-only-kernels-as-entry-points -emit-param-info -symbols -emit-exported-symbols -emit-imported-symbols -split-esimd -lower-esimd -O2 -device-globals -O0
+//
+// Run clang-linker-wrapper test for generating SYCLBIN files.
+//
+// RUN: clang-linker-wrapper --dry-run --host-triple=x86_64-unknown-linux-gnu \
+// RUN:   -syclbin=executable -sycl-device-libraries=%t.devicelib.o \
+// RUN:   --sycl-post-link-options="-O2 -device-globals -O0" \
+// RUN:   --linker-path=/usr/bin/ld %t.o -o a.out 2>&1 | FileCheck --check-prefix OPTIONS_POSTLINK_JIT_NEW_SYCLBIN %s
+// OPTIONS_POSTLINK_JIT_NEW_SYCLBIN: sycl-post-link{{.*}} -spec-const=native -properties -split=auto -emit-only-kernels-as-entry-points -emit-param-info -symbols -emit-kernel-names -emit-exported-symbols -emit-imported-symbols -split-esimd -lower-esimd -O2 -device-globals -O0

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

@@ -694,6 +694,9 @@ getTripleBasedSYCLPostLinkOpts(const ArgList &Args,
                    OPT_no_sycl_device_code_split_esimd, SplitEsimdByDefault);
   if (!Args.hasArg(OPT_sycl_thin_lto))
     PostLinkArgs.push_back("-symbols");
+  // Emit kernel names if we are producing SYCLBIN.
+  if (Args.hasArg(OPT_syclbin_EQ))
+    PostLinkArgs.push_back("-emit-kernel-names");
   // Specialization constant info generation is mandatory -
   // add options unconditionally
   PostLinkArgs.push_back("-emit-exported-symbols");

libclc/CMakeLists.txt

@@ -489,17 +489,12 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
       set( MACRO_ARCH ${ARCH} )
     endif()
 
-    # Enable SPIR-V builtin function declarations, so they don't
-    # have to be explicity declared in the soruce.
-    list( APPEND build_flags -Xclang -fdeclare-spirv-builtins)
     set( LIBCLC_ARCH_OBJFILE_DIR "${LIBCLC_OBJFILE_DIR}/${arch_suffix}" )
     file( MAKE_DIRECTORY ${LIBCLC_ARCH_OBJFILE_DIR} )
 
     # OpenCL 3.0 extensions
     string(CONCAT CL_3_0_EXTENSIONS
       "-cl-ext="
-      "+cl_khr_fp64,"
-      "+cl_khr_fp16,"
       "+__opencl_c_3d_image_writes,"
       "+__opencl_c_images,"
       "+cl_khr_3d_image_writes")
@@ -573,10 +568,11 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
     if( BUILD_LIBSPIRV_${t} )
       set( spirv_build_flags ${build_flags} )
       list( APPEND spirv_build_flags
+        # Enable SPIR-V builtin function declarations, so they don't have to be
+        # explicity declared in the soruce.
+        -Xclang -fdeclare-spirv-builtins
         -I${CMAKE_CURRENT_SOURCE_DIR}/opencl/include
         -I${CMAKE_CURRENT_SOURCE_DIR}/libspirv/include/
-        # FIXME: Fix libspirv to not require disabling this noisy warning
-        -Wno-bitwise-conditional-parentheses
       )
 
       add_libclc_builtin_set(

libclc/libspirv/lib/generic/SOURCES

@@ -67,9 +67,6 @@ math/cbrt.cl
 math/ceil.cl
 math/clc_exp10.cl
 math/clc_fmod.cl
-math/clc_pow.cl
-math/clc_pown.cl
-math/clc_powr.cl
 math/clc_remainder.cl
 math/clc_remquo.cl
 math/clc_rootn.cl