From ac5aa1faef759e704d369e8164ea91c6d7049946 Mon Sep 17 00:00:00 2001
From: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Date: Wed, 5 Dec 2018 15:17:18 +0000
Subject: IVGCVSW-2315 Add descriptor for Debug

Change-Id: I6b26c681989ef815752186f027a245ef8da7aea2
---
 src/backends/backendsCommon/ILayerSupport.cpp                 | 1 +
 src/backends/backendsCommon/WorkloadData.hpp                  | 2 +-
 src/backends/backendsCommon/WorkloadFactory.cpp               | 4 ++++
 src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/backends/backendsCommon')

diff --git a/src/backends/backendsCommon/ILayerSupport.cpp b/src/backends/backendsCommon/ILayerSupport.cpp
index 26dc06ddd2..3f2636c61a 100644
--- a/src/backends/backendsCommon/ILayerSupport.cpp
+++ b/src/backends/backendsCommon/ILayerSupport.cpp
@@ -99,6 +99,7 @@ bool ILayerSupport::IsConvolution2dSupported(const TensorInfo& input,
 
 bool ILayerSupport::IsDebugSupported(const TensorInfo& input,
                                      const TensorInfo& output,
+                                     const DebugDescriptor& descriptor,
                                      Optional<std::string&> reasonIfUnsupported) const
 {
     return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported);
diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp
index b0c1e6a857..b4bcfb0104 100644
--- a/src/backends/backendsCommon/WorkloadData.hpp
+++ b/src/backends/backendsCommon/WorkloadData.hpp
@@ -357,7 +357,7 @@ struct MinimumQueueDescriptor : QueueDescriptor
     void Validate(const WorkloadInfo& workloadInfo) const;
 };
 
-struct DebugQueueDescriptor : QueueDescriptor
+struct DebugQueueDescriptor : QueueDescriptorWithParameters<DebugDescriptor>
 {
     void Validate(const WorkloadInfo& workloadInfo) const;
 };
diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp
index fc79018aa5..915d667fed 100644
--- a/src/backends/backendsCommon/WorkloadFactory.cpp
+++ b/src/backends/backendsCommon/WorkloadFactory.cpp
@@ -201,11 +201,15 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId,
         }
         case LayerType::Debug:
         {
+            auto cLayer = boost::polymorphic_downcast<const DebugLayer*>(&layer);
+            const DebugDescriptor& descriptor = cLayer->GetParameters();
+
             const TensorInfo& input = layer.GetInputSlot(0).GetConnection()->GetTensorInfo();
             const TensorInfo& output = layer.GetOutputSlot(0).GetTensorInfo();
 
             result = layerSupportObject->IsDebugSupported(OverrideDataType(input, dataType),
                                                           OverrideDataType(output, dataType),
+                                                          descriptor,
                                                           reason);
             break;
         }
diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
index f25ba09624..e267988786 100644
--- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
+++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp
@@ -332,7 +332,7 @@ DECLARE_LAYER_POLICY_2_PARAM(Convolution2d)
 
 DECLARE_LAYER_POLICY_1_PARAM(MemCopy)
 
-DECLARE_LAYER_POLICY_1_PARAM(Debug)
+DECLARE_LAYER_POLICY_2_PARAM(Debug)
 
 DECLARE_LAYER_POLICY_2_PARAM(DepthwiseConvolution2d)
 
-- 
cgit v1.2.1