Skip to content

Commit d81b4cb

Browse files
author
Sergey Kanaev
committed
Merge remote-tracking branch 'public/sycl' into fix-windows-shutdown2
2 parents d3ce279 + 30cfe3e commit d81b4cb

File tree

7,859 files changed

+332467
-137972
lines changed

Some content is hidden

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

7,859 files changed

+332467
-137972
lines changed

‎.github/workflows/linux_post_commit.yml

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎.github/workflows/sycl_containers.yaml

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ on:
44
schedule:
55
# Every 1st and 15th day of month
66
- cron: '0 0 1,15 * *'
7+
push:
8+
branches:
9+
- sycl
10+
paths:
11+
- 'devops/containers/**'
712

813
jobs:
914
base_image_ubuntu2004:
@@ -14,7 +19,7 @@ jobs:
1419
- name: Checkout
1520
uses: actions/checkout@v2
1621
with:
17-
fetch-depth: 1
22+
fetch-depth: 2
1823
- name: Login to GitHub Container Registry
1924
uses: docker/login-action@v1
2025
with:
@@ -30,3 +35,29 @@ jobs:
3035
ghcr.io/${{ github.repository }}/ubuntu2004_base:latest
3136
context: ${{ github.workspace }}/devops
3237
file: ${{ github.workspace }}/devops/containers/ubuntu2004_base.Dockerfile
38+
# This job produces a Docker container with the latest versions of Intel
39+
# drivers, that can be found on GitHub.
40+
drivers_image_ubuntu2004:
41+
if: github.repository == 'intel/llvm'
42+
name: Intel Drivers Ubuntu 20.04 Docker image
43+
runs-on: ubuntu-latest
44+
steps:
45+
- name: Checkout
46+
uses: actions/checkout@v2
47+
with:
48+
fetch-depth: 2
49+
- name: Login to GitHub Container Registry
50+
uses: docker/login-action@v1
51+
with:
52+
registry: ghcr.io
53+
username: ${{ github.repository_owner }}
54+
password: ${{ secrets.GITHUB_TOKEN }}
55+
- name: Build and Push Container
56+
uses: docker/build-push-action@v2
57+
with:
58+
push: true
59+
tags: |
60+
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest-${{ github.sha }}
61+
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest
62+
context: ${{ github.workspace }}/devops
63+
file: ${{ github.workspace }}/devops/containers/ubuntu2004_intel_drivers.Dockerfile

‎.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ on:
4444
build_artifact_suffix:
4545
type: string
4646
required: true
47-
build_upload_artifact:
48-
type: boolean
49-
required: false
50-
default: false
5147

