diff options
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/JsonPrinter.cpp | 81 | ||||
-rw-r--r-- | src/armnn/JsonPrinter.hpp | 39 | ||||
-rw-r--r-- | src/armnn/JsonUtils.hpp | 80 | ||||
-rw-r--r-- | src/armnn/LoadedNetwork.cpp | 2 | ||||
-rw-r--r-- | src/armnn/Profiling.cpp | 23 | ||||
-rw-r--r-- | src/armnn/Profiling.hpp | 53 | ||||
-rw-r--r-- | src/armnn/ProfilingDetails.hpp | 153 |
7 files changed, 352 insertions, 79 deletions
diff --git a/src/armnn/JsonPrinter.cpp b/src/armnn/JsonPrinter.cpp index 9dc648c538..986edb9e6d 100644 --- a/src/armnn/JsonPrinter.cpp +++ b/src/armnn/JsonPrinter.cpp @@ -21,15 +21,17 @@ void JsonPrinter::PrintJsonChildObject(const JsonChildObject& object, size_t& id id++; } - PrintLabel(object.m_Label, id); - PrintType(object.m_Type); + if (object.GetType() != JsonObjectType::ExecObjectDesc) + { + PrintLabel(object.m_Label, id); + PrintType(object.m_Type); + } if (!object.m_Measurements.empty() || !object.m_Children.empty()) { PrintSeparator(); PrintNewLine(); } - if (object.GetType() == JsonObjectType::Measurement) { PrintMeasurementsList(object.m_Measurements); @@ -37,6 +39,15 @@ void JsonPrinter::PrintJsonChildObject(const JsonChildObject& object, size_t& id PrintNewLine(); PrintUnit(object.m_Unit); } + else if (object.GetType() == JsonObjectType::ExecObjectDesc) + { + for (std::string stringLine : object.m_LayerDetailsList) + { + PrintTabs(); + m_OutputStream << stringLine; + PrintNewLine(); + } + } if (!object.m_Children.empty()) { for (unsigned int childIndex = 0; childIndex < object.m_Children.size(); ++childIndex) @@ -50,21 +61,11 @@ void JsonPrinter::PrintJsonChildObject(const JsonChildObject& object, size_t& id } } } - PrintNewLine(); - PrintFooter(); -} - -void JsonPrinter::PrintHeader() -{ - m_OutputStream << "{" << std::endl; - IncrementNumberOfTabs(); -} - -void JsonPrinter::PrintArmNNHeader() -{ - PrintTabs(); - m_OutputStream << R"("ArmNN": {)" << std::endl; - IncrementNumberOfTabs(); + if (object.GetType() != JsonObjectType::ExecObjectDesc) + { + PrintNewLine(); + PrintFooter(); + } } std::string JsonPrinter::MakeKey(const std::string& label, size_t id) @@ -103,6 +104,10 @@ void JsonPrinter::PrintType(armnn::JsonObjectType type) { return "Event"; } + case JsonObjectType::ExecObjectDesc: + { + return "Operator Description"; + } default: { return "Unknown"; @@ -141,44 +146,4 @@ void JsonPrinter::PrintMeasurementsList(const std::vector<double>& measurementsV m_OutputStream << "]"; } -void JsonPrinter::PrintTabs() -{ - unsigned int numTabs = m_NumTabs; - while (numTabs-- > 0) - { - m_OutputStream << "\t"; - } -} - -void JsonPrinter::PrintSeparator() -{ - m_OutputStream << ","; -} - -void JsonPrinter::PrintNewLine() -{ - m_OutputStream << std::endl; -} - -void JsonPrinter::PrintFooter() -{ - DecrementNumberOfTabs(); - PrintTabs(); - m_OutputStream << "}"; -} - -void JsonPrinter::DecrementNumberOfTabs() -{ - if (m_NumTabs == 0) - { - return; - } - --m_NumTabs; -} - -void JsonPrinter::IncrementNumberOfTabs() -{ - ++m_NumTabs; -} - } // namespace armnn
\ No newline at end of file diff --git a/src/armnn/JsonPrinter.hpp b/src/armnn/JsonPrinter.hpp index 04f56b0134..4af1609ee3 100644 --- a/src/armnn/JsonPrinter.hpp +++ b/src/armnn/JsonPrinter.hpp @@ -5,12 +5,13 @@ #pragma once -#include <ostream> -#include <string.h> +#include <string> #include <map> #include <set> +#include <sstream> #include "Instrument.hpp" +#include "JsonUtils.hpp" namespace armnn { @@ -18,13 +19,15 @@ namespace armnn enum class JsonObjectType { Measurement, - Event + Event, + ExecObjectDesc }; struct JsonChildObject { + // Object type changes according to the JsonObjectType specified in enum JsonChildObject(const std::string& label) - : m_Label(label), m_Unit(Measurement::Unit::TIME_MS), m_Type(JsonObjectType::Event) + : m_Label(label), m_Unit(Measurement::Unit::TIME_MS), m_Type(JsonObjectType::Event) {} JsonChildObject(const JsonChildObject&) = default; @@ -33,6 +36,16 @@ struct JsonChildObject m_Measurements.push_back(measurement); } + void SetAndParseDetails(std::string layerDetailsStr) + { + std::stringstream layerDetails(layerDetailsStr); + std::string stringLine; + while (std::getline(layerDetails, stringLine, '\n')) + { + m_LayerDetailsList.push_back(stringLine); + } + } + void AddChild(const JsonChildObject& childObject) { m_Children.push_back(childObject); @@ -69,39 +82,31 @@ struct JsonChildObject Measurement::Unit m_Unit; JsonObjectType m_Type; std::vector<double> m_Measurements; + std::vector<std::string> m_LayerDetailsList; std::vector<JsonChildObject> m_Children; private: JsonChildObject() = delete; }; -class JsonPrinter +class JsonPrinter : public JsonUtils { public: void PrintJsonChildObject(const JsonChildObject& object, size_t& id); - void PrintHeader(); - void PrintArmNNHeader(); - void PrintFooter(); - void PrintSeparator(); - void PrintNewLine(); void PrintLabel(const std::string& label, size_t id); void PrintUnit(armnn::Measurement::Unit unit); void PrintType(armnn::JsonObjectType type); void PrintMeasurementsList(const std::vector<double>& measurementsVector); public: - JsonPrinter(std::ostream &outputStream) - : m_OutputStream(outputStream), m_NumTabs(0) + JsonPrinter(std::ostream& outputStream) + : JsonUtils(outputStream), m_OutputStream(outputStream) {} private: std::string MakeKey(const std::string& label, size_t id); - void PrintTabs(); - void DecrementNumberOfTabs(); - void IncrementNumberOfTabs(); - std::ostream &m_OutputStream; - unsigned int m_NumTabs; + std::ostream& m_OutputStream; }; } // namespace armnn
\ No newline at end of file diff --git a/src/armnn/JsonUtils.hpp b/src/armnn/JsonUtils.hpp new file mode 100644 index 0000000000..44fa7edc85 --- /dev/null +++ b/src/armnn/JsonUtils.hpp @@ -0,0 +1,80 @@ +// +// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <iomanip> + +#include "armnn/Types.hpp" +#include "armnn/backends/WorkloadInfo.hpp" + +namespace armnn +{ + +class JsonUtils +{ +public: + JsonUtils(std::ostream& outputStream) + : m_NumTabs(0), m_OutputStream(outputStream) + {} + + void PrintTabs() + { + unsigned int numTabs = m_NumTabs; + while ( numTabs-- > 0 ) + { + m_OutputStream << "\t"; + } + } + + void DecrementNumberOfTabs() + { + if ( m_NumTabs == 0 ) + { + return; + } + --m_NumTabs; + } + + void IncrementNumberOfTabs() + { + ++m_NumTabs; + } + + void PrintNewLine() + { + m_OutputStream << std::endl; + } + + void PrintFooter() + { + DecrementNumberOfTabs(); + PrintTabs(); + m_OutputStream << "}"; + } + + void PrintHeader() + { + m_OutputStream << "{" << std::endl; + IncrementNumberOfTabs(); + } + + void PrintArmNNHeader() + { + PrintTabs(); + m_OutputStream << R"("ArmNN": {)" << std::endl; + IncrementNumberOfTabs(); + } + void PrintSeparator() + { + m_OutputStream << ","; + } + +private: + unsigned int m_NumTabs; + std::ostream& m_OutputStream; +}; + +} // namespace armnn
\ No newline at end of file diff --git a/src/armnn/LoadedNetwork.cpp b/src/armnn/LoadedNetwork.cpp index 13beb13a07..c8dbcaaeb5 100644 --- a/src/armnn/LoadedNetwork.cpp +++ b/src/armnn/LoadedNetwork.cpp @@ -125,6 +125,8 @@ LoadedNetwork::LoadedNetwork(std::unique_ptr<IOptimizedNetwork> net, m_Profiler = std::make_shared<IProfiler>(); ProfilerManager::GetInstance().RegisterProfiler(m_Profiler.get()); + m_Profiler->EnableProfiling(networkProperties.m_ProfilingEnabled); + Graph& order = m_OptimizedNetwork->pOptimizedNetworkImpl->GetGraph().TopologicalSort(); //First create tensor handlers, backends and workload factories. //Handlers are created before workloads are. diff --git a/src/armnn/Profiling.cpp b/src/armnn/Profiling.cpp index d62c18a9a8..171d22bd0f 100644 --- a/src/armnn/Profiling.cpp +++ b/src/armnn/Profiling.cpp @@ -281,6 +281,13 @@ void ProfilerImpl::PopulateDescendants(std::map<const Event*, std::vector<const } } +void ConfigureDetailsObject(JsonChildObject& detailsObject, + std::string layerDetailsStr) +{ + detailsObject.SetType(JsonObjectType::ExecObjectDesc); + detailsObject.SetAndParseDetails(layerDetailsStr); + +} void ExtractJsonObjects(unsigned int inferenceIndex, const Event* parentEvent, @@ -347,7 +354,6 @@ void ProfilerImpl::Print(std::ostream& outStream) const PopulateDescendants(descendantsMap); JsonChildObject inferenceObject{"inference_measurements"}; - JsonChildObject layerObject{"layer_measurements"}; std::vector<JsonChildObject> workloadObjects; std::map<unsigned int, std::vector<JsonChildObject>> workloadToKernelObjects; @@ -360,6 +366,15 @@ void ProfilerImpl::Print(std::ostream& outStream) const printer.PrintHeader(); printer.PrintArmNNHeader(); + if (m_ProfilingDetails.get()->DetailsExist()) + { + JsonChildObject detailsObject{"layer_details"}; + ConfigureDetailsObject(detailsObject, m_ProfilingDetails.get()->GetProfilingDetails()); + + size_t id=0; + printer.PrintJsonChildObject(detailsObject, id); + } + // print inference object, also prints child layer and kernel measurements size_t id=0; printer.PrintJsonChildObject(inferenceObject, id); @@ -525,10 +540,10 @@ void IProfiler::Print(std::ostream& outStream) const } Event* IProfiler::BeginEvent(const BackendId& backendId, - const std::string& label, - std::vector<InstrumentPtr>&& instruments) + const std::string& label, + std::vector<InstrumentPtr>&& instruments) { - return pProfilerImpl->BeginEvent(this, backendId, label, std::move(instruments)); + return pProfilerImpl->BeginEvent(this, backendId, label, std::move(instruments)); } IProfiler::~IProfiler() = default; diff --git a/src/armnn/Profiling.hpp b/src/armnn/Profiling.hpp index d134425b6c..785f50521e 100644 --- a/src/armnn/Profiling.hpp +++ b/src/armnn/Profiling.hpp @@ -5,6 +5,7 @@ #pragma once #include "ProfilingEvent.hpp" +#include "ProfilingDetails.hpp" #include <armnn/utility/IgnoreUnused.hpp> #include "armnn/IProfiler.hpp" @@ -38,6 +39,14 @@ public: const std::string& name, std::vector<InstrumentPtr>&& instruments); + template<typename DescriptorType> + void AddLayerDetails(const std::string& label, + const DescriptorType& desc, + const WorkloadInfo& infos) + { + m_ProfilingDetails->AddDetailsToString(label, desc, infos); + } + // Marks the end of a user-defined event. void EndEvent(Event* event); @@ -61,6 +70,8 @@ public: uint32_t GetEventColor(const BackendId& backendId) const; using EventPtr = std::unique_ptr<Event>; + using DescPtr = std::unique_ptr<ProfilingDetails>; + struct Marker { std::size_t m_Id; @@ -83,6 +94,7 @@ public: std::stack<Event*> m_Parents; std::vector<EventPtr> m_EventSequence; + DescPtr m_ProfilingDetails = std::make_unique<ProfilingDetails>(); bool m_ProfilingEnabled; }; @@ -152,8 +164,39 @@ private: IProfiler* m_Profiler; ///< Profiler used }; +// Helper to easily add operator details during profiling. +class ScopedProfilingUpdateDescriptions +{ +public: + template<typename DescriptorType> + ScopedProfilingUpdateDescriptions(const std::string& name, const DescriptorType& desc, const WorkloadInfo& infos) + : m_Profiler(ProfilerManager::GetInstance().GetProfiler()) + { + if (m_Profiler && m_Profiler->IsProfilingEnabled()) + { + m_Profiler->AddLayerDetails(name, desc, infos); + } + } + + ~ScopedProfilingUpdateDescriptions() + {} + +private: + + IProfiler* m_Profiler; ///< Profiler used +}; + +template<typename DescriptorType> +void IProfiler::AddLayerDetails(const std::string& name, + const DescriptorType& desc, + const WorkloadInfo& infos) +{ + return pProfilerImpl->AddLayerDetails(name, desc, infos); +} + } // namespace armnn +// Event Definitions for profiling #define ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS_UNIQUE_LOC_INNER(lineNumber, backendId, /*name,*/ ...) \ armnn::ScopedProfilingEvent e_ ## lineNumber(backendId, /*name,*/ __VA_ARGS__); @@ -172,3 +215,13 @@ private: #define ARMNN_SCOPED_PROFILING_EVENT(backendId, name) \ ARMNN_SCOPED_PROFILING_EVENT_WITH_INSTRUMENTS(backendId, name, armnn::WallClockTimer()) + +// Workload Description definitons for profiling +#define ARMNN_REPORT_PROFILING_WORKLOAD_DESC_UNIQUE_LOC_INNER(lineNumber, name, desc, infos) \ + armnn::ScopedProfilingUpdateDescriptions e_ ## lineNumber(name, desc, infos); + +#define ARMNN_REPORT_PROFILING_WORKLOAD_DESC_UNIQUE_LOC(lineNumber, name, desc, infos) \ + ARMNN_REPORT_PROFILING_WORKLOAD_DESC_UNIQUE_LOC_INNER(lineNumber, name, desc, infos) + +#define ARMNN_REPORT_PROFILING_WORKLOAD_DESC(name, desc, infos) \ + ARMNN_REPORT_PROFILING_WORKLOAD_DESC_UNIQUE_LOC(__LINE__, name, desc, infos) diff --git a/src/armnn/ProfilingDetails.hpp b/src/armnn/ProfilingDetails.hpp new file mode 100644 index 0000000000..7224aad592 --- /dev/null +++ b/src/armnn/ProfilingDetails.hpp @@ -0,0 +1,153 @@ +// +// Copyright © 2021 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <iomanip> + +#include "armnn/Types.hpp" +#include "armnn/TypesUtils.hpp" +#include "armnn/backends/WorkloadInfo.hpp" + +#include "SerializeLayerParameters.hpp" +#include "JsonUtils.hpp" + +namespace armnn +{ + +/// ProfilingDetails class records any details associated with the operator and passes on for outputting to the user +class ProfilingDetails : public JsonUtils +{ +public: + /// Constructor + ProfilingDetails() : JsonUtils(m_ProfilingDetails), m_DetailsExist(false) + {} + + /// Destructor + ~ProfilingDetails() noexcept + {} + + /// Add to the ProfilingDetails + template<typename DescriptorType> + void AddDetailsToString(const std::string& workloadName, + const DescriptorType& desc, + const WorkloadInfo& infos) + { + m_ProfilingDetails << std::quoted("Name") << ": " << std::quoted(workloadName) << " "; + PrintHeader(); + + // Print tensor infos and related data types + PrintInfos(infos.m_InputTensorInfos, "Input"); + + PrintInfos(infos.m_OutputTensorInfos, "Output"); + + if ( infos.m_BiasTensorInfo.has_value()) + { + PrintInfo(infos.m_BiasTensorInfo.value(), "Bias"); + } + if ( infos.m_BiasTensorInfo.has_value()) + { + PrintInfo(infos.m_WeightsTensorInfo.value(), "Weights"); + } + if ( infos.m_ConvolutionMethod.has_value()) + { + PrintTabs(); + + m_ProfilingDetails << std::quoted("Convolution Method") << ": " + << std::quoted(infos.m_ConvolutionMethod.value()); + + PrintSeparator(); + PrintNewLine(); + } + + ParameterStringifyFunction extractParams = [this](const std::string& name, const std::string& value) { + PrintTabs(); + m_ProfilingDetails << std::quoted(name) << " : " << std::quoted(value); + if (name != "DataLayout") PrintSeparator(); + PrintNewLine(); + }; + + StringifyLayerParameters<DescriptorType>::Serialize(extractParams, desc); + + PrintFooter(); + PrintSeparator(); + PrintNewLine(); + + m_DetailsExist = true; + } + + /// Get the ProfilingDetails + /// \return the ProfilingDetails + std::string GetProfilingDetails() const + { + return m_ProfilingDetails.str(); + } + + bool DetailsExist() + { + return m_DetailsExist; + } + +private: + // Print tensor infos and related data types + void PrintInfo(const TensorInfo& info, const std::string& ioString) + { + const std::vector<TensorInfo> infoVect{ info }; + PrintInfos(infoVect, ioString); + } + + void PrintInfos(const std::vector<TensorInfo>& infos, const std::string& ioString) + { + for ( size_t i = 0; i < infos.size(); i++ ) + { + auto shape = infos[i].GetShape(); + PrintTabs(); + + m_ProfilingDetails << std::quoted(ioString + " " + std::to_string(i)) << ": "; + + PrintHeader(); + PrintTabs(); + + // Shape + m_ProfilingDetails << std::quoted("Shape") << ": \"["; + for ( unsigned int dim = 0; dim < shape.GetNumDimensions(); dim++ ) + { + shape.GetNumDimensions() == dim + 1 ? + m_ProfilingDetails << shape[dim] << "]\"" : // true + m_ProfilingDetails << shape[dim] << ","; // false + } + + PrintSeparator(); + PrintNewLine(); + + // Data Type + PrintTabs(); + m_ProfilingDetails << std::quoted("DataType") << ": " + << std::quoted(GetDataTypeName(infos[i].GetDataType())); + + PrintSeparator(); + PrintNewLine(); + + // Number of Dimensions + PrintTabs(); + m_ProfilingDetails << std::quoted("Num Dims") << ": " + << std::quoted(std::to_string(shape.GetNumDimensions())); + + + // Close out the scope + PrintNewLine(); + PrintFooter(); + PrintSeparator(); + PrintNewLine(); + } + } + + /// Stores ProfilingDetails + std::ostringstream m_ProfilingDetails; + bool m_DetailsExist; + +}; + +} // namespace armnn |