From 8212d04c0d84df167f70fbae336d67c892034633 Mon Sep 17 00:00:00 2001 From: KornevNikita Date: Fri, 26 Jul 2024 06:08:00 -0700 Subject: [PATCH 1/3] [CI][SYCL-CTS] Small improvements Also remove DSYCL_CTS_MEASURE_BUILD_TIMES. It affects the performance, but we don't use these results. --- .github/workflows/sycl-linux-run-tests.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 518148887f939..0faefa1ee43c2 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -303,24 +303,24 @@ jobs: - name: List excluded SYCL CTS categories if: inputs.tests_selector == 'cts' && env.CTS_TESTS_TO_BUILD == '' run: | + cts_exclude_filter="" if [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then - cat $PWD/devops/cts_exclude_filter_OCL_CPU - fi - if [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then - cat $PWD/devops/cts_exclude_filter_L0_GPU + cts_exclude_filter=cts_exclude_filter_OCL_CPU + elif [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then + cts_exclude_filter=cts_exclude_filter_L0_GPU fi + cat $PWD/devops/$cts_exclude_filter - name: Build SYCL CTS tests if: inputs.tests_selector == 'cts' env: CMAKE_EXTRA_ARGS: ${{ inputs.extra_cmake_args }} run: | - # Do not exclude any category if passing the CTS_TESTS_TO_BUILD variable. cts_exclude_filter="" + # If CTS_TESTS_TO_BUILD is null - use filter if [ -z "$CTS_TESTS_TO_BUILD" ]; then if [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then cts_exclude_filter=$PWD/devops/cts_exclude_filter_OCL_CPU - fi - if [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then + elif [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then cts_exclude_filter=$PWD/devops/cts_exclude_filter_L0_GPU fi fi @@ -329,7 +329,6 @@ jobs: -DSYCL_IMPLEMENTATION=DPCPP \ -DSYCL_CTS_EXCLUDE_TEST_CATEGORIES="$cts_exclude_filter" \ -DSYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS=OFF \ - -DSYCL_CTS_MEASURE_BUILD_TIMES=ON \ -DDPCPP_INSTALL_DIR="$(dirname $(which clang++))/.." \ $CMAKE_EXTRA_ARGS # Ignore errors so that if one category build fails others still have a From b8d9777cdf5b5db4c1a2f0f4dfc708d1027ba1d9 Mon Sep 17 00:00:00 2001 From: KornevNikita Date: Tue, 30 Jul 2024 01:58:15 -0700 Subject: [PATCH 2/3] Remove duplication --- .github/workflows/sycl-linux-run-tests.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index 0faefa1ee43c2..fe853b825c224 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -300,16 +300,6 @@ jobs: awk '/^Failed Tests|Unexpectedly Passed Tests|Unresolved tests|Testing Time/{flag=1}/FAILED: CMakeFiles/{flag=0}flag' e2e.log >> $GITHUB_STEP_SUMMARY fi exit $exit_code - - name: List excluded SYCL CTS categories - if: inputs.tests_selector == 'cts' && env.CTS_TESTS_TO_BUILD == '' - run: | - cts_exclude_filter="" - if [ "${{ contains(inputs.target_devices, 'opencl:cpu') }}" = "true" ]; then - cts_exclude_filter=cts_exclude_filter_OCL_CPU - elif [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then - cts_exclude_filter=cts_exclude_filter_L0_GPU - fi - cat $PWD/devops/$cts_exclude_filter - name: Build SYCL CTS tests if: inputs.tests_selector == 'cts' env: @@ -323,6 +313,9 @@ jobs: elif [ "${{ contains(inputs.target_devices, 'level_zero:gpu') }}" = "true" ]; then cts_exclude_filter=$PWD/devops/cts_exclude_filter_L0_GPU fi + + # List excluded SYCL CTS categories + cat $cts_exclude_filter fi cmake -GNinja -B./build-cts -S./khronos_sycl_cts -DCMAKE_CXX_COMPILER=$(which clang++) \ From 783aac9b5bd310312b6e9ec9804af34c7f09f9cb Mon Sep 17 00:00:00 2001 From: KornevNikita Date: Wed, 31 Jul 2024 04:12:23 -0700 Subject: [PATCH 3/3] group --- .github/workflows/sycl-linux-run-tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sycl-linux-run-tests.yml b/.github/workflows/sycl-linux-run-tests.yml index fe853b825c224..b0505e31fbd8f 100644 --- a/.github/workflows/sycl-linux-run-tests.yml +++ b/.github/workflows/sycl-linux-run-tests.yml @@ -314,8 +314,12 @@ jobs: cts_exclude_filter=$PWD/devops/cts_exclude_filter_L0_GPU fi - # List excluded SYCL CTS categories + # List excluded SYCL CTS categories: + # SYCL_CTS_EXCLUDE_TEST_CATEGORIES - Optional file specifying a list + # of test categories to be excluded from the build. + echo "::group::Excluded test categories" cat $cts_exclude_filter + echo "::endgroup::" fi cmake -GNinja -B./build-cts -S./khronos_sycl_cts -DCMAKE_CXX_COMPILER=$(which clang++) \