From 9b5ffd0484a07bcfc71ce265783a8b61d80ac6ad Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Wed, 10 May 2017 14:27:15 -0500 Subject: Add timestamps to Simics Istep messages Also added entries for -kernel startup -cxx testcase start (99.1) -shutdown Change-Id: I870961ae8ea0b43003db6bafb21addf660ab99ef Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40346 Reviewed-by: Martin Gloff Tested-by: Jenkins Server Reviewed-by: Michael Baiocchi Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Reviewed-by: Daniel M. Crowell --- src/build/debug/simics-debug-framework.py | 4 +++- src/kernel/kernel.C | 1 + src/usr/initservice/baseinitsvc/initservice.C | 1 + src/usr/initservice/extinitsvc/extinitsvc.C | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py index ced40566e..653b56678 100755 --- a/src/build/debug/simics-debug-framework.py +++ b/src/build/debug/simics-debug-framework.py @@ -591,7 +591,9 @@ def magic_instruction_callback(user_arg, cpu, arg): # Print current istep out to simics console major_istep = cpu.r4 minor_istep = cpu.r5 - print "ISTEP %d.%d" % (major_istep, minor_istep) + percent_s = "%s" + dateCommand = "shell \" date +'%s > ISTEP %d.%d' \""%(percent_s,major_istep,minor_istep) + SIM_run_alone(run_command, dateCommand ) if arg == 7055: # MAGIC_CONTINUOUS_TRACE hb_tracBinaryBuffer = cpu.r4 diff --git a/src/kernel/kernel.C b/src/kernel/kernel.C index b14181caf..5e97ebb4c 100644 --- a/src/kernel/kernel.C +++ b/src/kernel/kernel.C @@ -67,6 +67,7 @@ int main() printk("Booting %s kernel...\n\n", "Hostboot"); printk("CPU=%s\n", ProcessorCoreTypeStrings[CpuID::getCpuType()]); + MAGIC_INST_PRINT_ISTEP(6,2); // Erase task-pointer so that TaskManager::getCurrentTask() returns NULL. setSPRG3(NULL); diff --git a/src/usr/initservice/baseinitsvc/initservice.C b/src/usr/initservice/baseinitsvc/initservice.C index 49a5dccc0..58a86ac26 100644 --- a/src/usr/initservice/baseinitsvc/initservice.C +++ b/src/usr/initservice/baseinitsvc/initservice.C @@ -872,6 +872,7 @@ void InitService::doShutdown(uint64_t i_status, nanosleep(0,TEN_CTX_SWITCHES_NS); TRACFCOMP(g_trac_initsvc, "doShutdown> Final status=%.16X",worst_status); + MAGIC_INST_PRINT_ISTEP(21,4); shutdown(worst_status, i_payload_base, diff --git a/src/usr/initservice/extinitsvc/extinitsvc.C b/src/usr/initservice/extinitsvc/extinitsvc.C index 1d746d461..3fa8f7e24 100644 --- a/src/usr/initservice/extinitsvc/extinitsvc.C +++ b/src/usr/initservice/extinitsvc/extinitsvc.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2016 */ +/* Contributors Listed Below - COPYRIGHT 2011,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -153,6 +153,7 @@ errlHndl_t ExtInitSvc::executeUnitTests ( void ) TRACDCOMP( g_trac_initsvc, ENTER_MRK"executeUnitTests()" ); + MAGIC_INST_PRINT_ISTEP(99,1); do { -- cgit v1.2.3