Merge from 'sycl' to 'sycl-web'

Author: iclsrc

.github/CODEOWNERS

@@ -105,3 +105,12 @@ sycl/test-e2e/KernelFusion @victor-eds @Naghasan @sommerlukas
 
 # Matrix tests
 sycl/test-e2e/Matrix @dkhaldi @YuriPlyakhin @yubingex007-a11y
+
+# Native CPU
+llvm/**/*SYCLNativeCPU* @intel/dpcpp-nativecpu-pi-reviewers 
+clang/include/clang/Basic/SYCLNativeCPUHelpers.h @intel/dpcpp-nativecpu-pi-reviewers 
+clang/test/CodeGenSYCL/native_cpu*.cpp @intel/dpcpp-nativecpu-pi-reviewers 
+clang/test/Driver/sycl-native-cpu*.cpp @intel/dpcpp-nativecpu-pi-reviewers 
+sycl/**/native_cpu/ @intel/dpcpp-nativecpu-pi-reviewers
+sycl/doc/design/SYCLNativeCPU.md @intel/dpcpp-nativecpu-pi-reviewers
+sycl/include/sycl/detail/native_cpu.hpp @intel/dpcpp-nativecpu-pi-reviewers

.github/workflows/linux_matrix_e2e_on_nightly.yml

@@ -24,15 +24,15 @@ jobs:
             image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build
             extra_cmake_args: -DHIP_PLATFORM="AMD" -DAMD_ARCH="gfx1031"
             extra_image_opts: --device=/dev/kfd
-            target_devices: all
+            target_devices: ext_oneapi_hip:gpu
             reset_gpu: false
 
           - name: Intel
             runner: '["Linux", "gen9"]'
             image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest
             extra_cmake_args:
             extra_image_opts: -u 1001
-            target_devices: all
+            target_devices: ext_oneapi_level_zero:gpu;opencl:gpu;opencl:cpu
             reset_gpu: true
 
           - name: ESIMD Emu

.github/workflows/sycl_nightly.yml

@@ -11,6 +11,7 @@ on:
 
 jobs:
   test_matrix:
+    if: github.repository == 'intel/llvm'
     name: Generate Test Matrix
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:

.github/workflows/sycl_windows_build_and_test.yml

@@ -29,6 +29,8 @@ jobs:
     name: Build + LIT
     runs-on: [Windows, build]
     # TODO use cached checkout
+    outputs:
+      build_conclusion: ${{ steps.build.conclusion }}
     steps:
     - uses: ilammy/msvc-dev-cmd@7315a94840631165970262a99c72cfb48a65d25d
       with:
@@ -92,6 +94,7 @@ jobs:
       run: |
         cmake --build build --target check-libdevice
     - name: Install
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
       shell: bash
       # TODO replace utility installation with a single CMake target
       run: |
@@ -106,18 +109,21 @@ jobs:
         cmake --build build --target install-llvm-profdata
         cmake --build build --target install-compiler-rt
     - name: Pack toolchain
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
       shell: bash
       run: |
         tar -czf llvm_sycl.tar.gz -C install .
     - name: Upload toolchain
+      if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
       uses: actions/upload-artifact@v3
       with:
         name: sycl_windows_default
         path: llvm_sycl.tar.gz
 
   e2e-tests:
     needs: build
-    if: ${{ inputs.lts_matrix != '[]' }}
+    # Continue if build was successful.
+    if: ${{ always() && needs.build.outputs.build_conclusion == 'success' && inputs.lts_matrix != '[]' }}
     strategy:
       fail-fast: false
       matrix:

clang/include/clang/Driver/Options.td

@@ -3209,6 +3209,11 @@ def fsycl_max_parallel_jobs_EQ : Joined<["-"], "fsycl-max-parallel-link-jobs=">,
 def ftarget_compile_fast : Flag<["-"], "ftarget-compile-fast">,
   Flags<[CoreOption]>, HelpText<"Experimental feature: Reduce target "
   "compilation time, with potential runtime performance trade-off.">;
