Merge remote-tracking branch 'intel_llvm/sycl-web' into llvmspirv_pulldown

Author: Chenyang-L

.github/workflows/linux_single_e2e.yml

@@ -15,7 +15,7 @@ on:
         required: True
       image_options:
         type: string
-        required: False
+        required: True
 
       target_devices:
         type: string
@@ -59,6 +59,43 @@ on:
         default: '{}'
         required: False
 
+  workflow_dispatch:
+    inputs:
+      runner:
+        type: choice
+        options:
+          - '["Linux", "gen12"]'
+          - '["amdgpu"]'
+      image:
+        description: |
+          Use option ending with ":build" for AMDGPU, ":latest" for the rest.
+        type: choice
+        options:
+          - 'ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:latest'
+          - 'ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build'
+      image_options:
+        description: |
+          Use option with "--device=/dev/kfd" for AMDGPU, without it for the rest.
+        type: choice
+        options:
+          - '-u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN'
+          - '-u 1001 --device=/dev/dri --device=/dev/kfd --privileged --cap-add SYS_ADMIN'
+      target_devices:
+        type: choice
+        options:
+          - 'opencl:cpu'
+          - 'opencl:gpu'
+          - 'opencl:acc'
+          - 'ext_oneapi_level_zero:gpu'
+          - 'ext_oneapi_hip:gpu'
+          - 'ext_intel_esimd_emulator:gpu'
+
+      env:
+        description: |
+          Suggested variables: LIT_FILTER, LIT_FILTER_OUT. LIT_OPTS won't work
+          as we redefine it as part of this workflow.
+        default: '{"LIT_FILTER":""}'
+
 jobs:
   lin_e2e_only:
     name: ${{ inputs.name }}
@@ -83,7 +120,7 @@ jobs:
     - uses: ./devops/actions/cached_checkout
       with:
         path: llvm
-        ref: ${{ inputs.ref }}
+        ref: ${{ inputs.ref || github.sha }}
         merge_ref: ${{ inputs.merge_ref }}
         cache_path: "/__w/repo_cache/"
     - name: Install drivers

.github/workflows/sycl_cleanup.yml

@@ -49,16 +49,9 @@ jobs:
               - 'sycl/!(test-e2e|doc)/**'
             ci:
               - .github/workflows/**
-              - devops/*/**
               # devops/* contains config files, including drivers versions.
               # Allow them to be tested in pre-commit.
-            drivers_and_configs: &drivers_and_configs
-              - devops/*
-            test_build:
-              - *sycl
-              - *drivers_and_configs
-              # Temporary, until plugins are enabled in nightly image.
-              - sycl/**
+              - devops/*/**
 
       - name: Set output
         id: result
@@ -71,6 +64,6 @@ jobs:
               return '${{ steps.changes.outputs.changes }}';
             }
             // Treat everything as changed for huge PRs.
-            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci", "drivers_and_configs", "test_build"];
+            return ["llvm", "llvm_spirv", "clang", "sycl_fusion", "xptifw", "libclc", "sycl", "ci"];
 
       - run: echo '${{ steps.result.outputs.result }}'

.github/workflows/sycl_detect_changes.yml

@@ -73,7 +73,7 @@ on:
         type: string
         required: false
         default: 'SYCL-2020'
-      check_filters:
+      changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
         default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
@@ -136,35 +136,35 @@ jobs:
       id: build
       run: cmake --build $GITHUB_WORKSPACE/build
     - name: check-llvm
-      if: always() && !cancelled() && contains(inputs.check_filters, 'llvm')
+      if: always() && !cancelled() && contains(inputs.changes, 'llvm')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm
     - name: check-clang
-      if: always() && !cancelled() && contains(inputs.check_filters, 'clang')
+      if: always() && !cancelled() && contains(inputs.changes, 'clang')
       run: |
         # Can we move this to Dockerfile? Hopefully, noop on Windows.
         export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
         cmake --build $GITHUB_WORKSPACE/build --target check-clang
     - name: check-sycl
-      if: always() && !cancelled() && contains(inputs.check_filters, 'sycl')
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
       run: |
         # TODO consider moving this to Dockerfile.
         export LD_LIBRARY_PATH=/usr/local/cuda/compat/:/usr/local/cuda/lib64:$LD_LIBRARY_PATH
         cmake --build $GITHUB_WORKSPACE/build --target check-sycl
     - name: check-llvm-spirv
-      if: always() && !cancelled() && contains(inputs.check_filters, 'llvm_spirv')
+      if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
     - name: check-xptifw
-      if: always() && !cancelled() && contains(inputs.check_filters, 'xptifw')
+      if: always() && !cancelled() && contains(inputs.changes, 'xptifw')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
     - name: check-libclc
-      if: always() && !cancelled() && contains(inputs.check_filters, 'libclc')
+      if: always() && !cancelled() && contains(inputs.changes, 'libclc')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-libclc
     - name: check-libdevice
