IVGCVSW-4603 Support comparison operators in CL

    * Deprecate ClGreaterWorkload
    * Add ClComparisonWorkload to encompass all comparison operators

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ida0ed7f59899d75b0fe7de1e7433b1ade018c6f1

1 files changed, 62 insertions, 0 deletions

diff --git a/src/backends/cl/workloads/ClComparisonWorkload.cpp b/src/backends/cl/workloads/ClComparisonWorkload.cpp
new file mode 100644
index 0000000000..30b336dd94
--- /dev/null
+++ b/src/backends/cl/workloads/ClComparisonWorkload.cpp
@@ -0,0 +1,62 @@
+//
+// Copyright © 2020 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#include "ClComparisonWorkload.hpp"
+
+#include "ClWorkloadUtils.hpp"
+
+#include <aclCommon/ArmComputeUtils.hpp>
+#include <aclCommon/ArmComputeTensorUtils.hpp>
+
+#include <backendsCommon/CpuTensorHandle.hpp>
+
+#include <cl/ClLayerSupport.hpp>
+#include <cl/ClTensorHandle.hpp>
+#include <cl/ClLayerSupport.hpp>
+
+namespace armnn
+{
+
+using namespace armcomputetensorutils;
+
+arm_compute::Status ClComparisonWorkloadValidate(const TensorInfo& input0,
+                                                 const TensorInfo& input1,
+                                                 const TensorInfo& output,
+                                                 const ComparisonDescriptor& descriptor)
+{
+    const arm_compute::TensorInfo aclInput0Info = BuildArmComputeTensorInfo(input0);
+    const arm_compute::TensorInfo aclInput1Info = BuildArmComputeTensorInfo(input1);
+    const arm_compute::TensorInfo aclOutputInfo = BuildArmComputeTensorInfo(output);
+
+    const arm_compute::ComparisonOperation comparisonOperation = ConvertComparisonOperationToAcl(descriptor);
+
+    const arm_compute::Status aclStatus = arm_compute::CLComparison::validate(&aclInput0Info,
+                                                                              &aclInput1Info,
+                                                                              &aclOutputInfo,
+                                                                              comparisonOperation);
+    return aclStatus;
+}
+
+ClComparisonWorkload::ClComparisonWorkload(const ComparisonQueueDescriptor& descriptor, const WorkloadInfo& info)
+    : BaseWorkload<ComparisonQueueDescriptor>(descriptor, info)
+{
+    m_Data.ValidateInputsOutputs("ClComparisonWorkload", 2, 1);
+
+    arm_compute::ICLTensor& input0 = static_cast<IClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor();
+    arm_compute::ICLTensor& input1 = static_cast<IClTensorHandle*>(m_Data.m_Inputs[1])->GetTensor();
+    arm_compute::ICLTensor& output = static_cast<IClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor();
+
+    const arm_compute::ComparisonOperation comparisonOperation = ConvertComparisonOperationToAcl(m_Data.m_Parameters);
+
+    m_ComparisonLayer.configure(&input0, &input1, &output, comparisonOperation);
+}
+
+void ClComparisonWorkload::Execute() const
+{
+    ARMNN_SCOPED_PROFILING_EVENT_CL("ClComparisonWorkload_Execute");
+    RunClFunction(m_ComparisonLayer, CHECK_LOCATION());
+}
+
+} //namespace armnn