Skip to content

Commit b8f1bed

Browse files
[CI] Re-enable zstd in CI (#20381)
`zstd` got disable in CI by a bad merge in 9e1505c This PR re-enables `zstd` in CI.
1 parent 3780687 commit b8f1bed

File tree

10 files changed

+23
-5
lines changed

10 files changed

+23
-5
lines changed

.github/workflows/coverity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
cd $GITHUB_WORKSPACE/build
4646
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
4747
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
48-
--ci-defaults --hip --cuda \
48+
--ci-defaults --use-zstd --hip --cuda \
4949
-DNATIVECPU_USE_OCK=Off
5050
5151
- name: Build with coverity

.github/workflows/sycl-linux-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ jobs:
201201
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build \
202202
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/toolchain \
203203
-t Release \
204-
--ci-defaults ${{ inputs.build_configure_extra_args }} \
204+
--ci-defaults --use-zstd ${{ inputs.build_configure_extra_args }} \
205205
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
206206
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
207207
-DLLVM_INSTALL_UTILS=ON

.github/workflows/sycl-macos-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
cd $GITHUB_WORKSPACE/build
5050
python3 $GITHUB_WORKSPACE/src/buildbot/configure.py -w $GITHUB_WORKSPACE \
5151
-s $GITHUB_WORKSPACE/src -o $GITHUB_WORKSPACE/build -t Release \
52-
--ci-defaults $ARGS \
52+
--ci-defaults --use-zstd $ARGS \
5353
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
5454
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
5555
-DLLVM_INSTALL_UTILS=ON

.github/workflows/sycl-windows-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
IF NOT EXIST D:\github\_work\cache MKDIR D:\github\_work\cache
148148
IF NOT EXIST D:\github\_work\cache\${{inputs.build_cache_suffix}} MKDIR D:\github\_work\cache\${{inputs.build_cache_suffix}}
149149
python.exe src/buildbot/configure.py -o build ^
150-
--ci-defaults %ARGS% ^
150+
--ci-defaults --use-zstd %ARGS% ^
151151
"-DCMAKE_C_COMPILER=${{inputs.cxx}}" ^
152152
"-DCMAKE_CXX_COMPILER=${{inputs.cxx}}" ^
153153
"-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\install" ^

buildbot/configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def do_configure(args, passthrough_args):
6464

6565
sycl_enable_xpti_tracing = "ON"
6666
xpti_enable_werror = "OFF"
67-
llvm_enable_zstd = "OFF"
67+
llvm_enable_zstd = "ON"
6868
spirv_enable_dis = "OFF"
6969

7070
if sys.platform != "darwin":
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// End-to-End test for testing device image compression in AOT.
22
// REQUIRES: zstd, opencl-aot, cpu
33

4+
// XFAIL: target-native_cpu
5+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20397
6+
47
// CPU AOT targets host isa, so we compile on the run system instead.
58
// RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 %O0 --offload-compress --offload-compression-level=3 %S/Inputs/single_kernel.cpp -o %t_compress.out
69
// RUN: %{run} %t_compress.out

sycl/test-e2e/Compression/compression_separate_compile.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
// REQUIRES: zstd, opencl-aot, cpu, linux
55

6+
// XFAIL: run-mode && preview-mode
7+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20397
8+
9+
// XFAIL: target-native_cpu
10+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20397
11+
612
// CPU AOT targets host isa, so we compile everything on the run system instead.
713
////////////////////// Compile device images
814
// RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 -fsycl-host-compiler=clang++ -fsycl-host-compiler-options='-std=c++17 -Wno-attributes -Wno-deprecated-declarations -fPIC -DENABLE_KERNEL1' -DENABLE_KERNEL1 -c %s -o %t_kernel1_aot.o

sycl/test-e2e/DeviceImageDependencies/dynamic_compress.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33

44
// REQUIRES: zstd
55

6+
// XFAIL: (windows && run-mode) || target-native_cpu
7+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20397
8+
69
// DEFINE: %{dynamic_lib_options} = -fsycl %fPIC %shared_lib -fsycl-allow-device-image-dependencies -I %S/Inputs %if windows %{-DMAKE_DLL %}
710
// DEFINE: %{dynamic_lib_suffix} = %if windows %{dll%} %else %{so%}
811

sycl/test-e2e/DeviceLib/bfloat16_conversion_dlopen_test_compress.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
// Check bfloat16 devicelib device image compression.
1010

11+
// XFAIL: target-native_cpu
12+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20397
13+
1114
// REQUIRES: linux, zstd
1215
// RUN: rm -rf %t.dir; mkdir -p %t.dir
1316
// RUN: %{build} --offload-compress -DBUILD_LIB -fPIC -shared -o %t.dir/lib%basename_t_compress.so

sycl/test-e2e/DeviceLib/bfloat16_conversion_test_compress.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
// Check bfloat16 devicelib device image compression.
1010

11+
// XFAIL: target-native_cpu
12+
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/20397
13+
1114
// REQUIRES: linux, zstd
1215
// RUN: rm -rf %t.dir; mkdir -p %t.dir
1316
// RUN: %{build} --offload-compress -DBUILD_LIB -fPIC -shared -o %t.dir/lib%basename_t_compress.so

0 commit comments

Comments
 (0)