From f6b3d7d84d49a82309da266e62c72f643d6b8874 Mon Sep 17 00:00:00 2001
From: "Larsen, Steffen" <steffen.larsen@intel.com>
Date: Tue, 14 Mar 2023 06:40:02 -0700
Subject: [PATCH 1/2] [SYCL] Reenable reduction tests and reinforce coverage

This commit reenables a selection of reduction tests that were only
failing on certain systems. The failure was caused by reductions
working outside its work boundaries and was passing due to the values
read coincidentally being the same as the identity. To avoid this
in the future, this commit also adds test-cases with a different actual
identity.

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
---
 SYCL/Reduction/reduction_range_3d_rw.cpp | 23 +++++++++++++++++++++--
 SYCL/Reduction/reduction_utils.hpp       |  4 ++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/SYCL/Reduction/reduction_range_3d_rw.cpp b/SYCL/Reduction/reduction_range_3d_rw.cpp
index 522669e310..0115c7a279 100644
--- a/SYCL/Reduction/reduction_range_3d_rw.cpp
+++ b/SYCL/Reduction/reduction_range_3d_rw.cpp
@@ -67,14 +67,12 @@ int main() {
   tests<class D2, int>(Q, 99, PlusWithoutIdentity<int>{}, range<3>{2, 2, 2});
   tests<class D3, int>(Q, 99, PlusWithoutIdentity<int>{}, range<3>{2, 3, 4});
 
-  /* Temporarily disabled
   tests<class D4, int64_t>(Q, 99, PlusWithoutIdentity<int64_t>{},
                            range<3>{1, 1, MaxWGSize + 1});
   tests<class D5, int64_t>(Q, 99, PlusWithoutIdentity<int64_t>{},
                            range<3>{1, MaxWGSize + 1, 1});
   tests<class D6, int64_t>(Q, 99, PlusWithoutIdentity<int64_t>{},
                            range<3>{MaxWGSize + 1, 1, 1});
-  */
 
   tests<class D7, int64_t>(Q, 99, PlusWithoutIdentity<int64_t>{},
                            range<3>{2, 5, MaxWGSize * 2});
@@ -83,6 +81,27 @@ int main() {
   tests<class D9, int64_t>(Q, 99, PlusWithoutIdentity<int64_t>{},
                            range<3>{MaxWGSize * 3, 8, 4});
 
+  tests<class D1, int>(Q, 99, MultipliesWithoutIdentity<int>{},
+                       range<3>{1, 1, 1});
+  tests<class D2, int>(Q, 99, MultipliesWithoutIdentity<int>{},
+                       range<3>{2, 2, 2});
+  tests<class D3, int>(Q, 99, MultipliesWithoutIdentity<int>{},
+                       range<3>{2, 3, 4});
+
+  tests<class D4, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+                           range<3>{1, 1, MaxWGSize + 1});
+  tests<class D5, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+                           range<3>{1, MaxWGSize + 1, 1});
+  tests<class D6, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+                           range<3>{MaxWGSize + 1, 1, 1});
+
+  tests<class D7, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+                           range<3>{2, 5, MaxWGSize * 2});
+  tests<class D8, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+                           range<3>{3, MaxWGSize * 3, 2});
+  tests<class D9, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+                           range<3>{MaxWGSize * 3, 8, 4});
+
   printFinalStatus(NumErrors);
   return NumErrors;
 }
diff --git a/SYCL/Reduction/reduction_utils.hpp b/SYCL/Reduction/reduction_utils.hpp
index d5875fbbba..78a097bba9 100644
--- a/SYCL/Reduction/reduction_utils.hpp
+++ b/SYCL/Reduction/reduction_utils.hpp
@@ -141,6 +141,10 @@ template <class T> struct PlusWithoutIdentity {
   T operator()(const T &A, const T &B) const { return A + B; }
 };
 
+template <class T> struct MultipliesWithoutIdentity {
+  T operator()(const T &A, const T &B) const { return A * B; }
+};
+
 template <typename T> T getMinimumFPValue() {
   return std::numeric_limits<T>::has_infinity
              ? static_cast<T>(-std::numeric_limits<T>::infinity())

From c05c6c262a53822880634199e0d75a31071065aa Mon Sep 17 00:00:00 2001
From: "Larsen, Steffen" <steffen.larsen@intel.com>
Date: Tue, 14 Mar 2023 09:30:10 -0700
Subject: [PATCH 2/2] Fix names

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
---
 SYCL/Reduction/reduction_range_3d_rw.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/SYCL/Reduction/reduction_range_3d_rw.cpp b/SYCL/Reduction/reduction_range_3d_rw.cpp
index 0115c7a279..f29c828bea 100644
--- a/SYCL/Reduction/reduction_range_3d_rw.cpp
+++ b/SYCL/Reduction/reduction_range_3d_rw.cpp
@@ -81,25 +81,25 @@ int main() {
   tests<class D9, int64_t>(Q, 99, PlusWithoutIdentity<int64_t>{},
                            range<3>{MaxWGSize * 3, 8, 4});
 
-  tests<class D1, int>(Q, 99, MultipliesWithoutIdentity<int>{},
+  tests<class E1, int>(Q, 99, MultipliesWithoutIdentity<int>{},
                        range<3>{1, 1, 1});
-  tests<class D2, int>(Q, 99, MultipliesWithoutIdentity<int>{},
+  tests<class E2, int>(Q, 99, MultipliesWithoutIdentity<int>{},
                        range<3>{2, 2, 2});
-  tests<class D3, int>(Q, 99, MultipliesWithoutIdentity<int>{},
+  tests<class E3, int>(Q, 99, MultipliesWithoutIdentity<int>{},
                        range<3>{2, 3, 4});
 
-  tests<class D4, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+  tests<class E4, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
                            range<3>{1, 1, MaxWGSize + 1});
-  tests<class D5, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+  tests<class E5, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
                            range<3>{1, MaxWGSize + 1, 1});
-  tests<class D6, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+  tests<class E6, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
                            range<3>{MaxWGSize + 1, 1, 1});
 
-  tests<class D7, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+  tests<class E7, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
                            range<3>{2, 5, MaxWGSize * 2});
-  tests<class D8, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+  tests<class E8, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
                            range<3>{3, MaxWGSize * 3, 2});
-  tests<class D9, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
+  tests<class E9, int64_t>(Q, 99, MultipliesWithoutIdentity<int64_t>{},
                            range<3>{MaxWGSize * 3, 8, 4});
 
   printFinalStatus(NumErrors);