MLECO-1933, MLECO-1914, MLECO-1885: Update to 21.05-rc2 components
Core driver and sofware dependencies updated to latest release
candidate revisions. Note: TensorFlow Lite Micro has not been
updated.
Also, gcc warnings for simple_platform target and ad use case have
been fixed.
Change-Id: I455b421f34375a719a941e6e220fe292a57613f5
diff --git a/source/application/hal/platforms/bare-metal/timer/baremetal_timer.c b/source/application/hal/platforms/bare-metal/timer/baremetal_timer.c
index cd17a60..00028bd 100644
--- a/source/application/hal/platforms/bare-metal/timer/baremetal_timer.c
+++ b/source/application/hal/platforms/bare-metal/timer/baremetal_timer.c
@@ -260,7 +260,7 @@
printf_err("EthosU PMU axi0 read counter overflow.\n");
return 0;
}
- return (uint64_t)(end->npu_axi0_read_ccnt - st->npu_axi0_read_ccnt);
+ return (uint64_t)(end->npu_axi0_read_beats - st->npu_axi0_read_beats);
}
static uint64_t bm_get_npu_axi0_write_cycle_diff(time_counter *st, time_counter *end)
@@ -269,7 +269,7 @@
printf_err("EthosU PMU axi0 write counter overflow.\n");
return 0;
}
- return (uint64_t)(end->npu_axi0_write_ccnt - st->npu_axi0_write_ccnt);
+ return (uint64_t)(end->npu_axi0_write_beats - st->npu_axi0_write_beats);
}
static uint64_t bm_get_npu_axi1_read_cycle_diff(time_counter *st, time_counter *end)
@@ -278,7 +278,7 @@
printf_err("EthosU PMU axi1 read counter overflow.\n");
return 0;
}
- return (uint64_t)(end->npu_axi1_read_ccnt - st->npu_axi1_read_ccnt);
+ return (uint64_t)(end->npu_axi1_read_beats - st->npu_axi1_read_beats);
}
#endif /* defined (ARM_NPU) */
@@ -300,9 +300,9 @@
#if defined (ARM_NPU)
.npu_total_ccnt = ETHOSU_PMU_Get_CCNTR(),
.npu_idle_ccnt = ETHOSU_PMU_Get_EVCNTR(0),
- .npu_axi0_read_ccnt = ETHOSU_PMU_Get_EVCNTR(1),
- .npu_axi0_write_ccnt = ETHOSU_PMU_Get_EVCNTR(2),
- .npu_axi1_read_ccnt = ETHOSU_PMU_Get_EVCNTR(3)
+ .npu_axi0_read_beats = ETHOSU_PMU_Get_EVCNTR(1),
+ .npu_axi0_write_beats = ETHOSU_PMU_Get_EVCNTR(2),
+ .npu_axi1_read_beats = ETHOSU_PMU_Get_EVCNTR(3)
#endif /* defined (ARM_NPU) */
};
@@ -310,14 +310,14 @@
#if defined (ARM_NPU)
debug("NPU total cc: %" PRIu64
"; NPU idle cc: %" PRIu32
- "; NPU axi0 read cc: %" PRIu32
- "; NPU axi0 write cc: %" PRIu32
- "; NPU axi1 read cc: %" PRIu32 "\n",
+ "; NPU axi0 read beats: %" PRIu32
+ "; NPU axi0 write beats: %" PRIu32
+ "; NPU axi1 read beats: %" PRIu32 "\n",
t.npu_total_ccnt,
t.npu_idle_ccnt,
- t.npu_axi0_read_ccnt,
- t.npu_axi0_write_ccnt,
- t.npu_axi1_read_ccnt);
+ t.npu_axi0_read_beats,
+ t.npu_axi0_write_beats,
+ t.npu_axi1_read_beats);
#endif /* defined (ARM_NPU) */
return t;
diff --git a/source/application/hal/platforms/bare-metal/timer/include/baremetal_timer.h b/source/application/hal/platforms/bare-metal/timer/include/baremetal_timer.h
index 3020dac..0d23a05 100644
--- a/source/application/hal/platforms/bare-metal/timer/include/baremetal_timer.h
+++ b/source/application/hal/platforms/bare-metal/timer/include/baremetal_timer.h
@@ -22,10 +22,10 @@
#if defined (MPS3_PLATFORM)
#include "timer_mps3.h"
- typedef mps3_time_counter base_time_counter;
+ typedef mps3_time_counter base_time_counter;
#else /* defined (MPS3_PLATFORM) */
- #include "timer_fvp.h"
- typedef fvp_time_counter base_time_counter;
+ #include "timer_simple_platform.h"
+ typedef generic_time_counter base_time_counter;
#endif /* defined (MPS3_PLATFORM) */
typedef struct bm_time_counter {
@@ -34,9 +34,9 @@
#if defined (ARM_NPU)
uint64_t npu_total_ccnt;
uint32_t npu_idle_ccnt;
- uint32_t npu_axi0_read_ccnt;
- uint32_t npu_axi0_write_ccnt;
- uint32_t npu_axi1_read_ccnt;
+ uint32_t npu_axi0_read_beats;
+ uint32_t npu_axi0_write_beats;
+ uint32_t npu_axi1_read_beats;
#endif /* ARM_NPU */
} time_counter;