From ec937adde233f0edf08faa9cfb3d83c264336f2e Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Mon, 14 Jul 2014 17:15:52 +0200 Subject: [PATCH] run-in-simulavr.sh: move statistics to the end. This is more convenient for obvious reasons, you no longer have to search all the output for these few lines. --- testcases/run-in-simulavr.sh | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/testcases/run-in-simulavr.sh b/testcases/run-in-simulavr.sh index 86a9421..4ddc742 100755 --- a/testcases/run-in-simulavr.sh +++ b/testcases/run-in-simulavr.sh @@ -21,8 +21,14 @@ fi # General preparation. TRACEIN_FILE=$(mktemp) +STATISTICS_FILE=$(mktemp) -trap 'rm -f '${TRACEIN_FILE} 0 +trap 'cat '${STATISTICS_FILE}'; rm -f '${TRACEIN_FILE}' '${STATISTICS_FILE} 0 + + +# Prepare statistics. +echo > ${STATISTICS_FILE} +(cd .. && make size) | tail -4 >> ${STATISTICS_FILE} # Prepare a pin tracing file, assuming a Gen7-v1.4 configuration. See @@ -67,12 +73,14 @@ for GCODE_FILE in $*; do echo "${GCODE_FILE} not readable, skipping." continue fi + echo >> ${STATISTICS_FILE} + echo "${GCODE_FILE} statistics:" >> ${STATISTICS_FILE} FILE="${GCODE_FILE%.gcode}" VCD_FILE="${FILE}.vcd" DATA_FILE="${FILE}.data" VEL_FILE="${FILE}.processed.vcd" - + # We assume here queue and rx buffer are large enough to read # the file in one chunk. If not, raise MOVEBUFFER_SIZE in config.h. @@ -264,14 +272,15 @@ EOF } END { if (ledTimeCount > 0) { - print "Statistics (assuming a 20 MHz clock): " > "/dev/stderr"; - print "LED on occurences: " ledTimeCount "." > "/dev/stderr"; - print "Sum of all LED on time: " ledTimeSum " clock cycles." > "/dev/stderr"; - print "LED on time minimum: " ledTimeMin " clock cycles." > "/dev/stderr"; - print "LED on time maximum: " ledTimeMax " clock cycles." > "/dev/stderr"; - print "LED on time average: " ledTimeSum / ledTimeCount " clock cycles." > "/dev/stderr"; + print "LED on occurences: " ledTimeCount "." >> "'${STATISTICS_FILE}'"; + print "LED on time minimum: " ledTimeMin " clock cycles." \ + >> "'${STATISTICS_FILE}'"; + print "LED on time maximum: " ledTimeMax " clock cycles." \ + >> "'${STATISTICS_FILE}'"; + print "LED on time average: " ledTimeSum / ledTimeCount " clock cycles." \ + >> "'${STATISTICS_FILE}'"; } else { - print "Debug LED apparently unused." > "/dev/stderr"; + print "Debug LED apparently unused." > "'${STATISTICS_FILE}'"; } } ' < "${VCD_FILE}" | \