Skip to content

Commit 1349b09

Browse files
committed
Merge branch 'sycl' into llvmspirv_pulldown
Conflicts: clang/lib/Sema/SemaChecking.cpp
2 parents d1a2e01 + 3524739 commit 1349b09

File tree

2,259 files changed

+12586
-5506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,259 files changed

+12586
-5506
lines changed

.github/workflows/release-binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ jobs:
436436

437437
- name: Attest Build Provenance
438438
id: provenance
439-
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
439+
uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
440440
with:
441441
subject-path: ${{ needs.prepare.outputs.release-binary-filename }}
442442

.github/workflows/release-sources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
- name: Attest Build Provenance
9393
if: github.event_name != 'pull_request'
9494
id: provenance
95-
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
95+
uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
9696
with:
9797
subject-path: "*.xz"
9898
- if: github.event_name != 'pull_request'

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757

5858
# Upload the results to GitHub's code scanning dashboard.
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
60+
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
6161
with:
6262
sarif_file: results.sarif

.github/workflows/sycl-aws.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ on:
1515
description: "JSON string with array of objects with aws-type, runs-on, aws-ami, aws-spot, aws-disk, aws-timebomb, one-job properties"
1616
type: string
1717
default: '[{"runs-on":"aws_cuda-${{ github.run_id }}-${{ github.run_attempt }}","aws-ami":"ami-01cb0573cb039ab24","aws-type":["g5.2xlarge","g5.4xlarge"],"aws-disk":"/dev/sda1:64","aws-spot":"false"}]'
18+
ref:
19+
type: string
20+
required: false
1821

1922
jobs:
2023
aws:
@@ -24,6 +27,7 @@ jobs:
2427
- uses: actions/checkout@v4
2528
with:
2629
sparse-checkout: devops/actions/aws-ec2
30+
ref: ${{ inputs.ref || github.sha }}
2731
- run: npm install ./devops/actions/aws-ec2
2832
- uses: ./devops/actions/aws-ec2
2933
with:

.github/workflows/sycl-containers-igc-dev.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
strategy:
2727
matrix:
2828
include:
29-
- name: Intel Drivers Ubuntu 22.04 Docker image with dev IGC
30-
dockerfile: ubuntu2204_intel_drivers_igc_dev
31-
imagefile: ubuntu2204_intel_drivers
29+
- name: Intel Drivers Ubuntu 24.04 Docker image with dev IGC
30+
dockerfile: ubuntu2404_intel_drivers_igc_dev
31+
imagefile: ubuntu2404_intel_drivers
3232
tag: devigc
3333
build_args: |
3434
"use_latest=false"

.github/workflows/sycl-containers.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ jobs:
3939
file: ubuntu2204_base
4040
tag: latest
4141
build_args: ""
42+
- name: Base Ubuntu 24.04 Docker image
43+
file: ubuntu2404_base
44+
tag: latest
45+
build_args: ""
4246
- name: Build Ubuntu Docker image
4347
file: ubuntu2204_build
4448
tag: latest
@@ -47,8 +51,8 @@ jobs:
4751
file: ubuntu2204_intel_drivers
4852
tag: latest
4953
build_args: "use_latest=false"
50-
- name: Intel Drivers (unstable) Ubuntu 22.04 Docker image
51-
file: ubuntu2204_intel_drivers
54+
- name: Intel Drivers (unstable) Ubuntu 24.04 Docker image
55+
file: ubuntu2404_intel_drivers
5256
tag: unstable
5357
build_args: "use_latest=true"
5458
- name: Build + Intel Drivers Ubuntu 22.04 Docker image

.github/workflows/sycl-linux-build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ on:
5050
description: 'Artifacts retention period'
5151
type: string
5252
default: 3
53+
ref:
54+
type: string
55+
required: false
5356

5457
outputs:
5558
build_conclusion:
@@ -143,6 +146,7 @@ jobs:
143146
with:
144147
sparse-checkout: |
145148
devops/actions
149+
ref: ${{ inputs.ref || github.sha }}
146150
# Cleanup will be run after all actions are completed.
147151
- name: Register cleanup after job is finished
148152
uses: ./devops/actions/cleanup

