Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown

 Conflicts:
	clang/lib/Driver/ToolChains/SYCL.cpp
	llvm/lib/Target/SPIRV/SPIRVAsmPrinter.cpp
	llvm/lib/Target/SPIRV/SPIRVSymbolicOperands.td

Author: jsji

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

@@ -209,6 +209,7 @@ jobs:
       id: build
       # Emulate default value for manual dispatch as we've run out of available arguments.
       run: cmake --build $GITHUB_WORKSPACE/build --target ${{ inputs.build_target || 'sycl-toolchain' }}
+    - run: $GITHUB_WORKSPACE/build/bin/clang++ --version
     - name: check-llvm
       if: ${{ !cancelled() && contains(inputs.changes, 'llvm') }}
       env:

.github/workflows/sycl-nightly.yml

@@ -23,13 +23,22 @@ jobs:
         git diff --exit-code -I "^# RUN" origin/sycl-rel-6_3:sycl/test/abi/sycl_symbols_linux.dump sycl/test/abi/sycl_symbols_linux-sycl-rel-6_3.dump
         git diff --exit-code -I "^# RUN" origin/sycl-rel-6_3:sycl/test/abi/sycl_symbols_windows.dump sycl/test/abi/sycl_symbols_windows-sycl-rel-6_3.dump
 
+  get_date:
+    runs-on: ubuntu-latest
+    outputs:
+      date: ${{ steps.get_date.outputs.date }}
+    steps:
+    - id: get_date
+      run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
   ubuntu2204_build:
+    needs: get_date
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl-linux-build.yml
     secrets: inherit
     with:
       build_cache_root: "/__w/"
-      build_configure_extra_args: '--hip --cuda'
+      build_configure_extra_args: '--hip --cuda -DSYCL_BUILD_INFO="Nightly ${{ needs.get_date.outputs.date }}"'
       build_image: ghcr.io/intel/llvm/ubuntu2204_build:latest
 
       retention-days: 90
@@ -189,6 +198,7 @@ jobs:
       toolchain_decompress_command: ${{ needs.ubuntu2404_oneapi_build.outputs.toolchain_decompress_command }}
 
   build-win:
+    needs: get_date
     uses: ./.github/workflows/sycl-windows-build.yml
     if: github.repository == 'intel/llvm'
     with:
@@ -197,7 +207,7 @@ jobs:
       # functionality, make sure Linux/Windows names follow the same pattern.
       toolchain_artifact_filename: sycl_windows.tar.gz
       # Disable the spirv-dis requirement as to not require SPIR-V Tools.
-      build_configure_extra_args: -DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off
+      build_configure_extra_args: -DLLVM_SPIRV_ENABLE_LIBSPIRV_DIS=off -DSYCL_BUILD_INFO="Nightly ${{ needs.get_date.outputs.date }}"
       build_target: all
 
   e2e-win:
@@ -215,7 +225,7 @@ jobs:
             target_devices: level_zero:gpu
 
           - name: Intel L0 Arc GPU
-            runner: '["Windows", arc"]'
+            runner: '["Windows", "arc"]'
             target_devices: level_zero:gpu
 
           - name: Intel L0 Battlemage GPU
@@ -358,7 +368,7 @@ jobs:
   nightly_build_upload:
     name: Nightly Build Upload
     if: ${{ github.ref_name == 'sycl' }}
-    needs: [ubuntu2204_build, build-win]
+    needs: [get_date, ubuntu2204_build, build-win]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -378,10 +388,10 @@ jobs:
       id: tag
       run: |
         if [ "${{ github.event_name == 'schedule' }}" == "true" ]; then
-          echo "TAG=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
+          echo "TAG=${{ needs.get_date.outputs.date }}" >> "$GITHUB_OUTPUT"
         else
           # TODO: Use date of the commit?
-          echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
+          echo "TAG=${{ needs.get_date.outputs.date }}-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
         fi
     - name: Upload binaries
       uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1

.github/workflows/sycl-ur-perf-benchmarking.yml

@@ -5,8 +5,8 @@ name: SYCL Run Benchmarks
 
 on:
   schedule:
-    # 3 hours ahead of SYCL nightly
-    - cron: '0 0 * * *'
+    # 2 hours after SYCL nightly
+    - cron: '0 5 * * *'
   # Run on pull requests only when a benchmark-related files were changed.
   pull_request:
     # These paths are exactly the same as in sycl-linux/windows-precommit.yml (to ignore over there)
@@ -238,30 +238,14 @@ jobs:
       toolchain_decompress_command: ${{ needs.build_nightly.outputs.toolchain_decompress_command }}
   # END nightly benchmarking path
 
-  # Benchmark framework builds and runs on PRs path:
-  build_pr:
-    name: '[PR] Build SYCL'
-    if: github.event_name == 'pull_request'
-    uses: ./.github/workflows/sycl-linux-build.yml
-    with:
-      build_ref: ${{ github.sha }}
-      build_cache_root: "/__w/"
-      build_cache_suffix: "default"
-      # Docker image has last nightly pre-installed and added to the PATH
-      build_image: "ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest"
-      cc: clang
-      cxx: clang++
-      changes: '[]'
-      toolchain_artifact: sycl_linux_default
-
+  # BEGIN benchmark framework builds and runs on PRs path
   # TODO: When we have stable BMG runner(s), consider moving this job to that runner.
   test_benchmark_framework:
     name: '[PR] Benchmark suite testing'
