From 12ffc58d4bf4e9474c6b7dda84ddedcd342fbf78 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 5 Nov 2016 15:43:33 -0400 Subject: [PATCH] benchmarks: rename _NanoTscRead -> _tsc_read Change-Id: Id5687f79ac13136f14a14d250e149436a0173f04 Signed-off-by: Anas Nashif --- arch/x86/core/cpuhalt.c | 2 +- include/arch/x86/asm_inline_gcc.h | 5 ++--- kernel/microkernel/k_idle.c | 2 +- kernel/microkernel/k_init.c | 2 +- kernel/unified/idle.c | 2 +- kernel/unified/init.c | 2 +- tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c | 2 +- tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c | 4 ++-- .../kernel/test_tickless/microkernel/src/test_tickless.c | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/x86/core/cpuhalt.c b/arch/x86/core/cpuhalt.c index f47223de568..1a27fee9d60 100644 --- a/arch/x86/core/cpuhalt.c +++ b/arch/x86/core/cpuhalt.c @@ -62,7 +62,7 @@ void nano_cpu_idle(void) _int_latency_stop(); _sys_k_event_logger_enter_sleep(); #if defined(CONFIG_BOOT_TIME_MEASUREMENT) - __idle_tsc = _NanoTscRead(); + __idle_tsc = _tsc_read(); #endif #if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) diff --git a/include/arch/x86/asm_inline_gcc.h b/include/arch/x86/asm_inline_gcc.h index 8d9b759faf7..7f9dfdf1263 100644 --- a/include/arch/x86/asm_inline_gcc.h +++ b/include/arch/x86/asm_inline_gcc.h @@ -187,11 +187,10 @@ static ALWAYS_INLINE unsigned int find_msb_set(uint32_t op) /** - * - * _NanoTscRead - read timestamp register ensuring serialization + * @brief read timestamp register ensuring serialization */ -static inline uint64_t _NanoTscRead(void) +static inline uint64_t _tsc_read(void) { union { struct { diff --git a/kernel/microkernel/k_idle.c b/kernel/microkernel/k_idle.c index 796655e1e93..23cf54a1fe4 100644 --- a/kernel/microkernel/k_idle.c +++ b/kernel/microkernel/k_idle.c @@ -444,7 +444,7 @@ int _k_kernel_idle(void) extern uint64_t __idle_tsc; - __idle_tsc = _NanoTscRead(); + __idle_tsc = _tsc_read(); #endif for (;;) { diff --git a/kernel/microkernel/k_init.c b/kernel/microkernel/k_init.c index bc78cd02fa6..1e5a7253dea 100644 --- a/kernel/microkernel/k_init.c +++ b/kernel/microkernel/k_init.c @@ -82,7 +82,7 @@ void _main(void) */ extern uint64_t __main_tsc; - __main_tsc = _NanoTscRead(); + __main_tsc = _tsc_read(); #endif /* diff --git a/kernel/unified/idle.c b/kernel/unified/idle.c index 195c28fe6d0..f3b6fb57ef7 100644 --- a/kernel/unified/idle.c +++ b/kernel/unified/idle.c @@ -138,7 +138,7 @@ void idle(void *unused1, void *unused2, void *unused3) extern uint64_t __idle_tsc; - __idle_tsc = _NanoTscRead(); + __idle_tsc = _tsc_read(); #endif for (;;) { diff --git a/kernel/unified/init.c b/kernel/unified/init.c index 24c63703c93..9d129d2ebca 100644 --- a/kernel/unified/init.c +++ b/kernel/unified/init.c @@ -201,7 +201,7 @@ static void _main(void *unused1, void *unused2, void *unused3) /* record timestamp for kernel's _main() function */ extern uint64_t __main_tsc; - __main_tsc = _NanoTscRead(); + __main_tsc = _tsc_read(); #endif extern void main(void); diff --git a/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c b/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c index bf735cbf37e..1089f49b4d0 100644 --- a/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c +++ b/tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c @@ -46,7 +46,7 @@ void bootTimeTask(void) uint64_t idle_us; /* begin of idle timestamp in us */ uint64_t s_idle_tsc; /*__start->idle timestamp */ - task_tsc = _NanoTscRead(); + task_tsc = _tsc_read(); /* Go to sleep for 1 tick in order to timestamp when IdleTask halts. */ task_sleep(1); diff --git a/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c b/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c index ee935d85fe0..fc4873a482f 100644 --- a/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c +++ b/tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c @@ -42,7 +42,7 @@ void bootTimeTask(void) uint64_t s_main_tsc; /* __start->main timestamp */ uint64_t s_task_tsc; /*__start->task timestamp */ - task_tsc = _NanoTscRead(); + task_tsc = _tsc_read(); _start_us = __start_tsc / CONFIG_CPU_CLOCK_FREQ_MHZ; s_main_tsc = __main_tsc-__start_tsc; @@ -86,7 +86,7 @@ char __stack fiberStack[512]; void main(void) { /* record timestamp for nanokernel's main() function */ - __main_tsc = _NanoTscRead(); + __main_tsc = _tsc_read(); /* create bootTime fibers */ task_fiber_start(fiberStack, 512, (nano_fiber_entry_t) bootTimeTask, diff --git a/tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c b/tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c index d07403d393c..37c43f4d365 100644 --- a/tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c +++ b/tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c @@ -48,7 +48,7 @@ typedef uint64_t _timer_res_t; /* timestamp routines */ #define _TIMESTAMP_OPEN() -#define _TIMESTAMP_READ() (_NanoTscRead()) +#define _TIMESTAMP_READ() (_tsc_read()) #define _TIMESTAMP_CLOSE() #elif defined(CONFIG_ARM)