Merge remote-tracking branch 'intel/sycl' into dyn_slm_alloc

Author: kbobrovs

.github/workflows/sycl_linux_build_and_test.yml

@@ -195,7 +195,9 @@ jobs:
 
   llvm_test_suite:
     needs: [build, aws-start]
-    if: ${{ !failure() && inputs.lts_matrix != '[]' }}
+    # Continue if build was successful. If aws-start is not successful all
+    # AWS tasks will fail, but all non-AWS tasks should continue.
+    if: ${{ always() && needs.build.result == 'success' && inputs.lts_matrix != '[]' }}
     strategy:
       fail-fast: false
       max-parallel: ${{ inputs.max_parallel }}
@@ -242,7 +244,7 @@ jobs:
         check_sycl_all: ${{ matrix.check_sycl_all }}
         results_name_suffix: ${{ matrix.config }}_${{ inputs.build_artifact_suffix }}
         cmake_args: '${{ matrix.cmake_args }} ${{ inputs.lts_cmake_extra_args }}'
-  
+
   khronos_sycl_cts:
     needs: build
     if: ${{ inputs.cts_matrix != '' }}
@@ -293,6 +295,8 @@ jobs:
   aws-stop:
     name: Stop AWS
     needs: [ aws-start, llvm_test_suite ]
+    # Always attempt to shutdown AWS instance, even if AWS start was not
+    # successful.
     if: ${{ always() && inputs.lts_aws_matrix != '[]' }}
     runs-on: ubuntu-latest
     environment: aws

.github/workflows/sycl_post_commit.yml

@@ -65,11 +65,11 @@ jobs:
     - name: Configure
       run: |
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository "deb http://apt.llvm.org/focal/   llvm-toolchain-focal-13 main"
+        sudo add-apt-repository "deb http://apt.llvm.org/focal/   llvm-toolchain-focal-15 main"
         sudo apt-get update
-        sudo apt-get install -y clang-13
-        export CC="clang-13"
-        export CXX="clang++-13"
+        sudo apt-get install -y clang-15
+        export CC="clang-15"
+        export CXX="clang++-15"
         mkdir -p $GITHUB_WORKSPACE/build
         cd $GITHUB_WORKSPACE/build
         python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \

.github/workflows/sycl_precommit.yml

@@ -48,7 +48,7 @@ jobs:
     uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
       ref: ${{ github.event.pull_request.head.sha }}
-      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda"
+      lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda_aws"
 
   linux_default:
     name: Linux

.github/workflows/sycl_windows_build_and_test.yml

@@ -7,6 +7,9 @@ on:
         type: string
         required: false
         default: "default"
+      build_ref:
+        type: string
+        required: false
 
 jobs:
   build:
@@ -26,6 +29,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         path: src
+        ref: ${{ inputs.build_ref || github.ref }}
         fetch-depth: 1
     - name: Register cleanup after job is finished
       uses: ./src/devops/actions/cleanup

.github/workflows/windows_test_comment_trigger.yml

