Skip to content

[CI][SYCL-CTS] Small improvements #14807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 7, 2024
Merged

[CI][SYCL-CTS] Small improvements #14807

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8212d04
[CI][SYCL-CTS] Small improvements
KornevNikita Jul 26, 2024
b8d9777
Remove duplication
KornevNikita Jul 30, 2024
783aac9
group
KornevNikita Jul 31, 2024
b82de80
Merge remote-tracking branch 'origin/sycl' into improve-nightly-cts
KornevNikita Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions .github/workflows/sycl-linux-run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,36 +300,32 @@ 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: |
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
fi
- 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

# 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++) \
-DSYCL_IMPLEMENTATION=DPCPP \
-DSYCL_CTS_EXCLUDE_TEST_CATEGORIES="$cts_exclude_filter" \
-DSYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS=OFF \
-DSYCL_CTS_MEASURE_BUILD_TIMES=ON \
Copy link
Contributor

@aelovikov-intel aelovikov-intel Jul 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we dropping this?

Copy link
Contributor Author

@KornevNikita KornevNikita Jul 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mentioned this in the commit message (hope I'm not wrong)

Also remove DSYCL_CTS_MEASURE_BUILD_TIMES. It affects the performance, but we don't use these results.

Copy link
Contributor Author

@KornevNikita KornevNikita Aug 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aelovikov-intel should I remove it?

Copy link
Contributor

@aelovikov-intel aelovikov-intel Aug 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you think it's better without it, then dropping it is fine. You're the one working with the CTS runs in CI.

Copy link
Contributor Author

@KornevNikita KornevNikita Aug 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, then I'd prefer to drop it

-DDPCPP_INSTALL_DIR="$(dirname $(which clang++))/.." \
$CMAKE_EXTRA_ARGS
# Ignore errors so that if one category build fails others still have a
Expand Down