Merge branch 'sycl' of https://github.com/intel/llvm into benchmarking-workflow

Author: ianayl

.github/workflows/sycl-rel-nightly.yml

@@ -80,18 +80,6 @@ jobs:
             image_options: -u 1001 --privileged --cap-add SYS_ADMIN
             target_devices: opencl:cpu
             tests_selector: e2e
-
-          - name: SYCL-CTS on OCL CPU
-            runner: '["Linux", "gen12"]'
-            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-            target_devices: opencl:cpu
-            tests_selector: cts
-
-          - name: SYCL-CTS on L0 gen12
-            runner: '["Linux", "gen12"]'
-            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
-            target_devices: level_zero:gpu
-            tests_selector: cts
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: ${{ matrix.name }}
@@ -168,3 +156,50 @@ jobs:
     with:
       mode: stop
       ref: sycl-rel-6_0_0
+
+  build-sycl-cts:
+    needs: ubuntu2204_build
+    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
+    uses: ./.github/workflows/sycl-linux-run-tests.yml
+    with:
+      name: Build SYCL-CTS
+      runner: '["Linux", "build"]'
+      cts_testing_mode: 'build-only'
+      image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+      tests_selector: cts
+      ref: sycl-rel-6_0_0
+      devops_ref: sycl
+      sycl_toolchain_artifact: sycl_linux_default
+      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
+      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
+
+  run-sycl-cts:
+    needs: [ubuntu2204_build, build-sycl-cts]
+    if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: SYCL-CTS on OCL CPU
+            runner: '["Linux", "gen12"]'
+            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+            target_devices: opencl:cpu
+
+          - name: SYCL-CTS on L0 gen12
+            runner: '["Linux", "gen12"]'
+            image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
+            target_devices: level_zero:gpu
+    uses: ./.github/workflows/sycl-linux-run-tests.yml
+    with:
+      name: ${{ matrix.name }}
+      runner: ${{ matrix.runner }}
+      cts_testing_mode: 'run-only'
+      image_options: ${{ matrix.image_options }}
+      target_devices: ${{ matrix.target_devices }}
+      tests_selector: cts
+      ref: ${{ github.sha }}
+      devops_ref: sycl
+      sycl_toolchain_artifact: sycl_linux_default
+      sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
+      sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
+      sycl_cts_artifact: sycl_cts_bin

.github/workflows/ur-build-hw.yml

@@ -85,27 +85,16 @@ jobs:
     runs-on: ${{inputs.runner_name}}
 
     steps:
-    # TODO: If UR is merged into llvm it will require changes:
-    # - checkout only llvm repo
-    # - configure UR project from local tree
+    # TODO:
     # - investigate if DUR_CONFORMANCE_AMD_ARCH could be removed
     # - find better way to handle platform param (e.g. "Intel(R) OpenCL" -> "opencl")
     # - switch to Ninja generator in CMake
-    #
-    # Also, the step of downloading DPC++ should be integrated somehow;
-    # most likely use nightly release.
+    # - downloading DPC++ should be integrated somehow; most likely use nightly release.
     #
     - name: Checkout LLVM
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - name: Checkout UR
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      with:
-        repository: 'oneapi-src/unified-runtime'
-        path: unified-runtime
-        ref: main
-
-    - name: Install pip packages
+    - name: Install UR python dependencies
       working-directory: ${{github.workspace}}/unified-runtime
       run: pip install -r third_party/requirements.txt
 
@@ -115,7 +104,7 @@ jobs:
         mkdir dpcpp_compiler
         tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz -C dpcpp_compiler
 
-    - name: Configure CMake
+    - name: Configure Unified Runtime project
       working-directory: ${{github.workspace}}/unified-runtime
       # ">" is used to avoid adding "\" at the end of each line; this command is quite long
       run: >

.github/workflows/ur-precommit.yml

@@ -37,35 +37,19 @@ permissions: read-all
 
 jobs:
   detect_changes:
+    name: Detect Changes
     uses: ./.github/workflows/sycl-detect-changes.yml
 
