[Libreoffice-commits] 2 commits - loperf/loperf.sh loperf/utls.sh
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jan 17 19:34:06 PST 2013
loperf/loperf.sh | 89 +++++++++++++++++++++++++++++--------------------------
loperf/utls.sh | 29 ++++++++++-------
2 files changed, 65 insertions(+), 53 deletions(-)
New commits:
commit ea5b6daedb2993b33a8b8e82eb2c23ed1d9f22bd
Merge: 1af3c18 cb63b9a
Author: Yifan Jiang <yifanj2007 at googlemail.com>
Date: Fri Jan 18 03:33:49 2013 +0000
Merge "Add single number performance indicator CEst"
commit cb63b9a32775de00ac8ce45aff93a26f9a2502e7
Author: stephan66 <stephanv778 at gmail.com>
Date: Wed Dec 26 22:02:28 2012 +0100
Add single number performance indicator CEst
diff --git a/loperf/loperf.sh b/loperf/loperf.sh
index 3243818..19822cc 100755
--- a/loperf/loperf.sh
+++ b/loperf/loperf.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,11 +10,11 @@
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
-#
+#
# Major Contributor(s):
-#
+#
# Yifan Jiang <yifanj2007 at gmail.com>
-# Stephan van den Akker
+# Stephan van den Akker <stephanv778 at gmail.com>
#
# For minor contributions see the git repository.
#
@@ -32,19 +32,15 @@ OFFICEBIN="$1"
TESTDATE=$(date --rfc-3339=second)
-if test "$2" = "--dev-build"; then
- TESTHASH=$(get_lo_commit_hash "$OFFICEBIN")
- TESTHASH=${TESTHASH:-"GIT_REPO_NOT_FOUND"}
-else
- TESTHASH=$(get_lo_build);
-fi
+BUILD_ID=$(get_lo_build_id "$OFFICEBIN")
+BUILD_ID=${BUILD_ID:-"BUILD_ID_NOT_FOUND"}
-BUILD=$(get_lo_build)
+LOVERSION=$(get_lo_version "$OFFICEBIN")
DT=$(echo "$TESTDATE" | tr -s '\ \+\-\:' "_")
-CG_LOG="logs/callgrind/cg-lo$BUILD-$DT"
-PF_LOG="logs/loperf/pf-lo$BUILD-$DT.log"
-CSV_LOG="logs/callgrind/cg-lo$BUILD"
+CG_LOG="logs/callgrind/cg-lo$LOVERSION-$DT"
+PF_LOG="logs/loperf/pf-lo$LOVERSION-$DT.log"
+CSV_LOG="logs/callgrind/cg-lo$LOVERSION"
ERR_LOG="logs/error.log"
mkdir -p logs/callgrind 2>&1 > /dev/null
@@ -53,14 +49,13 @@ mkdir -p logs/loperf 2>&1 > /dev/null
function launch {
if test "$1" = ""; then
- valgrind --tool=callgrind --callgrind-out-file="$CG_LOG"_offload.log --simulate-cache=yes --dump-instr=yes "$OFFICEBIN" --splash-pipe=0 --headless > /dev/null 2>&1
+ valgrind --tool=callgrind --callgrind-out-file="$CG_LOG"_offload.log --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes "$OFFICEBIN" --splash-pipe=0 --headless > /dev/null 2>&1
echo -n "$CG_LOG"_offload.log
else
fn=${1#docs\/}
- valgrind --tool=callgrind --callgrind-out-file="$CG_LOG"_onload_"$fn".log --simulate-cache=yes --dump-instr=yes "$OFFICEBIN" "$1" --splash-pipe=0 --headless > /dev/null 2>&1
+ valgrind --tool=callgrind --callgrind-out-file="$CG_LOG"_onload_"$fn".log --simulate-cache=yes --dump-instr=yes --collect-bus=yes --branch-sim=yes "$OFFICEBIN" "$1" --splash-pipe=0 --headless > /dev/null 2>&1
echo -n "$CG_LOG"_onload_"$fn".log
fi
-
}
# Do a clean launch
@@ -68,23 +63,28 @@ echo "Start offload pvt..."
cur_log=$(launch)
# Mapping the data to array:
-#
-# Ir Dr Dw I1mr D1mr D1mw I2mr D2mr D2mw
+#
# offload[0] -> Ir
# offload[1] -> Dr
-# offload[2] -> Dw
+# offload[2] -> Dw
# offload[3] -> I1mr
# offload[4] -> D1mr
# offload[5] -> D1mw
-# offload[6] -> I2mr
-# offload[7] -> D2mr
-# offload[8] -> D2mw
+# offload[6] -> ILmr
+# offload[7] -> DLmr
+# offload[8] -> DLmw
+# offload[9] -> Bc
+# offload[10] -> Bcm
+# offload[11] -> Bi
+# offload[12] -> Bim
+# offload[13] -> Ge
+
offload_str=$(grep '^summary:' "$cur_log" | sed s/"summary: "//)
offload=($offload_str)
# Populate offload to PF_LOG
-echo "Ir Dr Dw I1mr D1mr D1mw I2mr D2mr D2mw" | tee -a "$PF_LOG"
-echo "######################################" | tee -a "$PF_LOG"
+echo " Ir Dr Dw I1mr D1mr D1mw ILmr DLmr DLmw Bc Bcm Bi Bim Ge" | tee -a "$PF_LOG"
+echo "########################################################" | tee -a "$PF_LOG"
echo | tee -a "$PF_LOG"
echo "Offload:" | tee -a "$PF_LOG"
echo "$offload_str" | tee -a "$PF_LOG"
@@ -94,42 +94,49 @@ echo | tee -a "$PF_LOG"
echo "Start onload pvt..."
find docs -type f | grep -Ev "\/\." | while read f; do
cur_log=$(launch "$f")
+
# Mapping the data to array:
- #
+ #
# onload[0] -> Ir
# onload[1] -> Dr
- # onload[2] -> Dw
+ # onload[2] -> Dw
# onload[3] -> I1mr
# onload[4] -> D1mr
# onload[5] -> D1mw
- # onload[6] -> I2mr
- # onload[7] -> D2mr
- # onload[8] -> D2mw
+ # onload[6] -> ILmr
+ # onload[7] -> DLmr
+ # onload[8] -> DLmw
+ # onload[9] -> Bc
+ # onload[10] -> Bcm
+ # onload[11] -> Bi
+ # onload[12] -> Bim
+ # onload[13] -> Ge
onload_str=$(grep '^summary:' "$cur_log" | sed s/"summary: "//)
onload=($onload_str)
# Populate onload to PF_LOG
echo "Load: $f" | tee -a "$PF_LOG"
- echo "$onload_str" | tee -a "$PF_LOG"
-
+ echo "$onload_str" | tee -a "$PF_LOG"
+
#Construct the csv file name
CSV_FN="$CSV_LOG"_onload_"${f#docs\/}".csv
-# echo "$TESTDATE" | tr -d "\n" >> "$CSV_FN"
-
- echo -n "$TESTDATE"$'\t'"$TESTHASH" >> "$CSV_FN"
+ echo -n "$TESTDATE"$'\t'"$BUILD_ID" >> "$CSV_FN"
# Populate onload delta to PF_LOG and CSV_FN
- for i in $(seq 0 8); do
+ for i in $(seq 0 13); do
onload_delta[$i]=$(expr ${onload[$i]} - ${offload[$i]})
echo -n ${onload_delta[$i]} " " | tee -a "$PF_LOG"
- echo -n $'\t' ${onload_delta[$i]} >> "$CSV_FN"
+ echo -n $'\t'${onload_delta[$i]} >> "$CSV_FN"
done
-
+
+ # CEst = Ir + 10 Bm + 10 L1m + 20 Ge + 100 L2m + 100 LLm
+ CEst=$(expr ${onload_delta[0]} + 10 \* $(expr ${onload_delta[12]} + ${onload_delta[10]}) + 10 \* $(expr ${onload_delta[3]} + ${onload_delta[4]} + ${onload_delta[5]}) + 20 \* ${onload_delta[13]} + 100 \* $(expr ${onload_delta[6]} + ${onload_delta[7]} + ${onload_delta[8]}))
+ echo $'\t'$CEst >> "$CSV_FN"
+
echo | tee -a "$PF_LOG"
echo | tee -a "$PF_LOG"
-
- echo >> "$CSV_FN"
+
done
# Regression check
@@ -137,7 +144,7 @@ echo "Regression Status:" | tee -a "$PF_LOG"
echo "-----------------" | tee -a "$PF_LOG"
find $(dirname $(readlink -f "$PF_LOG")) -type f | grep -v "$PF_LOG" | grep log$ | while read rf; do
-
+
check_regression "$PF_LOG" "$rf" | tee -a "$PF_LOG"
done
diff --git a/loperf/utls.sh b/loperf/utls.sh
index 4b08b1c..78402ac 100755
--- a/loperf/utls.sh
+++ b/loperf/utls.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,11 +10,11 @@
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
-#
+#
# Major Contributor(s):
-#
+#
# Yifan Jiang <yifanj2007 at gmail.com>
-# Stephan van den Akker
+# Stephan van den Akker <stephanv778 at gmail.com>
#
# For minor contributions see the git repository.
#
@@ -24,17 +24,23 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-function get_lo_build {
+function get_lo_version {
- #TODO: get the build for binary build
- echo -n "4.0"
+ echo -n $(echo $("$1" --version) | sed s/"LibreOffice "//)
}
function get_lo_commit_hash {
LOGITDIR=$(echo -n $(echo -n "$1" | sed 's/core.*//')core/.git)
-
- echo -n $(git --git-dir="$LOGITDIR" log -1 --date=iso --pretty=format:"%H")
+
+ echo -n $(git --git-dir="$LOGITDIR" log -1 --pretty=format:"%H")
+}
+
+function get_lo_build_id {
+
+ VERSIONRC_FN=$(echo -n $(echo -n "$1" | sed 's/soffice.*//')versionrc)
+
+ echo -n $(cat "$VERSIONRC_FN" | grep ^buildid | sed s/buildid\=//)
}
function is_delta_regress {
@@ -98,12 +104,11 @@ function check_regression {
echo "Document : ${arr_onload_files[$j]#Load: }"
echo "Reference: $2"
echo "Diffstats: $r"
- echo "--------------------------------------"
+ echo "--------------------------------------"
return 0
- fi
+ fi
done
return 1
-
}
More information about the Libreoffice-commits
mailing list