Merge remote-tracking branch 'upstream/sycl' into georgi/test-hip-usm-copy2d

Author: GeorgeWeb

.ci/monolithic-linux.sh

@@ -18,7 +18,7 @@ set -o pipefail
 
 MONOREPO_ROOT="${MONOREPO_ROOT:="$(git rev-parse --show-toplevel)"}"
 BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build}"
-rm -rf ${BUILD_DIR}
+rm -rf "${BUILD_DIR}"
 
 ccache --zero-stats
 
@@ -37,8 +37,8 @@ projects="${1}"
 targets="${2}"
 
 echo "--- cmake"
-pip install -q -r ${MONOREPO_ROOT}/mlir/python/requirements.txt
-cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
+pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
+cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D LLVM_ENABLE_PROJECTS="${projects}" \
       -G Ninja \
       -D CMAKE_BUILD_TYPE=Release \

.ci/monolithic-windows.sh

@@ -19,7 +19,7 @@ set -o pipefail
 MONOREPO_ROOT="${MONOREPO_ROOT:="$(git rev-parse --show-toplevel)"}"
 BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build}"
 
-rm -rf ${BUILD_DIR}
+rm -rf "${BUILD_DIR}"
 
 if [[ -n "${CLEAR_CACHE:-}" ]]; then
   echo "clearing sccache"
@@ -37,14 +37,14 @@ projects="${1}"
 targets="${2}"
 
 echo "--- cmake"
-pip install -q -r ${MONOREPO_ROOT}/mlir/python/requirements.txt
+pip install -q -r "${MONOREPO_ROOT}"/mlir/python/requirements.txt
 
 # The CMAKE_*_LINKER_FLAGS to disable the manifest come from research
 # on fixing a build reliability issue on the build server, please
 # see https://github.com/llvm/llvm-project/pull/82393 and
 # https://discourse.llvm.org/t/rfc-future-of-windows-pre-commit-ci/76840/40
 # for further information.
-cmake -S ${MONOREPO_ROOT}/llvm -B ${BUILD_DIR} \
+cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D LLVM_ENABLE_PROJECTS="${projects}" \
       -G Ninja \
       -D CMAKE_BUILD_TYPE=Release \

.github/workflows/docs.yml

@@ -65,7 +65,7 @@ jobs:
           fetch-depth: 1
       - name: Get subprojects that have doc changes
         id: docs-changed-subprojects
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v44
         with:
           files_yaml: |
             llvm:

.github/workflows/email-check.yaml

@@ -1,7 +1,7 @@
 name: "Check for private emails used in PRs"
 
 on:
-  pull_request_target:
+  pull_request:
     types:
       - opened
 
@@ -10,8 +10,6 @@ permissions:
 
 jobs:
   validate_email:
-    permissions:
-      pull-requests: write
     runs-on: ubuntu-latest
     if: github.repository == 'llvm/llvm-project'
     steps:
@@ -25,20 +23,25 @@ jobs:
         run: |
           git log -1
           echo "EMAIL=$(git show -s --format='%ae' HEAD~0)" >> $GITHUB_OUTPUT
+          # Create empty comment file
+          echo "[]" > comments
 
       - name: Validate author email
         if: ${{ endsWith(steps.author.outputs.EMAIL, 'noreply.github.com')  }}
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         env:
-          EMAIL: ${{ steps.author.outputs.EMAIL }}
+          COMMENT: >-
+            ⚠️ We detected that you are using a GitHub private e-mail address to contribute to the repo.<br/>
+            Please turn off [Keep my email addresses private](https://github.com/settings/emails) setting in your account.<br/>
+            See [LLVM Discourse](https://discourse.llvm.org/t/hidden-emails-on-github-should-we-do-something-about-it) for more information.
+        run: |
+          cat << EOF > comments
+          [{"body" : "$COMMENT"}]
+          EOF
+
+      - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
+        if: always()
         with:
-          script: |
-            const { EMAIL } = process.env
-            await github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `⚠️ We detected that you are using a GitHub private e-mail address to contribute to the repo.
-              Please turn off [Keep my email addresses private](https://github.com/settings/emails) setting in your account.
-              See [LLVM Discourse](https://discourse.llvm.org/t/hidden-emails-on-github-should-we-do-something-about-it) for more information.
-            `})
+          name: workflow-args
+          path: |
+            comments

.github/workflows/issue-write.yml