-  # TODO: If UR is merged into llvm it will require changes:
-  # - 'detect_changes' should be required for all UR jobs
-  # - 'if' condition should be used, for all UR jobs, to check if UR is affected
-  #     (see example test_job's if)
-  # - test_job should be removed
-  #
-  test_job:
-    # this is a temporary test job, to show how the 'if' should be used for all UR jobs
-    name: UR test job
-    needs: [detect_changes]
-    if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check if UR is affected
-        run: |
-          echo "UR affected"
-          echo 'Filters set: ${{needs.detect_changes.outputs.filters}}'
-
   source_checks:
     name: Source Checks
     needs: [detect_changes]
+    if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
     uses: ./.github/workflows/ur-source-checks.yml
 
   adapters:
     name: Adapters
-    needs: [source_checks]
+    needs: [detect_changes, source_checks]
+    if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
     strategy:
       matrix:
         # Extra native CPU jobs are here to force the loader to be used.
@@ -92,28 +76,17 @@ jobs:
 
   macos:
     name: MacOS build only
-    needs: [source_checks]
+    needs: [detect_changes, source_checks]
+    if: ${{ always() && !cancelled() && contains(needs.detect_changes.outputs.filters, 'ur') }}
     strategy:
       matrix:
         os: ['macos-13']
     runs-on: ${{matrix.os}}
 
     steps:
-    # TODO: If UR is merged into llvm it will require changes:
-    # - checkout only llvm repo
-    # - configure UR project from local tree
-    #
     - name: Checkout LLVM
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - name: Checkout UR
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      with:
-        repository: 'oneapi-src/unified-runtime'
-        path: unified-runtime
-        ref: main
-        fetch-depth: 1
-
     - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
       with:
         python-version: 3.9
@@ -125,7 +98,7 @@ jobs:
     - name: Install hwloc
       run: brew install hwloc
 
-    - name: Configure CMake
+    - name: Configure Unified Runtime project
       working-directory: ${{github.workspace}}/unified-runtime
       run: >
         cmake

.github/workflows/ur-source-checks.yml

@@ -15,26 +15,17 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-    # TODO: If UR is merged into llvm it will require changes:
-    # - checkout only llvm repo
-    # - configure UR project from local tree
+    # TODO:
     # - split into separate jobs for each OS
     #
     - name: Checkout LLVM
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - name: Checkout UR
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      with:
-        repository: 'oneapi-src/unified-runtime'
-        path: unified-runtime
-        ref: main
-
     - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
       with:
         python-version: 3.9
 
-    - name: Install pip packages
+    - name: Install UR python dependencies
       working-directory: ${{github.workspace}}/unified-runtime
       run: pip install -r third_party/requirements.txt
 
@@ -62,7 +53,7 @@ jobs:
       if: matrix.os == 'windows-2022'
       run: vcpkg install hwloc:x64-windows
 
-    - name: Configure CMake
+    - name: Configure Unified Runtime project
       working-directory: ${{github.workspace}}/unified-runtime
       env:
         VCPKG_PATH: "C:/vcpkg/packages/hwloc_x64-windows"

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -22,6 +22,9 @@ def err_drv_unsupported_option_argument : Error<
   "unsupported argument '%1' to option '%0'">;
 def err_drv_unsupported_option_argument_for_target : Error<
   "unsupported argument '%1' to option '%0' for target '%2'">;
+def err_drv_unsupported_opt_removed : Error<
+  "option '%0' is not supported and has been removed from the compiler. Please "
+  "see the compiler documentation for more details">;
 def err_drv_unknown_stdin_type : Error<
   "-E or -x required when input is from standard input">;
 def err_drv_unknown_stdin_type_clang_cl : Error<

clang/include/clang/Driver/Driver.h

