Skip to content

Commit e076073

Browse files
t4c1t4c1
committed
Merge branch 'sycl' into atomic_querries
# Conflicts: # sycl/include/CL/sycl/info/info_desc.hpp
2 parents b9cfe79 + a9068d9 commit e076073

File tree

4,516 files changed

+211273
-176728
lines changed

Some content is hidden

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

4,516 files changed

+211273
-176728
lines changed

‎.github/CODEOWNERS

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ sycl/include/sycl/ext/intel/sub_group.hpp @Pennycook @AlexeySachkov
3434
sycl/include/sycl/ext/intel/sub_group_host.hpp @Pennycook @AlexeySachkov
3535

3636
# PI API
37-
sycl/include/CL/sycl/detail/pi.def @smaslov-intel @againull
38-
sycl/include/CL/sycl/detail/pi.h @smaslov-intel @againull
39-
sycl/include/CL/sycl/detail/pi.hpp @smaslov-intel @againull
40-
sycl/include/CL/sycl/detail/pi* @smaslov-intel @againull
41-
sycl/plugins/ @smaslov-intel @againull
42-
sycl/source/detail/pi.cpp @smaslov-intel @againull
43-
sycl/source/detail/plugin.hpp @smaslov-intel @againull
44-
sycl/source/detail/posix_pi.cpp @smaslov-intel @againull
45-
sycl/source/detail/windows_pi.cpp @smaslov-intel @againull
37+
sycl/include/CL/sycl/detail/pi.def @smaslov-intel
38+
sycl/include/CL/sycl/detail/pi.h @smaslov-intel
39+
sycl/include/CL/sycl/detail/pi.hpp @smaslov-intel
40+
sycl/include/CL/sycl/detail/pi* @smaslov-intel
41+
sycl/plugins/ @smaslov-intel
42+
sycl/source/detail/pi.cpp @smaslov-intel
43+
sycl/source/detail/plugin.hpp @smaslov-intel
44+
sycl/source/detail/posix_pi.cpp @smaslov-intel
45+
sycl/source/detail/windows_pi.cpp @smaslov-intel
4646

4747
# ESIMD CPU emulator plug-in
4848
sycl/plugins/esimd_cpu/ @kbobrovs @smaslov-intel

‎.github/lockdown.yml

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

‎.github/workflows/clang-format.yml

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

‎.github/workflows/linux_post_commit.yml

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

‎.github/workflows/repo-lockdown.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: 'Repo Lockdown'
2+
on:
3+
pull_request_target:
4+
types: opened
5+
6+
permissions:
7+
pull-requests: write
8+
9+
jobs:
10+
action:
11+
runs-on: ubuntu-latest
12+
if: github.repository == 'llvm/llvm-project'
13+
steps:
14+
- uses: dessant/repo-lockdown@v2
15+
with:
16+
process-only: 'prs'
17+
pr-comment: >
18+
This repository does not accept pull requests.
19+
Please follow http://llvm.org/docs/Contributing.html#how-to-submit-a-patch for contribution to LLVM.