-      if: always() && !cancelled() && contains(inputs.check_filters, 'libdevice')
+      if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
       run: |
         cmake --build $GITHUB_WORKSPACE/build --target check-libdevice
     - name: Install

.github/workflows/sycl_linux_build_and_test.yml

@@ -11,9 +11,7 @@ jobs:
     name: Generate Test Matrix
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
-      # Restore once plugins are enabled in the build.
-      # lts_config: "hip_amdgpu;ocl_gen12;ocl_x64;l0_gen12;esimd_emu;cuda_aws;win_l0_gen12"
-      lts_config: "ocl_gen12;ocl_x64;l0_gen12;win_l0_gen12"
+      lts_config: "hip_amdgpu;ocl_gen12;ocl_x64;l0_gen12;esimd_emu;cuda_aws;win_l0_gen12"
 
   ubuntu2204_build_test:
     if: github.repository == 'intel/llvm'
@@ -23,11 +21,11 @@ jobs:
     with:
       build_cache_root: "/__w/"
       build_artifact_suffix: default-2204
+      build_configure_extra_args: '--hip --cuda --enable-esimd-emulator'
       merge_ref: ''
       retention-days: 90
       lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
       lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
-      build_configure_extra_args: ''
 
   ubuntu2204_opaque_pointers_build_test:
     if: github.repository == 'intel/llvm'
@@ -63,7 +61,7 @@ jobs:
     - name: Build and Push Container (with drivers)
       uses: ./devops/actions/build_container
       with:
-        push: ${{ github.event_name != 'pull_request' }}
+        push: ${{ github.ref_name == 'sycl' }}
         file: ubuntu2204_preinstalled
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -76,7 +74,7 @@ jobs:
     - name: Build and Push Container (no drivers)
       uses: ./devops/actions/build_container
       with:
-        push: ${{ github.event_name != 'pull_request' }}
+        push: ${{ github.ref_name == 'sycl' }}
         file: ubuntu2204_preinstalled
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -89,7 +87,7 @@ jobs:
     - name: Build and Push Container (Build image)
       uses: ./devops/actions/build_container
       with:
-        push: ${{ github.event_name != 'pull_request' }}
+        push: ${{ github.ref_name == 'sycl' }}
         file: ubuntu2204_preinstalled
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sycl_linux_gen12_exp.yml

@@ -92,4 +92,4 @@ jobs:
       build_cache_suffix: "default"
       lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
       lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
-      check_filters: ${{ needs.detect_changes.outputs.filters }}
+      changes: ${{ needs.detect_changes.outputs.filters }}

.github/workflows/sycl_nightly.yml

@@ -84,4 +84,4 @@ jobs:
     with:
       lts_matrix: ${{ needs.test_matrix.outputs.lts_wn_matrix }}
       build_ref: ${{ github.event.pull_request.head.sha }}
-      check_filters: ${{ needs.detect_changes.outputs.filters }}
+      changes: ${{ needs.detect_changes.outputs.filters }}

.github/workflows/sycl_precommit_linux.yml

@@ -18,7 +18,7 @@ on:
         type: string
         required: false
         default: ""
-      check_filters:
+      changes:
         type: string
         description: 'Filter matches for the changed files in the PR'
         default: '[llvm, clang, sycl, llvm_spirv, xptifw, libclc, libdevice]'
@@ -77,27 +77,27 @@ jobs:
       run: |
         cmake --build build --target sycl-toolchain
     - name: check-llvm
-      if: always() && !cancelled() && contains(inputs.check_filters, 'llvm')
+      if: always() && !cancelled() && contains(inputs.changes, 'llvm')
       run: |
         cmake --build build --target check-llvm
     - name: check-clang
-      if: always() && !cancelled() && contains(inputs.check_filters, 'clang')
+      if: always() && !cancelled() && contains(inputs.changes, 'clang')
       run: |
         cmake --build build --target check-clang
     - name: check-sycl
-      if: always() && !cancelled() && contains(inputs.check_filters, 'sycl')
+      if: always() && !cancelled() && contains(inputs.changes, 'sycl')
       run: |
         cmake --build build --target check-sycl
     - name: check-llvm-spirv
-      if: always() && !cancelled() && contains(inputs.check_filters, 'llvm_spirv')
+      if: always() && !cancelled() && contains(inputs.changes, 'llvm_spirv')
       run: |
         cmake --build build --target check-llvm-spirv
     - name: check-xptifw
-      if: always() && !cancelled() && contains(inputs.check_filters, 'xptifw')
+      if: always() && !cancelled() && contains(inputs.changes, 'xptifw')
       run: |
         cmake --build build --target check-xptifw
     - name: check-libdevice
-      if: always() && !cancelled() && contains(inputs.check_filters, 'libdevice')
+      if: always() && !cancelled() && contains(inputs.changes, 'libdevice')
       run: |
         cmake --build build --target check-libdevice
     - name: Install

