Merge branch 'intel' of https://github.com/intel/llvm-test-suite into esimd_emu_test_updates

Author: dongkyunahn-intel

SYCL/Basic/image/image_accessor_range.cpp

@@ -9,8 +9,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out
 
-// XFAIL: level_zero
-
 #include <CL/sycl.hpp>
 #include <CL/sycl/accessor.hpp>
 #include <iostream>

SYCL/ESIMD/api/functional/README.md

@@ -0,0 +1,7 @@
+# Tests configuration options
+Tests within this directory has additional preprocessor definitions available.
+
+`ESIMD_TESTS_VERBOSE_LOG` (default: not defined)
+Enables verbose log messages, including the trace messages for the current test
+case running. It could be usefull to investigate test failures, crashes or
+freezes.

SYCL/ESIMD/api/functional/common.hpp

@@ -61,13 +61,15 @@ template <typename T>
 inline bool should_skip_test_with(const sycl::device &device) {
   if constexpr (std::is_same_v<T, sycl::half>) {
     if (!device.has(sycl::aspect::fp16)) {
-      log::note(
+      // TODO: Use TestDescription after removal of the macro
+      // ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
+      log::print_line(
           "Device does not support half precision floating point operations");
       return true;
     }
   } else if constexpr (std::is_same_v<T, double>) {
     if (!device.has(sycl::aspect::fp64)) {
-      log::note(
+      log::print_line(
           "Device does not support double precision floating point operations");
       return true;
     }

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

@@ -14,20 +14,44 @@
 #pragma once
 
 #include "../common.hpp"
+#include <string>
 
 namespace esimd_test::api::functional::ctors {
 
-template <typename DataT, int NumElems, typename ContextT>
+#ifdef ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
+
+template <int NumElems, typename ContextT>
 class TestDescription : public ITestDescription {
+public:
+  TestDescription(const std::string &data_type) : m_data_type(data_type) {}
+
+  std::string to_string() const override {
+    std::string test_description("simd<");
+
+    test_description += m_data_type + ", " + std::to_string(NumElems) + ">";
+    test_description += ", with context: " + ContextT::get_description();
+
+    return test_description;
+  }
+
+private:
+  const std::string m_data_type;
+};
+
+#else
+
+// Deprecated, use TestDescription<NumElems, ContextT> for new tests instead
+//
+// TODO: Remove deprecated TestDescription from all tests
+template <typename DataT, int NumElems, typename ContextT>
+class [[deprecated]] TestDescription : public ITestDescription {
 public:
   TestDescription(size_t index, DataT retrieved_val, DataT expected_val,
                   const std::string &data_type)
       : m_data_type(data_type), m_retrieved_val(retrieved_val),
         m_expected_val(expected_val), m_index(index) {}
 
   std::string to_string() const override {
-    // TODO: Make strings for fp values more short during failure output, may be
-    // by using hex representation
     std::string log_msg("Failed for simd<");
 
     log_msg += m_data_type + ", " + std::to_string(NumElems) + ">";
@@ -46,4 +70,6 @@ class TestDescription : public ITestDescription {
   const size_t m_index;
 };
 
+#endif // ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
+
 } // namespace esimd_test::api::functional::ctors

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

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #pragma once
+#define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
 
 #include "common.hpp"
 
@@ -93,14 +94,17 @@ class const_ref {
 // Using functor class to be able to iterate over the pre-defined data types.
 template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
   static constexpr int NumElems = SizeT::value;
+  using TestDescriptionT = ctors::TestDescription<NumElems, TestCaseT>;
 
 public:
   bool operator()(sycl::queue &queue, const std::string &data_type) {
+    bool passed = true;
+    log::trace<TestDescriptionT>(data_type);
+
     if (should_skip_test_with<DataT>(queue.get_device())) {
       return true;
     }
 
-    bool passed = true;
     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
@@ -148,13 +152,13 @@ template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
     queue.wait_and_throw();
 
     for (size_t i = 0; i < result.size(); ++i) {
-      if (!are_bitwise_equal(ref_data[i], result[i])) {
-        passed = false;
+      const auto &expected = ref_data[i];
+      const auto &retrieved = result[i];
 
-        const auto description =
-            ctors::TestDescription<DataT, NumElems, TestCaseT>(
-                i, result[i], ref_data[i], data_type);
-        log::fail(description);
+      if (!are_bitwise_equal(expected, retrieved)) {
+        passed = false;
+        log::fail(TestDescriptionT(data_type), "Unexpected value at index ", i,
+                  ", retrieved: ", retrieved, ", expected: ", expected);
       }
     }
 

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

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #pragma once
+#define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
 
 #include "common.hpp"
 
@@ -90,14 +91,17 @@ class const_ref {
 // Using functor class to be able to iterate over the pre-defined data types.
 template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
   static constexpr int NumElems = SizeT::value;
+  using TestDescriptionT = ctors::TestDescription<NumElems, TestCaseT>;
 
 public:
   bool operator()(sycl::queue &queue, const std::string &data_type) {
+    bool passed = true;
+    log::trace<TestDescriptionT>(data_type);
+
     if (should_skip_test_with<DataT>(queue.get_device())) {
       return true;
     }
 
-    bool passed = true;
     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
@@ -139,13 +143,13 @@ template <typename DataT, typename SizeT, typename TestCaseT> class run_test {
     queue.wait_and_throw();
 
     for (size_t i = 0; i < result.size(); ++i) {
-      if (!are_bitwise_equal(ref_data[i], result[i])) {
-        passed = false;
+      const auto &expected = ref_data[i];
+      const auto &retrieved = result[i];
 
-        const auto description =
-            ctors::TestDescription<DataT, NumElems, TestCaseT>(
-                i, result[i], ref_data[i], data_type);
-        log::fail(description);
+      if (!are_bitwise_equal(expected, retrieved)) {
+        passed = false;
+        log::fail(TestDescriptionT(data_type), "Unexpected value at index ", i,
+                  ", retrieved: ", retrieved, ", expected: ", expected);
       }
     }
 

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

@@ -13,6 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #pragma once
+#define ESIMD_TESTS_DISABLE_DEPRECATED_TEST_DESCRIPTION_FOR_LOGS
 
 #include "common.hpp"
 
@@ -78,14 +79,16 @@ struct const_ref {
 // Struct that calls simd in provided context and then verifies obtained result.
 template <typename DataT, typename SizeT, typename TestCaseT> struct run_test {
   static constexpr int NumElems = SizeT::value;
+  using TestDescriptionT = ctors::TestDescription<NumElems, TestCaseT>;
 
   bool operator()(sycl::queue &queue, const std::string &data_type) {
+    bool passed = true;
+    log::trace<TestDescriptionT>(data_type);
+
     if (should_skip_test_with<DataT>(queue.get_device())) {
       return true;
     }
 
-    bool passed = true;
-
     // We use it to avoid empty functions being optimized out by compiler
     // checking the result of the simd calling because values of the constructed
     // object's elements are undefined.
@@ -103,12 +106,8 @@ template <typename DataT, typename SizeT, typename TestCaseT> struct run_test {
       queue.wait_and_throw();
     } catch (const sycl::exception &e) {
       passed = false;
-      std::string error_msg("A SYCL exception was caught:");
-      error_msg += std::string(e.what());
-      error_msg += " for simd<" + data_type;
-      error_msg += ", " + std::to_string(NumElems) + ">";
-      error_msg += ", with context: " + TestCaseT::get_description();
-      log::note(error_msg);
+      log::fail(TestDescriptionT(data_type), "A SYCL exception was caught: ",
+                e.what());
     }
 
     return passed;