Skip to content

Commit 3082834

Browse files
committed
Merge remote-tracking branch 'origin/sycl' into private/asachkov/generic-module-splitter
2 parents aec361c + dd23a85 commit 3082834

File tree

114 files changed

+3859
-895
lines changed

Some content is hidden

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

114 files changed

+3859
-895
lines changed

.github/workflows/sycl_containers.yaml

Lines changed: 4 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -22,121 +22,10 @@ on:
2222
- '.github/workflows/sycl_containers.yaml'
2323

2424
jobs:
25-
base_image_ubuntu2004:
26-
if: github.repository == 'intel/llvm'
27-
name: Base Ubuntu 20.04 Docker image
28-
runs-on: ubuntu-20.04
29-
steps:
30-
- name: Checkout
31-
uses: actions/checkout@v3
32-
with:
33-
fetch-depth: 2
34-
- name: Build and Push Container
35-
uses: ./devops/actions/build_container
36-
with:
37-
push: ${{ github.event_name != 'pull_request' }}
38-
file: ubuntu2004_base
39-
username: ${{ github.repository_owner }}
40-
password: ${{ secrets.GITHUB_TOKEN }}
41-
tags: |
42-
ghcr.io/${{ github.repository }}/ubuntu2004_base:${{ github.sha }}
43-
ghcr.io/${{ github.repository }}/ubuntu2004_base:latest
44-
build_image_ubuntu2004:
45-
if: github.repository == 'intel/llvm'
46-
name: Build Ubuntu Docker image
47-
runs-on: ubuntu-20.04
48-
steps:
49-
- name: Checkout
50-
uses: actions/checkout@v3
51-
with:
52-
fetch-depth: 2
53-
- name: Build and Push Container
54-
uses: ./devops/actions/build_container
55-
with:
56-
push: ${{ github.event_name != 'pull_request' }}
57-
file: ubuntu2004_build
58-
username: ${{ github.repository_owner }}
59-
password: ${{ secrets.GITHUB_TOKEN }}
60-
tags: |
61-
ghcr.io/${{ github.repository }}/ubuntu2004_build:${{ github.sha }}
62-
ghcr.io/${{ github.repository }}/ubuntu2004_build:latest
63-
64-
# This job produces a Docker container with the latest versions of Intel
65-
# drivers, that can be found on GitHub.
66-
drivers_image_ubuntu2004:
67-
if: github.repository == 'intel/llvm'
68-
name: Intel Drivers Ubuntu 20.04 Docker image
69-
runs-on: ubuntu-20.04
70-
needs: base_image_ubuntu2004
71-
steps:
72-
- name: Checkout
73-
uses: actions/checkout@v3
74-
with:
75-
fetch-depth: 2
76-
- name: Get dependencies configuration
77-
id: deps
78-
run: |
79-
DEPS=`cat devops/dependencies.json`
80-
DEPS="${DEPS//$'\r'/''}"
81-
DEPS="${DEPS//$'\n'/' '}"
82-
echo $DEPS
83-
echo "deps=$DEPS" >>$GITHUB_OUTPUT
84-
- name: Build and Push Container
85-
uses: ./devops/actions/build_container
86-
with:
87-
push: ${{ github.event_name != 'pull_request' }}
88-
file: ubuntu2004_intel_drivers
89-
username: ${{ github.repository_owner }}
90-
password: ${{ secrets.GITHUB_TOKEN }}
91-
tags: |
92-
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest-${{ github.sha }}
93-
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest
94-
build-args: |
95-
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
96-
igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
97-
cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
98-
level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
99-
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
100-
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
101-
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
102-
103-
# This job produces a Docker container with the latest versions of Intel
104-
# drivers, that can be found on GitHub.
105-
drivers_image_ubuntu2004_unstable:
106-
if: github.repository == 'intel/llvm'
107-
name: Intel Drivers (unstable) Ubuntu 20.04 Docker image
108-
runs-on: ubuntu-20.04
109-
needs: base_image_ubuntu2004
110-
steps:
111-
- name: Checkout
112-
uses: actions/checkout@v3
113-
with:
114-
fetch-depth: 2
115-
- name: Get dependencies configuration
116-
id: deps
117-
run: |
118-
DEPS=`cat devops/dependencies.json`
119-
DEPS="${DEPS//$'\r'/''}"
120-
DEPS="${DEPS//$'\n'/' '}"
121-
echo $DEPS
122-
echo "deps=$DEPS" >>$GITHUB_OUTPUT
123-
- name: Build and Push Container
124-
uses: ./devops/actions/build_container
125-
with:
126-
push: ${{ github.event_name != 'pull_request' }}
127-
file: ubuntu2004_intel_drivers
128-
username: ${{ github.repository_owner }}
129-
password: ${{ secrets.GITHUB_TOKEN }}
130-
tags: |
131-
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable-${{ github.sha }}
132-
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable
133-
# build-args:empty , so we automatically take the "latest" tags as
134-
# unstable
135-
13625
base_image_ubuntu2204:
13726
if: github.repository == 'intel/llvm'
13827
name: Base Ubuntu 22.04 Docker image
139-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-22.04
14029
steps:
14130
- name: Checkout
14231
uses: actions/checkout@v3
@@ -155,7 +44,7 @@ jobs:
15544
build_image_ubuntu2204:
15645
if: github.repository == 'intel/llvm'
15746
name: Build Ubuntu Docker image
158-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
15948
steps:
16049
- name: Checkout
16150
uses: actions/checkout@v3
@@ -177,7 +66,7 @@ jobs:
17766
drivers_image_ubuntu2204:
17867
if: github.repository == 'intel/llvm'
17968
name: Intel Drivers Ubuntu 22.04 Docker image
180-
runs-on: ubuntu-20.04
69+
runs-on: ubuntu-22.04
18170
needs: base_image_ubuntu2204
18271
steps:
18372
- name: Checkout
@@ -215,7 +104,7 @@ jobs:
215104
drivers_image_ubuntu2204_unstable:
216105
if: github.repository == 'intel/llvm'
217106
name: Intel Drivers (unstable) Ubuntu 22.04 Docker image
218-
runs-on: ubuntu-20.04
107+
runs-on: ubuntu-22.04
219108
needs: base_image_ubuntu2204
220109
steps:
221110
- name: Checkout

