Skip to content

Commit 0934bd0

Browse files
kalyanallekalyanalle
authored
Merge branch 'oneapi-src:master' into new_ecc_test_default_ecc_values
2 parents 0c26a5d + a0e59be commit 0934bd0

File tree

295 files changed

+22257
-15374
lines changed

Some content is hidden

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

295 files changed

+22257
-15374
lines changed

‎.github/docker/ubuntu.Dockerfile‎

Lines changed: 1 addition & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,6 @@ ARG VMIN
99

1010
SHELL ["/bin/bash", "-e", "-c"]
1111

12-
RUN <<EOF
13-
source /etc/lsb-release
14-
if ((VMAJ < 24)); then
15-
sed -i 's/^deb/deb [arch=amd64]/' /etc/apt/sources.list
16-
cat >> /etc/apt/sources.list <<EOF2
17-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ ${DISTRIB_CODENAME} main restricted universe multiverse
18-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ ${DISTRIB_CODENAME}-updates main restricted universe multiverse
19-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ ${DISTRIB_CODENAME}-security main restricted universe multiverse
20-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ ${DISTRIB_CODENAME}-backports main restricted universe multiverse
21-
EOF2
22-
else
23-
sed -i '/^Components:/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources
24-
cat >> /etc/apt/sources.list.d/ubuntu.sources <<EOF2
25-
26-
types: deb
27-
URIs: http://ports.ubuntu.com/ubuntu-ports/
28-
Suites: ${DISTRIB_CODENAME} ${DISTRIB_CODENAME}-updates ${DISTRIB_CODENAME}-security ${DISTRIB_CODENAME}-backports
29-
Components: main universe restricted multiverse
30-
Architectures: arm64
31-
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
32-
EOF2
33-
fi
34-
dpkg --add-architecture arm64
35-
EOF
36-
3712
ENV DEBIAN_FRONTEND=noninteractive
3813
# /etc/apt/apt.conf.d/docker-clean doesn't work on older versions of docker for U2204 containers
3914
RUN --mount=type=cache,target=/var/cache/apt <<EOF
@@ -42,87 +17,19 @@ apt-get update
4217
apt-get install -o Dpkg::Options::="--force-overwrite" -y \
4318
build-essential \
4419
ccache \
45-
$(((VMAJ == 20)) && echo \
46-
clang-format-7) \
4720
clang-tidy \
4821
cmake \
4922
curl \
5023
file \
5124
git \
5225
ninja-build \
53-
gcc-aarch64-linux-gnu \
54-
g++-aarch64-linux-gnu \
55-
libc6:arm64 \
56-
libstdc++6:arm64 \
26+
libboost-all-dev \
5727
libpapi-dev \
58-
libpapi-dev:arm64 \
5928
libpng-dev \
60-
libpng-dev:arm64 \
6129
libva-dev \
62-
libva-dev:arm64 \
6330
ocl-icd-opencl-dev \
64-
ocl-icd-opencl-dev:arm64 \
6531
opencl-headers \
6632
python3 \
6733
python3-pip
6834
rm -rf /var/lib/apt/lists/*
6935
EOF
70-
71-
# Make newest version of aarch64 toolchain the default and enable switching.
72-
RUN <<EOF
73-
shopt -s extglob
74-
for tool in $(ls /usr/bin/aarch64-linux-gnu-*([a-z\-+])); do
75-
for v in $(ls /usr/bin/aarch64-linux-gnu-* | grep -o [0-9]*$ | sort | uniq); do
76-
if [[ -f ${tool}-${v} ]]; then
77-
update-alternatives --install ${tool} $(basename ${tool}) ${tool}-${v} ${v}
78-
fi
79-
done
80-
done
81-
EOF
82-
83-
# Static libraries for boost cannot be installed from the apt sources
84-
# without conflicts
85-
# Required for https://github.com/boostorg/thread/issues/364 on Ubuntu 22+
86-
ENV BOOST_BUILD_PATH=/boost_1_73_0
87-
ADD https://archives.boost.io/release/1.73.0/source/boost_1_73_0.tar.gz /boost_1_73_0.tar.gz
88-
RUN <<EOF
89-
tar xf /boost_1_73_0.tar.gz
90-
rm /boost_1_73_0.tar.gz
91-
cd /boost_1_73_0
92-
./bootstrap.sh
93-
./b2 install \
94-
-j $(nproc) \
95-
link=static \
96-
address-model=64 \
97-
--with-chrono \
98-
--with-log \
99-
--with-program_options \
100-
--with-regex \
101-
--with-serialization \
102-
--with-system \
103-
--with-timer
104-
EOF
105-
COPY <<EOF /boost_1_73_0/config.jam
106-
using gcc : arm : aarch64-linux-gnu-g++ ;
107-
EOF
108-
RUN <<EOF
109-
cd /boost_1_73_0
110-
rm ./b2
111-
./bootstrap.sh --libdir=/usr/local/lib/aarch64-linux-gnu
112-
./b2 install \
113-
--config=/boost_1_73_0/config.jam \
114-
-j $(nproc) \
115-
link=static \
116-
address-model=64 \
117-
--libdir=/usr/local/lib/aarch64-linux-gnu \
118-
toolset=gcc-arm \
119-
--with-chrono \
120-
--with-log \
121-
--with-program_options \
122-
--with-regex \
123-
--with-serialization \
124-
--with-system \
125-
--with-timer
126-
cd ..
127-
rm -rf /boost_1_73_0
128-
EOF

‎.github/docker/windows.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# escape=`
22

3-
ARG BASE_IMAGE=mcr.microsoft.com/dotnet/framework/runtime:4.8
3+
ARG BASE_IMAGE=mcr.microsoft.com/dotnet/framework/runtime:4.8.1
44
FROM ${BASE_IMAGE}
55

66
SHELL ["powershell"]

‎.github/workflows/build-multi.yml‎

Lines changed: 86 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,88 @@ jobs:
3636
groups=${{ env.TEST_GROUPS_ARRAY }}
3737
EOF
3838
39+
build-quick:
40+
if: github.repository_owner == 'oneapi-src'
41+
runs-on: [ubuntu-latest]
42+
steps:
43+
- uses: actions/checkout@v4
44+
- name: Check ./scripts/lzt_gtest_scan.py
45+
run: |
46+
python3 scripts/lzt_gtest_scan.py \
47+
--workspace_dir .
48+
- uses: actions/checkout@v4
49+
with:
50+
repository: oneapi-src/level-zero
51+
path: level-zero
52+
- run: |
53+
sudo apt-get update
54+
sudo apt-get install -y \
55+
libboost-all-dev \
56+
libpapi-dev \
57+
libpng-dev \
58+
libva-dev \
59+
clang \
60+
clang-format-14
61+
- uses: hendrikmuhs/ccache-action@v1
62+
- name: Build Loader
63+
working-directory: level-zero
64+
run: |
65+
mkdir build
66+
cd build
67+
cmake \
68+
-D CMAKE_C_COMPILER_LAUNCHER=ccache \
69+
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
70+
-D CMAKE_BUILD_TYPE=Release \
71+
..
72+
make -j$(nproc)
73+
sudo make install
74+
- name: Build Tests
75+
run: |
76+
mkdir build
77+
cd build
78+
cmake \
79+
-D CMAKE_C_COMPILER_LAUNCHER=ccache \
80+
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
81+
-D CMAKE_BUILD_TYPE=Release \
82+
..
83+
../clang-format-patch.sh .. > clang_format_results.txt
84+
if [[ -s ./clang_format_results.txt ]]; then
85+
echo "Clang Format Check failed"
86+
cat ./clang_format_results.txt
87+
echo "<h3>clang-format</h3>" >> ${GITHUB_STEP_SUMMARY}
88+
echo \`\`\` >> ${GITHUB_STEP_SUMMARY}
89+
cat ./clang_format_results.txt >> ${GITHUB_STEP_SUMMARY}
90+
echo \`\`\` >> ${GITHUB_STEP_SUMMARY}
91+
exit 1
92+
else
93+
echo "::notice::clang-format check succeeded"
94+
fi
95+
make -j$(nproc) install
96+
- name: Check ./scripts/level_zero_report_utils.py
97+
env:
98+
ZE_ENABLE_NULL_DRIVER: 1
99+
LD_LIBRARY_PATH: ${{ github.workspace }}/level-zero/build/lib
100+
run: |
101+
python3 scripts/run_test_report.py \
102+
--run_test_sections all \
103+
--binary_dir ./build/out \
104+
--export_test_plan plan.csv
105+
echo "::group::Test Plan"
106+
cat plan.csv
107+
echo "::endgroup::"
108+
- name: Check that basic feature tests haven't changed
109+
env:
110+
ZE_ENABLE_NULL_DRIVER: 1
111+
LD_LIBRARY_PATH: ${{ github.workspace }}/level-zero/build/lib
112+
run: |
113+
python3 scripts/run_test_report.py \
114+
--run_test_features basic \
115+
--binary_dir ./build/out \
116+
--export_test_plan basic_features.csv
117+
git diff --no-index --exit-code \
118+
<(sort basic_features_freeze.csv) \
119+
<(sort basic_features.csv)
120+
39121
build:
40122
# Notes on formatting:
41123
#
@@ -46,26 +128,21 @@ jobs:
46128
# entry for <<- in the Here Documents section. This allows generated code to
47129
# be indented for readability in the workflow output.
48130
if: github.repository_owner == 'oneapi-src'
49-
needs: [config]
50-
runs-on: ${{ matrix.os.name == 'windows' && 'windows-latest' || 'ubuntu-latest' }}
131+
needs: [config, build-quick]
132+
runs-on: ${{ matrix.os.name == 'windows' && 'windows-2022' || 'ubuntu-latest' }}
51133
strategy:
52134
fail-fast: false
53135
matrix:
54136
os: [
55-
{name: ubuntu, vmaj: 20, vmin: '04'},
56137
{name: ubuntu, vmaj: 22, vmin: '04'},
57138
{name: ubuntu, vmaj: 24, vmin: '04'},
58-
{name: ubuntu, vmaj: 24, vmin: '10'},
59139
{name: sles, vmaj: 15, vmin: 2},
60140
{name: sles, vmaj: 15, vmin: 3},
61141
{name: sles, vmaj: 15, vmin: 4},
62142
{name: rhel, vmaj: 8, vmin: 6},
63143
{name: windows}
64144
]
65145
arch: ['']
66-
include: [
67-
{os: {name: ubuntu, vmaj: 20, vmin: '04'}, arch: arm64}
68-
]
69146
env:
70147
TEST_GROUPS: ${{ join(fromJSON(needs.config.outputs.groups), ' ') }}
71148
MSYS_NO_PATHCONV: 1
@@ -147,11 +224,6 @@ jobs:
147224
ccache --zero-stats
148225
cmake \
149226
-G Ninja \
150-
${{ matrix.arch == 'arm64' && ' \
151-
-D CMAKE_C_COMPILER=aarch64-linux-gnu-gcc \
152-
-D CMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ \
153-
-D CMAKE_SYSTEM_PROCESSOR=aarch64' || ' '
154-
}}\
155227
-D CMAKE_C_COMPILER_LAUNCHER=ccache \
156228
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
157229
${{ runner.os == 'Windows' && ' \
@@ -181,17 +253,12 @@ jobs:
181253
}}\
182254
${DOCKER_IMAGE}:${{ needs.config.outputs.ref-slug }} \
183255
bash -e -x <<-EOF
184-
256+
185257
ccache --zero-stats
186-
258+
187259
for group in ${TEST_GROUPS}; do
188260
cmake \
189261
-G Ninja \
190-
${{ matrix.arch == 'arm64' && ' \
191-
-D CMAKE_C_COMPILER=aarch64-linux-gnu-gcc \
192-
-D CMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ \
193-
-D CMAKE_SYSTEM_PROCESSOR=aarch64 ' || ' '
194-
}}\
195262
-D CMAKE_C_COMPILER_LAUNCHER=ccache \
196263
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
197264
${{ runner.os == 'Windows' && ' \
@@ -202,10 +269,7 @@ jobs:
202269
-D REQUIRE_OPENCL_BENCHMARKS=yes \
203270
-D CMAKE_INSTALL_PREFIX=${MOUNT_TARGET}/level-zero-tests-\${group} \
204271
..
205-
206272
cmake --build . -j --target install
207273
done
208-
209274
ccache --show-stats
210-
211275
EOF

‎.github/workflows/build-quick.yml‎

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
# Editor temporary files
66
*~
77
.*.sw?
8+
/.vscode

0 commit comments

Comments
 (0)