Skip to content

Commit 54d0eb4

Browse files
asudarsaasudarsa
committed
Fix merge conficts
Signed-off-by: Arvind Sudarsanam <[email protected]>
2 parents d73a1da + 23b68db commit 54d0eb4

File tree

18,309 files changed

+730753
-309893
lines changed

Some content is hidden

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

18,309 files changed

+730753
-309893
lines changed

‎.github/CODEOWNERS

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* @pvchupin
1+
* @bader
22

33
# Front-end compiler
44
clang/ @intel/dpcpp-cfe-reviewers
@@ -70,3 +70,6 @@ llvm/include/llvm/SYCLLowerIR/LowerInvokeSimd.h @kbobrovs @v-klochkov @rolandsch
7070
.github/workflows/ @intel/dpcpp-devops-reviewers
7171
buildbot/ @intel/dpcpp-devops-reviewers
7272
devops/ @intel/dpcpp-devops-reviewers
73+
74+
# Kernel fusion JIT compiler
75+
sycl-fusion/ @victor-eds @Naghasan @sommerlukas

‎.github/workflows/gh_pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Install deps
2323
run: |
2424
sudo apt-get install -y doxygen graphviz ssh ninja-build
25-
sudo pip3 install 'sphinx==4.1.2' 'myst-parser==0.15.1' 'recommonmark==0.7.1'
25+
sudo pip3 install 'sphinx==4.2.0' 'myst-parser==0.15.1' 'recommonmark==0.7.1'
2626
- name: Build Docs
2727
run: |
2828
mkdir -p $GITHUB_WORKSPACE/build

‎.github/workflows/sycl_containers.yaml

+113-6
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ jobs:
9494
build-args: |
9595
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
9696
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}}
9799
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
98100
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
99101
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
@@ -128,10 +130,115 @@ jobs:
128130
tags: |
129131
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable-${{ github.sha }}
130132
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:unstable
131-
build-args: |
132-
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.compute_runtime.github_tag}}
133-
igc_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.igc.github_tag}}
134-
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.tbb.github_tag}}
135-
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.fpgaemu.github_tag}}
136-
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux_staging.oclcpu.github_tag}}
133+
# build-args:empty , so we automatically take the "latest" tags as
134+
# unstable
137135

