[Core Software] Update and remove pmu "v2"-functions
NPU PMU interface currently have functions that have been stepped
each time a compatibilty breaking changed has been introduced. Old
entrypoints have been redefined with macro to use the latest version
for backwards compatibility. This series of patches will remove any
such functions and macro to unify the interface.
Update: All PMU entrypoints to support updated interface
Change-Id: I56f47a36dcba66f884e721dddc844b8983aca1dd
diff --git a/lib/ethosu_profiler/src/ethosu_profiler.cpp b/lib/ethosu_profiler/src/ethosu_profiler.cpp
index 9ddea13..bf4aae7 100644
--- a/lib/ethosu_profiler/src/ethosu_profiler.cpp
+++ b/lib/ethosu_profiler/src/ethosu_profiler.cpp
@@ -31,7 +31,7 @@
namespace {
uint64_t GetCurrentEthosuTicks(struct ethosu_driver *drv) {
- return ETHOSU_PMU_Get_CCNTR_v2(drv);
+ return ETHOSU_PMU_Get_CCNTR(drv);
}
} // namespace
@@ -44,8 +44,8 @@
end_ticks_ = std::make_unique<uint64_t[]>(max_events_);
struct ethosu_driver *drv = ethosu_reserve_driver();
- ETHOSU_PMU_CNTR_Enable_v2(drv, ETHOSU_PMU_CCNT_Msk);
- ETHOSU_PMU_CYCCNT_Reset_v2(drv);
+ ETHOSU_PMU_CNTR_Enable(drv, ETHOSU_PMU_CCNT_Msk);
+ ETHOSU_PMU_CYCCNT_Reset(drv);
ethosu_release_driver(drv);
}
@@ -60,9 +60,9 @@
if (strcmp("ethos-u", tag) == 0) {
struct ethosu_driver *ethosu_drv = ethosu_reserve_driver();
- ETHOSU_PMU_CYCCNT_Reset_v2(ethosu_drv);
- ETHOSU_PMU_PMCCNTR_CFG_Set_Start_Event_v2(ethosu_drv, ETHOSU_PMU_NPU_ACTIVE);
- ETHOSU_PMU_PMCCNTR_CFG_Set_Stop_Event_v2(ethosu_drv, ETHOSU_PMU_NPU_IDLE);
+ ETHOSU_PMU_CYCCNT_Reset(ethosu_drv);
+ ETHOSU_PMU_PMCCNTR_CFG_Set_Start_Event(ethosu_drv, ETHOSU_PMU_NPU_ACTIVE);
+ ETHOSU_PMU_PMCCNTR_CFG_Set_Stop_Event(ethosu_drv, ETHOSU_PMU_NPU_IDLE);
start_ticks_[num_events_] = GetCurrentEthosuTicks(ethosu_drv);
ethosu_release_driver(ethosu_drv);
} else {