From 5a64f22101ecdda4846e9d71428633f3ccd56fb2 Mon Sep 17 00:00:00 2001 From: Keith Davis Date: Wed, 4 Aug 2021 10:35:20 +0100 Subject: IVGCVSW-5980 Add Descriptor, TensorInfo and Convolution algorithm to JSON * Add GUID as field to layer details and profiling events * Add Optional GUID param to existing tests * Improve Details macro to be inline function * Fix some formatting Signed-off-by: Keith Davis Change-Id: I66f192a90a7642b3ee8e7dda0d3f428cce002581 --- src/backends/reference/workloads/RefConvolution2dWorkload.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/backends/reference/workloads/RefConvolution2dWorkload.cpp') diff --git a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp index 7c331715d8..b0b88b18db 100644 --- a/src/backends/reference/workloads/RefConvolution2dWorkload.cpp +++ b/src/backends/reference/workloads/RefConvolution2dWorkload.cpp @@ -16,9 +16,6 @@ RefConvolution2dWorkload::RefConvolution2dWorkload( const Convolution2dQueueDescriptor& descriptor, const WorkloadInfo& info) : BaseWorkload(descriptor, info) { - // Construct params for reporting operator details - std::string workloadName = "RefConvolution2dWorkload_Execute_Guid" + std::to_string(this->GetGuid()); - WorkloadInfo detailsInfo; detailsInfo.m_InputTensorInfos = info.m_InputTensorInfos; detailsInfo.m_OutputTensorInfos = info.m_OutputTensorInfos; @@ -29,7 +26,10 @@ RefConvolution2dWorkload::RefConvolution2dWorkload( } // Report Profiling Details - ARMNN_REPORT_PROFILING_WORKLOAD_DESC(workloadName, descriptor.m_Parameters, detailsInfo); + ARMNN_REPORT_PROFILING_WORKLOAD_DESC("RefConvolution2dWorkload_Execute", + descriptor.m_Parameters, + detailsInfo, + this->GetGuid()); m_Weight = std::make_unique(*( descriptor.m_Weight )); const TensorInfo& rFilterInfo = m_Weight->GetTensorInfo(); @@ -57,8 +57,7 @@ void RefConvolution2dWorkload::ExecuteAsync(WorkingMemDescriptor& workingMemDesc void RefConvolution2dWorkload::Execute(std::vector inputs, std::vector outputs) const { - std::string workloadName = "RefConvolutionWorkload_Execute_Guid" + std::to_string(this->GetGuid()); - ARMNN_SCOPED_PROFILING_EVENT(Compute::CpuRef, workloadName); + ARMNN_SCOPED_PROFILING_EVENT_GUID(Compute::CpuRef, "RefConvolution2dWorkload_Execute", this->GetGuid()); std::unique_ptr> inputDecoder = MakeDecoder(GetTensorInfo(inputs[0]), inputs[0]->Map()); std::unique_ptr> outputEncoder = MakeEncoder(GetTensorInfo(outputs[0]), outputs[0]->Map()); -- cgit v1.2.1