Skip to content

Commit 8458b5e

Browse files
maximdimakovmaximdimakov
committed
Merge remote-tracking branch 'origin/sycl' into fix_CP_cache
2 parents a042881 + 6699a5d commit 8458b5e

File tree

9,545 files changed

+548011
-240725
lines changed

Some content is hidden

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

9,545 files changed

+548011
-240725
lines changed

‎.github/ISSUE_TEMPLATE.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: DO NOT FILE AN ISSUE
3+
about: DO NOT FILE AN ISSUE DUE TO ONGOING MIGRATION
4+
title: "DO NOT FILE AN ISSUE DUE TO ONGOING MIGRATION"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
# DO NOT FILE AN ISSUE
11+
12+
We are in the process of migrating from bugzilla to github issues please do not file a new issue as this could disrupt the migration process.
13+
14+
# DO NOT FILE AN ISSUE

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ contact_links:
22
- name: Ask community a question
33
url: https://github.com/intel/llvm/discussions/categories/q-a
44
about: Please use Q&A Discussions category instead of Issues to ask questions
5+
6+
blank_issues_enabled: false

‎.github/ISSUE_TEMPLATE/do-not-file-an-issue.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: DO NOT FILE AN ISSUE
3+
about: DO NOT FILE AN ISSUE DUE TO ONGOING MIGRATION
4+
title: "DO NOT FILE AN ISSUE DUE TO ONGOING MIGRATION"
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
# DO NOT FILE AN ISSUE
11+
12+
We are in the process of migrating from bugzilla to github issues please do not file a new issue as this could disrupt the migration process.
13+
14+
# DO NOT FILE AN ISSUE

‎.github/workflows/sycl_containers.yaml

Lines changed: 56 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,53 @@ jobs:
3035
ghcr.io/${{ github.repository }}/ubuntu2004_base:latest
3136
context: ${{ github.workspace }}/devops
3237
file: ${{ github.workspace }}/devops/containers/ubuntu2004_base.Dockerfile
38+
build_image_ubuntu2004:
39+
if: github.repository == 'intel/llvm'
40+
name: Build Ubuntu Docker image
41+
runs-on: ubuntu-latest
42+
steps:
43+
- name: Checkout
44+
uses: actions/checkout@v2
45+
with:
46+
fetch-depth: 2
47+
- name: Login to GitHub Container Registry
48+
uses: docker/login-action@v1
49+
with:
50+
registry: ghcr.io
51+
username: ${{ github.repository_owner }}
52+
password: ${{ secrets.GITHUB_TOKEN }}
53+
- name: Build and Push Container
54+
uses: docker/build-push-action@v2
55+
with:
56+
push: true
57+
tags: |
58+
ghcr.io/${{ github.repository }}/ubuntu2004_build:${{ github.sha }}
59+
ghcr.io/${{ github.repository }}/ubuntu2004_build:latest
60+
context: ${{ github.workspace }}/devops
61+
file: ${{ github.workspace }}/devops/containers/ubuntu2004_build.Dockerfile
62+
# This job produces a Docker container with the latest versions of Intel
63+
# drivers, that can be found on GitHub.
64+
drivers_image_ubuntu2004:
65+
if: github.repository == 'intel/llvm'
66+
name: Intel Drivers Ubuntu 20.04 Docker image
67+
runs-on: ubuntu-latest
68+
steps:
69+
- name: Checkout
70+
uses: actions/checkout@v2
71+
with:
72+
fetch-depth: 2
73+
- name: Login to GitHub Container Registry
74+
uses: docker/login-action@v1
75+
with:
76+
registry: ghcr.io
77+
username: ${{ github.repository_owner }}
78+
password: ${{ secrets.GITHUB_TOKEN }}
79+
- name: Build and Push Container
80+
uses: docker/build-push-action@v2
81+
with:
82+
push: true
83+
tags: |
84+
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest-${{ github.sha }}
85+
ghcr.io/${{ github.repository }}/ubuntu2004_intel_drivers:latest
86+
context: ${{ github.workspace }}/devops
87+
file: ${{ github.workspace }}/devops/containers/ubuntu2004_intel_drivers.Dockerfile

