Merge branch 'sycl' into win-e2esplit

Author: ayylol

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

@@ -121,7 +121,7 @@ jobs:
       image: ${{ matrix.image }}
       image_options: ${{ matrix.image_options }}
       target_devices: ${{ matrix.target_devices }}
-      extra_lit_opts: --param fallback-to-build-if-requires-build-and-run=True ${{ matrix.extra_lit_opts }}
+      extra_lit_opts: ${{ matrix.extra_lit_opts }}
       reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
       ref: ${{ github.sha }}
       sycl_toolchain_artifact: sycl_linux_default

.github/workflows/sycl-windows-run-tests.yml

@@ -111,7 +111,7 @@ jobs:
       shell: cmd
       run: |
         mkdir build-e2e
-        cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="level_zero:gpu" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\github\level-zero_win-sdk\lib" -DLEVEL_ZERO_INCLUDE="D:\github\level-zero_win-sdk\include" -DLLVM_LIT="..\llvm\llvm\utils\lit\lit.py"
+        cmake -GNinja -B build-e2e -S.\llvm\sycl\test-e2e -DSYCL_TEST_E2E_TARGETS="level_zero:gpu" -DCMAKE_CXX_COMPILER="clang++" -DLEVEL_ZERO_LIBS_DIR="D:\\github\\level-zero_win-sdk\\lib" -DLEVEL_ZERO_INCLUDE="D:\\github\\level-zero_win-sdk\\include" -DLLVM_LIT="..\\llvm\\llvm\\utils\\lit\\lit.py"
     - name: Run End-to-End tests
       shell: bash
       run: |

.github/workflows/ur-benchmarks-reusable.yml

@@ -1,198 +1,12 @@
 name: Benchmarks Reusable
 
-on:
-  workflow_call:
-    inputs:
-      str_name:
-        required: true
-        type: string
-      pr_no:
-        required: true
-        # even though this is a number, this is a workaround for issues with
-        # reusable workflow calls that result in "Unexpected value '0'" error.
-        type: string
-      bench_script_params:
-        required: false
-        type: string
-        default: ''
-      sycl_config_params:
-        required: false
-        type: string
-        default: ''
-      upload_report:
-        required: false
-        type: boolean
-        default: false
-      compute_runtime_commit:
-        required: false
-        type: string
-        default: ''
+# This workflow is a WIP: This workflow file acts as a placeholder.
 
-permissions:
-  contents: read
-  pull-requests: write
+on: [ workflow_call ]
 
 jobs:
-  bench-run:
-    name: Build SYCL, Run Benchmarks
-    strategy:
-      matrix:
-        adapter: [
-          {str_name: "${{ inputs.str_name }}",
-          sycl_config: "${{ inputs.sycl_config_params }}"
-          }
-        ]
-        build_type: [Release]
-        compiler: [{c: clang, cxx: clang++}]
-
-    runs-on: "PVC_PERF"
-
+  do-nothing:
+    runs-on: ubuntu-latest
     steps:
