diff options
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/Instrument.hpp | 2 | ||||
-rw-r--r-- | src/armnn/Profiling.cpp | 21 | ||||
-rw-r--r-- | src/armnn/ProfilingEvent.cpp | 5 | ||||
-rw-r--r-- | src/armnn/ProfilingEvent.hpp | 4 |
4 files changed, 32 insertions, 0 deletions
diff --git a/src/armnn/Instrument.hpp b/src/armnn/Instrument.hpp index 8dde2ecefa..11505d1b46 100644 --- a/src/armnn/Instrument.hpp +++ b/src/armnn/Instrument.hpp @@ -61,6 +61,8 @@ public: virtual const char* GetName() const = 0; + virtual bool HasKernelMeasurements() const { return false;} + }; } //namespace armnn diff --git a/src/armnn/Profiling.cpp b/src/armnn/Profiling.cpp index 805b61e8ef..db2962ecad 100644 --- a/src/armnn/Profiling.cpp +++ b/src/armnn/Profiling.cpp @@ -316,6 +316,20 @@ void ExtractJsonObjects(unsigned int inferenceIndex, } std::vector<Measurement> instrumentMeasurements = parentEvent->GetMeasurements(); unsigned int childIdx = 0; + unsigned int numSkippedKernels = 0; + if (inferenceIndex > 0) + { + for (auto &i: parentEvent->GetInstruments()) + { + if (i->HasKernelMeasurements()) + { + numSkippedKernels = static_cast<unsigned int>(parentObject.m_Children.size() - + instrumentMeasurements.size()); + childIdx = numSkippedKernels; + } + } + } + for (size_t measurementIndex = 0; measurementIndex < instrumentMeasurements.size(); ++measurementIndex, ++childIdx) { if (inferenceIndex == 0) @@ -328,6 +342,13 @@ void ExtractJsonObjects(unsigned int inferenceIndex, ARMNN_ASSERT(parentObject.NumChildren() == childIdx); parentObject.AddChild(measurementObject); } + else + { + if (numSkippedKernels > 0) + { + parentObject.GetChild(--numSkippedKernels).AddMeasurement(0.0); + } + } parentObject.GetChild(childIdx).AddMeasurement(instrumentMeasurements[measurementIndex].m_Value); } diff --git a/src/armnn/ProfilingEvent.cpp b/src/armnn/ProfilingEvent.cpp index e341344544..9f045ffabb 100644 --- a/src/armnn/ProfilingEvent.cpp +++ b/src/armnn/ProfilingEvent.cpp @@ -66,6 +66,11 @@ const std::vector<Measurement> Event::GetMeasurements() const return measurements; } +const std::vector<Event::InstrumentPtr>& Event::GetInstruments() const +{ + return m_Instruments; +} + const std::string& Event::GetName() const { return m_EventName; diff --git a/src/armnn/ProfilingEvent.hpp b/src/armnn/ProfilingEvent.hpp index 3b9d5261ef..e4e26ec235 100644 --- a/src/armnn/ProfilingEvent.hpp +++ b/src/armnn/ProfilingEvent.hpp @@ -55,6 +55,10 @@ public: /// \return Recorded measurements of the event const std::vector<Measurement> GetMeasurements() const; + /// Get the Instruments used by this Event + /// \return Return a reference to the collection of Instruments + const std::vector<InstrumentPtr>& GetInstruments() const; + /// Get the name of the event /// \return Name of the event const std::string& GetName() const; |