From dcc1ce0f9b64198f3bb82d9858ec79663808a35f Mon Sep 17 00:00:00 2001 From: Kristofer Jonsson Date: Tue, 21 Dec 2021 16:25:19 +0100 Subject: Inference process update Split runJob() into smaller functions to make the code easier to read and maintain. Correct return type of Layer By Layer profiler GetTotalTicks(). Change-Id: Ie414522017b3b6c6da9a09182439dbe4b2efdb1f --- .../include/layer_by_layer_profiler.hpp | 2 +- .../src/layer_by_layer_profiler.cpp | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/layer_by_layer_profiler/include/layer_by_layer_profiler.hpp b/lib/layer_by_layer_profiler/include/layer_by_layer_profiler.hpp index 37bd868..a547576 100644 --- a/lib/layer_by_layer_profiler/include/layer_by_layer_profiler.hpp +++ b/lib/layer_by_layer_profiler/include/layer_by_layer_profiler.hpp @@ -38,7 +38,7 @@ public: int32_t event_id = EventID(EventLevelError, EvtStatistics_No, EventRecordNone)); uint32_t BeginEvent(const char *tag); void EndEvent(uint32_t event_handle); - uint64_t GetTotalTicks() const; + int32_t GetTotalTicks() const; void Log() const; uint64_t GetPmuCycleCounterCount() const; diff --git a/lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp b/lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp index a5b8e5a..a4f67d6 100644 --- a/lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp +++ b/lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp @@ -40,13 +40,13 @@ uint64_t GetCurrentEthosuTicks(struct ethosu_driver *drv) { namespace tflite { LayerByLayerProfiler::LayerByLayerProfiler(const std::vector &event_config, - bool pmu_cycle_counter_enable, + bool _pmu_cycle_counter_enable, size_t max_events, - Backend backend, - int32_t event_id) : + Backend _backend, + int32_t _event_id) : pmu_event_config(event_config), - pmu_event_count(), pmu_cycle_counter_enable(pmu_cycle_counter_enable), pmu_cycle_counter_count(0), - max_events_(max_events), backend(backend), event_id(event_id), num_events_(0) { + pmu_event_count(), pmu_cycle_counter_enable(_pmu_cycle_counter_enable), pmu_cycle_counter_count(0), + max_events_(max_events), backend(_backend), event_id(_event_id), num_events_(0) { tags_ = std::make_unique(max_events); start_ticks_ = std::make_unique(max_events); @@ -67,7 +67,7 @@ uint32_t LayerByLayerProfiler::BeginEvent(const char *tag) { size_t numEventCounters = ETHOSU_PMU_Get_NumEventCounters(); if (pmu_event_config.size() > numEventCounters) { - LOG_WARN("PMU event config list is bigger (%lu) than available PMU event counters (%lu)", + LOG_WARN("PMU event config list is bigger (%zu) than available PMU event counters (%zu)", pmu_event_config.size(), numEventCounters); LOG_WARN("PMU event config list will be truncated"); @@ -135,7 +135,7 @@ void LayerByLayerProfiler::EndEvent(uint32_t event_handle) { if (backend == PRINTF) { if (strcmp("ethos-u", tags_[event_handle]) == 0) { for (size_t i = 0; i < pmu_event_count.size(); i++) { - LOG("ethos-u : ethosu_pmu_cntr%lu : %u\n", i, pmu_event_count[i]); + LOG("ethos-u : ethosu_pmu_cntr%zu : %" PRIu32 "\n", i, pmu_event_count[i]); } LOG("ethos-u : cycle_cnt : %" PRIu64 " cycles\n", pmu_cycle_counter_count); } else { @@ -148,11 +148,11 @@ void LayerByLayerProfiler::EndEvent(uint32_t event_handle) { } } -uint64_t LayerByLayerProfiler::GetTotalTicks() const { - uint64_t ticks = 0; +int32_t LayerByLayerProfiler::GetTotalTicks() const { + int32_t ticks = 0; for (size_t i = 0; i < num_events_; ++i) { - ticks += end_ticks_[i] - start_ticks_[i]; + ticks += static_cast(end_ticks_[i] - start_ticks_[i]); } return ticks; -- cgit v1.2.1