‎.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
env:
5757
INPUTS: ${{ toJSON(inputs) }}
5858
run: |
59-
if [[ "$GITHUB_EVENT_NAME" != "workflow_call" ]]; then
59+
if [[ "$GITHUB_WORKFLOW" == "Reusable SYCL Linux build and test workflow" ]]; then
6060
INPUTS="{
6161
\"cc\":\"gcc\",
6262
\"cxx\":\"g++\",
@@ -137,6 +137,10 @@ jobs:
137137
if: always()
138138
run: |
139139
cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
140+
- name: check-libclc
141+
if: always()
142+
run: |
143+
cmake --build $GITHUB_WORKSPACE/build --target check-libclc
140144
- name: Install
141145
# TODO replace utility installation with a single CMake target
142146
run: |

‎.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: "/__w/llvm"
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
name: Linux Default
1010
uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
1111
with:
12-
build_cache_root: "__w/llvm"
12+
build_cache_root: "/__w/llvm"
1313
build_github_cache: true
1414
build_artifact_suffix: default
1515
linux_no_assert:
16-
name: Linux Default
16+
name: Linux (no assert)
1717
uses: intel/llvm/.github/workflows/sycl_linux_build_and_test.yml@sycl
1818
with:
19-
build_cache_root: "__w/llvm"
19+
build_cache_root: "/__w/llvm"
2020
build_github_cache: true
2121
build_cache_suffix: gcc_no_assertions
2222
build_artifact_suffix: gcc_no_assertions

‎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/configure.py

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ def do_configure(args):
1515

1616
llvm_external_projects = 'sycl;llvm-spirv;opencl;libdevice;xpti;xptifw'
1717

18+
libclc_amd_target_names = ';amdgcn--;amdgcn--amdhsa'
19+
libclc_nvidia_target_names = 'nvptx64--;nvptx64--nvidiacl'
20+
1821
if args.llvm_external_projects:
1922
llvm_external_projects += ";" + args.llvm_external_projects.replace(",", ";")
2023

@@ -43,14 +46,6 @@ def do_configure(args):
4346
sycl_enable_xpti_tracing = 'ON'
4447
xpti_enable_werror = 'ON'
4548

46-
if args.ci_defaults:
47-
print("#############################################")
48-
print("# Default CI configuration will be applied. #")
49-
print("#############################################")
50-
51-
# For clang-format and clang-tidy
52-
llvm_enable_projects += ";clang-tools-extra"
53-
5449
# replace not append, so ARM ^ X86
5550
if args.arm:
5651
llvm_targets_to_build = 'ARM;AArch64'
@@ -63,22 +58,22 @@ def do_configure(args):
6358

6459
if args.cuda:
6560
llvm_targets_to_build += ';NVPTX'
66-
libclc_targets_to_build = 'nvptx64--;nvptx64--nvidiacl'
61+
libclc_targets_to_build = libclc_nvidia_target_names
6762
libclc_gen_remangled_variants = 'ON'
6863
sycl_build_pi_cuda = 'ON'
6964

7065
if args.hip:
7166
if args.hip_platform == 'AMD':
7267
llvm_targets_to_build += ';AMDGPU'
73-
libclc_targets_to_build += ';amdgcn--;amdgcn--amdhsa'
68+
libclc_targets_to_build += libclc_amd_target_names
7469
if args.hip_amd_arch:
7570
sycl_clang_extra_flags += "-Xsycl-target-backend=amdgcn-amd-amdhsa --offload-arch="+args.hip_amd_arch
7671

7772
# The HIP plugin for AMD uses lld for linking
7873
llvm_enable_projects += ';lld'
7974
elif args.hip_platform == 'NVIDIA' and not args.cuda:
8075
llvm_targets_to_build += ';NVPTX'
81-
libclc_targets_to_build += ';nvptx64--;nvptx64--nvidiacl'
76+
libclc_targets_to_build += libclc_nvidia_target_names
8277
libclc_gen_remangled_variants = 'ON'
8378

8479
sycl_build_pi_hip_platform = args.hip_platform
@@ -99,7 +94,28 @@ def do_configure(args):
9994
llvm_build_shared_libs = 'ON'
10095

10196
if args.use_lld:
102-
llvm_enable_lld = 'ON'
97+
llvm_enable_lld = 'ON'
98+
99+
# CI Default conditionally appends to options, keep it at the bottom of
100+
# args handling
101+
if args.ci_defaults:
102+
print("#############################################")
103+
print("# Default CI configuration will be applied. #")
104+
print("#############################################")
105+
106+
# For clang-format and clang-tidy
107+
llvm_enable_projects += ";clang-tools-extra"
108+
# libclc is required for CI validation
109+
if 'libclc' not in llvm_enable_projects:
110+
llvm_enable_projects += ';libclc'
111+
# libclc passes `--nvvm-reflect-enable=false`, build NVPTX to enable it
112+
if 'NVPTX' not in llvm_targets_to_build:
113+
llvm_targets_to_build += ';NVPTX'
114+
# Add both NVIDIA and AMD libclc targets
115+
if libclc_amd_target_names not in libclc_targets_to_build:
116+
libclc_targets_to_build += libclc_amd_target_names
117+
if libclc_nvidia_target_names not in libclc_targets_to_build:
118+
libclc_targets_to_build += libclc_nvidia_target_names
103119

