Update HB simics calls to new PHYP model names.

    See SW149779.  The PHYP simics model is changing the location of
    phys_mem to be under system_cmp0 and renaming venice_cec_chip_cmp0
    to proc_venicechip_cmp0.  Change our debug and startup scripts
    to match these new naming conventions.

Change-Id: I32b2ff8fa3467806ac4d7fac1b8b2e1db0796259
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1256
Tested-by: Jenkins Server
Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 23 insertions, 30 deletions

diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest
index e7a4167df..49d8240b6 100755
--- a/src/build/citest/autocitest
+++ b/src/build/citest/autocitest
@@ -329,9 +329,9 @@ loopcount=0
 while [ $(($modsstarted)) -lt 1 -o $(($modsstarted)) -ne $(($modscompleted)) ]; do
     sleep 5
     ((loopcount++))     # increment loopcount
-        autosim $NOWIN --simcmd   "phys_mem.read 0x$mods_completed_addr 0x08"     1> $SBXHOME/modscompleted.log  2> /dev/null
+        autosim $NOWIN --simcmd   "(system_cmp0.phys_mem).read 0x$mods_completed_addr 0x08"     1> $SBXHOME/modscompleted.log  2> /dev/null
     modscompleted=`cat $SBXHOME/modscompleted.log | xargs echo -n`
-    autosim $NOWIN --simcmd   "phys_mem.read 0x$mods_started_addr 0x08"     1> $SBXHOME/modsstarted.log  2> /dev/null
+    autosim $NOWIN --simcmd   "(system_cmp0.phys_mem).read 0x$mods_started_addr 0x08"     1> $SBXHOME/modsstarted.log  2> /dev/null
     modsstarted=`cat $SBXHOME/modsstarted.log | xargs echo -n`
 
     echo "ModulesStarted:ModulesCompleted  => $modsstarted:$modscompleted"
@@ -346,7 +346,7 @@ done
 
 
 echo "====> dump totaltests..."
-autosim $NOWIN --simcmd   "phys_mem.read 0x$totaltests_addr 0x08"     1> $SBXHOME/totaltests.log  2> /dev/null
+autosim $NOWIN --simcmd   "(system_cmp0.phys_mem).read 0x$totaltests_addr 0x08"     1> $SBXHOME/totaltests.log  2> /dev/null
 if [ $? -ne 0 ] ; then
         echo "ERROR: Unable to run $?"
         stopsim
@@ -357,7 +357,7 @@ totaltests=`cat $SBXHOME/totaltests.log | xargs echo -n`
 
 
 echo "====> dump failedtests..."
-autosim $NOWIN --simcmd   "phys_mem.read 0x$failedtests_addr 0x08"     1> $SBXHOME/failedtests.log  2> /dev/null
+autosim $NOWIN --simcmd   "(system_cmp0.phys_mem).read 0x$failedtests_addr 0x08"     1> $SBXHOME/failedtests.log  2> /dev/null
 if [ $? -ne 0 ] ; then
         echo "ERROR: Unable to run $?"
         stopsim
@@ -368,7 +368,7 @@ failedtests=`cat $SBXHOME/failedtests.log | xargs echo -n`
 
 
 echo "====> dump warnings..."
-autosim $NOWIN --simcmd   "phys_mem.read 0x$warnings_addr 0x08"     1> $SBXHOME/warnings.log  2> /dev/null
+autosim $NOWIN --simcmd   "(system_cmp0.phys_mem).read 0x$warnings_addr 0x08"     1> $SBXHOME/warnings.log  2> /dev/null
 if [ $? -ne 0 ] ; then
         echo "ERROR: Unable to run $?"
         stopsim
@@ -379,7 +379,7 @@ warnings=`cat $SBXHOME/warnings.log | xargs echo -n`
 
 
 echo "====> dump tracecalls..."