.github/workflows/sycl_gen_test_matrix.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
intel_drivers_image:
77
type: string
88
required: false
9-
default: "ghcr.io/intel/llvm/ubuntu2004_intel_drivers:latest"
9+
default: "ghcr.io/intel/llvm/ubuntu2204_intel_drivers:latest"
1010
amdgpu_image:
1111
type: string
1212
required: false
13-
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
13+
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
1414
cuda_image:
1515
type: string
1616
required: false
17-
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
17+
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
1818
lts_config:
1919
type: string
2020
required: true
@@ -34,21 +34,25 @@ on:
3434
required: false
3535
default: ${{ github.sha }}
3636
outputs:
37-
lts_matrix:
38-
description: "Generated Matrix"
39-
value: ${{ jobs.test_matrix.outputs.lts_matrix }}
37+
lts_lx_matrix:
38+
description: "Linux LTS"
39+
value: ${{ jobs.test_matrix.outputs.lts_lx_matrix }}
40+
lts_wn_matrix:
41+
description: "Windows LTS"
42+
value: ${{ jobs.test_matrix.outputs.lts_wn_matrix }}
4043
cts_matrix:
41-
description: "Generated SYCL CTS Matrix"
44+
description: "SYCL CTS"
4245
value: ${{ jobs.test_matrix.outputs.cts_matrix }}
4346
lts_aws_matrix:
44-
description: "Generated Matrix AWS subset"
47+
description: "Linux AWS"
4548
value: ${{ jobs.test_matrix.outputs.lts_aws_matrix }}
4649
jobs:
4750
test_matrix:
4851
name: Generate Test Matrix
4952
runs-on: ubuntu-20.04
5053
outputs:
51-
lts_matrix: ${{ steps.work.outputs.lts_matrix }}
54+
lts_lx_matrix: ${{ steps.work.outputs.lts_lx_matrix }}
55+
lts_wn_matrix: ${{ steps.work.outputs.lts_wn_matrix }}
5256
cts_matrix: ${{ steps.work.outputs.cts_matrix }}
5357
lts_aws_matrix: ${{ steps.work.outputs.lts_aws_matrix }}
5458
steps:

