[SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (intel#748)

* [SYCL][ESIMD] Split tests into core and fp_extra

Author: vasilytric

SYCL/ESIMD/api/functional/ctors/ctor_array.hpp

@@ -13,11 +13,18 @@
 //===----------------------------------------------------------------------===//
 
 #pragma once
+<<<<<<< HEAD
 #define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
 
 #include "common.hpp"
 
 namespace esimd = sycl::ext::intel::esimd;
+=======
+
+#include "common.hpp"
+
+namespace esimd = sycl::ext::intel::experimental::esimd;
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 
 namespace esimd_test::api::functional::ctors {
 
@@ -92,6 +99,7 @@ class const_ref {
 
 // The main test routine.
 // Using functor class to be able to iterate over the pre-defined data types.
+<<<<<<< HEAD
 template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
   static constexpr int NumElems = SizeT::value;
   using TestDescriptionT = ctors::TestDescription<NumElems, TestCaseT>;
@@ -105,6 +113,15 @@ template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
       return true;
     }
 
+=======
+template <typename DataT, typename DimT, typename TestCaseT> class run_test {
+  static constexpr int NumElems = DimT::value;
+
+public:
+  bool operator()(sycl::queue &queue, const std::string &data_type) {
+
+    bool passed = true;
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
     const std::vector<DataT> ref_data = generate_ref_data<DataT, NumElems>();
 
     // If current number of elements is equal to one, then run test with each
@@ -138,7 +155,11 @@ template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
       const DataT *const ref = shared_ref_data.data();
       DataT *const out = result.data();
 
+<<<<<<< HEAD
       cgh.single_task<Kernel<DataT, NumElems, TestCaseT>>(
+=======
+      cgh.single_task<ctors::Kernel<DataT, NumElems, TestCaseT>>(
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
           [=]() SYCL_ESIMD_KERNEL {
             DataT ref_on_dev[NumElems];
             for (size_t i = 0; i < NumElems; ++i) {
@@ -152,13 +173,23 @@ template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
     queue.wait_and_throw();
 
     for (size_t i = 0; i < result.size(); ++i) {
+<<<<<<< HEAD
       const auto &expected = ref_data[i];
       const auto &retrieved = result[i];
 
       if (!are_bitwise_equal(expected, retrieved)) {
         passed = false;
         log::fail(TestDescriptionT(data_type), "Unexpected value at index ", i,
                   ", retrieved: ", retrieved, ", expected: ", expected);
+=======
+      if (!are_bitwise_equal(ref_data[i], result[i])) {
+        passed = false;
+
+        const auto description =
+            ctors::TestDescription<DataT, NumElems, TestCaseT>(
+                i, result[i], ref_data[i], data_type);
+        log::fail(description);
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
       }
     }
 

SYCL/ESIMD/api/functional/ctors/ctor_array_core.cpp

@@ -26,6 +26,7 @@
 
 using namespace esimd_test::api::functional;
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 using namespace sycl::ext::intel::experimental::esimd;
 
@@ -168,13 +169,16 @@ template <typename DataT, typename DimT, typename TestCaseT> class run_test {
   }
 };
 >>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721))
+=======
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 
 int main(int, char **) {
   sycl::queue queue(esimd_test::ESIMDSelector{},
                     esimd_test::createExceptionHandler());
 
   bool passed = true;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   const auto types = get_tested_types<tested_types::core>();
   const auto sizes = get_all_sizes();
@@ -195,6 +199,15 @@ int main(int, char **) {
 
   passed &= for_all_combinations<run_test>(types, dims, contexts, queue);
 >>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721))
+=======
+  const auto types = get_tested_types<tested_types::core>();
+  const auto dims = get_all_dimensions();
+  const auto contexts =
+      unnamed_type_pack<ctors::initializer, ctors::var_decl,
+                        ctors::rval_in_expr, ctors::const_ref>::generate();
+
+  passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 
   std::cout << (passed ? "=== Test passed\n" : "=== Test FAILED\n");
   return passed ? 0 : 1;

SYCL/ESIMD/api/functional/ctors/ctor_array_fp_extra.cpp

@@ -15,8 +15,13 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
 // Test for simd constructor from an array.
+<<<<<<< HEAD
 // This test uses extra fp data types, sizes and different simd constructor
 // invocation contexts.
+=======
+// This test uses extra fp data types, dimensionality and different simd
+// constructor invocation contexts.
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 // The test does the following actions:
 //  - construct fixed-size array that filled with reference values
 //  - use std::move() to provide it to simd constructor
@@ -33,13 +38,21 @@ int main(int, char **) {
   bool passed = true;
 
   const auto types = get_tested_types<tested_types::fp_extra>();
+<<<<<<< HEAD
   const auto sizes = get_all_sizes();
+=======
+  const auto dims = get_all_dimensions();
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
   const auto contexts =
       unnamed_type_pack<ctors::initializer, ctors::var_decl,
                         ctors::rval_in_expr, ctors::const_ref>::generate();
 
+<<<<<<< HEAD
   passed &=
       for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
+=======
+  passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 
   std::cout << (passed ? "=== Test passed\n" : "=== Test FAILED\n");
   return passed ? 0 : 1;

SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp

@@ -7,13 +7,17 @@
 //
 //===----------------------------------------------------------------------===//
 <<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
+<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
+=======
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
 ///
 /// \file
 /// This file provides functions for tests on simd copy constructor.
 ///
 //===----------------------------------------------------------------------===//
 
 #pragma once
+<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
 #define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
 =======
 // REQUIRES: gpu, level_zero
@@ -31,6 +35,12 @@
 #include "common.hpp"
 
 namespace esimd = sycl::ext::intel::esimd;
+=======
+
+#include "common.hpp"
+
+namespace esimd = sycl::ext::intel::experimental::esimd;
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
 
 namespace esimd_test::api::functional::ctors {
 
@@ -175,6 +185,7 @@ template <typename DataT, typename DimT, typename TestCaseT> class run_test {
   }
 };
 
+<<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
 <<<<<<< HEAD:SYCL/ESIMD/api/functional/ctors/ctor_copy.hpp
 } // namespace esimd_test::api::functional::ctors
 =======
@@ -195,3 +206,6 @@ int main(int, char **) {
   return passed ? 0 : 1;
 }
 >>>>>>> 6870ea3ee ([SYCL][ESIMD] Provide the for_all_combinations utility (#721)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp
+=======
+} // namespace esimd_test::api::functional::ctors
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748)):SYCL/ESIMD/api/functional/ctors/ctor_copy.cpp

SYCL/ESIMD/api/functional/ctors/ctor_copy_core.cpp

@@ -15,8 +15,13 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
 // Test for simd copy constructor.
+<<<<<<< HEAD
 // This test uses different data types, sizes and different simd constructor
 // invocation contexts.
+=======
+// This test uses different data types, dimensionality and different simd
+// constructor invocation contexts.
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 // The test do the following actions:
 //  - construct simd object with golden values calls copy constructor from
 //    constructed simd object
@@ -33,13 +38,21 @@ int main(int, char **) {
   bool passed = true;
 
   const auto types = get_tested_types<tested_types::core>();
+<<<<<<< HEAD
   const auto sizes = get_all_sizes();
+=======
+  const auto dims = get_all_dimensions();
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
   const auto contexts =
       unnamed_type_pack<ctors::initializer, ctors::var_decl,
                         ctors::rval_in_expr, ctors::const_ref>::generate();
 
+<<<<<<< HEAD
   passed &=
       for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
+=======
+  passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 
   std::cout << (passed ? "=== Test passed\n" : "=== Test FAILED\n");
   return passed ? 0 : 1;

SYCL/ESIMD/api/functional/ctors/ctor_copy_fp_extra.cpp

@@ -15,8 +15,13 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 //
 // Test for simd copy constructor.
+<<<<<<< HEAD
 // This test uses different data types, sizes and different simd constructor
 // invocation contexts.
+=======
+// This test uses extra fp data types, dimensionality and different simd
+// constructor invocation contexts.
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 // The test do the following actions:
 //  - construct simd object with golden values calls copy constructor from
 //    constructed simd object
@@ -33,13 +38,21 @@ int main(int, char **) {
   bool passed = true;
 
   const auto types = get_tested_types<tested_types::fp_extra>();
+<<<<<<< HEAD
   const auto sizes = get_all_sizes();
+=======
+  const auto dims = get_all_dimensions();
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
   const auto contexts =
       unnamed_type_pack<ctors::initializer, ctors::var_decl,
                         ctors::rval_in_expr, ctors::const_ref>::generate();
 
+<<<<<<< HEAD
   passed &=
       for_all_combinations<ctors::run_test>(types, sizes, contexts, queue);
+=======
+  passed &= for_all_combinations<ctors::run_test>(types, dims, contexts, queue);
+>>>>>>> c1366f1d7 ([SYCL][ESIMD] Split tests on simd constructors into core and fp_extra (#748))
 
   std::cout << (passed ? "=== Test passed\n" : "=== Test FAILED\n");
   return passed ? 0 : 1;