-autosim $NOWIN --simcmd   "phys_mem.read 0x$tracecalls_addr 0x08"     1> $SBXHOME/tracecalls.log  2> /dev/null
+autosim $NOWIN --simcmd   "(system_cmp0.phys_mem).read 0x$tracecalls_addr 0x08"     1> $SBXHOME/tracecalls.log  2> /dev/null
 if [ $? -ne 0 ] ; then
         echo "ERROR: Unable to run $?"
         stopsim
diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup
index 7250e50f9..39491ca73 100755
--- a/src/build/citest/etc/workarounds.presimsetup
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -26,6 +26,10 @@
 ##    to setup the sandbox
 ##
 
+echo "+++ Update PHYP level for new component names (CMVC 841788)"
+mkdir -p $sb/simu/data
+egrep -v "WSALIAS DEFAULT PHYPLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo
+echo "WSALIAS DEFAULT PHYPLEVEL env/phypb/simics-4.2.0/simics-4.2.94/ph120625a800.42" >> $sb/simu/data/simicsInfo
 
 #### Examples ####
 #echo "+++ Some message about why you need to do this."
diff --git a/src/build/debug/simics-debug-framework.py b/src/build/debug/simics-debug-framework.py
index 065e42167..e7694e03c 100755
--- a/src/build/debug/simics-debug-framework.py
+++ b/src/build/debug/simics-debug-framework.py
@@ -152,7 +152,8 @@ class DebugFrameworkProcess:
         addr = int(match.group(1))
         size = int(match.group(2))
 
-        data = "".join(map(chr, conf.phys_mem.memory[[addr , addr+size-1]]))
+        data = "".join(map(chr,
+            conf.system_cmp0.phys_mem.memory[[addr , addr+size-1]]))
         self.sendMsg("data-response", data)
 
     # Write data to memory.
@@ -165,7 +166,7 @@ class DebugFrameworkProcess:
         size = int(match.group(2))
         data = map(ord, match.group(3).decode("hex"));
 
-        conf.phys_mem.memory[[addr, addr+size-1]] = data;
+        conf.system_cmp0.phys_mem.memory[[addr, addr+size-1]] = data;
 
     # Clock forward the model.
     #    This message had data of the format "0dCYCLES".
@@ -209,7 +210,7 @@ class DebugFrameworkProcess:
         size = int(match.group(2))
 
         ##  read the register using xscom reg addresses
-        runStr  =   "phys_mem.read 0x%x  0x%x"%(addr, size)
+        runStr  =   "(system_cmp0.phys_mem).read 0x%x  0x%x"%(addr, size)
         ( result, out )  =   quiet_run_command( runStr, output_modes.regular )
         ## DEBUG print ">> %s: "%(runStr) + "0x%16.16x"%(result) + " : " + out
         self.sendMsg("data-response", "%16.16x"%(result) )
@@ -225,7 +226,7 @@ class DebugFrameworkProcess:
         size = int(match.group(2))
         data = int(match.group(3) )
 
-        runStr  =   "phys_mem.write 0x%x 0x%x 0x%x"%(addr, data, size)
+        runStr  =   "(system_cmp0.phys_mem).write 0x%x 0x%x 0x%x"%(addr, data, size)
         ( result, out )  =   quiet_run_command( runStr, output_modes.regular )
         ## DEBUG print ">> %s : "%(runStr) + " 0x%16.16x"%(result) + " : " + out
         if ( result ):
@@ -331,7 +332,8 @@ def hexDumpToNumber(hexlist):
 # representing the data read from simics. The list returned may be handed
 # to hexDumpToNumber() to turn the list into a number.
 def dumpSimicsMemory(address,bytecount):
-    hexlist = map(hex,conf.phys_mem.memory[[address,address+bytecount-1]])
+    hexlist = map(hex,
+        conf.system_cmp0.phys_mem.memory[[address,address+bytecount-1]])
     return hexlist
 
 
@@ -345,7 +347,7 @@ def readLong(address):
     return hexDumpToNumber(hexlist)
 
 def writeLong(address,datvalue):
-    conf.phys_mem.memory[[address,address+3]] = [0,0,0,datvalue]
+    conf.system_cmp0.phys_mem.memory[[address,address+3]] = [0,0,0,datvalue]
     return
 
 