.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
build_image:
1515
type: string
1616
required: false
17-
default: "ghcr.io/intel/llvm/ubuntu2004_build:latest"
17+
default: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
1818
build_ref:
1919
type: string
2020
required: false
@@ -55,7 +55,7 @@ on:
5555
cts_matrix:
5656
type: string
5757
required: false
58-
default: ""
58+
default: "[]"
5959
cts_cmake_extra_args:
6060
type: string
6161
required: false
@@ -232,7 +232,7 @@ jobs:
232232

233233
khronos_sycl_cts:
234234
needs: build
235-
if: ${{ inputs.cts_matrix != '' }}
235+
if: ${{ inputs.cts_matrix != '[]' }}
236236
strategy:
237237
fail-fast: false
238238
matrix:

.github/workflows/sycl_nightly.yml

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
- cron: '0 3 * * *'
77
pull_request:
88
paths:
9-
- 'devops/containers/ubuntu2004_preinstalled.Dockerfile'
109
- 'devops/containers/ubuntu2204_preinstalled.Dockerfile'
1110
- '.github/workflows/sycl_nightly.yml'
1211

@@ -17,16 +16,6 @@ jobs:
1716
with:
1817
lts_config: "ocl_gen9;ocl_x64"
1918

20-
ubuntu2004_build_test:
21-
if: github.repository == 'intel/llvm'
22-
uses: ./.github/workflows/sycl_linux_build_and_test.yml
23-
needs: test_matrix
24-
secrets: inherit
25-
with:
26-
build_cache_root: "/__w/"
27-
build_artifact_suffix: default
28-
build_configure_extra_args: ''
29-
3019
ubuntu2204_build_test:
3120
if: github.repository == 'intel/llvm'
3221
uses: ./.github/workflows/sycl_linux_build_and_test.yml
@@ -36,18 +25,6 @@ jobs:
3625
build_cache_root: "/__w/"
3726
build_artifact_suffix: default-2204
3827
build_configure_extra_args: ''
39-
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
40-
41-
ubuntu2004_opaque_pointers_build_test:
42-
if: github.repository == 'intel/llvm'
43-
uses: ./.github/workflows/sycl_linux_build_and_test.yml
44-
needs: test_matrix
45-
secrets: inherit
46-
with:
47-
build_cache_root: "/__w/"
48-
build_cache_suffix: opaque_pointers
49-
build_artifact_suffix: opaque_pointers
50-
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"
5128

5229
ubuntu2204_opaque_pointers_build_test:
5330
if: github.repository == 'intel/llvm'
@@ -59,53 +36,15 @@ jobs:
5936
build_cache_suffix: opaque_pointers
6037
build_artifact_suffix: opaque_pointers-2204
6138
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DSPIRV_ENABLE_OPAQUE_POINTERS=TRUE"
62-
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
6339

6440
windows_default:
6541
name: Windows
6642
if: github.repository == 'intel/llvm'
6743
uses: ./.github/workflows/sycl_windows_build_and_test.yml
6844

