[Tests] Skipping c++20 MSVC group comparison checks in kernel (uxlfou…

…ndation#1568) --------- Signed-off-by: Dan Hoeflinger <[email protected]>
auygy365 · May 16, 2024 · a006f9e · a006f9e
1 parent 26a8d1e
commit a006f9e
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 11 deletions.
diff --git a/test/support/test_config.h b/test/support/test_config.h
@@ -154,6 +154,12 @@
 #define _PSTL_TEST_COMPLEX_SINH_BROKEN _PSTL_TEST_COMPLEX_OP_BROKEN
 #define _PSTL_TEST_COMPLEX_TANH_BROKEN _PSTL_TEST_COMPLEX_OP_BROKEN
 
+// oneAPI DPC++ compiler 2024.2.0 and earlier is unable to eliminate a "dead" function call to an undefined function
+// within a sycl kernel which MSVC uses to allow comparisons with literal zero without warning
+#define _PSTL_TEST_COMPARISON_BROKEN                                                                                   \
+    ((__cplusplus >= 202002L || _MSVC_LANG >= 202002L) && _MSVC_STL_VERSION >= 143 && _MSVC_STL_UPDATE >= 202303L &&   \
+    __INTEL_LLVM_COMPILER > 0 && __INTEL_LLVM_COMPILER <= 20240200)
+
 #define _PSTL_TEST_COMPLEX_TIMES_COMPLEX_BROKEN _PSTL_TEST_COMPLEX_OP_BROKEN
 #define _PSTL_TEST_COMPLEX_TIMES_COMPLEX_BROKEN_GLIBCXX (__GLIBCXX__ > 0 && __GLIBCXX__ <= 20210601)
 #define _PSTL_TEST_COMPLEX_DIV_COMPLEX_BROKEN _PSTL_TEST_COMPLEX_OP_BROKEN

diff --git a/test/xpu_api/containers/sequences/array/array.comparison/greater_g.pass.cpp b/test/xpu_api/containers/sequences/array/array.comparison/greater_g.pass.cpp
@@ -19,6 +19,7 @@
 
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 bool
 kernel_test()
 {
@@ -42,12 +43,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of work with dpl::array and '>' in kernel_test");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/containers/sequences/array/array.comparison/greater_or_equal_g.pass.cpp b/test/xpu_api/containers/sequences/array/array.comparison/greater_or_equal_g.pass.cpp
@@ -19,6 +19,7 @@
 
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 bool
 kernel_test()
 {
@@ -42,12 +43,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of work with dpl::array and '>=' in kernel_test");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/containers/sequences/array/array.comparison/less_g.pass.cpp b/test/xpu_api/containers/sequences/array/array.comparison/less_g.pass.cpp
@@ -19,6 +19,7 @@
 
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 bool
 kernel_test()
 {
@@ -42,12 +43,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of work with dpl::array and '<' in kernel_test");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/containers/sequences/array/array.comparison/less_or_equal_g.pass.cpp b/test/xpu_api/containers/sequences/array/array.comparison/less_or_equal_g.pass.cpp
@@ -19,6 +19,7 @@
 
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 bool
 kernel_test()
 {
@@ -42,12 +43,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of work with dpl::array and '<=' in kernel_test");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/tuple/tuple.tuple/tuple.comparison/tuple_comp.pass.cpp b/test/xpu_api/tuple/tuple.tuple/tuple.comparison/tuple_comp.pass.cpp
@@ -21,6 +21,7 @@
 #include "support/test_macros.h"
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 template <typename X>
 bool
 test(const X& x)
@@ -60,12 +61,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of dpl::tuple comparison check");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/tuple/tuple.tuple/tuple.rel/lt.pass.cpp b/test/xpu_api/tuple/tuple.tuple/tuple.rel/lt.pass.cpp
@@ -20,6 +20,7 @@
 #include "support/test_macros.h"
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 class KernelTupleLTTest1;
 class KernelTupleLTTest2;
 
@@ -304,16 +305,22 @@ kernel_test2(sycl::queue& deviceQueue)
     auto ret_access_host = buffer1.get_host_access(sycl::read_only);
     EXPECT_TRUE(ret_access_host[0], "Wrong result of dpl::tuple comparison check");
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     sycl::queue deviceQueue = TestUtils::get_test_queue();
     kernel_test1(deviceQueue);
     if (TestUtils::has_type_support<double>(deviceQueue.get_device()))
     {
         kernel_test2(deviceQueue);
     }
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/utilities/optional/optional.nullops/greater_equal_optional_nullops.pass.cpp b/test/xpu_api/utilities/optional/optional.nullops/greater_equal_optional_nullops.pass.cpp
@@ -20,6 +20,7 @@
 #include "support/test_macros.h"
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 bool
 kernel_test()
 {
@@ -48,12 +49,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of greater or equal value check");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/utilities/optional/optional.nullops/greater_optional_nullops.pass.cpp b/test/xpu_api/utilities/optional/optional.nullops/greater_optional_nullops.pass.cpp
@@ -20,6 +20,7 @@
 #include "support/test_macros.h"
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 bool
 kernel_test()
 {
@@ -47,12 +48,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of greater value check");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/utilities/optional/optional.nullops/less_equal_optional_nullops.pass.cpp b/test/xpu_api/utilities/optional/optional.nullops/less_equal_optional_nullops.pass.cpp
@@ -20,6 +20,7 @@
 #include "support/test_macros.h"
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 bool
 kernel_test()
 {
@@ -48,12 +49,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of less or equal check");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/utilities/optional/optional.nullops/less_than_optional_nullops.pass.cpp b/test/xpu_api/utilities/optional/optional.nullops/less_than_optional_nullops.pass.cpp
@@ -20,6 +20,7 @@
 #include "support/test_macros.h"
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 bool
 kernel_test()
 {
@@ -48,12 +49,18 @@ kernel_test()
     }
     return ret;
 }
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     auto ret = kernel_test();
     EXPECT_TRUE(ret, "Wrong result of '...'less then' value check");
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }
diff --git a/test/xpu_api/utilities/pairs/pairs.spec/comparison.pass.cpp b/test/xpu_api/utilities/pairs/pairs.spec/comparison.pass.cpp
@@ -20,6 +20,7 @@
 #include "support/test_macros.h"
 #include "support/utils.h"
 
+#if !_PSTL_TEST_COMPARISON_BROKEN
 class KernelPairTest;
 void
 kernel_test()
@@ -97,10 +98,17 @@ kernel_test()
     EXPECT_TRUE(ret_access_host[0], "Wrong result of dpl::pair comparison check");
 }
 
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
+
 int
 main()
 {
+    bool bProcessed = false;
+
+#if !_PSTL_TEST_COMPARISON_BROKEN
     kernel_test();
+    bProcessed = true;
+#endif // !_PSTL_TEST_COMPARISON_BROKEN
 
-    return TestUtils::done();
+    return TestUtils::done(bProcessed);
 }