-    - name: Add comment to PR
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-      if: ${{ always() && inputs.pr_no != 0 }}
-      with:
-        script: |
-          const pr_no = '${{ inputs.pr_no }}';
-          const adapter = '${{ matrix.adapter.str_name }}';
-          const url = '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}';
-          const params = '${{ inputs.bench_script_params }}';
-          const body = `Compute Benchmarks ${adapter} run (with params: ${params}):\n${url}`;
-
-          github.rest.issues.createComment({
-            issue_number: pr_no,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: body
-          })
-
-    - name: Checkout SYCL
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      with:
-        path: sycl-repo
-
-    # We need to fetch special ref for proper PR's merge commit. Note, this ref may be absent if the PR is already merged.
-    - name: Fetch PR's merge commit
-      if: ${{ inputs.pr_no != 0 }}
-      working-directory: ${{github.workspace}}/sycl-repo
-      run: |
-        git fetch -- https://github.com/${{github.repository}} +refs/pull/${{ inputs.pr_no }}/*:refs/remotes/origin/pr/${{ inputs.pr_no }}/*
-        git checkout origin/pr/${{ inputs.pr_no }}/merge
-        git rev-parse origin/pr/${{ inputs.pr_no }}/merge
-
-    - name: Install pip packages
-      run: |
-        pip install --force-reinstall -r ${{github.workspace}}/sycl-repo/unified-runtime/scripts/benchmarks/requirements.txt
-
-    - name: Configure SYCL
-      run: >
-        python3 sycl-repo/buildbot/configure.py
-        -t ${{matrix.build_type}}
-        -o ${{github.workspace}}/sycl_build
-        --cmake-gen "Ninja"
-        --cmake-opt="-DLLVM_INSTALL_UTILS=ON"
-        --cmake-opt="-DSYCL_PI_TESTS=OFF"
-        --cmake-opt=-DCMAKE_C_COMPILER_LAUNCHER=ccache
-        --cmake-opt=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        ${{matrix.adapter.sycl_config}}
-
-    - name: Build SYCL
-      run: cmake --build ${{github.workspace}}/sycl_build -j $(nproc)
-
-    # We need a complete installed UR for compute-benchmarks.
-    - name: Configure UR
-      run: >
-        cmake -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
-        -S${{github.workspace}}/sycl-repo/unified-runtime
-        -B${{github.workspace}}/ur_build
-        -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/ur_install
-        -DUR_BUILD_TESTS=OFF
-        -DUR_BUILD_ADAPTER_L0=ON
-        -DUR_BUILD_ADAPTER_L0_V2=ON
-        -DUMF_DISABLE_HWLOC=ON
-
-    - name: Build UR
-      run: cmake --build ${{github.workspace}}/ur_build -j $(nproc)
-
-    - name: Install UR
-      run: cmake --install ${{github.workspace}}/ur_build
-
-    - name: Compute core range
-      run: |
-        # Compute the core range for the first NUMA node; second node is for UMF jobs.
-        # Skip the first 4 cores - the kernel is likely to schedule more work on these.
-        CORES="$(lscpu | awk '
-          /NUMA node0 CPU|On-line CPU/ {line=$0}
-          END {
-            split(line, a, " ")
-            split(a[4], b, ",")
-            sub(/^0/, "4", b[1])
-            print b[1]
-          }')"
-        echo "Selected core: $CORES"
-        echo "CORES=$CORES" >> $GITHUB_ENV
-
-        ZE_AFFINITY_MASK=0
-        echo "ZE_AFFINITY_MASK=$ZE_AFFINITY_MASK" >> $GITHUB_ENV
-
-    - name: Run benchmarks
-      working-directory: ${{ github.workspace }}
-      id: benchmarks
-      run: >
-        taskset -c "${{ env.CORES }}" ${{ github.workspace }}/sycl-repo/unified-runtime/scripts/benchmarks/main.py
-        ~/llvm_bench_workdir
-        --sycl ${{ github.workspace }}/sycl_build
-        --ur ${{ github.workspace }}/ur_install
-        --adapter ${{ matrix.adapter.str_name }}
-        --compare baseline
-        --compute-runtime ${{ inputs.compute_runtime_commit }}
-        --build-igc
-        ${{ inputs.upload_report && '--output-html' || '' }}
-        ${{ inputs.pr_no != 0 && '--output-markdown' || '' }}
-        ${{ inputs.bench_script_params }}
-
-    - name: Print benchmark results
-      run: |
-        cat ${{ github.workspace }}/benchmark_results.md || true
-
-    - name: Add comment to PR
-      uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-      if: ${{ always() && inputs.pr_no != 0 }}
-      with:
-        script: |
-          let markdown = ""
-          try {
-            const fs = require('fs');
-            markdown = fs.readFileSync('benchmark_results.md', 'utf8');
-          } catch(err) {
-          }
-
-          const pr_no = '${{ inputs.pr_no }}';
-          const adapter = '${{ matrix.adapter.str_name }}';
-          const url = '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}';
-          const test_status = '${{ steps.benchmarks.outcome }}';
-          const job_status = '${{ job.status }}';
-          const params = '${{ inputs.bench_script_params }}';
-          const body = `Benchmarks ${adapter} run (${params}):\n${url}\nJob status: ${job_status}. Test status: ${test_status}.\n ${markdown}`;
-
-          github.rest.issues.createComment({
-            issue_number: pr_no,
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            body: body
-          })
-
-    - name: Rename benchmark results file
-      if: ${{ always() && inputs.upload_report }}
-      run: mv benchmark_results.html benchmark_results_${{ inputs.pr_no }}.html
-
-    - name: Upload HTML report
-      if: ${{ always() && inputs.upload_report }}
-      uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
-      with:
-        path: benchmark_results_${{ inputs.pr_no }}.html
-        key: benchmark-results-${{ inputs.pr_no }}-${{ matrix.adapter.str_name }}-${{ github.run_id }}
-
-    - name: Get information about platform
-      if: ${{ always() }}
-      run: ${{github.workspace}}/sycl-repo/unified-runtime/.github/scripts/get_system_info.sh
+      - run: echo 'This workflow is a WIP.'
+  

