Merge remote-tracking branch 'origin/sycl' into sycl-max-wg-size-kernel-props-conflicts

Author: frasercrmck

.github/workflows/sycl-docs.yml

@@ -10,13 +10,21 @@ on:
     - '.github/workflows/sycl-docs.yml'
     - 'clang/docs/**'
     - 'sycl/doc/**'
+  push:
+    branches:
+    - sycl
+    paths:
+    - '.github/workflows/sycl-docs.yml'
+    - 'clang/docs/**'
+    - 'sycl/doc/**'
 
-permissions: read-all
+permissions:
+  contents: read
+  pages: write
+  id-token: write
 
 jobs:
   build:
-    permissions:
-      contents: write  # for Git to git push
     runs-on: ubuntu-latest
     if: github.repository == 'intel/llvm'
     steps:
@@ -35,24 +43,18 @@ jobs:
         -s $GITHUB_WORKSPACE/repo -o $GITHUB_WORKSPACE/build -t Release --docs
         cmake --build . --target docs-sycl-html
         cmake --build . --target docs-clang-html
-    - name: Deploy
-      if: ${{ github.event_name == 'schedule' }}
-      env:
-        SSH_KEY: ${{secrets.ACTIONS_DEPLOY_KEY}}
-      run: |
-        mkdir -p ~/.ssh
-        echo "$SSH_KEY" > ~/.ssh/id_rsa
-        chmod 600 ~/.ssh/id_rsa
-        eval "$(ssh-agent -s)"
-        ssh-add -k ~/.ssh/id_rsa
-        git clone [email protected]:intel/llvm-docs.git docs
-        cd $GITHUB_WORKSPACE/docs
-        git rm -rf .
+        # Copy the generated docs to a separate directory for uploading.
+        mkdir $GITHUB_WORKSPACE/install_docs
+        cd $GITHUB_WORKSPACE/install_docs
+        mkdir clang
+        mv $GITHUB_WORKSPACE/build/tools/sycl/doc/html/* .
+        mv $GITHUB_WORKSPACE/build/tools/clang/docs/html/* clang/
         touch .nojekyll
-        yes | \cp -rf $GITHUB_WORKSPACE/build/tools/sycl/doc/html/* .
-        mv $GITHUB_WORKSPACE/build/tools/clang/docs/html clang/
-        git config --global user.name "iclsrc"
-        git config --global user.email "[email protected]"
-        git add .
-        git diff-index --quiet HEAD || git commit --amend -m "Update docs" -s
-        git push -f
+    # Upload the generated docs as an artifact and deploy to GitHub Pages.
+    - name: Upload artifact
+      uses: actions/upload-pages-artifact@v3
+      with:
+        path: ./install_docs
+    - name: Deploy to GitHub Pages
+      if: ${{ github.event_name == 'push' }}
+      uses: actions/deploy-pages@v4

.github/workflows/sycl-linux-precommit.yml

@@ -116,8 +116,16 @@ jobs:
       extra_lit_opts: ${{ matrix.extra_lit_opts }}
       env: ${{ matrix.env || '{}' }}
 
-      install_igc_driver: ${{ contains(needs.detect_changes.outputs.filters, 'drivers') }}
-      install_dev_igc_driver: ${{ matrix.use_igc_dev && contains(needs.detect_changes.outputs.filters, 'devigccfg') || 'false' }}
+      # Do not install drivers on AMD and CUDA runners.
+      install_igc_driver: |
+        ${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
+        !contains(matrix.target_devices, 'ext_oneapi_hip') &&
+        contains(needs.detect_changes.outputs.filters, 'drivers') }}
+      install_dev_igc_driver: |
+        ${{ !contains(matrix.target_devices, 'ext_oneapi_cuda') &&
+        !contains(matrix.target_devices, 'ext_oneapi_hip') &&
+        matrix.use_igc_dev && contains(needs.detect_changes.outputs.filters, 'devigccfg') ||
+        'false' }}
       # Run only if the PR does not have the 'ci-no-devigc' label.
       skip_run: ${{matrix.use_igc_dev && contains(github.event.pull_request.labels.*.name, 'ci-no-devigc') || 'false'}}
 

README.md

@@ -42,7 +42,7 @@ source project. One of the examples is
 Features parity between this project and downstream projects is not guaranteed.
 
 Project documentation is available at:
-[DPC++ Documentation](https://intel.github.io/llvm-docs/).
+[DPC++ Documentation](https://intel.github.io/llvm/).
 
 ### How to use DPC++
 

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -12433,6 +12433,12 @@ def err_sycl_kernel_incorrectly_named : Error<
   "'-fsycl-unnamed-lambda' to enable unnamed kernel lambdas"
   "}0">;
 
+// SYCL free function kernels extension.
+def note_free_function_kernel_param_type_not_fwd_declarable : Note<
+  "%0 is not forward declarable">;
+def note_free_function_kernel_param_type_not_supported : Note<
+  "%0 is not yet supported as a free function kernel parameter">;
+
 def err_sycl_kernel_not_function_object
     : Error<"kernel parameter must be a lambda or function object">;
 def err_sycl_restrict : Error<

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -1815,22 +1815,18 @@ void SYCLToolChain::AddSYCLIncludeArgs(const clang::driver::Driver &Driver,
                                        const ArgList &DriverArgs,
                                        ArgStringList &CC1Args) {
   // Add the SYCL header search locations in the specified order.
-  //   ../include/sycl
   //   ../include/sycl/stl_wrappers
   //   ../include
   SmallString<128> IncludePath(Driver.Dir);
   llvm::sys::path::append(IncludePath, "..");
   llvm::sys::path::append(IncludePath, "include");
-  SmallString<128> SYCLPath(IncludePath);
-  llvm::sys::path::append(SYCLPath, "sycl");
   // This is used to provide our wrappers around STL headers that provide
   // additional functions/template specializations when the user includes those
   // STL headers in their programs (e.g., <complex>).
-  SmallString<128> STLWrappersPath(SYCLPath);
+  SmallString<128> STLWrappersPath(IncludePath);
+  llvm::sys::path::append(STLWrappersPath, "sycl");
   llvm::sys::path::append(STLWrappersPath, "stl_wrappers");
   CC1Args.push_back("-internal-isystem");
-  CC1Args.push_back(DriverArgs.MakeArgString(SYCLPath));
-  CC1Args.push_back("-internal-isystem");
   CC1Args.push_back(DriverArgs.MakeArgString(STLWrappersPath));
   CC1Args.push_back("-internal-isystem");
   CC1Args.push_back(DriverArgs.MakeArgString(IncludePath));