136+
base_image_ubuntu2204:
137+
if: github.repository == 'intel/llvm'
138+
name: Base Ubuntu 22.04 Docker image
139+
runs-on: ubuntu-latest
140+
steps:
141+
- name: Checkout
142+
uses: actions/checkout@v3
143+
with:
144+
fetch-depth: 2
145+
- name: Build and Push Container
146+
uses: ./devops/actions/build_container
147+
with:
148+
push: ${{ github.event_name != 'pull_request' }}
149+
file: ubuntu2204_base
150+
username: ${{ github.repository_owner }}
151+
password: ${{ secrets.GITHUB_TOKEN }}
152+
tags: |
153+
ghcr.io/${{ github.repository }}/ubuntu2204_base:${{ github.sha }}
154+
ghcr.io/${{ github.repository }}/ubuntu2204_base:latest
155+
build_image_ubuntu2204:
156+
if: github.repository == 'intel/llvm'
157+
name: Build Ubuntu Docker image
158+
runs-on: ubuntu-latest
159+
steps:
160+
- name: Checkout
161+
uses: actions/checkout@v3
162+
with:
163+
fetch-depth: 2
164+
- name: Build and Push Container
165+
uses: ./devops/actions/build_container
166+
with:
167+
push: ${{ github.event_name != 'pull_request' }}
168+
file: ubuntu2204_build
169+
username: ${{ github.repository_owner }}
170+
password: ${{ secrets.GITHUB_TOKEN }}
171+
tags: |
172+
ghcr.io/${{ github.repository }}/ubuntu2204_build:${{ github.sha }}
173+
ghcr.io/${{ github.repository }}/ubuntu2204_build:latest
174+
175+
# This job produces a Docker container with the latest versions of Intel
176+
# drivers, that can be found on GitHub.
177+
drivers_image_ubuntu2204:
178+
if: github.repository == 'intel/llvm'
179+
name: Intel Drivers Ubuntu 22.04 Docker image
180+
runs-on: ubuntu-latest
181+
needs: base_image_ubuntu2204
182+
steps:
183+
- name: Checkout
184+
uses: actions/checkout@v3
185+
with:
186+
fetch-depth: 2
187+
- name: Get dependencies configuration
188+
id: deps
189+
run: |
190+
DEPS=`cat devops/dependencies.json`
191+
DEPS="${DEPS//$'\r'/''}"
192+
DEPS="${DEPS//$'\n'/' '}"
193+
echo $DEPS
194+
echo "deps=$DEPS" >>$GITHUB_OUTPUT
195+
- name: Build and Push Container
196+
uses: ./devops/actions/build_container
197+
with:
198+
push: ${{ github.event_name != 'pull_request' }}
199+
file: ubuntu2204_intel_drivers
200+
username: ${{ github.repository_owner }}
201+
password: ${{ secrets.GITHUB_TOKEN }}
202+
tags: |
203+
ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:latest-${{ github.sha }}
204+
ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:latest
205+
build-args: |
206+
compute_runtime_tag=${{fromJson(steps.deps.outputs.deps).linux.compute_runtime.github_tag}}
207+
igc_tag=${{fromJson(steps.deps.outputs.deps).linux.igc.github_tag}}
208+
cm_tag=${{fromJson(steps.deps.outputs.deps).linux.cm.github_tag}}
209+
level_zero_tag=${{fromJson(steps.deps.outputs.deps).linux.level_zero.github_tag}}
210+
tbb_tag=${{fromJson(steps.deps.outputs.deps).linux.tbb.github_tag}}
211+
fpgaemu_tag=${{fromJson(steps.deps.outputs.deps).linux.fpgaemu.github_tag}}
212+
cpu_tag=${{fromJson(steps.deps.outputs.deps).linux.oclcpu.github_tag}}
213+
# This job produces a Docker container with the latest versions of Intel
214+
# drivers, that can be found on GitHub.
215+
drivers_image_ubuntu2204_unstable:
216+
if: github.repository == 'intel/llvm'
217+
name: Intel Drivers (unstable) Ubuntu 22.04 Docker image
218+
runs-on: ubuntu-latest
219+
needs: base_image_ubuntu2204
220+
steps:
221+
- name: Checkout
222+
uses: actions/checkout@v3
223+
with:
224+
fetch-depth: 2
225+
- name: Get dependencies configuration
226+
id: deps
227+
run: |
228+
DEPS=`cat devops/dependencies.json`
229+
DEPS="${DEPS//$'\r'/''}"
230+
DEPS="${DEPS//$'\n'/' '}"
231+
echo $DEPS
232+
echo "deps=$DEPS" >>$GITHUB_OUTPUT
233+
- name: Build and Push Container
234+
uses: ./devops/actions/build_container
235+
with:
236+
push: ${{ github.event_name != 'pull_request' }}
237+
file: ubuntu2204_intel_drivers
238+
username: ${{ github.repository_owner }}
239+
password: ${{ secrets.GITHUB_TOKEN }}
240+
tags: |
241+
ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:unstable-${{ github.sha }}
242+
ghcr.io/${{ github.repository }}/ubuntu2204_intel_drivers:unstable
243+
# build-args:empty, so we automatically take the "latest" tags as
244+
# unstable

‎.github/workflows/sycl_linux_build_and_test.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@ jobs:
195195

196196
llvm_test_suite:
197197
needs: [build, aws-start]
198-
if: ${{ !failure() && inputs.lts_matrix != '[]' }}
198+
# Continue if build was successful. If aws-start is not successful all
199+
# AWS tasks will fail, but all non-AWS tasks should continue.
200+
if: ${{ always() && needs.build.result == 'success' && inputs.lts_matrix != '[]' }}
199201
strategy:
200202
fail-fast: false
201203
max-parallel: ${{ inputs.max_parallel }}
@@ -242,7 +244,7 @@ jobs:
242244
check_sycl_all: ${{ matrix.check_sycl_all }}
243245
results_name_suffix: ${{ matrix.config }}_${{ inputs.build_artifact_suffix }}
244246
cmake_args: '${{ matrix.cmake_args }} ${{ inputs.lts_cmake_extra_args }}'
245-
247+
246248
khronos_sycl_cts:
247249
needs: build
248250
if: ${{ inputs.cts_matrix != '' }}
@@ -293,6 +295,8 @@ jobs:
293295
aws-stop:
294296
name: Stop AWS
295297
needs: [ aws-start, llvm_test_suite ]
298+
# Always attempt to shutdown AWS instance, even if AWS start was not
299+
# successful.
296300
if: ${{ always() && inputs.lts_aws_matrix != '[]' }}
297301
runs-on: ubuntu-latest
298302
environment: aws

‎.github/workflows/sycl_nightly.yml

+61
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
paths:
99
- 'devops/containers/ubuntu2004_preinstalled.Dockerfile'
10+
- 'devops/containers/ubuntu2204_preinstalled.Dockerfile'
1011
- '.github/workflows/sycl_nightly.yml'
1112

1213
jobs:
@@ -26,6 +27,17 @@ jobs:
2627
build_artifact_suffix: default
2728
build_configure_extra_args: ''
2829

