diff options
| author | Finn Williams <Finn.Williams@arm.com> | 2020-05-08 12:24:31 +0100 |
|---|---|---|
| committer | Finn Williams <Finn.Williams@arm.com> | 2020-05-08 12:42:39 +0100 |
| commit | 78229c4e6472b6e30627d549c97e9cbe678ec4d3 (patch) | |
| tree | 4f0e32d70956e1989771583dc371d3b5cd489a18 | |
| parent | e09fc820968ee4de20df60e371088582a710bad0 (diff) | |
| download | armnn-78229c4e6472b6e30627d549c97e9cbe678ec4d3.tar.gz | |
IVGCVSW-4794 Fix ArmNN Counters incorrectly set to delta
* Change all ArmNN counters to absolute
* Fix bug in the DirectoryCaptureCommandHandler where the offsets of the
m_CounterClass and m_CounterInterpolation were swapped
* Fix bug in the DirectoryCaptureCommandHandler where the offsets of the
m_DeviceUid and m_CounterSetUid were swapped
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: If396628306757088aa0acf739fb3e4f240b4394b
| -rw-r--r-- | src/profiling/DirectoryCaptureCommandHandler.cpp | 8 | ||||
| -rw-r--r-- | src/profiling/ProfilingService.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/profiling/DirectoryCaptureCommandHandler.cpp b/src/profiling/DirectoryCaptureCommandHandler.cpp index 23221fb74e..e20f5402c6 100644 --- a/src/profiling/DirectoryCaptureCommandHandler.cpp +++ b/src/profiling/DirectoryCaptureCommandHandler.cpp @@ -230,21 +230,21 @@ std::vector<CounterDirectoryEventRecord> DirectoryCaptureCommandHandler::ReadEve // Event record word 1: // 0:15 [16] counter_set: UID of the counter_set this event is associated with. Set to zero if the event // is NOT associated with a counter_set - eventRecords[i].m_DeviceUid = profiling::ReadUint16(data, eventRecordOffset); + eventRecords[i].m_CounterSetUid = profiling::ReadUint16(data, eventRecordOffset); eventRecordOffset += uint16_t_size; // 16:31 [16] device: UID of the device this event is associated with. Set to zero if the event is NOT // associated with a device - eventRecords[i].m_CounterSetUid = profiling::ReadUint16(data, eventRecordOffset); + eventRecords[i].m_DeviceUid = profiling::ReadUint16(data, eventRecordOffset); eventRecordOffset += uint16_t_size; // Event record word 2: // 0:15 [16] interpolation: type describing how to interpolate each data point in a stream of data points - eventRecords[i].m_CounterClass = profiling::ReadUint16(data, eventRecordOffset); + eventRecords[i].m_CounterInterpolation = profiling::ReadUint16(data, eventRecordOffset); eventRecordOffset += uint16_t_size; // 16:31 [16] class: type describing how to treat each data point in a stream of data points - eventRecords[i].m_CounterInterpolation = profiling::ReadUint16(data, eventRecordOffset); + eventRecords[i].m_CounterClass = profiling::ReadUint16(data, eventRecordOffset); eventRecordOffset += uint16_t_size; // Event record word 3-4: diff --git a/src/profiling/ProfilingService.cpp b/src/profiling/ProfilingService.cpp index d87ed0bf67..294a294de9 100644 --- a/src/profiling/ProfilingService.cpp +++ b/src/profiling/ProfilingService.cpp @@ -327,7 +327,7 @@ void ProfilingService::Initialize() m_CounterDirectory.RegisterCounter(armnn::profiling::BACKEND_ID, armnn::profiling::NETWORK_LOADS, "ArmNN_Runtime", - 0, + 1, 0, 1.f, "Network loads", @@ -343,7 +343,7 @@ void ProfilingService::Initialize() m_CounterDirectory.RegisterCounter(armnn::profiling::BACKEND_ID, armnn::profiling::NETWORK_UNLOADS, "ArmNN_Runtime", - 0, + 1, 0, 1.f, "Network unloads", @@ -359,7 +359,7 @@ void ProfilingService::Initialize() m_CounterDirectory.RegisterCounter(armnn::profiling::BACKEND_ID, armnn::profiling::REGISTERED_BACKENDS, "ArmNN_Runtime", - 0, + 1, 0, 1.f, "Backends registered", @@ -375,7 +375,7 @@ void ProfilingService::Initialize() m_CounterDirectory.RegisterCounter(armnn::profiling::BACKEND_ID, armnn::profiling::UNREGISTERED_BACKENDS, "ArmNN_Runtime", - 0, + 1, 0, 1.f, "Backends unregistered", @@ -391,7 +391,7 @@ void ProfilingService::Initialize() m_CounterDirectory.RegisterCounter(armnn::profiling::BACKEND_ID, armnn::profiling::INFERENCES_RUN, "ArmNN_Runtime", - 0, + 1, 0, 1.f, "Inferences run", |