Merge from 'sycl' to 'sycl-web'

Author: iclsrc

.github/CODEOWNERS

@@ -18,6 +18,9 @@ opencl/ @intel/llvm-reviewers-runtime
 # OpenCL "offline" compiler
 opencl/opencl-aot/ @intel/dpcpp-tools-reviewers
 
+# libclc library
+libclc/ @intel/llvm-reviewers-cuda
+
 # Device library
 libdevice/ @intel/llvm-reviewers-runtime
 

.github/workflows/sycl_nightly.yml

@@ -60,13 +60,3 @@ jobs:
         tags: |
           ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
           ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
-  ubuntu2004_build_test_new_pm:
-    # Default Linux building and LIT testing using new Pass Manager by default
-    if: github.repository == 'intel/llvm'
-    uses: ./.github/workflows/sycl_linux_build_and_test.yml
-    with:
-      build_cache_root: "/__w/"
-      build_cache_suffix: new_pm
-      build_artifact_suffix: new_pm
-      build_configure_extra_args: '--hip --cuda --cmake-opt=-DLLVM_ENABLE_NEW_PASS_MANAGER=ON'
-      lts_config: "hip_amdgpu;ocl_x64"

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -3299,6 +3299,10 @@ def err_attribute_argument_is_zero : Error<
 def warn_attribute_argument_n_negative : Warning<
   "%0 attribute parameter %1 is negative and will be ignored">,
   InGroup<CudaCompat>;
+def warn_reqd_sub_group_attribute_cuda_n_32
+    : Warning<"attribute argument %0 is invalid and will be ignored; CUDA "
+              "requires sub_group size 32">,
+      InGroup<CudaCompat>;
 def err_property_function_in_objc_container : Error<
   "use of Objective-C property in function nested in Objective-C "
   "container not supported, move function outside its container">;

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3894,6 +3894,10 @@ void Sema::AddIntelReqdSubGroupSize(Decl *D, const AttributeCommonInfo &CI,
           << CI << /*positive*/ 0;
       return;
     }
+    if (Context.getTargetInfo().getTriple().isNVPTX() && ArgVal != 32) {
+      Diag(E->getExprLoc(), diag::warn_reqd_sub_group_attribute_cuda_n_32)
+          << ArgVal.getSExtValue();
+    }
 
     // Check to see if there's a duplicate attribute with different values
     // already applied to the declaration.

clang/test/SemaSYCL/reqd-sub-group-size-cuda.cpp

@@ -0,0 +1,20 @@
+// RUN: %clang_cc1 -fsycl-is-device -triple nvptx -internal-isystem %S/Inputs -std=c++2b -verify %s
+//
+// This tests that a warning is returned when a sub group size other than 32 is
+// requested in the CUDA backend via the reqd_sub_group_size() kernel attribute.
+#include "sycl.hpp"
+
+int main() {
+
+  sycl::queue Q;
+
+  Q.submit([&](sycl::handler &h) {
+    h.single_task<class invalid_kernel>([=] [[sycl::reqd_sub_group_size(8)]] {}); // expected-warning {{attribute argument 8 is invalid and will be ignored; CUDA requires sub_group size 32}}
+  });
+
+  Q.submit([&](sycl::handler &h) {
+    h.single_task<class valid_kernel>([=] [[sycl::reqd_sub_group_size(32)]] {});
+  });
+
+  return 0;
+}

devops/dependencies.json

@@ -42,15 +42,15 @@
   },
   "linux_staging": {
     "compute_runtime": {
-      "github_tag": "22.15.22905",
-      "version": "22.15.22905",
-      "url": "https://github.com/intel/compute-runtime/releases/tag/22.15.22905",
+      "github_tag": "22.21.23269",
+      "version": "22.21.23269",
+      "url": "https://github.com/intel/compute-runtime/releases/tag/22.21.23269",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "igc": {
-      "github_tag": "igc-1.0.10840",
-      "version": "1.0.10840",
-      "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.10840",
+      "github_tag": "igc-1.0.11279",
+      "version": "1.0.11279",
+      "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.11279",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "cm": {
@@ -109,4 +109,4 @@
       "root": "{ARCHIVE_ROOT}/comp/oclfpga/win"
     }
   }
-}
+}