@@ -354,7 +356,7 @@ def writeLong(address,datvalue):
 # data is a list of byte-sized integers.
 def writeSimicsMemory(address,data):
     size = len(data)
-    conf.phys_mem.memory[[address, address+size-1]] = data;
+    conf.system_cmp0.phys_mem.memory[[address, address+size-1]] = data;
 
 # Convert an integer to a byte list <size> bytes long.
 def intToList(n,size):
diff --git a/src/build/mkrules/dist_rules.mk b/src/build/mkrules/dist_rules.mk
index c197fb630..c3d834163 100644
--- a/src/build/mkrules/dist_rules.mk
+++ b/src/build/mkrules/dist_rules.mk
@@ -356,7 +356,7 @@ $(TARGET_DIR)/$(1)$(call __ODE_REMAKE_TARGET, $(2)) : \
 	@$$(call EXECUTE_IN_SANDBOX,\
 	    mkdir -p $(firstword $(subst :, ,$(2))) && \
 	    cd $(firstword $(subst :, ,$(2))) && \
-	    mk -a $(subst NOTARGET,,$(word 2, $(subst :, ,$(2)))),\
+	    mk -O1 -a $(subst NOTARGET,,$(word 2, $(subst :, ,$(2)))),\
 	    $(word 3, $(subst :, ,$(2))))
 	@touch $$@
 endef
diff --git a/src/build/simics/startup.simics b/src/build/simics/startup.simics
index 3259d74af..61fb90099 100755
--- a/src/build/simics/startup.simics
+++ b/src/build/simics/startup.simics
@@ -7,24 +7,11 @@ $hb_machine = (shell "env | grep 'GFW_P8_.*_PROC_CCIN' | sed 's/GFW_P8_\\(.*\\)_
 $hb_machine = (python "\""+$hb_machine+"\".lower()")
 python "os.environ['HB_MACHINE'] = \""+$hb_machine+"\""
 
-# Load fake PNOR.
-try {
-    $hb_pnor_image_name = $hb_machine + ".pnor"
-    $hb_pnor_image = (lookup-file $hb_pnor_image_name)
-    if ($hb_pnor_image) {
-        (system_cmp0.phys_mem).load-file $hb_pnor_image 0x400000
-    } else {
-        echo "ERROR: Cannot find Hostboot PNOR image."
-    }
-} except { echo "ERROR: Failed to load fake PNOR." }
-
 # Preload VPD in PNOR
 try {
     run-python-file (lookup-file hbfw/hb-pnor-mvpd-preload.py)
     fpga0.sfc_master_mmio_image.add-partial-diff-file ./sysmvpd.dat 0x281000
     fpga0.sfc_master_mmio_image.add-partial-diff-file ./sysspd.dat 0x301000
-    #(system_cmp0.phys_mem).load-file ./sysmvpd.dat 0x681000
-    #(system_cmp0.phys_mem).load-file ./sysspd.dat 0x701000
 } except { echo "ERROR: Failed to preload VPD into PNOR." }
 
 # Load HB debug tools.
@@ -39,7 +26,7 @@ try {
 ########################### WORKAROUNDS ####################################
 # Setup the mailbox.
 # for mbox on core 0 use:
-# venice_cec_chip_cmp0.psi_hb->psihb_xivr_fsi=0x0140000000     #02010917
+# proc_venicechip_cmp0.psi_hb->psihb_xivr_fsi=0x0140000000     #02010917
 # for mbox on core 5 use:
-venice_cec_chip_cmp0.psi_hb->psihb_xivr_fsi=0x0000A00140000000   #02010917
-venice_cec_chip_cmp0.psi_hb->psihb_irsn=0x00030003FFFF0000 #0201091b
+proc_venicechip_cmp0.psi_hb->psihb_xivr_fsi=0x0000A00140000000   #02010917
+proc_venicechip_cmp0.psi_hb->psihb_irsn=0x00030003FFFF0000 #0201091b