Skip to content

Commit 31b6ba1

Browse files
authored
[CI][SYCL-CTS] Small improvements (#14807)
Remove step "List excluded SYCL CTS categories" due to duplicated code. List cts-filter in the "Build SYCL CTS tests" step instead. Also remove DSYCL_CTS_MEASURE_BUILD_TIMES. It affects the performance, but we don't use these results.
1 parent c4a3f15 commit 31b6ba1

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

.github/workflows/sycl-linux-run-tests.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -300,36 +300,32 @@ jobs:
300300
awk '/^Failed Tests|Unexpectedly Passed Tests|Unresolved tests|Testing Time/{flag=1}/FAILED: CMakeFiles/{flag=0}flag' e2e.log >> $GITHUB_STEP_SUMMARY
301301
fi
302302
exit $exit_code
303-
- name: List excluded SYCL CTS categories
304-
if: inputs.tests_selector == 'cts' && env.CTS_TESTS_TO_BUILD == ''
305-
run: |
306-
if [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then
307-
cat $PWD/devops/cts_exclude_filter_OCL_CPU
308-
fi
309-
if [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then
310-
cat $PWD/devops/cts_exclude_filter_L0_GPU
311-
fi
312303
- name: Build SYCL CTS tests
313304
if: inputs.tests_selector == 'cts'
314305
env:
315306
CMAKE_EXTRA_ARGS: ${{ inputs.extra_cmake_args }}
316307
run: |
317-
# Do not exclude any category if passing the CTS_TESTS_TO_BUILD variable.
318308
cts_exclude_filter=""
309+
# If CTS_TESTS_TO_BUILD is null - use filter
319310
if [ -z "$CTS_TESTS_TO_BUILD" ]; then
320311
if [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then
321312
cts_exclude_filter=$PWD/devops/cts_exclude_filter_OCL_CPU
322-
fi
323-
if [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then
313+
elif [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then
324314
cts_exclude_filter=$PWD/devops/cts_exclude_filter_L0_GPU
325315
fi
316+
317+
# List excluded SYCL CTS categories:
318+
# SYCL_CTS_EXCLUDE_TEST_CATEGORIES - Optional file specifying a list
319+
# of test categories to be excluded from the build.
320+
echo "::group::Excluded test categories"
321+
cat $cts_exclude_filter
322+
echo "::endgroup::"
326323
fi
327324
328325
cmake -GNinja -B./build-cts -S./khronos_sycl_cts -DCMAKE_CXX_COMPILER=$(which clang++) \
329326
-DSYCL_IMPLEMENTATION=DPCPP \
330327
-DSYCL_CTS_EXCLUDE_TEST_CATEGORIES="$cts_exclude_filter" \
331328
-DSYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS=OFF \
332-
-DSYCL_CTS_MEASURE_BUILD_TIMES=ON \
333329
-DDPCPP_INSTALL_DIR="$(dirname $(which clang++))/.." \
334330
$CMAKE_EXTRA_ARGS
335331
# Ignore errors so that if one category build fails others still have a

0 commit comments

Comments
 (0)