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 <mgloff@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
open-power · May 22, 2017 · 9b5ffd0 · 9b5ffd0
1 parent 494c9f4
commit 9b5ffd0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
     {