llvm-spirv/.github/workflows/check-code-style.yml

@@ -11,7 +11,7 @@ name: Check code style
 on:
   pull_request:
     branches:
-      - master
+      - main
       - llvm_release_*
     paths-ignore: # no need to check formatting for:
       - 'docs/**' # documentation
@@ -63,7 +63,8 @@ jobs:
         sudo apt-get update
         sudo apt-get install -yqq \
             clang-format-${{ env.LLVM_VERSION }} clang-tidy-${{ env.LLVM_VERSION }} \
-            llvm-${{ env.LLVM_VERSION }}-dev libomp-${{ env.LLVM_VERSION }}-dev
+            llvm-${{ env.LLVM_VERSION }}-dev libomp-${{ env.LLVM_VERSION }}-dev \
+            mlir-${{ env.LLVM_VERSION }}-tools \
 
     - name: Generate compile command database
       if: ${{ steps.gather-list-of-changes.outputs.HAS_CHANGES }}

llvm-spirv/.github/workflows/check-in-tree-build.yml

@@ -9,7 +9,7 @@ name: In-tree build & tests
 on:
   push:
     branches:
-      - master
+      - main
       - llvm_release_*
     paths-ignore: # no need to check build for:
       - 'docs/**' # documentation
@@ -18,7 +18,7 @@ on:
       - '**/check-out-of-tree-build.yml' # check-out-of-tree-build workflow
   pull_request:
     branches:
-      - master
+      - main
       - llvm_release_*
     paths-ignore: # no need to check build for:
       - 'docs/**' # documentation

llvm-spirv/.github/workflows/check-out-of-tree-build.yml

@@ -9,7 +9,7 @@ name: Out-of-tree build & tests
 on:
   push:
     branches:
-      - master
+      - main
       - llvm_release_*
     paths-ignore: # no need to check build for:
       - 'docs/**' # documentation
@@ -18,7 +18,7 @@ on:
       - '**/check-in-tree-build.yml' # check-in-tree-build workflow
   pull_request:
     branches:
-      - master
+      - main
       - llvm_release_*
     paths-ignore: # no need to check build for:
       - 'docs/**' # documentation
@@ -52,6 +52,7 @@ jobs:
             llvm-${{ env.LLVM_VERSION }}-dev \
             libomp-${{ env.LLVM_VERSION }}-dev \
             llvm-${{ env.LLVM_VERSION }}-tools \
+            mlir-${{ env.LLVM_VERSION }}-tools \
             spirv-tools
           # Linux systems in GitHub Actions already have older versions of clang
           # pre-installed. Make sure to override these with the relevant version.

llvm-spirv/CONTRIBUTING.md

@@ -106,6 +106,6 @@ it can be merged:
 [json grammar file]: https://github.com/KhronosGroup/SPIRV-Headers/blob/master/include/spirv/unified1/spirv.core.grammar.json
 [instructions]: https://github.com/KhronosGroup/SPIRV-Headers#generating-headers-from-the-json-grammar-for-the-spir-v-core-instruction-set
 [SPIR-V Headers repository]: https://github.com/KhronosGroup/SPIRV-Headers
-[internal SPIR-V header file]: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/master/lib/SPIRV/libSPIRV/spirv_internal.hpp
+[internal SPIR-V header file]: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/blob/main/lib/SPIRV/libSPIRV/spirv_internal.hpp
 [Contributor License Agreement]: https://cla-assistant.io/KhronosGroup/SPIRV-LLVM-Translator
 [Travis CI testing]: https://travis-ci.org/KhronosGroup/SPIRV-LLVM-Translator