+def ftarget_export_symbols : Flag<["-"], "ftarget-export-symbols">,
+  Flags<[CoreOption]>, HelpText<"Expose exported symbols in a generated "
+  "target library to allow for visibilty to other modules.">;
+def fno_target_export_symbols : Flag<["-"], "fno-target-export-symbols">,
+  Flags<[CoreOption]>;
 def : Flag<["-"], "fsycl-rdc">, Flags<[CoreOption]>, Alias<fgpu_rdc>;
 def : Flag<["-"], "fno-sycl-rdc">, Flags<[CoreOption]>, Alias<fno_gpu_rdc>;
 def fsycl_optimize_non_user_code : Flag<["-"], "fsycl-optimize-non-user-code">,

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -991,9 +991,12 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
       CmdArgs.push_back(Args.MakeArgString(DepInfo));
     }
     // -ftarget-compile-fast AOT
-    if (Args.hasArg(options::OPT_ftarget_compile_fast)) {
+    if (Args.hasArg(options::OPT_ftarget_compile_fast))
       BeArgs.push_back("-igc_opts 'PartitionUnit=1,SubroutineThreshold=50000'");
-    }
+    // -ftarget-export-symbols
+    if (Args.hasFlag(options::OPT_ftarget_export_symbols,
+                     options::OPT_fno_target_export_symbols, false))
+      BeArgs.push_back("-library-compilation");
   } else if (Triple.getSubArch() == llvm::Triple::NoSubArch &&
              Triple.isSPIR()) {
     // -ftarget-compile-fast JIT

clang/test/Driver/ftarget-export-symbols.cpp

@@ -0,0 +1,29 @@
+// Test -ftarget-export-symbols behavior
+
+// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl \
+// RUN:    -fsycl-targets=spir64_gen -ftarget-export-symbols %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=TARGET_EXPORT %s
+// RUN: %clang_cl -### --target=x86_64-pc-windows-msvc -fsycl \
+// RUN:     -fsycl-targets=spir64_gen -ftarget-export-symbols %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=TARGET_EXPORT %s
+// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl \
+// RUN:    -fsycl-targets=spir64_gen -ftarget-export-symbols \
+// RUN:    -fno-target-export-symbols %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=NO_TARGET_EXPORT %s
+
+// TARGET_EXPORT: ocloc{{.*}} "-output"
+// TARGET_EXPORT: "-options" "-library-compilation"
+// NO_TARGET_EXPORT-NOT: "-library-compilation"
+
+// 'unused' for non-spir64_gen targets
+// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl \
+// RUN:    -fsycl-targets=spir64 -ftarget-export-symbols %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=UNUSED %s
+// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl \
+// RUN:    -fsycl-targets=spir64_x86_64 -ftarget-export-symbols %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=UNUSED %s
+// RUN: %clang -### -target x86_64-unknown-linux-gnu -fsycl \
+// RUN:    -fsycl-targets=spir64_fpga -ftarget-export-symbols %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=UNUSED %s
+
+// UNUSED: argument unused during compilation: '-ftarget-export-symbols'

devops/dependencies.json

@@ -1,15 +1,15 @@
 {
   "linux": {
     "compute_runtime": {
-      "github_tag": "23.09.25812.14",
-      "version": "23.09.25812.14",
-      "url": "https://github.com/intel/compute-runtime/releases/tag/23.09.25812.14",
+      "github_tag": "23.13.26032.30",
+      "version": "23.13.26032.30",
+      "url": "https://github.com/intel/compute-runtime/releases/tag/23.13.26032.30",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "igc": {
-      "github_tag": "igc-1.0.13463.18",
-      "version": "1.0.13463.18",
-      "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.13463.18",
+      "github_tag": "igc-1.0.13700.14",
+      "version": "1.0.13700.14",
+      "url": "https://github.com/intel/intel-graphics-compiler/releases/tag/igc-1.0.13700.14",
       "root": "{DEPS_ROOT}/opencl/runtime/linux/oclgpu"
     },
     "cm": {
@@ -74,4 +74,4 @@
       "root": "{ARCHIVE_ROOT}/comp/oclfpga/win"
     }
   }
-}
+}