From e87446c9ce7f6cbefcd7bbaff324eebdca10687e Mon Sep 17 00:00:00 2001 From: Mikael Olsson Date: Fri, 15 Dec 2023 17:17:06 +0100 Subject: Change PMU event counter values to use 64-bit The PMU event counter value is an accumulation of 32-bit values during the inference and to ensure the total value fits in the rpmsg message and UAPI, the variable holding the value has been changed to 64-bit. The driver library, Python wrapper and inference runner have been changed accordingly to support the 64-bit values. Change-Id: I09a8e45eb75800c8a787f83abff5a3693148cc15 Signed-off-by: Mikael Olsson --- kernel/ethosu_core_rpmsg.h | 2 +- kernel/ethosu_inference.c | 2 +- kernel/ethosu_inference.h | 2 +- kernel/uapi/ethosu.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kernel') diff --git a/kernel/ethosu_core_rpmsg.h b/kernel/ethosu_core_rpmsg.h index 8d2c51d..0b7feab 100644 --- a/kernel/ethosu_core_rpmsg.h +++ b/kernel/ethosu_core_rpmsg.h @@ -135,7 +135,7 @@ struct ethosu_core_msg_inference_rsp { uint32_t ofm_size[ETHOSU_CORE_BUFFER_MAX]; uint32_t status; uint8_t pmu_event_config[ETHOSU_CORE_PMU_MAX]; - uint32_t pmu_event_count[ETHOSU_CORE_PMU_MAX]; + uint64_t pmu_event_count[ETHOSU_CORE_PMU_MAX]; uint32_t pmu_cycle_counter_enable; uint64_t pmu_cycle_counter_count; }; diff --git a/kernel/ethosu_inference.c b/kernel/ethosu_inference.c index ac617c3..5fbad58 100644 --- a/kernel/ethosu_inference.c +++ b/kernel/ethosu_inference.c @@ -457,7 +457,7 @@ void ethosu_inference_rsp(struct ethosu_mailbox *mailbox, inf->pmu_cycle_counter_count = rsp->pmu_cycle_counter_count; dev_dbg(dev, - "PMU events. config=[%u, %u, %u, %u], count=[%u, %u, %u, %u]\n", + "PMU events. config=[%u, %u, %u, %u], count=[%llu, %llu, %llu, %llu]\n", inf->pmu_event_config[0], inf->pmu_event_config[1], inf->pmu_event_config[2], inf->pmu_event_config[3], inf->pmu_event_count[0], inf->pmu_event_count[1], diff --git a/kernel/ethosu_inference.h b/kernel/ethosu_inference.h index 9fa0a4a..5040ef1 100644 --- a/kernel/ethosu_inference.h +++ b/kernel/ethosu_inference.h @@ -72,7 +72,7 @@ struct ethosu_inference { struct ethosu_network *net; enum ethosu_uapi_status status; uint8_t pmu_event_config[ETHOSU_PMU_EVENT_MAX]; - uint32_t pmu_event_count[ETHOSU_PMU_EVENT_MAX]; + uint64_t pmu_event_count[ETHOSU_PMU_EVENT_MAX]; uint32_t pmu_cycle_counter_enable; uint64_t pmu_cycle_counter_count; struct ethosu_mailbox_msg msg; diff --git a/kernel/uapi/ethosu.h b/kernel/uapi/ethosu.h index 35eaf60..8240ad9 100644 --- a/kernel/uapi/ethosu.h +++ b/kernel/uapi/ethosu.h @@ -169,7 +169,7 @@ struct ethosu_uapi_pmu_config { * @cycle_count: Count for cycle counter. */ struct ethosu_uapi_pmu_counts { - __u32 events[ETHOSU_PMU_EVENT_MAX]; + __u64 events[ETHOSU_PMU_EVENT_MAX]; __u64 cycle_count; }; -- cgit v1.2.1