From 130b80614b518a42ce417467762ccded736cffc9 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Wed, 3 Sep 2025 18:17:16 -0700 Subject: [PATCH 1/3] [SYCL] Disable self-contained-headers test on Windows The test is flaky and has no value in general. --- .../sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp diff --git a/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp b/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp new file mode 100755 index 0000000000000..9a7d05279c2d9 --- /dev/null +++ b/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp @@ -0,0 +1,9 @@ +// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s +// expected-no-diagnostics +// +// UNSUPPORTED: system-windows +// Different versions of STL implementations by Microsoft either implicitly +// include cmath or not. It means the test result depends on the system +// environment. + +#include From a8a39fad71090192c7895db08f067bcd8d7f3104 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Wed, 3 Sep 2025 19:09:32 -0700 Subject: [PATCH 2/3] Mark test as expected to fail on non-Windows platforms. --- sycl/test/self-contained-headers/lit.local.cfg | 4 ---- .../sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/sycl/test/self-contained-headers/lit.local.cfg b/sycl/test/self-contained-headers/lit.local.cfg index 767afc0f1b74e..30a1d3e1a195c 100644 --- a/sycl/test/self-contained-headers/lit.local.cfg +++ b/sycl/test/self-contained-headers/lit.local.cfg @@ -7,8 +7,4 @@ config.test_format = SYCLHeadersTest() # standalone. `os.path.join` is required here so the filtering works # cross-platform config.sycl_headers_xfail = [ - # FIXME: remove this rule when the header is moved to the clang project - os.path.join( - "sycl", "stl_wrappers", "__sycl_cmath_wrapper_impl.hpp" - ), ] diff --git a/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp b/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp index 9a7d05279c2d9..4f35561f1b0ba 100755 --- a/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp +++ b/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp @@ -1,6 +1,7 @@ // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s // expected-no-diagnostics // +// XFAIL: !system-windows // UNSUPPORTED: system-windows // Different versions of STL implementations by Microsoft either implicitly // include cmath or not. It means the test result depends on the system From 84f5ac15e1238478abeda225e3a4a41676c57275 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Wed, 3 Sep 2025 20:06:38 -0700 Subject: [PATCH 3/3] Update sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp Co-authored-by: Andrei Elovikov --- .../sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp b/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp index 4f35561f1b0ba..ca7ca5259c340 100755 --- a/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp +++ b/sycl/test/self-contained-headers/sycl/stl_wrappers/__sycl_cmath_wrapper_impl.hpp.cpp @@ -7,4 +7,5 @@ // include cmath or not. It means the test result depends on the system // environment. +// TODO: Longer term that header should really be moved to the clang project. #include