.github/workflows/sycl_precommit_windows.yml

@@ -339,6 +339,9 @@ class BinaryFunction {
   bool HasPseudoProbe{BC.getUniqueSectionByName(".pseudo_probe_desc") &&
                       BC.getUniqueSectionByName(".pseudo_probe")};
 
+  /// True if the function uses ORC format for stack unwinding.
+  bool HasORC{false};
+
   /// True if the original entry point was patched.
   bool IsPatched{false};
 
@@ -1340,6 +1343,9 @@ class BinaryFunction {
   /// Return true if the function has Pseudo Probe
   bool hasPseudoProbe() const { return HasPseudoProbe; }
 
+  /// Return true if the function uses ORC format for stack unwinding.
+  bool hasORC() const { return HasORC; }
+
   /// Return true if the original entry point was patched.
   bool isPatched() const { return IsPatched; }
 
@@ -1704,6 +1710,9 @@ class BinaryFunction {
 
   void setHasSDTMarker(bool V) { HasSDTMarker = V; }
 
+  /// Mark the function as using ORC format for stack unwinding.
+  void setHasORC(bool V) { HasORC = V; }
+
   BinaryFunction &setPersonalityFunction(uint64_t Addr) {
     assert(!PersonalityFunction && "can't set personality function twice");
     PersonalityFunction = BC.getOrCreateGlobalSymbol(Addr, "FUNCat");

.github/workflows/sycl_windows_build_and_test.yml

@@ -33,6 +33,9 @@ class MetadataManager {
   /// CFG is not yet built.
   void runInitializersPreCFG();
 
+  /// Execute metadata initializers after CFG was constructed for functions.
+  void runInitializersPostCFG();
+
   /// Run finalization step of rewriters after code has been emitted.
   void runFinalizersAfterEmit();
 };

bolt/include/bolt/Core/BinaryFunction.h

@@ -49,6 +49,9 @@ class MetadataRewriter {
   /// contents of the section. Functions are in pre-cfg state.
   virtual Error preCFGInitializer() { return Error::success(); }
 
+  /// Run the rewriter once the functions are in CFG state.
+  virtual Error postCFGInitializer() { return Error::success(); }
+
   /// Finalize section contents based on the new context after the new code is
   /// emitted.
   virtual Error postEmitFinalizer() { return Error::success(); }

bolt/include/bolt/Rewrite/MetadataManager.h

@@ -171,6 +171,9 @@ class RewriteInstance {
   /// Process metadata in special sections before CFG is built for functions.
   void processMetadataPreCFG();
 
+  /// Process metadata in special sections after CFG is built for functions.
+  void processMetadataPostCFG();
+
   /// Update debug and other auxiliary information in the file.
   void updateMetadata();
 

bolt/include/bolt/Rewrite/MetadataRewriter.h

@@ -290,6 +290,10 @@ DIE *DIEBuilder::constructDIEFast(DWARFDie &DDie, DWARFUnit &U,
   DIEInfo &DieInfo = getDIEInfo(UnitId, *Idx);
 
   uint64_t Offset = DDie.getOffset();
+  // Just for making debugging easier.
+  // DIE dump is not very useful.
+  // It's nice to know original offset from which this DIE was constructed.
+  DieInfo.Die->setOffset(Offset);
   uint64_t NextOffset = Offset;
   DWARFDataExtractor Data = U.getDebugInfoExtractor();
   DWARFDebugInfoEntry DDIEntry;

bolt/include/bolt/Rewrite/RewriteInstance.h

@@ -1205,7 +1205,7 @@ void DWARFRewriter::updateDWARFObjectAddressRanges(
 
     // If we are at this point we are in the CU/Skeleton CU, and
     // DW_AT_GNU_ranges_base or DW_AT_rnglists_base doesn't exist.
-    if (Unit.getVersion() < 4)
+    if (Unit.getVersion() <= 4)
       DIEBldr.addValue(&Die, dwarf::DW_AT_GNU_ranges_base, dwarf::DW_FORM_data4,
                        DIEInteger(*RangesBase));
     else if (Unit.getVersion() == 5)
@@ -1225,9 +1225,10 @@ void DWARFRewriter::updateDWARFObjectAddressRanges(
     convertToRangesPatchDebugInfo(Unit, DIEBldr, Die, DebugRangesOffset,
                                   LowPCAttrInfo, HighPCAttrInfo, LowPCToUse,
                                   RangesBase);
-  } else {
+  } else if (!(Unit.isDWOUnit() &&
+               Die.getTag() == dwarf::DW_TAG_compile_unit)) {
     if (opts::Verbosity >= 1)
-      errs() << "BOLT-ERROR: cannot update ranges for DIE in Unit offset 0x"
+      errs() << "BOLT-WARNING: cannot update ranges for DIE in Unit offset 0x"
              << Unit.getOffset() << '\n';
   }
 }