104120
install_dir = os.path.join(abs_obj_dir, "install")
105121

‎buildbot/dependency.conf

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
[VERSIONS]
2-
# https://github.com/intel/llvm/releases/download/2021-WW40/oclcpuexp-2021.12.9.0.24_rel.tar.gz
3-
ocl_cpu_rt_ver=2021.12.9.0.24
4-
# https://github.com/intel/llvm/releases/download/2021-WW40/win-oclcpuexp-2021.12.9.0.24_rel.zip
5-
ocl_cpu_rt_ver_win=2021.12.9.0.24
2+
# https://github.com/intel/llvm/releases/download/2021-WW50/oclcpuexp-2021.13.11.0.23_rel.tar.gz
3+
ocl_cpu_rt_ver=2021.13.11.0.23
4+
# https://github.com/intel/llvm/releases/download/2021-WW50/win-oclcpuexp-2021.13.11.0.23_rel.zip
5+
ocl_cpu_rt_ver_win=2021.13.11.0.23
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
1515
# https://github.com/oneapi-src/oneTBB/blob/master/cmake/README.md
1616
# or downloaded using links below:
17-
# https://github.com/oneapi-src/oneTBB/releases/download/v2021.3.0/oneapi-tbb-2021.3.0-lin.tgz
18-
tbb_ver=2021.4.0.569
19-
# https://github.com/oneapi-src/oneTBB/releases/download/v2021.3.0/oneapi-tbb-2021.3.0-win.zip
20-
tbb_ver_win=2021.4.0.561
17+
# https://github.com/oneapi-src/oneTBB/releases/download/v2021.4.0/oneapi-tbb-2021.4.0-lin.tgz
18+
tbb_ver=2021.5.0
19+
# https://github.com/oneapi-src/oneTBB/releases/download/v2021.4.0/oneapi-tbb-2021.4.0-win.zip
20+
tbb_ver_win=2021.5.0
2121

22-
# https://github.com/intel/llvm/releases/download/2021-WW40/fpgaemu-2021.12.9.0.24_rel.tar.gz
23-
ocl_fpga_emu_ver=2021.12.9.0.24
24-
# https://github.com/intel/llvm/releases/download/2021-WW40/win-fpgaemu-2021.12.9.0.24_rel.zip
25-
ocl_fpga_emu_ver_win=2021.12.9.0.24
26-
fpga_ver=20210805_000004
27-
fpga_ver_win=20210805_000004
22+
# https://github.com/intel/llvm/releases/download/2021-WW50/fpgaemu-2021.13.11.0.23_rel.tar.gz
23+
ocl_fpga_emu_ver=2021.13.11.0.23
24+
# https://github.com/intel/llvm/releases/download/2021-WW50/win-fpgaemu-2021.13.11.0.23_rel.zip
25+
ocl_fpga_emu_ver_win=2021.13.11.0.23
26+
fpga_ver=20211014_000004
27+
fpga_ver_win=20211014_000004
2828
ocloc_ver_win=27.20.100.9168
2929

3030
[DRIVER VERSIONS]
31-
cpu_driver_lin=2021.12.9.0.24
32-
cpu_driver_win=2021.12.9.0.24
33-
gpu_driver_lin=21.44.21506
34-
gpu_driver_win=30.0.100.9955
35-
fpga_driver_lin=2021.12.9.0.24
36-
fpga_driver_win=2021.12.9.0.24
31+
cpu_driver_lin=2021.13.11.0.23
32+
cpu_driver_win=2021.13.11.0.23
33+
gpu_driver_lin=21.46.21636
34+
gpu_driver_win=30.0.101.1069
35+
fpga_driver_lin=2021.13.11.0.23
36+
fpga_driver_win=2021.13.11.0.23
3737
# NVidia CUDA driver
3838
# TODO provide URL for CUDA driver
3939
nvidia_gpu_driver_lin=435.21

0 commit comments

Comments
 (0)