‎.github/workflows/sycl_linux_build_and_test.yml

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
name: Reusable SYCL Linux build and test workflow
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '.github/workflows/sycl_linux_build_and_test.yml'
7+
workflow_call:
8+
inputs:
9+
cc:
10+
type: string
11+
required: false
12+
default: "gcc"
13+
cxx:
14+
type: string
15+
required: false
16+
default: "g++"
17+
build_image:
18+
type: string
19+
required: false
20+
default: "ghcr.io/intel/llvm/ubuntu2004_base:latest"
21+
build_runs_on:
22+
type: string
23+
required: false
24+
default: "ubuntu-latest"
25+
build_github_cache:
26+
type: boolean
27+
required: false
28+
default: false
29+
build_cache_root:
30+
type: string
31+
required: true
32+
build_cache_suffix:
33+
type: string
34+
required: false
35+
default: "default"
36+
build_cache_size:
37+
type: string
38+
required: false
39+
default: 2G
40+
build_configure_extra_args:
41+
type: string
42+
required: false
43+
default: ""
44+
build_artifact_suffix:
45+
type: string
46+
required: true
47+
48+
jobs:
49+
configure:
50+
name: Pre-build configuration
51+
runs-on: ubuntu-latest
52+
outputs:
53+
params: ${{ steps.input-parameters.outputs.params }}
54+
steps:
55+
- id: input-parameters
56+
env:
57+
INPUTS: ${{ toJSON(inputs) }}
58+
run: |
59+
if [[ "$GITHUB_EVENT_NAME" != "workflow_call" ]]; then
60+
INPUTS="{
61+
\"cc\":\"gcc\",
62+
\"cxx\":\"g++\",
63+
\"build_runs_on\":\"sycl-precommit-linux\",
64+
\"build_image\":\"ghcr.io/intel/llvm/ubuntu2004_base:latest\",
65+
\"build_github_cache\":\"false\",
66+
\"build_cache_root\":\"/__w/\",
67+
\"build_cache_suffix\":\"default\",
68+
\"build_cache_size\":\"2G\",
69+
\"build_configure_extra_args\":\"\",
70+
\"build_artifact_suffix\":\"default\",
71+
\"build_upload_artifact\":\"false\"
72+
}"
73+
fi
74+
INPUTS="${INPUTS//'%'/'%25'}"
75+
INPUTS="${INPUTS//$'\n'/'%0A'}"
76+
INPUTS="${INPUTS//$'\r'/'%0D'}"
77+
echo "::set-output name=params::$INPUTS"
78+
echo "$INPUTS"
79+
build:
80+
name: Build SYCL toolchain
81+
needs: configure
82+
runs-on: ${{ fromJSON(needs.configure.outputs.params).build_runs_on }}
83+
container:
84+
image: ${{ fromJSON(needs.configure.outputs.params).build_image }}
85+
options: -u 1001:1001
86+
steps:
87+
- uses: actions/checkout@v2
88+
with:
89+
path: src
90+
- name: Setup Cache
91+
uses: actions/cache@v2
92+
if: ${{ steps.parameters.build_github_cache }}
93+
id: cache
94+
with:
95+
path: ${{ fromJSON(needs.configure.outputs.params).build_cache_root }}/build_cache_${{ fromJSON(needs.configure.outputs.params).build_cache_suffix }}
96+
key: sycl-build-${{ fromJSON(needs.configure.outputs.params).build_cache_suffix }}-${{ github.sha }}
97+
restore-keys: |
98+
sycl-build-${{ fromJSON(needs.configure.outputs.params).build_cache_suffix }}-
99+
- name: Configure
100+
env:
101+
CC: ${{ fromJSON(needs.configure.outputs.params).cc }}
102+
CXX: ${{ fromJSON(needs.configure.outputs.params).cxx }}
103+
CACHE_ROOT: ${{ fromJSON(needs.configure.outputs.params).build_cache_root }}
104+
CACHE_SUFFIX: ${{ fromJSON(needs.configure.outputs.params).build_cache_suffix }}
105+
CACHE_SIZE: ${{ fromJSON(needs.configure.outputs.params).build_cache_size }}
106+
ARGS: ${{ fromJSON(needs.configure.outputs.params).build_configure_extra_args }}
107+
run: |
108+
mkdir -p $CACHE_ROOT/build_cache_$CACHE_SUFFIX
109+
mkdir -p $GITHUB_WORKSPACE/build
110+
cd $GITHUB_WORKSPACE/build
111+
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
112+
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
113+
--ci-defaults $ARGS --cmake-opt="-DLLVM_CCACHE_BUILD=ON" \
114+
--cmake-opt="-DLLVM_CCACHE_DIR=$CACHE_ROOT/build_cache_$CACHE_SUFFIX" \
115+
--cmake-opt="-DLLVM_CCACHE_MAXSIZE=$CACHE_SIZE"
116+
- name: Compile
117+
run: cmake --build $GITHUB_WORKSPACE/build
118+
# TODO allow to optionally disable in-tree checks
119+
- name: check-llvm
120+
if: always()
121+
run: |
122+
cmake --build $GITHUB_WORKSPACE/build --target check-llvm
123+
- name: check-clang
124+
if: always()
125+
run: |
126+
export XDG_CACHE_HOME=$GITHUB_WORKSPACE/os_cache
127+
cmake --build $GITHUB_WORKSPACE/build --target check-clang
128+
- name: check-sycl
129+
if: always()
130+
run: |
131+
cmake --build $GITHUB_WORKSPACE/build --target check-sycl
132+
- name: check-llvm-spirv
133+
if: always()
134+
run: |
135+
cmake --build $GITHUB_WORKSPACE/build --target check-llvm-spirv
136+
- name: check-xptifw
137+
if: always()
138+
run: |
139+
cmake --build $GITHUB_WORKSPACE/build --target check-xptifw
140+
- name: 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+
152+
- name: Pack
153+
run: tar -cJf llvm_sycl.tar.xz -C $GITHUB_WORKSPACE/build/install .
154+
- name: Upload artifacts
155+
uses: actions/upload-artifact@v1
156+
with:
157+
name: sycl_linux_${{ fromJSON(needs.configure.outputs.params).build_artifact_suffix }}
158+
path: llvm_sycl.tar.xz
159+
- name: Cleanup
160+
if: always()
161+
run: rm -rf $GITHUB_WORKSPACE/*
162+

0 commit comments

Comments
 (0)