From a856501ac5c2d0cca70068993e5c7cc714872890 Mon Sep 17 00:00:00 2001
From: Keith Davis <keith.davis@arm.com>
Date: Fri, 14 Feb 2020 12:22:40 +0000
Subject: IVGCVSW-4420 Failing Unit Test Cl: Quantize layer

 * Fix bug with missing ValidateInputsOutputs in Cl Workload
 * Renamed data type tests to be more specific
 * Future proofing

Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I157acc318e40d727fcfb3f36f7f577fc87472f3d
---
 src/backends/cl/workloads/ClDequantizeWorkload.cpp | 2 ++
 src/backends/cl/workloads/ClQuantizeWorkload.cpp   | 2 ++
 src/backends/cl/workloads/ClWorkloadUtils.hpp      | 1 +
 3 files changed, 5 insertions(+)

(limited to 'src/backends/cl/workloads')

diff --git a/src/backends/cl/workloads/ClDequantizeWorkload.cpp b/src/backends/cl/workloads/ClDequantizeWorkload.cpp
index 67a555a020..eca795de7e 100644
--- a/src/backends/cl/workloads/ClDequantizeWorkload.cpp
+++ b/src/backends/cl/workloads/ClDequantizeWorkload.cpp
@@ -32,6 +32,8 @@ ClDequantizeWorkload::ClDequantizeWorkload(const DequantizeQueueDescriptor& desc
                                            const WorkloadInfo& workloadInfo)
                                            : BaseWorkload<DequantizeQueueDescriptor>(descriptor, workloadInfo)
 {
+    m_Data.ValidateInputsOutputs("ClDequantizeWorkload", 1, 1);
+
     arm_compute::ICLTensor& input = boost::polymorphic_pointer_downcast<IClTensorHandle>(
             m_Data.m_Inputs[0])->GetTensor();
 
diff --git a/src/backends/cl/workloads/ClQuantizeWorkload.cpp b/src/backends/cl/workloads/ClQuantizeWorkload.cpp
index 230e346a00..263065a5a4 100644
--- a/src/backends/cl/workloads/ClQuantizeWorkload.cpp
+++ b/src/backends/cl/workloads/ClQuantizeWorkload.cpp
@@ -32,6 +32,8 @@ arm_compute::Status ClQuantizeWorkloadValidate(const TensorInfo& input,
 ClQuantizeWorkload::ClQuantizeWorkload(const QuantizeQueueDescriptor& descriptor, const WorkloadInfo& info)
     : BaseWorkload<QuantizeQueueDescriptor>(descriptor, info)
 {
+    m_Data.ValidateInputsOutputs("ClQuantizeWorkload", 1, 1);
+
     arm_compute::ICLTensor& input  = static_cast<IClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor();
     arm_compute::ICLTensor& output = static_cast<IClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor();
 
diff --git a/src/backends/cl/workloads/ClWorkloadUtils.hpp b/src/backends/cl/workloads/ClWorkloadUtils.hpp
index d3c6df50ed..b4bcc1c017 100644
--- a/src/backends/cl/workloads/ClWorkloadUtils.hpp
+++ b/src/backends/cl/workloads/ClWorkloadUtils.hpp
@@ -101,6 +101,7 @@ inline void InitializeArmComputeClTensorData(arm_compute::CLTensor& clTensor,
         case DataType::Float32:
             CopyArmComputeClTensorData(clTensor, handle->GetConstTensor<float>());
             break;
+        case DataType::QAsymmS8:
         case DataType::QAsymmU8:
             CopyArmComputeClTensorData(clTensor, handle->GetConstTensor<uint8_t>());
             break;
-- 
cgit v1.2.1