@@ -0,0 +1,87 @@
+name: Test windows on the comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  windows_test_preparation:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.issue.pull_request && github.event.comment.body == '/start Windows testing' }}
+    steps:
+    - name: react_to_comment
+      uses: actions/github-script@v4
+      with:
+        script: |
+          const {owner, repo} = context.issue;
+          github.reactions.createForIssueComment({
+            owner,
+            repo,
+            comment_id: context.payload.comment.id,
+            content: "rocket",
+          });
+    - name: get_pr_sha
+      id: sha
+      uses: actions/github-script@v4
+      with:
+        result-encoding: string
+        script: |
+          const { owner, repo, number } = context.issue;
+          const pr = await github.pulls.get({
+            owner,
+            repo,
+            pull_number: number,
+          });
+          return pr.data.head.sha
+    - name: update_pr_status_pending
+      run: |
+          gh api --method POST -H "Accept: application/vnd.github+json" /repos/$OWNER/$REPO/statuses/$SHA -f state='pending' -f target_url='${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' -f description='The build started2!' -f context='Windows pre-commit'
+          echo "REF == = = = = = = ${{ steps.sha.outputs.result }}"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        OWNER: ${{ github.repository_owner }}
+        REPO: ${{ github.event.repository.name }}
+        SHA: ${{ steps.sha.outputs.result }}
+    outputs:
+      PR_SHA: ${{ steps.sha.outputs.result }}
+
+
+  windows_default:
+    name: Windows
+    needs: [windows_test_preparation]
+    if: github.repository == 'intel/llvm'
+    uses: ./.github/workflows/sycl_windows_build_and_test.yml
+    with:
+      build_ref: ${{ needs.windows_test_preparation.outputs.PR_SHA }}
+
+  windows_test_completion:
+    runs-on: ubuntu-latest
+    needs: [windows_default]
+    steps:
+    - name: update_pr_status_success
+      if: always() && success()
+      run: |
+          gh api --method POST -H "Accept: application/vnd.github+json" /repos/$OWNER/$REPO/statuses/$SHA -f state='success' -f target_url='${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' -f description='The build started2!' -f context='Windows pre-commit'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        OWNER: ${{ github.repository_owner }}
+        REPO: ${{ github.event.repository.name }}
+        SHA: ${{ steps.sha.outputs.result }}
+    - name: update_pr_status_failure
+      if: failure()
+      run: |
+          gh api --method POST -H "Accept: application/vnd.github+json" /repos/$OWNER/$REPO/statuses/$SHA -f state='failure' -f target_url='${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' -f description='The build started2!' -f context='Windows pre-commit'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        OWNER: ${{ github.repository_owner }}
+        REPO: ${{ github.event.repository.name }}
+        SHA: ${{ steps.sha.outputs.result }}
+
+  # windows_default:
+  #   runs-on: ubuntu-latest
+  #   needs: [windows_test_preparation]
+  #   steps:
+  #   - name: print_ref
+  #     run: |
+  #       echo "REF == = = = = = = ${{github.ref}}"
+  #       echo "REF == = = = = = = ${{ needs.windows_test_preparation.outputs.PR_SHA }}"

CONTRIBUTING.md

@@ -81,6 +81,15 @@ approved by an Intel representative.
   - A new approval is needed if the PR was updated (e.g. during code review).
 - Once the PR is approved and all checks have passed, the pull request is
 ready for merge.
+- Sometimes unrelated fails can be observed in the PR. It's author
+responsibility to find/guess the reason of these fails and post a comment in
+the PR with:
+  - possible reason of fails, ideally with a link to the PR, which caused fails
+  - link to other PR(s), which expected to fix fails
+  - person who is currently looking into fails
+  - link to existing open issue
+  - if author cannot identify any of these, the minimal action expected is to
+    open a new [issue](/../../issues)
 
 ### Merge
 
@@ -89,7 +98,8 @@ and merge] and using PR description as the commit message, replacing all
 individual comments made per commit. Authors of the change must ensure PR
 description is up to date at the merge stage, as sometimes comments addressed
 during code reviews can invalidate original PR description. Feel free to ping
-@intel/llvm-gatekeepers if your PR is green and can be merged.
+@intel/llvm-gatekeepers if your PR is green and can be merged. Note that
+gatekeepers will require explanation for any failures observed.
 
 Pulldown from LLVM upstream is done through merge commits to preserve hashes of
 the original commits pulled from the LLVM community repository.

README.md