@@ -617,7 +617,11 @@ class Driver {
 
   /// getSYCLDeviceTriple - Returns the SYCL device triple for the
   /// specified subarch
-  llvm::Triple getSYCLDeviceTriple(StringRef TargetArch = "spir64") const;
+  // TODO: Additional Arg input parameter is for diagnostic output information
+  // regarding FPGA support removal. This should be cleaned up in a future
+  // release.
+  llvm::Triple getSYCLDeviceTriple(StringRef TargetArch = "spir64",
+                                   const llvm::opt::Arg *Arg = nullptr) const;
 
   /// PrintActions - Print the list of actions.
   void PrintActions(const Compilation &C) const;

clang/include/clang/Driver/Options.h

@@ -27,6 +27,7 @@ enum ClangFlags {
   Ignored = (1 << 9),
   TargetSpecific = (1 << 10),
   Deprecated = (1 << 11),
+  UnsupportedRemoved = (1 << 12),
 };
 
 // Flags specifically for clang option visibility. We alias DefaultVis to

clang/include/clang/Driver/Options.td

@@ -51,6 +51,11 @@ def NoArgumentUnused : OptionFlag;
 // lines that use it.
 def Unsupported : OptionFlag;
 
+// UnsupportedRemoved - The option is unsupported and recently removed. Allows
+// for special diagnostic handling, and the driver will reject command
+// lines that use it.
+def UnsupportedRemoved : OptionFlag;
+
 // Ignored - The option is unsupported, and the driver will silently ignore it.
 def Ignored : OptionFlag;
 
@@ -6982,8 +6987,8 @@ defm : FlangIgnoredDiagOpt<"target-lifetime">;
 
 // C++ SYCL options
 let Group = sycl_Group in {
-def reuse_exe_EQ : Joined<["-"], "reuse-exe=">, Visibility<[ClangOption, CLOption, DXCOption]>,
-  HelpText<"Speed up FPGA aoc compile if the device code in <exe> is unchanged.">,
+def reuse_exe_EQ : Joined<["-"], "reuse-exe=">,
+  Visibility<[ClangOption, CLOption, DXCOption]>, Flags<[UnsupportedRemoved]>,
   MetaVarName<"<exe>">;
 def fsycl : Flag<["-"], "fsycl">,
   HelpText<"Enable SYCL C++ extensions">;
@@ -7031,10 +7036,9 @@ def fsycl_default_sub_group_size
 def fsycl_default_sub_group_size_EQ
     : Joined<["-"], "fsycl-default-sub-group-size=">,
       Alias<fsycl_default_sub_group_size>, Visibility<[ClangOption, CC1Option]>;
-def fintelfpga : Flag<["-"], "fintelfpga">,
+def fintelfpga : Flag<["-"], "fintelfpga">, Flags<[UnsupportedRemoved]>,
   Visibility<[ClangOption, CLOption, CC1Option]>,
-  MarshallingInfoFlag<LangOpts<"IntelFPGA">>,
-  HelpText<"Perform ahead-of-time compilation for FPGA">;
+  MarshallingInfoFlag<LangOpts<"IntelFPGA">>;
 def fsycl_embed_ir : Flag<["-"], "fsycl-embed-ir">,
   HelpText<"Embed LLVM IR for runtime kernel fusion">;
 defm sycl_esimd_force_stateless_mem : BoolFOption<"sycl-esimd-force-stateless-mem",
@@ -7131,11 +7135,9 @@ def fsycl_use_bitcode : Flag<["-"], "fsycl-use-bitcode">,
 def fno_sycl_use_bitcode : Flag<["-"], "fno-sycl-use-bitcode">,
   Alias<fsycl_device_obj_EQ>, AliasArgs<["spirv"]>, Flags<[Deprecated]>,
   HelpText<"Use SPIR-V instead of LLVM bitcode in fat objects (deprecated)">;
-def fsycl_link_EQ : Joined<["-"], "fsycl-link=">,
-  HelpText<"Generate partially linked device and host object to be used at "
-           "various stages of compilation">, Values<"image,early">;
+def fsycl_link_EQ : Joined<["-"], "fsycl-link=">;
 def fsycl_link : Flag<["-"], "fsycl-link">, Alias<fsycl_link_EQ>,
-  AliasArgs<["early"]>, HelpText<"Generate partially linked device object to "
+  AliasArgs<["default"]>, HelpText<"Generate partially linked device object to "
   "be used with the host link">;
 defm sycl_unnamed_lambda
     : BoolFOption<