-    needs: [build_pr]
     permissions:
       contents: write
       packages: read
-    if: ${{ !cancelled() && needs.build_pr.outputs.build_conclusion == 'success' }}
+    if: github.event_name == 'pull_request'
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: 'Framework test: PVC_PERF, L0, Minimal preset'
@@ -275,7 +259,4 @@ jobs:
       benchmark_dry_run: true
       benchmark_exit_on_failure: true
       repo_ref: ${{ github.sha }}
-      toolchain_artifact: ${{ needs.build_pr.outputs.toolchain_artifact }}
-      toolchain_artifact_filename: ${{ needs.build_pr.outputs.toolchain_artifact_filename }}
-      toolchain_decompress_command: ${{ needs.build_pr.outputs.toolchain_decompress_command }}
   # END benchmark framework builds and runs on PRs path

.github/workflows/sycl-windows-build.yml

@@ -159,6 +159,7 @@ jobs:
       shell: bash
       run: |
         cmake --build build --target ${{ inputs.build_target }}
+    - run: build/bin/clang++ --version
     - name: check-llvm
       if: ${{ !cancelled() && contains(inputs.changes, 'llvm') }}
       shell: bash

buildbot/configure.py

@@ -32,7 +32,7 @@ def do_configure(args, passthrough_args):
     libclc_nvidia_target_names = ";nvptx64--nvidiacl"
 
     sycl_enable_jit = "OFF"
-    if not args.disable_jit:
+    if not args.disable_jit and sys.platform != "darwin":
         llvm_external_projects += ";sycl-jit"
         sycl_enable_jit = "ON"
 

clang/include/clang/Basic/Version.h

@@ -66,6 +66,9 @@ namespace clang {
   /// the CL_SYCL_LANGUAGE_VERSION and SYCL_LANGUAGE_VERSION macros.
   llvm::SmallVector<std::pair<llvm::StringRef, llvm::StringRef>, 2>
   getSYCLVersionMacros(const LangOptions &LangOpts);
+
+  /// Retrieves a string representing the Intel SYCL compiler build info.
+  std::string getSYCLBuildInfo();
 }
 
 #endif // LLVM_CLANG_BASIC_VERSION_H

clang/include/clang/Options/Options.td

@@ -1342,12 +1342,12 @@ def fgpu_sanitize : Flag<["-"], "fgpu-sanitize">, Group<f_Group>,
 def fno_gpu_sanitize : Flag<["-"], "fno-gpu-sanitize">, Group<f_Group>;
 
 def offload_compress : Flag<["--"], "offload-compress">,
-  HelpText<"Compress offload device binaries (HIP only)">;
+  HelpText<"Compress offload device binaries (HIP and SYCL only)">;
 def no_offload_compress : Flag<["--"], "no-offload-compress">;
 
 def offload_compression_level_EQ : Joined<["--"], "offload-compression-level=">,
   Flags<[HelpHidden]>,
-  HelpText<"Compression level for offload device binaries (HIP only)">;
+  HelpText<"Compression level for offload device binaries (HIP and SYCL only)">;
 
 def offload_jobs_EQ : Joined<["--"], "offload-jobs=">,
   HelpText<"Specify the number of threads to use for device offloading tasks "

clang/lib/Basic/CMakeLists.txt

@@ -42,6 +42,7 @@ add_custom_command(OUTPUT "${version_inc}"
                            "-DLLVM_VC_REVISION=${llvm_vc_revision}"
                            "-DLLVM_FORCE_VC_REVISION=${LLVM_FORCE_VC_REVISION}"
                            "-DLLVM_FORCE_VC_REPOSITORY=${LLVM_FORCE_VC_REPOSITORY}"
+                           "-DSYCL_BUILD_INFO=${SYCL_BUILD_INFO}"
                            -P "${generate_vcs_version_script}")
 
 # Mark the generated header as being generated.

clang/lib/Basic/Version.cpp

@@ -65,6 +65,14 @@ std::string getClangVendor() {
 #endif
 }
 
+std::string getSYCLBuildInfo() {
+#ifdef SYCL_BUILD_INFO
+  return SYCL_BUILD_INFO;
+#else
+  return "development";
+#endif
+}
+
 std::string getClangFullRepositoryVersion() {
   std::string buf;
   llvm::raw_string_ostream OS(buf);

clang/lib/Driver/Driver.cpp

@@ -2735,6 +2735,7 @@ void Driver::PrintSYCLToolHelp(const Compilation &C) const {
 }
 
 void Driver::PrintVersion(const Compilation &C, raw_ostream &OS) const {
+  OS << "Intel SYCL compiler " << getSYCLBuildInfo() << " build based on:\n";
   if (IsFlangMode()) {
     OS << getClangToolFullVersion("flang") << '\n';
   } else {