Skip to content

[SYCL][COMPAT] Move non-e2e tests to correct dir #15828

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.

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
Oct 24, 2024

Conversation

joeatodd
Copy link
Contributor

This PR moves tests which don't execute anything on a device into sycl/test/syclcompat instead of sycl/test-e2e/syclcompat/.

Also fix an issue with kernel_properties.cpp test setup.

@joeatodd joeatodd requested a review from a team as a code owner October 23, 2024 10:48
@@ -23,7 +23,7 @@
// We need hardware which can support at least 2 sub-group sizes, since that
// hardware (presumably) supports the `intel_reqd_sub_group_size` attribute.
// REQUIRES: sg-32 && sg-16
// RUN: %{build} %if cl_options %{/clang:-S /clang:-emit-llvm%} %else %{-S -emit-llvm%} -o - | FileCheck %s
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ayylol I'd really appreciate your advice here. I rebased after #15744 was merged. I have removed the %if cl_options clause here, because I think %clangxx (and the fact I've moved the test from sycl/test-e2e to sycl/test) means that I don't need it, but I'm not confident about that. Is this OK or am I undoing your work?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hey @joeatodd I am not so familiar with the how the tests in test function to know right away if this would not cause any issues, however I can describe what was needed to reproduce the issue when it was in the e2e folder so you can check if it is needed after you move it.

in test-e2e the compiler used in %clangxx is set via the CMAKE_CXX_COMPILER flag. Setting this to clang-cl on windows is what made the warning be emitted, due to the -emit-llvm flag not existing on the MSVC driver. Because the e2e tests also add the -Werror flag to the %clangxx expansion this created a failure.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the info 🙏

@joeatodd
Copy link
Contributor Author

@intel/llvm-gatekeepers this is ready to merge 🙏

@martygrant martygrant merged commit 003fa58 into intel:sycl Oct 24, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants