benchmark-terasort-report: use today's number for relative increase

Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/benchmark-terasort-report b/benchmark-terasort-report
index 960e998..496319e 100755
--- a/benchmark-terasort-report
+++ b/benchmark-terasort-report
@@ -24,15 +24,6 @@ THIS_BENCHMARK_DIR="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P)"
 PATH=$THIS_BENCHMARK_DIR:$PATH
 source $THIS_BENCHMARK_DIR/common.sh
 
-ZERO_BASELINE=${ZERO_BASELINE:=1} client_today=$(print-speedup client)
-ZERO_BASELINE=${ZERO_BASELINE:=1} server_today=$(print-speedup server)
-
-x=$(echo "scale=10; $client_today / ${CLIENT_BASELINE}" | bc)
-y=$(echo "scale=10; $server_today / ${SERVER_BASELINE}" | bc)
-
-client_today_vs_client_baseline=$(printf "%.02f" $x)
-server_today_vs_server_baseline=$(printf "%.02f" $y)
-
 email_subject=
 email_to=
 
@@ -65,6 +56,15 @@ if [[ -n $email_subject ]]; then
     echo "Subject: $email_subject"
 fi
 
+ZERO_BASELINE=${ZERO_BASELINE:=1} client_today=$(print-speedup client)
+ZERO_BASELINE=${ZERO_BASELINE:=1} server_today=$(print-speedup server)
+
+x=$(echo "scale=10; $client_today / ${CLIENT_BASELINE}" | bc)
+y=$(echo "scale=10; $server_today / ${SERVER_BASELINE}" | bc)
+
+client_today_vs_client_baseline=$(printf "%.02f" $x)
+server_today_vs_server_baseline=$(printf "%.02f" $y)
+
 people_link="http://openjdk.linaro.org/hadoop-terasort-benchmark-results/"
 
 echo "Regression test Hadoop-Terasort completed"
@@ -76,10 +76,10 @@ echo "the performance against the baseline performance of the Zero interpreter"
 echo "and against the baseline performance of the client and server compilers"
 echo "on $BASEDATE."
 echo ""
-echo "Relative performance: Zero: 1.0, Client: ${CLIENT_BASELINE}, Server: ${SERVER_BASELINE}"
+echo "Relative performance: Zero: 1.0, Client: ${client_today}, Server: ${server_today}"
 echo ""
-echo "Client $client_today / Client $BASEDATE: ${client_today_vs_client_baseline}x"
-echo "Server $server_today / Server $BASEDATE: ${server_today_vs_server_baseline}x"
+echo "Client $client_today / Client $BASEDATE ($CLIENT_BASELINE): ${client_today_vs_client_baseline}x"
+echo "Server $server_today / Server $BASEDATE ($SERVER_BASELINE): ${server_today_vs_server_baseline}x"
 echo ""
 echo "Details of the test setup and historical results may be found here:"
 echo ""