michaelh/zephyr
1
0
Fork 0
Code Releases Activity

benchmarks: rename _NanoTscRead -> _tsc_read

Browse source 
Change-Id: Id5687f79ac13136f14a14d250e149436a0173f04
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-11-05 15:43:33 -04:00 • committed by Andrew Boie
commit 12ffc58d4b
9 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/core/cpuhalt.c
View file

@ -62,7 +62,7 @@ void nano_cpu_idle(void)
_int_latency_stop(); _int_latency_stop();
_sys_k_event_logger_enter_sleep(); _sys_k_event_logger_enter_sleep();
#if defined(CONFIG_BOOT_TIME_MEASUREMENT) #if defined(CONFIG_BOOT_TIME_MEASUREMENT)
__idle_tsc = _NanoTscRead(); __idle_tsc = _tsc_read();
#endif #endif
#if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE) #if defined(CONFIG_NANOKERNEL) && defined(CONFIG_TICKLESS_IDLE)

5
include/arch/x86/asm_inline_gcc.h
View file

@ -187,11 +187,10 @@ static ALWAYS_INLINE unsigned int find_msb_set(uint32_t op)
/** /**
* * @brief read timestamp register ensuring serialization
* _NanoTscRead - read timestamp register ensuring serialization
*/ */
static inline uint64_t _NanoTscRead(void) static inline uint64_t _tsc_read(void)
{ {
union { union {
struct { struct {

2
kernel/microkernel/k_idle.c
View file

@ -444,7 +444,7 @@ int _k_kernel_idle(void)
extern uint64_t __idle_tsc; extern uint64_t __idle_tsc;
__idle_tsc = _NanoTscRead(); __idle_tsc = _tsc_read();
#endif #endif
for (;;) { for (;;) {

2
kernel/microkernel/k_init.c
View file

@ -82,7 +82,7 @@ void _main(void)
*/ */
extern uint64_t __main_tsc; extern uint64_t __main_tsc;
__main_tsc = _NanoTscRead(); __main_tsc = _tsc_read();
#endif #endif
/* /*

2
kernel/unified/idle.c
View file

@ -138,7 +138,7 @@ void idle(void *unused1, void *unused2, void *unused3)
extern uint64_t __idle_tsc; extern uint64_t __idle_tsc;
__idle_tsc = _NanoTscRead(); __idle_tsc = _tsc_read();
#endif #endif
for (;;) { for (;;) {

2
kernel/unified/init.c
View file

@ -201,7 +201,7 @@ static void _main(void *unused1, void *unused2, void *unused3)
/* record timestamp for kernel's _main() function */ /* record timestamp for kernel's _main() function */
extern uint64_t __main_tsc; extern uint64_t __main_tsc;
__main_tsc = _NanoTscRead(); __main_tsc = _tsc_read();
#endif #endif
extern void main(void); extern void main(void);

2
tests/legacy/benchmark/boot_time/microkernel/src/boot_time.c
View file

@ -46,7 +46,7 @@ void bootTimeTask(void)
uint64_t idle_us; /* begin of idle timestamp in us */ uint64_t idle_us; /* begin of idle timestamp in us */
uint64_t s_idle_tsc; /*__start->idle timestamp */ 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. */ /* Go to sleep for 1 tick in order to timestamp when IdleTask halts. */
task_sleep(1); task_sleep(1);

4
tests/legacy/benchmark/boot_time/nanokernel/src/boot_time.c
View file

@ -42,7 +42,7 @@ void bootTimeTask(void)
uint64_t s_main_tsc; /* __start->main timestamp */ uint64_t s_main_tsc; /* __start->main timestamp */
uint64_t s_task_tsc; /*__start->task 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; _start_us = __start_tsc / CONFIG_CPU_CLOCK_FREQ_MHZ;
s_main_tsc = __main_tsc-__start_tsc; s_main_tsc = __main_tsc-__start_tsc;
@ -86,7 +86,7 @@ char __stack fiberStack[512];
void main(void) void main(void)
{ {
/* record timestamp for nanokernel's main() function */ /* record timestamp for nanokernel's main() function */
__main_tsc = _NanoTscRead(); __main_tsc = _tsc_read();
/* create bootTime fibers */ /* create bootTime fibers */
task_fiber_start(fiberStack, 512, (nano_fiber_entry_t) bootTimeTask, task_fiber_start(fiberStack, 512, (nano_fiber_entry_t) bootTimeTask,

2
tests/legacy/kernel/test_tickless/microkernel/src/test_tickless.c
View file

@ -48,7 +48,7 @@ typedef uint64_t _timer_res_t;
/* timestamp routines */ /* timestamp routines */
#define _TIMESTAMP_OPEN() #define _TIMESTAMP_OPEN()
#define _TIMESTAMP_READ() (_NanoTscRead()) #define _TIMESTAMP_READ() (_tsc_read())
#define _TIMESTAMP_CLOSE() #define _TIMESTAMP_CLOSE()
#elif defined(CONFIG_ARM) #elif defined(CONFIG_ARM)