michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: boot_time: remove all the code and instrumentation feeding into test

Browse source 
Remove the config BOOT_TIME_MEASUREMENT and corresponding #ifdef'd code
throughout (kernel/init.c, idle.c, core/common.S , reset.S, ... ) which
hold the extern hooks for z_timestamp_main and z_timestamp_idle in the
removed boot_time test suite.

Signed-off-by: Jennifer Williams <jennifer.m.williams@intel.com>
This commit is contained in:
Jennifer Williams 2021-05-04 18:08:49 -07:00 • committed by Anas Nashif
commit ca75bbef3c
7 changed files with 0 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arch/arc/core/reset.S
View file

@ -54,17 +54,6 @@ SECTION_FUNC(TEXT,__start)
#ifdef CONFIG_ARC_SECURE_FIRMWARE #ifdef CONFIG_ARC_SECURE_FIRMWARE
sflag r0 sflag r0
#endif #endif
#if defined(CONFIG_BOOT_TIME_MEASUREMENT) && defined(CONFIG_ARCV2_TIMER)
/*
* ARCV2 timer (timer0) is a free run timer, let it start to count
* here.
*/
mov_s r0, 0xffffffff
sr r0, [_ARC_V2_TMR0_LIMIT]
mov_s r0, 0
sr r0, [_ARC_V2_TMR0_COUNT]
#endif
/* interrupt related init */ /* interrupt related init */
#ifndef CONFIG_ARC_NORMAL_FIRMWARE #ifndef CONFIG_ARC_NORMAL_FIRMWARE
/* IRQ_ACT and IRQ_CTRL should be initialized and set in secure mode */ /* IRQ_ACT and IRQ_CTRL should be initialized and set in secure mode */

11
arch/x86/core/common.S
View file

@ -26,17 +26,6 @@
1: 1:
#endif #endif
#ifdef CONFIG_BOOT_TIME_MEASUREMENT
/*
* Boot time measurements use TSC as a datum; zero it.
*/
xorl %eax, %eax
xorl %edx, %edx
movl $X86_TIME_STAMP_COUNTER_MSR, %ecx
wrmsr
#endif
#ifdef CONFIG_PIC_DISABLE #ifdef CONFIG_PIC_DISABLE
/* /*
* "Disable" legacy i8259 interrupt controllers. Note that we * "Disable" legacy i8259 interrupt controllers. Note that we

3
drivers/timer/arcv2_timer0.c
View file

@ -300,9 +300,6 @@ int sys_clock_driver_init(const struct device *dev)
timer_int_handler, NULL, 0); timer_int_handler, NULL, 0);
timer0_limit_register_set(last_load - 1); timer0_limit_register_set(last_load - 1);
#ifdef CONFIG_BOOT_TIME_MEASUREMENT
cycle_count = timer0_count_register_get();
#endif
#endif #endif
timer0_count_register_set(0); timer0_count_register_set(0);
timer0_control_register_set(_ARC_V2_TMR_CTRL_NH | _ARC_V2_TMR_CTRL_IE); timer0_control_register_set(_ARC_V2_TMR_CTRL_NH | _ARC_V2_TMR_CTRL_IE);

6
kernel/idle.c
View file

@ -14,8 +14,6 @@
#include <logging/log.h> #include <logging/log.h>
#include <ksched.h> #include <ksched.h>
extern uint32_t z_timestamp_idle;
LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL); LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);
/** /**
@ -68,10 +66,6 @@ void idle(void *unused1, void *unused2, void *unused3)
ARG_UNUSED(unused2); ARG_UNUSED(unused2);
ARG_UNUSED(unused3); ARG_UNUSED(unused3);
#ifdef CONFIG_BOOT_TIME_MEASUREMENT
z_timestamp_idle = k_cycle_get_32();
#endif
while (true) { while (true) {
/* SMP systems without a working IPI can't /* SMP systems without a working IPI can't
* actual enter an idle state, because they * actual enter an idle state, because they

5
kernel/include/kernel_internal.h
View file

@ -127,11 +127,6 @@ extern void z_early_boot_rand_get(uint8_t *buf, size_t length);
extern int z_stack_adjust_initialized; extern int z_stack_adjust_initialized;
#endif #endif
#ifdef CONFIG_BOOT_TIME_MEASUREMENT
extern uint32_t z_timestamp_main; /* timestamp when main task starts */
extern uint32_t z_timestamp_idle; /* timestamp when CPU goes idle */
#endif
extern struct k_thread z_main_thread; extern struct k_thread z_main_thread;

10
kernel/init.c
View file

@ -37,12 +37,6 @@
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(os, CONFIG_KERNEL_LOG_LEVEL); LOG_MODULE_REGISTER(os, CONFIG_KERNEL_LOG_LEVEL);
/* boot time measurement items */
#ifdef CONFIG_BOOT_TIME_MEASUREMENT
uint32_t __noinit z_timestamp_main; /* timestamp when main task starts */
uint32_t __noinit z_timestamp_idle; /* timestamp when CPU goes idle */
#endif
/* the only struct z_kernel instance */ /* the only struct z_kernel instance */
struct z_kernel _kernel; struct z_kernel _kernel;
@ -177,10 +171,6 @@ static void bg_thread_main(void *unused1, void *unused2, void *unused3)
z_sys_init_run_level(_SYS_INIT_LEVEL_SMP); z_sys_init_run_level(_SYS_INIT_LEVEL_SMP);
#endif #endif
#ifdef CONFIG_BOOT_TIME_MEASUREMENT
z_timestamp_main = k_cycle_get_32();
#endif
extern void main(void); extern void main(void);
main(); main();

6
subsys/debug/Kconfig
View file

@ -6,12 +6,6 @@
menu "System Monitoring Options" menu "System Monitoring Options"
config BOOT_TIME_MEASUREMENT
bool "Boot time measurements"
depends on ARCH_POSIX || ARM || X86
help
This option enables the recording of timestamps during system boot.
menuconfig THREAD_ANALYZER menuconfig THREAD_ANALYZER
bool "Enable Thread analyzer" bool "Enable Thread analyzer"
select INIT_STACKS select INIT_STACKS