Skip to content

[CI] Use devops dir from sycl on sycl-rel nightly #17004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 14, 2025
Merged

[CI] Use devops dir from sycl on sycl-rel nightly #17004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
562e733
[CI] Use devops dir from sycl on sycl-rel nightly
KornevNikita Feb 13, 2025
8eb9333
Merge remote-tracking branch 'origin/sycl' into use-sycl-devops-actions
KornevNikita Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/sycl-linux-run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ on:
ref:
type: string
required: True
devops_ref:
type: string
required: False
description: |
By default we checkout the devops directory from "inputs.ref" branch.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we ever want this to be different? shouldnt we always use the current version from the sycl branch?

Copy link
Contributor Author

@KornevNikita KornevNikita Feb 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure. So this first checkout defines which devops/actions/cleanup and devops/actions/cached_checkout scripts are used. Are there cases when you need to use the script from your branch, not from sycl, e.g. If you need to test changes in cached_checkout?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ive never had to, since we should always use the workflow/script in the current PR which is always what i wanted

devops_ref may be specified to checkout the devops dir from different
branch.
Note: it doesn't affect ./devops/actions/run-tests/* as these actions
call checkout again and therefore override the devops directory, so
configs/dependecies from input.ref are used.

sycl_toolchain_artifact:
type: string
Expand Down Expand Up @@ -197,7 +207,7 @@ jobs:
sudo bash -c 'echo 1 > /sys/kernel/debug/dri/0/i915_wedged'
- uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
ref: ${{ inputs.devops_ref || inputs.ref }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

another option - may be we can drop ref at all so actions/checkout@v4 will use github.sha as by default.

Copy link
Contributor

@aelovikov-intel aelovikov-intel Feb 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we still [want to] have CUDA on AWS testing. Due to its setup it can't use pull_request trigger and uses pull_request_target trigger. IIUC, the ref input is mostly to support such scenario (although I might be wrong here).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you mean this one? As I understand it's not used for ~6months and we don't have AWS runners anymore or? Nick made these changes, so @sarnex can we just drop ref args at all? Like

Suggested change
ref: ${{ inputs.devops_ref || inputs.ref }}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still run it in Nightly:

llvm/.github/workflows/sycl-nightly.yml

Lines 147 to 169 in f3d12f0

cuda-aws-start:
needs: [ubuntu2204_build]
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
uses: ./.github/workflows/sycl-aws.yml
secrets: inherit
with:
mode: start
cuda-run-tests:
needs: [ubuntu2204_build, cuda-aws-start]
if: ${{ always() && !cancelled() && needs.ubuntu2204_build.outputs.build_conclusion == 'success' }}
uses: ./.github/workflows/sycl-linux-run-tests.yml
with:
name: CUDA E2E
runner: '["aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}"]'
image: ghcr.io/intel/llvm/ubuntu2204_build:latest
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
target_devices: cuda:gpu
ref: ${{ github.sha }}
sycl_toolchain_artifact: sycl_linux_default
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}

because we don't want the infrastructure support to rot.

sparse-checkout: |
devops
- name: Register cleanup after job is finished
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/sycl-rel-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
# since the last run. More precisely, it checks if the last commit is older
# than 24h. That means the previous Nightly already tested this commit.
check_for_new_commits:
if: github.repository == 'intel/llvm'
runs-on: ubuntu-latest
name: Check for new commits
outputs:
Expand Down Expand Up @@ -101,6 +102,7 @@ jobs:
extra_lit_opts: ${{ matrix.extra_lit_opts }}
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
ref: sycl-rel-6_0_0
devops_ref: sycl
sycl_toolchain_artifact: sycl_linux_default
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
sycl_toolchain_decompress_command: ${{ needs.ubuntu2204_build.outputs.artifact_decompress_command }}
Expand Down Expand Up @@ -130,6 +132,7 @@ jobs:
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
extra_lit_opts: --param gpu-intel-gen12=True
ref: sycl-rel-6_0_0
devops_ref: sycl

cuda-aws-start:
needs: [ubuntu2204_build]
Expand All @@ -151,6 +154,7 @@ jobs:
image_options: -u 1001 --gpus all --cap-add SYS_ADMIN --env NVIDIA_DISABLE_REQUIRE=1
target_devices: cuda:gpu
ref: sycl-rel-6_0_0
devops_ref: sycl

sycl_toolchain_artifact: sycl_linux_default
sycl_toolchain_archive: ${{ needs.ubuntu2204_build.outputs.artifact_archive_name }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/sycl-windows-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ jobs:
with:
sparse-checkout: |
devops/actions
ref: ${{ inputs.ref || github.sha }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for reviewers: just aligned this with sycl-linux-build.yml

- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
with:
arch: amd64
Expand Down
12 changes: 11 additions & 1 deletion .github/workflows/sycl-windows-run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ on:
ref:
type: string
required: False
devops_ref:
type: string
required: False
description: |
By default we checkout the devops directory from "inputs.ref" branch.
devops_ref may be specified to checkout the devops dir from different
branch.
Note: it doesn't affect ./devops/actions/run-tests/* as these actions
call checkout again and therefore override the devops directory, so
configs/dependecies from input.ref are used.

sycl_toolchain_artifact:
type: string
Expand Down Expand Up @@ -61,7 +71,7 @@ jobs:
with:
sparse-checkout: |
devops/actions
ref: ${{ inputs.ref || github.sha }}
ref: ${{ inputs.devops_ref|| inputs.ref || github.sha }}
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756
with:
arch: amd64
Expand Down
Loading