From e928f32dbf3f21cc22a2de13e4c33b40f0b1da86 Mon Sep 17 00:00:00 2001 From: Shakeeb Date: Wed, 6 Jul 2016 05:22:28 -0500 Subject: Renaming SBE trexStringFile Change-Id: I728fe06135300b2a02dafb5af9d18cb25081f469 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26666 Tested-by: Jenkins Server Reviewed-by: RAJA DAS Reviewed-by: Sachin Gupta --- sbe/build/simics/simics-debug-framework.py | 154 +++++++++++++++++------------ sbe/image/Makefile | 6 +- 2 files changed, 92 insertions(+), 68 deletions(-) (limited to 'sbe') diff --git a/sbe/build/simics/simics-debug-framework.py b/sbe/build/simics/simics-debug-framework.py index e9a903c9..f377e07d 100755 --- a/sbe/build/simics/simics-debug-framework.py +++ b/sbe/build/simics/simics-debug-framework.py @@ -1,65 +1,89 @@ -import os -import os.path -import subprocess -import re -import random -import sys -import imp -testIstepAuto = imp.load_source("testIstepAuto", os.environ['SBE_TOOLS_PATH'] + "/testIstepAuto.py") -err = False - -syms = {}; - -def check_sbe_tools_path (): - global SBE_TOOLS_PATH - SBE_TOOLS_PATH = os.environ['SBE_TOOLS_PATH']; - -def register_sbe_debug_framework_tools(): - check_sbe_tools_path () - fillSymTable() - # Create command hook. - new_command("sbe-istep",testIstepAuto.sbe_istep_func, - args = [arg(int_t, "major"), arg(int_t, "minor")], - alias = "istep", - type = ["sbe-commands"], - short = "Runs the debug framework for istep ", - doc = "") - new_command("sbe-trace", collectTrace, - args = [arg(int_t, "procNr")], - alias = "strace", - type = ["sbe-commands"], - short = "Runs the debug framework for trace ", - doc = "") - print "SBE Debug Framework: Registered tool:", "sbe-istep" - print "SBE Debug Framework: Registered tool:", "sbe-trace" - - -def fillSymTable(): -# symFile = os.environ['SBE_IMG_OUT_LOC'] + "/sbe.syms" - symFile = SBE_TOOLS_PATH + "/sbe.syms" -# symFile = os.environ['sb'] + "/../obj/ppc/sbei/sbfw/simics/sbe.syms" - f = open( symFile, 'r') - for line in f: - words = line.split() - if( len( words ) == 4 ): - syms[words[3]] = [words[0], words[1]] - -def collectTrace ( procNr ): - fileName = "sbe_" + `procNr` + "_tracMERG" - cmd1 = "pipe \"p9Proc" + `procNr` + ".sbe.mibo_space.x 0x" + syms['g_pk_trace_buf'][0] + " 0x2028\" \"sed 's/^p:0x........ //g' | sed 's/ ................$//g' | sed 's/ //g' | xxd -r -p> ppetrace.bin\"" - cmd2 = "shell \"" + SBE_TOOLS_PATH + "/ppe2fsp ppetrace.bin sbetrace.bin \"" - cmd3 = "shell \"" + SBE_TOOLS_PATH + "/fsp-trace -s " + SBE_TOOLS_PATH + "/trexStringFile sbetrace.bin >" + fileName + "\"" - cmd4 = "shell \"" + "cat " + fileName + "\"" - - ( rc, out ) = quiet_run_command( cmd1, output_modes.regular ) - if ( rc ): - print "simics ERROR running %s: %d "%( cmd1, rc ) - - SIM_run_alone( run_command, cmd2 ) - SIM_run_alone( run_command, cmd3 ) - SIM_run_alone( run_command, cmd4 ) - - -# Run the registration automatically whenever this script is loaded. -register_sbe_debug_framework_tools() - +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: sbe/build/simics/simics-debug-framework.py $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG +import os +import os.path +import subprocess +import re +import random +import sys +import imp +testIstepAuto = imp.load_source("testIstepAuto", os.environ['SBE_TOOLS_PATH'] + "/testIstepAuto.py") +err = False + +syms = {}; + +def check_sbe_tools_path (): + global SBE_TOOLS_PATH + SBE_TOOLS_PATH = os.environ['SBE_TOOLS_PATH']; + +def register_sbe_debug_framework_tools(): + check_sbe_tools_path () + fillSymTable() + # Create command hook. + new_command("sbe-istep",testIstepAuto.sbe_istep_func, + args = [arg(int_t, "major"), arg(int_t, "minor")], + alias = "istep", + type = ["sbe-commands"], + short = "Runs the debug framework for istep ", + doc = "") + new_command("sbe-trace", collectTrace, + args = [arg(int_t, "procNr")], + alias = "strace", + type = ["sbe-commands"], + short = "Runs the debug framework for trace ", + doc = "") + print "SBE Debug Framework: Registered tool:", "sbe-istep" + print "SBE Debug Framework: Registered tool:", "sbe-trace" + + +def fillSymTable(): +# symFile = os.environ['SBE_IMG_OUT_LOC'] + "/sbe.syms" + symFile = SBE_TOOLS_PATH + "/sbe.syms" +# symFile = os.environ['sb'] + "/../obj/ppc/sbei/sbfw/simics/sbe.syms" + f = open( symFile, 'r') + for line in f: + words = line.split() + if( len( words ) == 4 ): + syms[words[3]] = [words[0], words[1]] + +def collectTrace ( procNr ): + fileName = "sbe_" + `procNr` + "_tracMERG" + cmd1 = "pipe \"p9Proc" + `procNr` + ".sbe.mibo_space.x 0x" + syms['g_pk_trace_buf'][0] + " 0x2028\" \"sed 's/^p:0x........ //g' | sed 's/ ................$//g' | sed 's/ //g' | xxd -r -p> ppetrace.bin\"" + cmd2 = "shell \"" + SBE_TOOLS_PATH + "/ppe2fsp ppetrace.bin sbetrace.bin \"" + cmd3 = "shell \"" + SBE_TOOLS_PATH + "/fsp-trace -s " + SBE_TOOLS_PATH + "/sbeStringFile sbetrace.bin >" + fileName + "\"" + cmd4 = "shell \"" + "cat " + fileName + "\"" + + ( rc, out ) = quiet_run_command( cmd1, output_modes.regular ) + if ( rc ): + print "simics ERROR running %s: %d "%( cmd1, rc ) + + SIM_run_alone( run_command, cmd2 ) + SIM_run_alone( run_command, cmd3 ) + SIM_run_alone( run_command, cmd4 ) + + +# Run the registration automatically whenever this script is loaded. +register_sbe_debug_framework_tools() + diff --git a/sbe/image/Makefile b/sbe/image/Makefile index f03bc65c..abb145ff 100644 --- a/sbe/image/Makefile +++ b/sbe/image/Makefile @@ -144,7 +144,7 @@ SIMICS_PPE_TAR_FILES += $(OBJDIR)/../test/*.xml SIMICS_PPE_TAR_FILES += $(OBJDIR)/../test/*.py SIMICS_PPE_TAR_FILES += $(OBJDIR)/../../tools/ppetracepp/fsp-trace SIMICS_PPE_TAR_FILES += $(OBJDIR)/../../tools/ppetracepp/ppe2fsp -SIMICS_PPE_TAR_FILES += $(OBJDIR)/trexStringFile +SIMICS_PPE_TAR_FILES += $(OBJDIR)/sbeStringFile SIMICS_BB_TAR_FILES += $(OBJDIR)/../build/simics/* # Common Pm libraries @@ -445,11 +445,11 @@ appendloader: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMA #/afs/bb/proj/cte/tools/ppetools/prod/powerpc-eabi/bin/objcopy -O binary --only-section=.fixed $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(OBJDIR)/fixed.bin -# collect all of the trace hash files for this image into a single trexStringFile +# collect all of the trace hash files for this image into a single sbeStringFile .PHONY : tracehash tracehash: mkdir -p $(OBJDIR) - $(THASH) -c -d $(OBJDIR) -s $(OBJDIR)/trexStringFile + $(THASH) -c -d $(OBJDIR) -s $(OBJDIR)/sbeStringFile #clean the kernel directory first, then the application level clean clean: -- cgit v1.2.1