@@ -2,7 +2,9 @@ name: Comment on an issue
 
 on:
   workflow_run:
-    workflows: ["Check code formatting"]
+    workflows:
+      - "Check code formatting"
+      - "Check for private emails used in PRs"
     types:
       - completed
 
@@ -25,13 +27,13 @@ jobs:
           name: workflow-args
 
       - name: 'Comment on PR'
-        uses: actions/github-script@v3
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             var fs = require('fs');
             const comments = JSON.parse(fs.readFileSync('./comments'));
-            if (!comments) {
+            if (!comments || comments.length == 0) {
               return;
             }
 
@@ -77,6 +79,15 @@ jobs:
             }
             const gql_result = await github.graphql(gql_query, gql_variables);
             console.log(gql_result);
+            // If the branch for the PR was deleted before this job has a chance
+            // to run, then the ref will be null.  This can happen if someone:
+            // 1. Rebase the PR, which triggers some workflow.
+            // 2. Immediately merges the PR and deletes the branch.
+            // 3. The workflow finishes and triggers this job.
+            if (!gql_result.repository.ref) {
+              console.log("Ref has been deleted");
+              return;
+            }
             console.log(gql_result.repository.ref.associatedPullRequests.nodes);
 
             var pr_number = 0;

.github/workflows/pr-code-format.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v44
         with:
           separator: ","
           skip_initial_fetch: true
@@ -36,7 +36,7 @@ jobs:
       - name: Fetch code formatting utils
         uses: actions/checkout@v4
         with:
-          reository: ${{ github.repository }}
+          repository: ${{ github.repository }}
           ref: ${{ github.base_ref }}
           sparse-checkout: |
             llvm/utils/git/requirements_formatting.txt

.github/workflows/scorecard.yml

@@ -57,6 +57,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
         with:
           sarif_file: results.sarif

.github/workflows/sycl-containers.yaml

@@ -24,12 +24,37 @@ on:
 permissions: read-all
 
 jobs:
-  base_image_ubuntu2204:
+  build_and_push_images:
     if: github.repository == 'intel/llvm'
-    name: Base Ubuntu 22.04 Docker image
+    name: Build and Push Docker Images
     runs-on: ubuntu-22.04
     permissions:
       packages: write
+    strategy:
+      matrix:
+        include:
+          - name: Base Ubuntu 22.04 Docker image
+            file: ubuntu2204_base
+            tag: latest
+            build_args: ""
+          - name: Build Ubuntu Docker image
+            file: ubuntu2204_build
+            tag: latest
+            build_args: ""
+          - name: Intel Drivers Ubuntu 22.04 Docker image
+            file: ubuntu2204_intel_drivers
+            tag: latest
+            build_args: "use_latest=false"
+          - name: Intel Drivers Ubuntu 22.04 Docker image with dev IGC
+            file: ubuntu2204_intel_drivers
+            tag: devigc
+            build_args: |
+                  "use_latest=false"
+                  "use_igc_dev=true"
+          - name: Intel Drivers (unstable) Ubuntu 22.04 Docker image
+            file: ubuntu2204_intel_drivers
+            tag: unstable
+            build_args: "use_latest=true"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -39,105 +64,11 @@ jobs:
         uses: ./devops/actions/build_container
         with:
           push: ${{ github.event_name != 'pull_request' }}
-          file: ubuntu2204_base
+          file: ${{ matrix.file }}
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
           tags: |
-            ghcr.io/${{ github.repository }}/ubuntu2204_base:${{ github.sha }}
-            ghcr.io/${{ github.repository }}/ubuntu2204_base:latest
-  build_image_ubuntu2204:
-    if: github.repository == 'intel/llvm'
-    name: Build Ubuntu Docker image
-    runs-on: ubuntu-22.04
-    permissions:
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-      - name: Build and Push Container
-        uses: ./devops/actions/build_container
-        with:
-          push: ${{ github.event_name != 'pull_request' }}
-          file: ubuntu2204_build
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          tags: |
-            ghcr.io/${{ github.repository }}/ubuntu2204_build:${{ github.sha }}
-            ghcr.io/${{ github.repository }}/ubuntu2204_build:latest
+            ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}-${{ github.sha }}
+            ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}
+          build-args: ${{ matrix.build_args }}
 