69-
ubuntu2004_docker_build_push:
70-
if: github.repository == 'intel/llvm'
71-
runs-on: ubuntu-20.04
72-
needs: ubuntu2004_build_test
73-
steps:
74-
- uses: actions/checkout@v3
75-
- uses: actions/download-artifact@v3
76-
with:
77-
name: sycl_linux_default
78-
path: devops/
79-
- name: Build and Push Container (with drivers)
80-
uses: ./devops/actions/build_container
81-
with:
82-
push: ${{ github.event_name != 'pull_request' }}
83-
file: ubuntu2004_preinstalled
84-
username: ${{ github.repository_owner }}
85-
password: ${{ secrets.GITHUB_TOKEN }}
86-
build-args: |
87-
base_image=ghcr.io/intel/llvm/ubuntu2004_intel_drivers
88-
base_tag=latest
89-
tags: |
90-
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:${{ github.sha }}
91-
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:latest
92-
- name: Build and Push Container (no drivers)
93-
uses: ./devops/actions/build_container
94-
with:
95-
push: ${{ github.event_name != 'pull_request' }}
96-
file: ubuntu2004_preinstalled
97-
username: ${{ github.repository_owner }}
98-
password: ${{ secrets.GITHUB_TOKEN }}
99-
build-args: |
100-
base_image=ghcr.io/intel/llvm/ubuntu2004_base
101-
base_tag=latest
102-
tags: |
103-
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
104-
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
105-
10645
ubuntu2204_docker_build_push:
10746
if: github.repository == 'intel/llvm'
108-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
10948
needs: ubuntu2204_build_test
11049
steps:
11150
- uses: actions/checkout@v3

.github/workflows/sycl_post_commit.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ jobs:
2222
if: github.repository == 'intel/llvm'
2323
uses: ./.github/workflows/sycl_gen_test_matrix.yml
2424
with:
25-
lts_config: "l0_gen9"
26-
cts_config: "cuda"
25+
lts_config: "l0_gen9;win_l0_gen12"
2726
linux_default:
2827
name: Linux Default
2928
if: github.repository == 'intel/llvm'
@@ -33,7 +32,7 @@ jobs:
3332
with:
3433
build_cache_root: "/__w/llvm"
3534
build_artifact_suffix: "post_commit"
36-
lts_matrix: ${{ needs.test_matrix.outputs.lts_matrix }}
35+
lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
3736
cts_matrix: ${{ needs.test_matrix.outputs.cts_matrix }}
3837
lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
3938
build_configure_extra_args: --hip --cuda --enable-esimd-emulator --cmake-opt="-DSYCL_ENABLE_STACK_PRINTING=ON" --cmake-opt="-DSYCL_LIB_WITH_DEBUG_SYMBOL=ON"
@@ -63,8 +62,11 @@ jobs:
6362

6463
windows_default:
6564
name: Windows
65+
needs: test_matrix
6666
if: github.repository == 'intel/llvm'
6767
uses: ./.github/workflows/sycl_windows_build_and_test.yml
68+
with:
69+
lts_matrix: ${{ needs.test_matrix.outputs.lts_wn_matrix }}
6870

6971
macos_default:
7072
name: macOS

.github/workflows/sycl_precommit.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ permissions:
2828

2929
jobs:
3030
lint:
31-
runs-on: ubuntu-20.04
31+
runs-on: ubuntu-22.04
3232
container:
33-
image: ghcr.io/intel/llvm/sycl_ubuntu2004_nightly:no-drivers
33+
image: ghcr.io/intel/llvm/sycl_ubuntu2204_nightly:no-drivers
3434
steps:
3535
- name: 'PR commits + 1'
3636
run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}"
@@ -48,7 +48,7 @@ jobs:
4848
uses: ./.github/workflows/sycl_gen_test_matrix.yml
4949
with:
5050
ref: ${{ github.event.pull_request.head.sha }}
51-
lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda_aws"
51+
lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda_aws;win_l0_gen12"
5252

5353
linux_default:
5454
name: Linux
@@ -64,5 +64,14 @@ jobs:
6464
build_cache_size: "8G"
6565
build_artifact_suffix: "default"
6666
build_cache_suffix: "default"
67-
lts_matrix: ${{ needs.test_matrix.outputs.lts_matrix }}
67+
lts_matrix: ${{ needs.test_matrix.outputs.lts_lx_matrix }}
6868
lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
69+
70+
windows_default:
71+
name: Windows
72+
needs: test_matrix
73+
if: github.repository == 'intel/llvm'
74+
uses: ./.github/workflows/sycl_windows_build_and_test.yml
75+
with:
76+
lts_matrix: ${{ needs.test_matrix.outputs.lts_wn_matrix }}
77+
build_ref: ${{ github.event.pull_request.head.sha }}

0 commit comments

Comments
 (0)