Merge from 'sycl' to 'sycl-web'

Author: iclsrc

devops/actions/clang-format/action.yml

@@ -6,6 +6,7 @@ runs:
   - name: Run clang-format for the patch
     shell: bash {0}
     run: |
+      git config --global --add safe.directory /__w/llvm/llvm
       git clang-format ${GITHUB_SHA}^1
       git diff > ./clang-format.patch
   # Add patch with formatting fixes to CI job artifacts

devops/actions/llvm_test_suite/action.yml

@@ -33,7 +33,9 @@ post-if: false
 runs:
   using: "composite"
   steps:
-  - run: cp -r /actions .
+  - run: |
+      cp -r /actions .
+      git config --global --add safe.directory /__w/repo_cache/intel/llvm-test-suite
     shell: bash
   - name: Checkout LLVM Test Suite
     uses: ./actions/cached_checkout

sycl/include/CL/sycl/detail/stl_type_traits.hpp

@@ -78,12 +78,6 @@ struct is_output_iterator<T, output_iterator_requirements<T>> {
   static constexpr bool value = true;
 };
 
-template <typename T, typename U>
-inline constexpr bool is_same_v = std::is_same<T, U>::value;
-
-template <typename T, typename U>
-inline constexpr bool is_convertible_v = std::is_convertible<T, U>::value;
-
 } // namespace detail
 } // namespace sycl
 } // __SYCL_INLINE_NAMESPACE(cl)

sycl/include/CL/sycl/handler.hpp

@@ -927,14 +927,11 @@ class __SYCL_EXPORT handler {
   }
 
   template <int Dims, typename LambdaArgType> struct TransformUserItemType {
-    using type = typename std::conditional_t<
-        detail::is_same_v<id<Dims>, LambdaArgType>, LambdaArgType,
-        typename std::conditional_t<
-            detail::is_convertible_v<nd_item<Dims>, LambdaArgType>,
-            nd_item<Dims>,
-            typename std::conditional_t<
-                detail::is_convertible_v<item<Dims>, LambdaArgType>, item<Dims>,
-                LambdaArgType>>>;
+    using type = typename std::conditional<
+        std::is_convertible<nd_item<Dims>, LambdaArgType>::value, nd_item<Dims>,
+        typename std::conditional<
+            std::is_convertible<item<Dims>, LambdaArgType>::value, item<Dims>,
+            LambdaArgType>::type>::type;
   };
 
   /// Defines and invokes a SYCL kernel function for the specified range.

sycl/test/basic_tests/parallel_for_type_check.cpp

@@ -1,6 +1,7 @@
 // RUN: %clangxx -fsycl -fsycl-device-only -D__SYCL_INTERNAL_API -O0 -c -emit-llvm -S -o - %s | FileCheck %s
 
 // This test performs basic type check for sycl::id that is used in result type.
+// Check that sycl::id is converted from sycl::item.
 
 #include <CL/sycl.hpp>
 #include <iostream>
@@ -21,7 +22,7 @@ int main() {
     auto buf_acc = data_buf.get_access<sycl::access::mode::read_write>(h);
     h.parallel_for(
         sycl::range<1>{sz},
-        // CHECK: cl{{.*}}sycl{{.*}}detail{{.*}}RoundedRangeKernel{{.*}}id{{.*}}main{{.*}}handler
+        // CHECK: cl{{.*}}sycl{{.*}}detail{{.*}}RoundedRangeKernel{{.*}}item{{.*}}main{{.*}}handler
         [=](sycl::id<1> item) { buf_acc[item] += 1; });
   });
   q.wait();