commit 75eea338eb232ebdafa2fb84d22e711b5f964785
author Sang-Hoon Park <sang-hoon.park@arm.com> Fri Nov 13 13:44:13 2020 +0000
committer Sang-Hoon Park <sang-hoon.park@arm.com> Wed Nov 18 12:25:16 2020 +0000
tree d069d26864c3ae180ff526262a1436af839a5bb0
parent 10a73f5c0cc15ffba532bc923c6471f67af0959a

COMPMID-3961: Add Logical OR/AND/NOT operator on CL

Change-Id: I612aeed6affa17624fb9044964dd59c41a5c9888
Signed-off-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4448
Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

tests/validation/reference/Logical.cpp

diff --git a/tests/validation/reference/Logical.cpp b/tests/validation/reference/Logical.cpp
index 394525c..9989ec8 100644
--- a/tests/validation/reference/Logical.cpp
+++ b/tests/validation/reference/Logical.cpp
@@ -22,6 +22,8 @@
  * SOFTWARE.
  */
 #include "tests/validation/reference/Logical.h"
+#include "src/core/KernelTypes.h"
+#include "tests/framework/Asserts.h"
 
 namespace arm_compute
 {
@@ -32,27 +34,30 @@
 namespace reference
 {
 template <typename T>
-T logical_op(LogicalBinaryOperation op, T src1, T src2)
+T logical_binary_op(arm_compute::kernels::LogicalOperation op, T src1, T src2)
 {
     switch(op)
     {
-        case LogicalBinaryOperation::AND:
+        case arm_compute::kernels::LogicalOperation::And:
             return src1 && src2;
-        case LogicalBinaryOperation::OR:
+        case arm_compute::kernels::LogicalOperation::Or:
             return src1 || src2;
-        case LogicalBinaryOperation::UNKNOWN:
+        // The following operators are either invalid or not binary operator
+        case arm_compute::kernels::LogicalOperation::Not:
+        /* fall through */
+        case arm_compute::kernels::LogicalOperation::Unknown:
+        /* fall through */
         default:
-            ARM_COMPUTE_ERROR_ON_MSG(true, "unknown logical binary operation is given");
+            ARM_COMPUTE_ASSERT(true);
     }
-    return false;
+    return T{};
 }
 
 template <size_t dim>
 struct BroadcastUnroll
 {
     template <typename T>
-    static void unroll(LogicalBinaryOperation op,
-                       const SimpleTensor<T> &src1, const SimpleTensor<T> &src2, SimpleTensor<T> &dst,
+    static void unroll(arm_compute::kernels::LogicalOperation op, const SimpleTensor<T> &src1, const SimpleTensor<T> &src2, SimpleTensor<T> &dst,
                        Coordinates &id_src1, Coordinates &id_src2, Coordinates &id_dst)
     {
         const bool src1_is_broadcast = (src1.shape()[dim - 1] != dst.shape()[dim - 1]);
@@ -79,10 +84,10 @@
 struct BroadcastUnroll<0>
 {
     template <typename T>
-    static void unroll(LogicalBinaryOperation op, const SimpleTensor<T> &src1, const SimpleTensor<T> &src2, SimpleTensor<T> &dst,
+    static void unroll(arm_compute::kernels::LogicalOperation op, const SimpleTensor<T> &src1, const SimpleTensor<T> &src2, SimpleTensor<T> &dst,
                        Coordinates &id_src1, Coordinates &id_src2, Coordinates &id_dst)
     {
-        dst[coord2index(dst.shape(), id_dst)] = logical_op(op, src1[coord2index(src1.shape(), id_src1)], src2[coord2index(src2.shape(), id_src2)]);
+        dst[coord2index(dst.shape(), id_dst)] = logical_binary_op(op, src1[coord2index(src1.shape(), id_src1)], src2[coord2index(src2.shape(), id_src2)]);
     }
 };
 
@@ -94,7 +99,7 @@
     Coordinates     id_dst{};
     SimpleTensor<T> dst{ TensorShape::broadcast_shape(src1.shape(), src2.shape()), src1.data_type() };
 
-    BroadcastUnroll<Coordinates::num_max_dimensions>::unroll(LogicalBinaryOperation::OR, src1, src2, dst, id_src1, id_src2, id_dst);
+    BroadcastUnroll<Coordinates::num_max_dimensions>::unroll(arm_compute::kernels::LogicalOperation::Or, src1, src2, dst, id_src1, id_src2, id_dst);
 
     return dst;
 }
@@ -107,7 +112,7 @@
     Coordinates     id_dst{};
     SimpleTensor<T> dst{ TensorShape::broadcast_shape(src1.shape(), src2.shape()), src1.data_type() };
 
-    BroadcastUnroll<Coordinates::num_max_dimensions>::unroll(LogicalBinaryOperation::AND, src1, src2, dst, id_src1, id_src2, id_dst);
+    BroadcastUnroll<Coordinates::num_max_dimensions>::unroll(arm_compute::kernels::LogicalOperation::And, src1, src2, dst, id_src1, id_src2, id_dst);
 
     return dst;
 }
@@ -133,4 +138,4 @@
 } // namespace reference
 } // namespace validation
 } // namespace test
-} // namespace arm_compute
\ No newline at end of file
+} // namespace arm_compute