30+
ubuntu2204_build_test:
31+
if: github.repository == 'intel/llvm'
32+
uses: ./.github/workflows/sycl_linux_build_and_test.yml
33+
needs: test_matrix
34+
secrets: inherit
35+
with:
36+
build_cache_root: "/__w/"
37+
build_artifact_suffix: default
38+
build_configure_extra_args: ''
39+
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
40+
2941
ubuntu2004_opaque_pointers_build_test:
3042
if: github.repository == 'intel/llvm'
3143
uses: ./.github/workflows/sycl_linux_build_and_test.yml
@@ -37,6 +49,18 @@ jobs:
3749
build_artifact_suffix: opaque_pointers
3850
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE"
3951

52+
ubuntu2204_opaque_pointers_build_test:
53+
if: github.repository == 'intel/llvm'
54+
uses: ./.github/workflows/sycl_linux_build_and_test.yml
55+
needs: test_matrix
56+
secrets: inherit
57+
with:
58+
build_cache_root: "/__w/"
59+
build_cache_suffix: opaque_pointers
60+
build_artifact_suffix: opaque_pointers
61+
build_configure_extra_args: "--hip --cuda --enable-esimd-emulator --cmake-opt=-DDPCPP_ENABLE_OPAQUE_POINTERS=TRUE"
62+
build_image: "ghcr.io/intel/llvm/ubuntu2204_build:latest"
63+
4064
windows_default:
4165
name: Windows
4266
if: github.repository == 'intel/llvm'
@@ -78,3 +102,40 @@ jobs:
78102
tags: |
79103
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
80104
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
105+
106+
ubuntu2204_docker_build_push:
107+
if: github.repository == 'intel/llvm'
108+
runs-on: ubuntu-latest
109+
needs: ubuntu2204_build_test
110+
steps:
111+
- uses: actions/checkout@v3
112+
- uses: actions/download-artifact@v3
113+
with:
114+
name: sycl_linux_default
115+
path: devops/
116+
- name: Build and Push Container (with drivers)
117+
uses: ./devops/actions/build_container
118+
with:
119+
push: ${{ github.event_name != 'pull_request' }}
120+
file: ubuntu2204_preinstalled
121+
username: ${{ github.repository_owner }}
122+
password: ${{ secrets.GITHUB_TOKEN }}
123+
build-args: |
124+
base_image=ghcr.io/intel/llvm/ubuntu2204_intel_drivers
125+
base_tag=latest
126+
tags: |
127+
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:${{ github.sha }}
128+
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:latest
129+
- name: Build and Push Container (no drivers)
130+
uses: ./devops/actions/build_container
131+
with:
132+
push: ${{ github.event_name != 'pull_request' }}
133+
file: ubuntu2204_preinstalled
134+
username: ${{ github.repository_owner }}
135+
password: ${{ secrets.GITHUB_TOKEN }}
136+
build-args: |
137+
base_image=ghcr.io/intel/llvm/ubuntu2204_base
138+
base_tag=latest
139+
tags: |
140+
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers-${{ github.sha }}
141+
ghcr.io/${{ github.repository }}/sycl_ubuntu2204_nightly:no-drivers

‎.github/workflows/sycl_post_commit.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ jobs:
6565
- name: Configure
6666
run: |
6767
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
68-
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
68+
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
6969
sudo apt-get update
70-
sudo apt-get install -y clang-13
71-
export CC="clang-13"
72-
export CXX="clang++-13"
70+
sudo apt-get install -y clang-15
71+
export CC="clang-15"
72+
export CXX="clang++-15"
7373
mkdir -p $GITHUB_WORKSPACE/build
7474
cd $GITHUB_WORKSPACE/build
7575
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \

‎.github/workflows/sycl_precommit.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
- '.github/ISSUE_TEMPLATE/**'
1010
- '.github/CODEOWNERS'
1111
- '.github/workflows/sycl_update_gpu_driver.yml'
12+
- '.github/workflows/sycl_containers.yaml'
13+
- '.github/workflows/sycl_nightly.yml'
14+
- '.github/workflows/sycl_post_commit.yml'
1215
- '.github/workflows/sycl_windows_build_and_test.yml'
1316
- '.github/workflows/sycl_macos_build_and_test.yml'
1417
- 'devops/containers/**'
@@ -45,7 +48,7 @@ jobs:
4548
uses: ./.github/workflows/sycl_gen_test_matrix.yml
4649
with:
4750
ref: ${{ github.event.pull_request.head.sha }}
48-
lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda"
51+
lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda;cuda_aws"
4952

5053
linux_default:
5154
name: Linux

‎.github/workflows/sycl_windows_build_and_test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
type: string
88
required: false
99
default: "default"
10+
build_ref:
11+
type: string
12+
required: false
1013

1114
jobs:
1215
build:
@@ -26,6 +29,7 @@ jobs:
2629
- uses: actions/checkout@v3
2730
with:
2831
path: src
32+
ref: ${{ inputs.build_ref || github.ref }}
2933
fetch-depth: 1
3034
- name: Register cleanup after job is finished
3135
uses: ./src/devops/actions/cleanup

0 commit comments

Comments
 (0)