Skip to content

Commit

Permalink
Merge branch 'sycl' into maxime/profiling_v2
Browse files Browse the repository at this point in the history
  • Loading branch information
mfrancepillois committed Jan 31, 2024
2 parents fbbc822 + a934d57 commit 7ff2327
Show file tree
Hide file tree
Showing 125 changed files with 2,533 additions and 745 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
fetch-depth: 1
- name: Get subprojects that have doc changes
id: docs-changed-subprojects
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v42
with:
files_yaml: |
llvm:
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
with:
fetch-depth: 1
- name: Setup Python env
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ on:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: github.repository == 'intel/llvm'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: repo
- name: Install deps
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/libclang-abi-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
sed -i 's/LLVM_[0-9]\+/LLVM_NOVERSION/' $lib-${{ matrix.ref }}.abi
done
- name: Upload ABI file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.name }}
path: '*${{ matrix.ref }}.abi'
Expand All @@ -144,12 +144,12 @@ jobs:
- abi-dump
steps:
- name: Download baseline
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-baseline
path: build-baseline
- name: Download latest
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-latest
path: build-latest
Expand All @@ -163,7 +163,7 @@ jobs:
done
- name: Upload ABI Comparison
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: compat-report-${{ github.sha }}
path: compat_reports/
6 changes: 3 additions & 3 deletions .github/workflows/libcxx-build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ matrix.config }}-${{ matrix.cxx }}-results
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
ENABLE_CLANG_TIDY: ${{ matrix.clang_tidy }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always() # Upload artifacts even if the build or test suite fails
with:
name: ${{ matrix.config }}-results
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
CC: clang-18
CXX: clang++-18
ENABLE_CLANG_TIDY: "OFF"
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: ${{ matrix.config }}-results
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/llvm-bugs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-latest
if: github.repository == 'llvm/llvm-project'
steps:
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
check-latest: true
- run: npm install mailgun.js form-data
- name: Send notification
uses: actions/github-script@v6
uses: actions/github-script@v7
env:
MAILGUN_API_KEY: ${{ secrets.LLVM_BUGS_KEY }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/llvm-project-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
# lldb. Using this setup-python action to make 3.10 the default
# python fixes this.
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ inputs.python_version }}
- name: Install Ninja
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/llvm-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ jobs:
# Remove symbol versioning from dumps, so we can compare across major versions.
sed -i 's/LLVM_${{ matrix.llvm_version_major }}/LLVM_NOVERSION/' ${{ matrix.ref }}.abi
- name: Upload ABI file
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.name }}
path: ${{ matrix.ref }}.abi

- name: Upload symbol list file
if: matrix.name == 'build-baseline'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: symbol-list
path: llvm.symbols
Expand All @@ -167,17 +167,17 @@ jobs:
- abi-dump
steps:
- name: Download baseline
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-baseline
path: build-baseline
- name: Download latest
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build-latest
path: build-latest
- name: Download symbol list
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: symbol-list
path: symbol-list
Expand All @@ -196,7 +196,7 @@ jobs:
abi-compliance-checker "$EXTRA_ARGS" -l libLLVM.so -old build-baseline/*.abi -new build-latest/*.abi || test "${{ needs.abi-dump-setup.outputs.ABI_HEADERS }}" = "llvm-c"
- name: Upload ABI Comparison
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: compat-report-${{ github.sha }}
path: compat_reports/
2 changes: 1 addition & 1 deletion .github/workflows/new-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
github.event.pull_request.draft == false &&
github.event.pull_request.commits < 10
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
configuration-path: .github/new-prs-labeler.yml
# workaround for https://github.com/actions/labeler/issues/112
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-code-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v42
with:
separator: ","
skip_initial_fetch: true
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
clangformat: 17.0.1

- name: Setup Python env
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Setup Python env
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
cache: 'pip'
cache-dependency-path: './llvm/docs/requirements.txt'
Expand All @@ -59,7 +59,7 @@ jobs:
./llvm/utils/release/build-docs.sh -release "${{ inputs.release-version }}" -no-doxygen
- name: Create Release Notes Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release-notes
path: docs-build/html-export/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Setup Python env
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
cache: 'pip'
cache-dependency-path: './llvm/docs/requirements.txt'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -49,14 +49,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
with:
sarif_file: results.sarif
8 changes: 4 additions & 4 deletions .github/workflows/sycl_containers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Build and Push Container
Expand All @@ -47,7 +47,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Build and Push Container
Expand All @@ -70,7 +70,7 @@ jobs:
needs: base_image_ubuntu2204
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Get dependencies configuration
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
needs: base_image_ubuntu2204
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Get dependencies configuration
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sycl_detect_changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Set output
id: result
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
console.log("Number of files changed:");
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sycl_linux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
echo "Unsupported extension"
exit 1
fi
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
sparse-checkout: |
devops/actions
Expand Down Expand Up @@ -227,7 +227,7 @@ jobs:
run: tar -I '${{ steps.artifact_info.outputs.COMPRESS }}' -cf ${{ steps.artifact_info.outputs.ARCHIVE_NAME }} -C $GITHUB_WORKSPACE/build/install .
- name: Upload toolchain
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: sycl_linux_${{ inputs.build_artifact_suffix }}
path: ${{ steps.artifact_info.outputs.ARCHIVE_NAME }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/sycl_linux_precommit_aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
create-check:
runs-on: [Linux, build]
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v7
with:
script: |
const sha = context.payload.workflow_run.head_sha
Expand All @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-20.04
environment: aws
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
sparse-checkout: devops/actions/aws-ec2
- run: npm install ./devops/actions/aws-ec2
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
if: always()
runs-on: [Linux, build]
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v7
with:
script: |
const sha = context.payload.workflow_run.head_sha
Expand All @@ -99,7 +99,7 @@ jobs:
runs-on: ubuntu-20.04
environment: aws
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
sparse-checkout: devops/actions/aws-ec2
- run: npm install ./devops/actions/aws-ec2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sycl_linux_run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:
run: |
sudo mount -t debugfs none /sys/kernel/debug
sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
sparse-checkout: |
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
rm env_before env_after
- name: Download SYCL toolchain
if: inputs.sycl_toolchain_artifact != '' && github.event_name != 'workflow_run'
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ inputs.sycl_toolchain_artifact }}
- name: Debug prints [workflow_run]
Expand All @@ -207,7 +207,7 @@ jobs:
ls
- name: Download SYCL toolchain [workflow_run]
if: inputs.sycl_toolchain_artifact != '' && github.event_name == 'workflow_run'
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const name = '${{ inputs.sycl_toolchain_artifact }}'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sycl_macos_build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
steps:
- name: Install dependencies
run: brew install ccache ninja
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.build_ref }}
path: src
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: build_cache_${{ inputs.build_cache_suffix }}
key: sycl-${{ runner.os }}-${{ inputs.build_cache_suffix }}-${{ github.sha }}
Expand Down
Loading

0 comments on commit 7ff2327

Please sign in to comment.