.github/workflows/ur-benchmarks.yml

@@ -1,53 +1,12 @@
 name: Benchmarks
 
-on:
-  workflow_dispatch:
-    inputs:
-      str_name:
-        description: Adapter
-        type: choice
-        required: true
-        default: 'level_zero'
-        options:
-          - level_zero
-          - level_zero_v2
-      pr_no:
-        description: PR number (0 is sycl main branch)
-        type: number
-        required: true
-      bench_script_params:
-        description: Benchmark script arguments
-        type: string
-        required: false
-        default: ''
-      sycl_config_params:
-        description: Extra params for SYCL configuration
-        type: string
-        required: false
-        default: ''
-      compute_runtime_commit:
-        description: 'Compute Runtime commit'
-        type: string
-        required: false
-        default: ''
-      upload_report:
-        description: 'Upload HTML report'
-        type: boolean
-        required: false
-        default: false
+# This workflow is a WIP: this workflow file acts as a placeholder.
 
-permissions:
-  contents: read
-  pull-requests: write
+on: [ workflow_dispatch ]
 
 jobs:
-  manual:
-    name: Compute Benchmarks
-    uses: ./.github/workflows/ur-benchmarks-reusable.yml
-    with:
-      str_name: ${{ inputs.str_name }}
-      pr_no: ${{ inputs.pr_no }}
-      bench_script_params: ${{ inputs.bench_script_params }}
-      sycl_config_params: ${{ inputs.sycl_config_params }}
-      compute_runtime_commit: ${{ inputs.compute_runtime_commit }}
-      upload_report: ${{ inputs.upload_report }}
+  do-nothing:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo 'This workflow is a WIP.'
+

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -5130,7 +5130,7 @@ void CGDebugInfo::EmitLabel(const LabelDecl *D, CGBuilderTy &Builder) {
   DBuilder.insertLabel(L,
                        llvm::DILocation::get(CGM.getLLVMContext(), Line, Column,
                                              Scope, CurInlinedAt),
-                       Builder.GetInsertBlock());
+                       Builder.GetInsertBlock()->end());
 }
 
 llvm::DIType *CGDebugInfo::CreateSelfType(const QualType &QualTy,
@@ -5208,7 +5208,7 @@ void CGDebugInfo::EmitDeclareOfBlockDeclRefVariable(
                                   LexicalBlockStack.back(), CurInlinedAt);
   auto *Expr = DBuilder.createExpression(addr);
   if (InsertPoint)
-    DBuilder.insertDeclare(Storage, D, Expr, DL, InsertPoint);
+    DBuilder.insertDeclare(Storage, D, Expr, DL, InsertPoint->getIterator());
   else
     DBuilder.insertDeclare(Storage, D, Expr, DL, Builder.GetInsertBlock());
 }
@@ -5873,7 +5873,7 @@ void CGDebugInfo::EmitPseudoVariable(CGBuilderTy &Builder,
 
   if (auto InsertPoint = Value->getInsertionPointAfterDef()) {
     DBuilder.insertDbgValueIntrinsic(Value, D, DBuilder.createExpression(), DIL,
-                                     &**InsertPoint);
+                                     *InsertPoint);
   }
 }
 

clang/lib/Driver/ToolChains/SYCL.cpp

@@ -309,8 +309,8 @@ static bool selectBfloatLibs(const llvm::Triple &Triple, const Compilation &C,
 
   static llvm::SmallSet<StringRef, 8> GPUArchsWithNBF16{
       "intel_gpu_pvc",     "intel_gpu_acm_g10", "intel_gpu_acm_g11",
-      "intel_gpu_acm_g12", "intel_gpu_dg2_10",  "intel_gpu_dg2_11",
-      "intel_dg2_g12",     "intel_gpu_bmg_g21"};
+      "intel_gpu_acm_g12", "intel_gpu_dg2_g10", "intel_gpu_dg2_g11",
+      "intel_dg2_g12",     "intel_gpu_bmg_g21", "intel_gpu_lnl_m"};
   const llvm::opt::ArgList &Args = C.getArgs();
   bool NeedLibs = false;
 
@@ -351,7 +351,8 @@ static bool selectBfloatLibs(const llvm::Triple &Triple, const Compilation &C,
 
     auto checkBF = [](StringRef Device) {
       return Device.starts_with("pvc") || Device.starts_with("ats") ||
-             Device.starts_with("dg2") || Device.starts_with("bmg");
+             Device.starts_with("dg2") || Device.starts_with("bmg") ||
+             Device.starts_with("lnl");
     };
 
     auto checkSpirvJIT = [](StringRef Target) {