5248
jobs:
5349
configure:
@@ -142,17 +138,24 @@ jobs:
142138
run: |
143139
cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
144140
- name: Install
145-
if: ${{ steps.parameters.build_upload_artifact }}
146-
run: cmake --build $GITHUB_WORKSPACE/build --target install
141+
# TODO replace utility installation with a single CMake target
142+
run: |
143+
cmake --build $GITHUB_WORKSPACE/build --target deploy-sycl-toolchain
144+
cmake --build $GITHUB_WORKSPACE/build --target utils/FileCheck/install
145+
cmake --build $GITHUB_WORKSPACE/build --target utils/count/install
146+
cmake --build $GITHUB_WORKSPACE/build --target utils/not/install
147+
cmake --build $GITHUB_WORKSPACE/build --target utils/lit/install
148+
cmake --build $GITHUB_WORKSPACE/build --target utils/llvm-lit/install
149+
cmake --build $GITHUB_WORKSPACE/build --target install-clang-format
150+
cmake --build $GITHUB_WORKSPACE/build --target install-clang-tidy
151+
147152
- name: Pack
148-
if: ${{ steps.parameters.build_upload_artifact }}
149-
run: tar -czf llvm_sycl.tar.gz -C $GITHUB_WORKSPACE/build/install .
153+
run: tar -cJf llvm_sycl.tar.xz -C $GITHUB_WORKSPACE/build/install .
150154
- name: Upload artifacts
151155
uses: actions/upload-artifact@v1
152-
if: ${{ steps.parameters.build_upload_artifact }}
153156
with:
154157
name: sycl_linux_${{ fromJSON(needs.configure.outputs.params).build_artifact_suffix }}
155-
path: llvm_sycl.tar.gz
158+
path: llvm_sycl.tar.xz
156159
- name: Cleanup
157160
if: always()
158161
run: rm -rf $GITHUB_WORKSPACE/*

‎.github/workflows/sycl_nightly.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: SYCL Nightly Builds
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 3 * * *'
7+
8+
jobs:
9+
ubuntu2004_build_test:
10+
if: github.repository == 'intel/llvm'
11+
uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
12+
with:
13+
build_github_cache: true
14+
build_cache_root: ${{ github.workspace }}
15+
build_artifact_suffix: default
16+
ubuntu2004_docker_build_push:
17+
if: github.repository == 'intel/llvm'
18+
runs-on: ubuntu-latest
19+
needs: ubuntu2004_build_test
20+
steps:
21+
- uses: actions/checkout@v2
22+
- uses: actions/download-artifact@v2
23+
with:
24+
name: sycl_nightly_ubuntu2004
25+
path: devops/
26+
- name: Login to GitHub Container Registry
27+
uses: docker/login-action@v1
28+
with:
29+
registry: ghcr.io
30+
username: ${{ github.repository_owner }}
31+
password: ${{ secrets.GITHUB_TOKEN }}
32+
- name: Build and Push Container (with drivers)
33+
uses: docker/build-push-action@v2
34+
with:
35+
push: true
36+
build-args: |
37+
base_image=ghcr.io/intel/llvm/ubuntu2004_intel_drivers
38+
base_tag=latest
39+
tags: |
40+
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:${{ github.sha }}
41+
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:latest
42+
context: ${{ github.workspace }}/devops
43+
file: ${{ github.workspace }}/devops/containers/ubuntu2004_preinstalled.Dockerfile
44+
- name: Build and Push Container (no drivers)
45+
uses: docker/build-push-action@v2
46+
with:
47+
push: true
48+
build-args: |
49+
base_image=ghcr.io/intel/llvm/ubuntu2004_base
50+
base_tag=latest
51+
tags: |
52+
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers-${{ github.sha }}
53+
ghcr.io/${{ github.repository }}/sycl_ubuntu2004_nightly:no-drivers
54+
context: ${{ github.workspace }}/devops
55+
file: ${{ github.workspace }}/devops/containers/ubuntu2004_preinstalled.Dockerfile

‎.github/workflows/sycl_post_commit.yml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: Linux Post Commit Checks
2+
3+
on:
4+
push:
5+
branches:
6+
- sycl
7+
jobs:
8+
linux_default:
9+
name: Linux Default
10+
uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
11+
with:
12+
build_cache_root: "__w/llvm"
13+
build_github_cache: true
14+
build_artifact_suffix: default
15+
linux_no_assert:
16+
name: Linux Default
17+
uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
18+
with:
19+
build_cache_root: "__w/llvm"
20+
build_github_cache: true
21+
build_cache_suffix: gcc_no_assertions
22+
build_artifact_suffix: gcc_no_assertions
23+
build_configure_extra_args: --no-assertions
24+
linux_clang_shared_libs:
25+
# TODO use nightly images when Docker containers are available
26+
name: Linux + Clang + Shared libs
27+
runs-on: ubuntu-20.04
28+
if: github.repository == 'intel/llvm'
29+
steps:
30+
- uses: actions/checkout@v2
31+
with:
32+
path: src
33+
- name: Install Ubuntu deps
34+
run: sudo apt install -y ninja-build ccache
35+
- name: Setup Cache
36+
uses: actions/cache@v2
37+
id: cache
38+
with:
39+
path: ${{ github.workspace }}/cache
40+
key: build-linux-shared-libs-${{ github.sha }}
41+
restore-keys: |
42+
build-linux-shared-libs-
43+
- name: Configure
44+
run: |
45+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
46+
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
47+
sudo apt-get update
48+
sudo apt-get install -y clang-13
49+
export CC="clang-13"
50+
export CXX="clang++-13"
51+
mkdir -p $GITHUB_WORKSPACE/build
52+
cd $GITHUB_WORKSPACE/build
53+
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
54+
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
55+
--ci-defaults --shared-libs --cmake-opt="-DLLVM_CCACHE_BUILD=ON" \
56+
--cmake-opt="-DLLVM_CCACHE_DIR=$GITHUB_WORKSPACE/cache" \
57+
--cmake-opt="-DLLVM_CCACHE_MAXSIZE=2G"
58+
- name: Compile
59+
run: |
60+
python3 $GITHUB_WORKSPACE/src/buildbot/compile.py -w $GITHUB_WORKSPACE \
61+
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build
62+
- name: check-llvm
63+
if: always()
64+
run: |
65+
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
66+
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm
67+
- name: check-clang
68+
if: always()
69+
run: |
70+
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
71+
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-clang
72+
- name: check-sycl
73+
if: always()
74+
run: |
75+
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
76+
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-sycl
77+
- name: check-llvm-spirv
78+
if: always()
79+
run: |
80+
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
81+
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-llvm-spirv
82+
- name: check-xptifw
83+
if: always()
84+
run: |
85+
python3 $GITHUB_WORKSPACE/src/buildbot/check.py -w $GITHUB_WORKSPACE \
86+
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t check-xptifw
87+
- name: Pack
88+
run: tar -czvf llvm_sycl.tar.gz -C $GITHUB_WORKSPACE/build/install .
89+
- name: Upload artifacts
90+
uses: actions/upload-artifact@v1
91+
with:
92+
name: sycl_linux_${{ matrix.config }}
93+
path: llvm_sycl.tar.gz

‎buildbot/compile.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def do_compile(args):
3131
"cmake",
3232
"--build", abs_obj_dir,
3333
"--",
34-
"deploy-sycl-toolchain",
34+
args.build_target,
3535
"-j", str(cpu_count)]
3636

3737
if args.verbose:
@@ -58,6 +58,7 @@ def main():
5858
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
5959
parser.add_argument("-j", "--build-parallelism", metavar="BUILD_PARALLELISM", help="build parallelism")
6060
parser.add_argument("-v", "--verbose", action='store_true', help="verbose build output")
61+
parser.add_argument("-t", "--build-target", metavar="BUILD_TARGET", default="deploy-sycl-toolchain", help="set build target")
6162

6263
args = parser.parse_args()
6364

‎buildbot/dependency.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ ocl_cpu_rt_ver=2021.12.9.0.24
44
# https://github.com/intel/llvm/releases/download/2021-WW40/win-oclcpuexp-2021.12.9.0.24_rel.zip
55
ocl_cpu_rt_ver_win=2021.12.9.0.24
66
# Same GPU driver supports Level Zero and OpenCL
7-
# https://github.com/intel/compute-runtime/releases/tag/21.44.21506
8-
ocl_gpu_rt_ver=21.44.21506
7+
# https://github.com/intel/compute-runtime/releases/tag/21.46.21636
8+
ocl_gpu_rt_ver=21.46.21636
99
# Same GPU driver supports Level Zero and OpenCL
10-
# https://downloadmirror.intel.com/677976/igfx_win_100.9955.zip
11-
ocl_gpu_rt_ver_win=30.0.100.9955
10+
# https://downloadmirror.intel.com/685037/igfx_win_101.1069.zip
11+
ocl_gpu_rt_ver_win=30.0.101.1069
1212
intel_sycl_ver=build
1313

1414
# TBB binaries can be built from sources following instructions under
@@ -30,8 +30,8 @@ ocloc_ver_win=27.20.100.9168
3030
[DRIVER VERSIONS]
3131
cpu_driver_lin=2021.12.9.0.24
3232
cpu_driver_win=2021.12.9.0.24
33-
gpu_driver_lin=21.44.21506
34-
gpu_driver_win=30.0.100.9955
33+
gpu_driver_lin=21.46.21636
34+
gpu_driver_win=30.0.101.1069
3535
fpga_driver_lin=2021.12.9.0.24
3636
fpga_driver_win=2021.12.9.0.24
3737
# NVidia CUDA driver

0 commit comments

Comments
 (0)