Merge from 'sycl' to 'sycl-web'

Author: iclsrc

opencl/CMakeLists.txt

@@ -21,7 +21,7 @@ set(OCL_LOADER_REPO
 # Repo tags/hashes
 
 set(OCL_HEADERS_TAG dcd5bede6859d26833cd85f0d6bbcee7382dc9b3)
-set(OCL_LOADER_TAG 5f8249691ec8c25775789498951f8e9eb62c201d)
+set(OCL_LOADER_TAG 5d9177ee79bfbcc75ee9a8cff6415eab2c3113f6)
 
 # OpenCL Headers
 if(NOT OpenCL_HEADERS)

sycl/include/CL/sycl/kernel_handler.hpp

@@ -23,7 +23,7 @@ class kernel_handler {
 public:
 #if __cplusplus >= 201703L
   template <auto &S>
-  typename std::remove_reference_t<decltype(S)>::value_type
+  __SYCL_ALWAYS_INLINE typename std::remove_reference_t<decltype(S)>::value_type
   get_specialization_constant() {
 #ifdef __SYCL_DEVICE_ONLY__
     return getSpecializationConstantOnDevice<S>();
@@ -49,7 +49,7 @@ class kernel_handler {
       auto &S,
       typename T = typename std::remove_reference_t<decltype(S)>::value_type,
       std::enable_if_t<std::is_fundamental_v<T>> * = nullptr>
-  T getSpecializationConstantOnDevice() {
+  __SYCL_ALWAYS_INLINE T getSpecializationConstantOnDevice() {
     const char *SymbolicID = __builtin_sycl_unique_stable_id(S);
     return __sycl_getScalar2020SpecConstantValue<T>(
         SymbolicID, &S, MSpecializationConstantsBuffer);
@@ -58,7 +58,7 @@ class kernel_handler {
       auto &S,
       typename T = typename std::remove_reference_t<decltype(S)>::value_type,
       std::enable_if_t<std::is_compound_v<T>> * = nullptr>
-  T getSpecializationConstantOnDevice() {
+  __SYCL_ALWAYS_INLINE T getSpecializationConstantOnDevice() {
     const char *SymbolicID = __builtin_sycl_unique_stable_id(S);
     return __sycl_getComposite2020SpecConstantValue<T>(
         SymbolicID, &S, MSpecializationConstantsBuffer);

sycl/source/detail/queue_impl.cpp

@@ -201,7 +201,7 @@ void *queue_impl::instrumentationProlog(const detail::code_location &CodeLoc,
   xpti::utils::StringHelper NG;
   Name = NG.nameWithAddress<queue_impl *>("queue.wait", this);
 
-  if (!CodeLoc.fileName()) {
+  if (CodeLoc.fileName()) {
     // We have source code location information
     Payload =
         xpti::payload_t(Name.c_str(), CodeLoc.fileName(), CodeLoc.lineNumber(),
@@ -236,7 +236,9 @@ void *queue_impl::instrumentationProlog(const detail::code_location &CodeLoc,
       xpti::addMetadata(WaitEvent, "sym_function_name", CodeLoc.functionName());
       xpti::addMetadata(WaitEvent, "sym_source_file_name", CodeLoc.fileName());
       xpti::addMetadata(WaitEvent, "sym_line_no",
-                        std::to_string(CodeLoc.lineNumber()));
+                        static_cast<int32_t>((CodeLoc.lineNumber())));
+      xpti::addMetadata(WaitEvent, "sym_column_no",
+                        static_cast<int32_t>((CodeLoc.columnNumber())));
     }
     xptiNotifySubscribers(StreamID, xpti::trace_wait_begin, nullptr, WaitEvent,
                           QWaitInstanceNo,

sycl/test/regression/spec_const_O0.cpp

@@ -0,0 +1,19 @@
+// RUN: %clangxx -O0 -fsycl -fsycl-device-only -Xclang -emit-llvm %s -o - | FileCheck %s
+// This test checks that even under -O0 the entire call chain starting from
+// kh.get_specialization_constant and ending with
+// __sycl_getScalar2020SpecConstantValue gets inlined.
+#include <CL/sycl.hpp>
+
+using namespace cl::sycl;
+
+constexpr specialization_id<unsigned int> SPEC_CONST(1024);
+
+SYCL_EXTERNAL unsigned int foo(kernel_handler &kh) {
+  return kh.get_specialization_constant<SPEC_CONST>();
+}
+
+// CHECK-LABEL: define dso_local spir_func noundef i32 @_Z3foo{{.*}} {
+// CHECK-NOT: {{.*}}spir_func
+// CHECK: %{{.*}} = {{.*}}call spir_func {{.*}}i32 @_Z37__sycl_getScalar2020SpecConstantValue
+// CHECK-NOT: {{.*}}spir_func
+// CHECK-LABEL: }