@@ -6,6 +6,8 @@ Intel LLVM-based projects:
 - [oneAPI DPC++ compiler](#oneapi-dpc-compiler)
 - [Late-outline OpenMP and OpenMP Offload](#late-outline-openmp-and-openmp-offload)
 
+For general contribution process see [CONTRIBUTING.md](./CONTRIBUTING.md)
+
 ## oneAPI DPC++ compiler
 
 [![](https://spec.oneapi.io/oneapi-logo-white-scaled.jpg)](https://www.oneapi.io/)

bolt/include/bolt/Core/BinaryContext.h

@@ -152,7 +152,7 @@ class BinaryContext {
   std::string Filename;
 
   /// Unique build ID if available for the binary.
-  Optional<std::string> FileBuildID;
+  std::optional<std::string> FileBuildID;
 
   /// Set of all sections.
   struct CompareSections {
@@ -259,7 +259,7 @@ class BinaryContext {
   void clearFragmentsToSkip() { FragmentsToSkip.clear(); }
 
   /// Given DWOId returns CU if it exists in DWOCUs.
-  Optional<DWARFUnit *> getDWOCU(uint64_t DWOId);
+  std::optional<DWARFUnit *> getDWOCU(uint64_t DWOId);
 
   /// Returns DWOContext if it exists.
   DWARFContext *getDWOContext() const;
@@ -283,9 +283,9 @@ class BinaryContext {
 
   Expected<unsigned> getDwarfFile(StringRef Directory, StringRef FileName,
                                   unsigned FileNumber,
-                                  Optional<MD5::MD5Result> Checksum,
-                                  Optional<StringRef> Source, unsigned CUID,
-                                  unsigned DWARFVersion);
+                                  std::optional<MD5::MD5Result> Checksum,
+                                  std::optional<StringRef> Source,
+                                  unsigned CUID, unsigned DWARFVersion);
 
   /// [start memory address] -> [segment info] mapping.
   std::map<uint64_t, SegmentInfo> SegmentMapInfo;
@@ -319,7 +319,7 @@ class BinaryContext {
   StringRef getFilename() const { return Filename; }
   void setFilename(StringRef Name) { Filename = std::string(Name); }
 
-  Optional<StringRef> getFileBuildID() const {
+  std::optional<StringRef> getFileBuildID() const {
     if (FileBuildID)
       return StringRef(*FileBuildID);
 
@@ -1063,9 +1063,9 @@ class BinaryContext {
   /// segments was mapped. \p FileOffset is the offset in the file of the
   /// mapping. Note that \p FileOffset should be page-aligned and could be
   /// different from the file offset of the segment which could be unaligned.
-  /// If no segment is found that matches \p FileOffset, return NoneType().
-  Optional<uint64_t> getBaseAddressForMapping(uint64_t MMapAddress,
-                                              uint64_t FileOffset) const;
+  /// If no segment is found that matches \p FileOffset, return std::nullopt.
+  std::optional<uint64_t> getBaseAddressForMapping(uint64_t MMapAddress,
+                                                   uint64_t FileOffset) const;
 
   /// Check if the address belongs to this binary's static allocation space.
   bool containsAddress(uint64_t Address) const {

bolt/include/bolt/Core/BinaryFunction.h

@@ -894,7 +894,8 @@ class BinaryFunction {
   BinaryBasicBlock *getLandingPadBBFor(const BinaryBasicBlock &BB,
                                        const MCInst &InvokeInst) const {
     assert(BC.MIB->isInvoke(InvokeInst) && "must be invoke instruction");
-    const Optional<MCPlus::MCLandingPad> LP = BC.MIB->getEHInfo(InvokeInst);
+    const std::optional<MCPlus::MCLandingPad> LP =
+        BC.MIB->getEHInfo(InvokeInst);
     if (LP && LP->first) {
       BinaryBasicBlock *LBB = BB.getLandingPad(LP->first);
       assert(LBB && "Landing pad should be defined");
@@ -971,7 +972,7 @@ class BinaryFunction {
   /// returns false. Stop if Callback returns true or all names have been used.
   /// Return the name for which the Callback returned true if any.
   template <typename FType>
-  Optional<StringRef> forEachName(FType Callback) const {
+  std::optional<StringRef> forEachName(FType Callback) const {
     for (MCSymbol *Symbol : Symbols)
       if (Callback(Symbol->getName()))
         return Symbol->getName();
@@ -992,11 +993,12 @@ class BinaryFunction {
   }
 
   /// Check if any of function names matches the given regex.
-  Optional<StringRef> hasNameRegex(const StringRef NameRegex) const;
+  std::optional<StringRef> hasNameRegex(const StringRef NameRegex) const;
 
   /// Check if any of restored function names matches the given regex.
   /// Restored name means stripping BOLT-added suffixes like "/1",
-  Optional<StringRef> hasRestoredNameRegex(const StringRef NameRegex) const;
+  std::optional<StringRef>
+  hasRestoredNameRegex(const StringRef NameRegex) const;
 
   /// Return a vector of all possible names for the function.
   std::vector<StringRef> getNames() const {
@@ -1316,7 +1318,7 @@ class BinaryFunction {
   }
 
   /// Return the name of the section this function originated from.
-  Optional<StringRef> getOriginSectionName() const {
+  std::optional<StringRef> getOriginSectionName() const {
     if (!OriginSection)
       return std::nullopt;
     return OriginSection->getName();

bolt/include/bolt/Core/DebugData.h

@@ -46,7 +46,7 @@ struct AttrInfo {
 /// \param DIE die to look up in.
 /// \param AbbrevDecl abbrev declaration for the die.
 /// \param Index an index in Abbrev declaration entry.
-Optional<AttrInfo>
+std::optional<AttrInfo>
 findAttributeInfo(const DWARFDie DIE,
                   const DWARFAbbreviationDeclaration *AbbrevDecl,
                   uint32_t Index);
@@ -56,7 +56,8 @@ findAttributeInfo(const DWARFDie DIE,
 /// \param DIE die to look up in.
 /// \param Attr the attribute to extract.
 /// \return an optional AttrInfo with DWARFFormValue and Offset.
-Optional<AttrInfo> findAttributeInfo(const DWARFDie DIE, dwarf::Attribute Attr);
+std::optional<AttrInfo> findAttributeInfo(const DWARFDie DIE,
+                                          dwarf::Attribute Attr);
 
 // DWARF5 Header in order of encoding.
 // Types represent encodnig sizes.
@@ -424,13 +425,13 @@ class DebugStrOffsetsWriter {
 
   /// Initializes Buffer and Stream.
   void initialize(const DWARFSection &StrOffsetsSection,
-                  const Optional<StrOffsetsContributionDescriptor> Contr);
+                  const std::optional<StrOffsetsContributionDescriptor> Contr);
 
   /// Update Str offset in .debug_str in .debug_str_offsets.
   void updateAddressMap(uint32_t Index, uint32_t Address);
 
   /// Writes out current sections entry into .debug_str_offsets.
-  void finalizeSection();
+  void finalizeSection(DWARFUnit &Unit);
 
   /// Returns False if no strings were added to .debug_str.
   bool isFinalized() const { return !StrOffsetsBuffer->empty(); }
@@ -444,8 +445,10 @@ class DebugStrOffsetsWriter {
   std::unique_ptr<DebugStrOffsetsBufferVector> StrOffsetsBuffer;
   std::unique_ptr<raw_svector_ostream> StrOffsetsStream;
   std::map<uint32_t, uint32_t> IndexToAddressMap;
+  DenseSet<uint64_t> ProcessedBaseOffsets;
   // Section size not including header.
   uint32_t CurrentSectionSize{0};
+  bool StrOffsetSectionWasModified = false;
 };
 
 using DebugStrBufferVector = SmallVector<char, 16>;
@@ -1130,11 +1133,11 @@ class DwarfLineTable {
 
   /// Emit the Dwarf file and the line tables for a given CU.
   void emitCU(MCStreamer *MCOS, MCDwarfLineTableParams Params,
-              Optional<MCDwarfLineStr> &LineStr, BinaryContext &BC) const;
+              std::optional<MCDwarfLineStr> &LineStr, BinaryContext &BC) const;
 
   Expected<unsigned> tryGetFile(StringRef &Directory, StringRef &FileName,
-                                Optional<MD5::MD5Result> Checksum,
-                                Optional<StringRef> Source,
+                                std::optional<MD5::MD5Result> Checksum,
+                                std::optional<StringRef> Source,
                                 uint16_t DwarfVersion,
                                 unsigned FileNumber = 0) {
     assert(RawData.empty() && "cannot use with raw data");
@@ -1150,8 +1153,8 @@ class DwarfLineTable {
   /// Sets the root file \p Directory, \p FileName, optional \p CheckSum, and
   /// optional \p Source.
   void setRootFile(StringRef Directory, StringRef FileName,
-                   Optional<MD5::MD5Result> Checksum,
-                   Optional<StringRef> Source) {
+                   std::optional<MD5::MD5Result> Checksum,
+                   std::optional<StringRef> Source) {
     Header.setRootFile(Directory, FileName, Checksum, Source);
   }