diff options
Diffstat (limited to 'lib/layer_by_layer_profiler/src')
-rw-r--r-- | lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp | 106 |
1 files changed, 9 insertions, 97 deletions
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 a4f67d6..4f525ee 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Arm Limited. All rights reserved. + * Copyright (c) 2021-2022 Arm Limited. All rights reserved. * * SPDX-License-Identifier: Apache-2.0 * @@ -25,27 +25,12 @@ #include "ethosu_log.h" #include "layer_by_layer_profiler.hpp" -#include <ethosu_driver.h> #include <inttypes.h> #include <stdio.h> -namespace { - -uint64_t GetCurrentEthosuTicks(struct ethosu_driver *drv) { - return ETHOSU_PMU_Get_CCNTR(drv); -} - -} // namespace - namespace tflite { -LayerByLayerProfiler::LayerByLayerProfiler(const std::vector<uint8_t> &event_config, - bool _pmu_cycle_counter_enable, - size_t max_events, - 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), +LayerByLayerProfiler::LayerByLayerProfiler(size_t max_events, Backend _backend, int32_t _event_id) : max_events_(max_events), backend(_backend), event_id(_event_id), num_events_(0) { tags_ = std::make_unique<const char *[]>(max_events); @@ -60,47 +45,11 @@ uint32_t LayerByLayerProfiler::BeginEvent(const char *tag) { num_events_ = 0; } - tags_[num_events_] = tag; - - if (strcmp("ethos-u", tag) == 0) { - struct ethosu_driver *drv = ethosu_reserve_driver(); - size_t numEventCounters = ETHOSU_PMU_Get_NumEventCounters(); - - if (pmu_event_config.size() > numEventCounters) { - 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"); - pmu_event_config.resize(numEventCounters); - } - // Enable PMU - ETHOSU_PMU_Enable(drv); - - for (size_t i = 0; i < pmu_event_config.size(); i++) { - ETHOSU_PMU_Set_EVTYPER(drv, i, static_cast<ethosu_pmu_event_type>(pmu_event_config[i])); - } - - ETHOSU_PMU_CNTR_Enable(drv, (1 << pmu_event_config.size()) - 1); - ETHOSU_PMU_EVCNTR_ALL_Reset(drv); - - // Configure the cycle counter - if (pmu_cycle_counter_enable) { - ETHOSU_PMU_CNTR_Disable(drv, ETHOSU_PMU_CCNT_Msk); - ETHOSU_PMU_CYCCNT_Reset(drv); - - ETHOSU_PMU_PMCCNTR_CFG_Set_Stop_Event(drv, ETHOSU_PMU_NPU_IDLE); - ETHOSU_PMU_PMCCNTR_CFG_Set_Start_Event(drv, ETHOSU_PMU_NPU_ACTIVE); - - ETHOSU_PMU_CNTR_Enable(drv, ETHOSU_PMU_CCNT_Msk); - } - start_ticks_[num_events_] = 0; // Hardware cycle counter has been reset above, thus starts at 0 - ethosu_release_driver(drv); - } else { - start_ticks_[num_events_] = GetCurrentTimeTicks(); - } - + tags_[num_events_] = tag; + start_ticks_[num_events_] = GetCurrentTimeTicks(); end_ticks_[num_events_] = start_ticks_[num_events_]; // NOTE: In case an EndEvent() doesn't trigger, cycles reports as 0 + return num_events_++; } @@ -108,41 +57,12 @@ uint32_t LayerByLayerProfiler::BeginEvent(const char *tag) { void LayerByLayerProfiler::EndEvent(uint32_t event_handle) { TFLITE_DCHECK(event_handle < max_events_); - if (strcmp("ethos-u", tags_[event_handle]) == 0) { - struct ethosu_driver *drv = ethosu_reserve_driver(); - - end_ticks_[event_handle] = GetCurrentEthosuTicks(drv); - // Get the cycle count - if (pmu_cycle_counter_enable) { - pmu_cycle_counter_count = end_ticks_[event_handle]; - } - - // Save the PMU counter values - // NOTE: If multiple ethos-u layers, only the latest will be saved - pmu_event_count.resize(pmu_event_config.size()); - for (size_t i = 0; i < pmu_event_config.size(); i++) { - pmu_event_count[i] = ETHOSU_PMU_Get_EVCNTR(drv, i); - } - - // Shut down the PMU - ETHOSU_PMU_Disable(drv); - - ethosu_release_driver(drv); - } else { - end_ticks_[event_handle] = GetCurrentTimeTicks(); - } + end_ticks_[event_handle] = GetCurrentTimeTicks(); 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%zu : %" PRIu32 "\n", i, pmu_event_count[i]); - } - LOG("ethos-u : cycle_cnt : %" PRIu64 " cycles\n", pmu_cycle_counter_count); - } else { - LOG("%s : cycle_cnt : %" PRIu64 " cycles\n", - tags_[event_handle], - end_ticks_[event_handle] - start_ticks_[event_handle]); - } + LOG("%s : cycle_cnt : %" PRIu64 " cycles\n", + tags_[event_handle], + end_ticks_[event_handle] - start_ticks_[event_handle]); } else { EventRecord2(event_id, (int32_t)event_handle, end_ticks_[event_handle] - start_ticks_[event_handle]); } @@ -158,14 +78,6 @@ int32_t LayerByLayerProfiler::GetTotalTicks() const { return ticks; } -uint64_t LayerByLayerProfiler::GetPmuCycleCounterCount() const { - return pmu_cycle_counter_count; -} - -const std::vector<uint32_t> &LayerByLayerProfiler::GetPmuEventCount() const { - return pmu_event_count; -} - void LayerByLayerProfiler::Log() const { #if !defined(TF_LITE_STRIP_ERROR_STRINGS) |