ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lp_us_tickers test: provide minor fixes after review 

- count_ticks: fix counter overflow handling,
- count_ticks: use reg_cycles variable in while loop,
- increment test: reduce number of cycles for slow cores if measure process needs to be repeated (difference is greater than 1).
pull/7009/head
Przemyslaw Stekiel 2018-03-09 10:14:25 +01:00 committed by Bartek Szatkowski
parent f6163a341c
commit 85ce887cea
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
TESTS/mbed_hal/common_tickers/main.cpp
View File

@ -40,6 +40,9 @@
#define NUM_OF_CYCLES 100000 #define NUM_OF_CYCLES 100000
#define US_TICKER_OV_LIMIT 20000
#define LP_TICKER_OV_LIMIT 4000
using namespace utest::v1; using namespace utest::v1;
volatile int intFlag = 0; volatile int intFlag = 0;
@ -59,7 +62,7 @@ uint32_t count_ticks(uint32_t cycles, uint32_t step)
const uint32_t start = intf->read(); const uint32_t start = intf->read();
while (cycles -= step) { while (reg_cycles -= step) {
/* Just wait. */ /* Just wait. */
} }
@ -68,7 +71,7 @@ uint32_t count_ticks(uint32_t cycles, uint32_t step)
core_util_critical_section_exit(); core_util_critical_section_exit();
/* Handle overflow - overflow protection may not work in this case. */ /* Handle overflow - overflow protection may not work in this case. */
uint32_t diff = (start <= stop) ? (stop - start) : (uint32_t)(max_count - start + stop); uint32_t diff = (start <= stop) ? (stop - start) : (uint32_t)(max_count - start + stop + 1);
return (diff); return (diff);
} }
@ -338,12 +341,15 @@ void ticker_increment_test(void)
TEST_ASSERT_UINT32_WITHIN(1, next_tick_count, base_tick_count); TEST_ASSERT_UINT32_WITHIN(1, next_tick_count, base_tick_count);
} else { // high frequency tickers } else { // high frequency tickers
const uint32_t base_tick_count = count_ticks(NUM_OF_CYCLES, 1);
uint32_t num_of_cycles = NUM_OF_CYCLES;
const uint32_t base_tick_count = count_ticks(num_of_cycles, 1);
uint32_t next_tick_count = base_tick_count; uint32_t next_tick_count = base_tick_count;
uint32_t inc_val = 0; uint32_t inc_val = 0;
while (inc_val < 100) { while (inc_val < 100) {
next_tick_count = count_ticks(NUM_OF_CYCLES + inc_val, 1); next_tick_count = count_ticks(num_of_cycles + inc_val, 1);
if (next_tick_count == base_tick_count) { if (next_tick_count == base_tick_count) {
/* Same tick count, so increase num of cycles. */ /* Same tick count, so increase num of cycles. */
@ -351,9 +357,11 @@ void ticker_increment_test(void)
} else { } else {
/* It is possible that the difference between base and next /* It is possible that the difference between base and next
* tick count on some platforms is greater that 1, in this case we need * tick count on some platforms is greater that 1, in this case we need
* to repeat counting with the same number of cycles. * to repeat counting with the reduced number of cycles (for slower boards).
* In cases if difference is exactly 1 we can exit the loop. * In cases if difference is exactly 1 we can exit the loop.
*/ */
num_of_cycles /= 2;
if (next_tick_count - base_tick_count == 1 || if (next_tick_count - base_tick_count == 1 ||
base_tick_count - next_tick_count == 1) { base_tick_count - next_tick_count == 1) {
break; break;