Skip to content

Arm backend: Use better Ethos-U PMU counters for Ethos-U85 #6455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 5, 2024
Merged

Arm backend: Use better Ethos-U PMU counters for Ethos-U85 #6455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2331465
Arm backend: Use better Ethos-U PMU counters for Ethos-U85
zingo Oct 10, 2024
ca8b449
Merge branch 'pytorch:main' into Arm-backend-Use-better-Ethos-U-PMU-c…
zingo Oct 31, 2024
130b554
Merge branch 'pytorch:main' into Arm-backend-Use-better-Ethos-U-PMU-c…
zingo Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backends/arm/third-party/ethos-u-core-driver
Open in desktop
Submodule ethos-u-core-driver updated from 90f9df to 78df00
31 changes: 23 additions & 8 deletions examples/arm/executor_runner/arm_perf_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,14 @@ static std::vector<uint64_t> ethosu_pmuEventCounts(
ETHOSU_PMU_Get_NumEventCounters(),
0);

#if defined(ETHOSU55) || defined(ETHOSU65)
static const uint32_t ethosu_pmuCountersUsed = 4;
#elif defined(ETHOSU85)
static const uint32_t ethosu_pmuCountersUsed = 5;
#else
#error No NPU target defined
#endif

// ethosu_pmuCountersUsed should match numbers of counters setup in
// ethosu_inference_begin() and not be more then the HW supports
static_assert(ETHOSU_PMU_NCOUNTERS >= ethosu_pmuCountersUsed);
Expand All @@ -44,18 +51,26 @@ void ethosu_inference_begin(struct ethosu_driver* drv, void*) {
ETHOSU_PMU_Set_EVTYPER(drv, 1, ETHOSU_PMU_AXI1_RD_DATA_BEAT_RECEIVED);
ETHOSU_PMU_Set_EVTYPER(drv, 2, ETHOSU_PMU_AXI0_WR_DATA_BEAT_WRITTEN);
ETHOSU_PMU_Set_EVTYPER(drv, 3, ETHOSU_PMU_NPU_IDLE);
// Enable the 4 counters
ETHOSU_PMU_CNTR_Enable(
drv,
ETHOSU_PMU_CNT1_Msk | ETHOSU_PMU_CNT2_Msk | ETHOSU_PMU_CNT3_Msk |
ETHOSU_PMU_CNT4_Msk);
#elif defined(ETHOSU85)
ETHOSU_PMU_Set_EVTYPER(drv, 0, ETHOSU_PMU_EXT0_RD_DATA_BEAT_RECEIVED);
ETHOSU_PMU_Set_EVTYPER(drv, 1, ETHOSU_PMU_EXT1_RD_DATA_BEAT_RECEIVED);
ETHOSU_PMU_Set_EVTYPER(drv, 2, ETHOSU_PMU_EXT0_WR_DATA_BEAT_WRITTEN);
ETHOSU_PMU_Set_EVTYPER(drv, 3, ETHOSU_PMU_NPU_IDLE);
ETHOSU_PMU_Set_EVTYPER(drv, 0, ETHOSU_PMU_SRAM_RD_DATA_BEAT_RECEIVED);
ETHOSU_PMU_Set_EVTYPER(drv, 1, ETHOSU_PMU_SRAM_WR_DATA_BEAT_WRITTEN);
ETHOSU_PMU_Set_EVTYPER(drv, 2, ETHOSU_PMU_EXT_RD_DATA_BEAT_RECEIVED);
ETHOSU_PMU_Set_EVTYPER(drv, 3, ETHOSU_PMU_EXT_WR_DATA_BEAT_WRITTEN);
ETHOSU_PMU_Set_EVTYPER(drv, 4, ETHOSU_PMU_NPU_IDLE);
// Enable the 5 counters
ETHOSU_PMU_CNTR_Enable(
drv,
ETHOSU_PMU_CNT1_Msk | ETHOSU_PMU_CNT2_Msk | ETHOSU_PMU_CNT3_Msk |
ETHOSU_PMU_CNT4_Msk | ETHOSU_PMU_CNT5_Msk);
#else
#error No NPU target defined
#endif

// Enable 4 counters
ETHOSU_PMU_CNTR_Enable(drv, 0xf);

ETHOSU_PMU_CNTR_Enable(drv, ETHOSU_PMU_CCNT_Msk);
ETHOSU_PMU_CYCCNT_Reset(drv);

Expand Down Expand Up @@ -177,7 +192,7 @@ void StopMeasurements() {
#elif defined(ETHOSU85)
ET_LOG(
Info,
"Ethos-U PMU Events:[ETHOSU_PMU_EXT0_RD_DATA_BEAT_RECEIVED, ETHOSU_PMU_EXT1_RD_DATA_BEAT_RECEIVED, ETHOSU_PMU_EXT0_WR_DATA_BEAT_WRITTEN, ETHOSU_PMU_NPU_IDLE]");
"Ethos-U PMU Events:[ETHOSU_PMU_SRAM_RD_DATA_BEAT_RECEIVED, ETHOSU_PMU_SRAM_WR_DATA_BEAT_WRITTEN, ETHOSU_PMU_EXT_RD_DATA_BEAT_RECEIVED, ETHOSU_PMU_EXT_WR_DATA_BEAT_WRITTEN, ETHOSU_PMU_NPU_IDLE]");
#else
#error No NPU target defined
#endif
Expand Down
Loading