.github/workflows/sycl-linux-precommit.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ jobs:
4545
build_cache_root: "/__w/"
4646
build_artifact_suffix: "default"
4747
build_cache_suffix: "default"
48+
# Docker image has last nightly pre-installed and added to the PATH
49+
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
50+
cc: clang
51+
cxx: clang++
4852
changes: ${{ needs.detect_changes.outputs.filters }}
4953

5054
determine_arc_tests:
@@ -103,7 +107,7 @@ jobs:
103107
env: '{"LIT_FILTER":${{ needs.determine_arc_tests.outputs.arc_tests }} }'
104108
- name: E2E tests with dev igc on Intel Arc A-Series Graphics
105109
runner: '["Linux", "arc"]'
106-
image: ghcr.io/intel/llvm/ubuntu2204_intel_drivers:devigc
110+
image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:devigc
107111
image_options: -u 1001 --device=/dev/dri -v /dev/dri/by-path:/dev/dri/by-path --privileged --cap-add SYS_ADMIN
108112
target_devices: level_zero:gpu;opencl:gpu
109113
reset_intel_gpu: true

.github/workflows/sycl-nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
image_options: ${{ matrix.image_options }}
111111
target_devices: ${{ matrix.target_devices }}
112112
tests_selector: ${{ matrix.tests_selector }}
113-
extra_lit_opts: ${{ matrix.extra_lit_opts }}
113+
extra_lit_opts: "--param 'cxx_flags=-D_GLIBCXX_USE_CXX11_ABI=0' ${{ matrix.extra_lit_opts }}"
114114
reset_intel_gpu: ${{ matrix.reset_intel_gpu }}
115115
ref: ${{ github.sha }}
116116
merge_ref: ''
@@ -168,7 +168,7 @@ jobs:
168168

169169
cuda-aws-stop:
170170
needs: [cuda-aws-start, cuda-run-tests]
171-
if: always()
171+
if: always() && ${{ needs.cuda-aws-start.result != 'skipped' }}
172172
uses: ./.github/workflows/sycl-aws.yml
173173
secrets: inherit
174174
with:
@@ -198,7 +198,7 @@ jobs:
198198
echo "TAG=$(date +'%Y-%m-%d')-${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
199199
fi
200200
- name: Upload binaries
201-
uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8
201+
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974
202202
with:
203203
files: |
204204
sycl_linux.tar.gz

.github/workflows/sycl-post-commit.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ jobs:
3535
build_cache_root: "/__w/llvm"
3636
build_cache_suffix: default
3737
build_artifact_suffix: default
38-
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
39-
# Docker image has last nightly pre-installed and added to the PATH
40-
build_image: "ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:build"
41-
cc: clang
42-
cxx: clang++
38+
build_configure_extra_args: --no-assertions --hip --cuda --native_cpu --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
4339
merge_ref: ''
4440

4541
e2e-lin:
@@ -107,7 +103,11 @@ jobs:
107103
&& success()
108104
&& github.repository == 'intel/llvm'
109105
uses: ./.github/workflows/sycl-windows-build.yml
110-
106+
with:
107+
compiler: icx
108+
build_configure_extra_args: --cmake-opt=-DCMAKE_C_FLAGS="/clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt=-DCMAKE_CXX_FLAGS="/clang:-Wno-nonportable-include-path /clang:-Wno-cast-function-type-mismatch" --cmake-opt="-DCMAKE_EXE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_MODULE_LINKER_FLAGS=/manifest:no" --cmake-opt="-DCMAKE_SHARED_LINKER_FLAGS=/manifest:no"
109+
build_cache_suffix: icx
110+
111111
e2e-win:
112112
needs: build-win
113113
# Continue if build was successful.
@@ -121,6 +121,7 @@ jobs:
121121
runner: '["Windows","gen12"]'
122122
sycl_toolchain_archive: ${{ needs.build-win.outputs.artifact_archive_name }}
123123
extra_lit_opts: --param gpu-intel-gen12=True
124+
compiler: icx
124125

125126
macos_default:
126127
name: macOS

0 commit comments

Comments
 (0)