fix tracegen module and scripts
This commit is contained in:
@ -37,7 +37,6 @@ AXE=${AXE-axe}
|
||||
MODEL=${MODEL-WMO}
|
||||
LOG_DIR=${LOG_DIR-tracegen-log}
|
||||
TRACE_STATS=${TRACE_STATS-tracestats.py}
|
||||
ELF_FILE=${ELF_FILE-../riscv-tools/riscv-tests/build/isa/rv64ui-p-simple}
|
||||
|
||||
###############################################################################
|
||||
|
||||
@ -76,12 +75,6 @@ if [ ! `command -v $TRACE_STATS` ]; then
|
||||
exit -1
|
||||
fi
|
||||
|
||||
if [ ! -f $ELF_FILE ]; then
|
||||
echo Can\'t find dummy elf file for ground tests
|
||||
echo Please run build.sh in riscv-tools to produce \'rv64ui-p-simple\'
|
||||
exit -1
|
||||
fi
|
||||
|
||||
if [ "$MODEL" != SC -a \
|
||||
"$MODEL" != TSO -a \
|
||||
"$MODEL" != PSO -a \
|
||||
@ -119,7 +112,7 @@ for (( I = $START_SEED; I <= $END_SEED; I++ )); do
|
||||
fi
|
||||
|
||||
# Generate trace
|
||||
$TRACE_GEN $EMU $I $ELF_FILE > $LOG/trace.txt
|
||||
$TRACE_GEN $EMU $I > $LOG/trace.txt
|
||||
if [ ! $? -eq 0 ]; then
|
||||
echo -e "\n\nError: emulator returned non-zero exit code"
|
||||
echo See $LOG/trace.txt for details
|
||||
|
@ -33,12 +33,12 @@ import subprocess
|
||||
import re
|
||||
|
||||
def main():
|
||||
if len(sys.argv) != 4:
|
||||
sys.stderr.write("Usage: tracegen.py EMULATOR SEED ELF\n")
|
||||
if len(sys.argv) != 3:
|
||||
sys.stderr.write("Usage: tracegen.py EMULATOR SEED\n")
|
||||
sys.exit(-1)
|
||||
|
||||
p = subprocess.Popen([sys.argv[1],
|
||||
"+verbose", "-s" + sys.argv[2], sys.argv[3]],
|
||||
"+verbose", "-s" + sys.argv[2]],
|
||||
stderr=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
if p == None:
|
||||
sys.stderr.write("File not found: " + sys.argv[1] + "\n")
|
||||
|
Reference in New Issue
Block a user