-  # This job produces a Docker container with the latest versions of Intel
-  # drivers, that can be found on GitHub.
-  drivers_image_ubuntu2204:
-    if: github.repository == 'intel/llvm'
-    name: Intel Drivers Ubuntu 22.04 Docker image
-    runs-on: ubuntu-22.04
-    permissions:
-      packages: write
-    needs: base_image_ubuntu2204
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-      - name: Get dependencies configuration
-        id: deps
-        run: |
-          DEPS=`cat devops/dependencies.json`
-          DEPS="${DEPS//$'\r'/''}"
-          DEPS="${DEPS//$'\n'/' '}"
-          echo $DEPS
-          echo "deps=$DEPS" >>$GITHUB_OUTPUT
-      - name: Build and Push Container
-        uses: ./devops/actions/build_container
-        with:
-          push: ${{ github.event_name != 'pull_request' }}
-          file: ubuntu2204_intel_drivers
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          tags: |
-            ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:latest-${{ github.sha }}
-            ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:latest
-          build-args: |
-            compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
-            igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
-            cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
-            level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
-            tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
-            fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
-            cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
-  # This job produces a Docker container with the latest versions of Intel
-  # drivers, that can be found on GitHub.
-  drivers_image_ubuntu2204_unstable:
-    if: github.repository == 'intel/llvm'
-    name: Intel Drivers (unstable) Ubuntu 22.04 Docker image
-    runs-on: ubuntu-22.04
-    permissions:
-      packages: write
-    needs: base_image_ubuntu2204
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-      - name: Get dependencies configuration
-        id: deps
-        run: |
-          DEPS=`cat devops/dependencies.json`
-          DEPS="${DEPS//$'\r'/''}"
-          DEPS="${DEPS//$'\n'/' '}"
-          echo $DEPS
-          echo "deps=$DEPS" >>$GITHUB_OUTPUT
-      - name: Build and Push Container
-        uses: ./devops/actions/build_container
-        with:
-          push: ${{ github.event_name != 'pull_request' }}
-          file: ubuntu2204_intel_drivers
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          tags: |
-            ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:unstable-${{ github.sha }}
-            ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:unstable
-          # build-args:empty, so we automatically take the "latest" tags as
-          # unstable

.github/workflows/sycl-detect-changes.yml

@@ -20,7 +20,7 @@ jobs:
       filters: ${{ steps.result.outputs.result }}
     steps:
       - name: Check file changes
-        uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
         id: changes
         with:
           filters: |

.github/workflows/sycl-nightly.yml

@@ -146,7 +146,7 @@ jobs:
           echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
         fi
     - name: Upload binaries
-      uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
+      uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564
       with:
         files: |
           sycl_linux.tar.gz
@@ -160,6 +160,8 @@ jobs:
   ubuntu2204_docker_build_push:
     if: github.repository == 'intel/llvm'
     runs-on: [Linux, build]
+    permissions:
+      packages: write
     needs: ubuntu2204_build
     steps:
     - uses: actions/checkout@v4

bolt/include/bolt/Core/AddressMap.h

@@ -14,7 +14,6 @@
 #ifndef BOLT_CORE_ADDRESS_MAP_H
 #define BOLT_CORE_ADDRESS_MAP_H
 
-#include "llvm/ADT/StringRef.h"
 #include "llvm/MC/MCSymbol.h"
 
 #include <optional>

bolt/include/bolt/Core/BinaryContext.h

@@ -265,7 +265,8 @@ class BinaryContext {
 
 public:
   static Expected<std::unique_ptr<BinaryContext>>
-  createBinaryContext(const ObjectFile *File, bool IsPIC,
+  createBinaryContext(Triple TheTriple, StringRef InputFileName,
+                      SubtargetFeatures *Features, bool IsPIC,
                       std::unique_ptr<DWARFContext> DwCtx,
                       JournalingStreams Logger);
 

bolt/include/bolt/Core/BinaryData.h

@@ -18,7 +18,6 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCSymbol.h"
 #include "llvm/Support/raw_ostream.h"
-#include <algorithm>
 #include <string>
 #include <vector>
 

bolt/include/bolt/Core/BinaryDomTree.h

@@ -16,7 +16,6 @@
 
 #include "bolt/Core/BinaryBasicBlock.h"
 #include "llvm/IR/Dominators.h"
-#include "llvm/Support/GenericDomTreeConstruction.h"
 
 namespace llvm {
 namespace bolt {