tools/tests/run.sh: download test bench data from Google Storage rather than SVN

Review URL: https://codereview.appspot.com/7343045

git-svn-id: http://skia.googlecode.com/svn/trunk@7749 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/README.sh b/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/README.sh
deleted file mode 100755 (executable)
index b664488..0000000
--- a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/README.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-# This directory contains tarballs of a subset of real performance
-# data from our production bots.
-#
-# How I created these tarballs:
-
-PLATFORM=Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32
-TEMPDIR=$(mktemp -d)
-
-
-# DOWNLOAD SELECTED RAW DATA FROM GOOGLE STORAGE
-
-REVS="7671 7679 7686"
-for REV in $REVS; do
-
-  FILES="bench_r${REV}_data_skp_device_bitmap_multi_2_mode_tile_256_256_timeIndividualTiles bench_r${REV}_data_skp_device_bitmap_multi_3_mode_tile_256_256_timeIndividualTiles bench_r${REV}_data_skp_device_bitmap_multi_4_mode_tile_256_256_timeIndividualTiles"
-
-  for FILE in $FILES; do
-    URL=http://chromium-skia-gm.commondatastorage.googleapis.com/playback/perfdata/${PLATFORM}/data/${FILE}
-    curl $URL --output $TEMPDIR/$FILE
-  done
-
-done
-
-
-# TAR UP THE RAW DATA
-
-TARBALL_DIR="$PWD/tools/tests/benchgraphs/$PLATFORM/tarballs"
-mkdir -p $TARBALL_DIR
-pushd $TEMPDIR
-for REV in $REVS; do
-  tar --create --gzip --file ${TARBALL_DIR}/r${REV}.tgz bench_r${REV}_*
-done 
-popd
-
-
-# CLEAN UP
-
-rm -rf $TEMPDIR

diff --git a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7671.tgz b/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7671.tgz
deleted file mode 100644 (file)
index 6441772..0000000
Binary files a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7671.tgz and /dev/null differ

diff --git a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7679.tgz b/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7679.tgz
deleted file mode 100644 (file)
index 2688f9d..0000000
Binary files a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7679.tgz and /dev/null differ

diff --git a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7686.tgz b/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7686.tgz
deleted file mode 100644 (file)
index 708d163..0000000
Binary files a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/tarballs/r7686.tgz and /dev/null differ

diff --git a/tools/tests/run.sh b/tools/tests/run.sh
index 1f7bf5e191d0cfa4e7de87a478ff5f0788c61cd9..6cb31cc9003a568ebd295b2750cc2fedc357fe26 100755 (executable)
--- a/tools/tests/run.sh
+++ b/tools/tests/run.sh
@@ -17,6 +17,9 @@ cd $(dirname $0)/../..
 # TODO: make it look in Release and/or Debug
 SKDIFF_BINARY=out/Debug/skdiff
 
+# Suffixes of all the raw bench data files we want to process.
+BENCHDATA_FILE_SUFFIXES="data_skp_device_bitmap_multi_2_mode_tile_256_256_timeIndividualTiles data_skp_device_bitmap_multi_3_mode_tile_256_256_timeIndividualTiles data_skp_device_bitmap_multi_4_mode_tile_256_256_timeIndividualTiles"
+
 # Compare contents of all files within directories $1 and $2,
 # EXCEPT for any dotfiles.
 # If there are any differences, a description is written to stdout and
@@ -76,6 +79,32 @@ skdiff_test "--nodiffs --match identical-bits $SKDIFF_TESTDIR/baseDir $SKDIFF_TE
 skdiff_test "--nodiffs --match identical-bits --match identical-pixels $SKDIFF_TESTDIR/baseDir $SKDIFF_TESTDIR/comparisonDir" "$SKDIFF_TESTDIR/identical-bits-or-pixels"
 
 
+# Download a subset of the raw bench data for platform $1 at revision $2.
+# If any of those files already exist locally, we assume that they are
+# correct and up to date, and we don't download them again.
+function benchgraph_download_rawdata {
+  if [ $# != 2 ]; then
+    echo "benchgraph_download_rawdata requires exactly 2 parameters, got $#"
+    exit 1
+  fi
+  PLATFORM="$1"
+  REV="$2"
+
+  PLATFORM_DIR="tools/tests/benchgraphs/$PLATFORM"
+  RAW_BENCH_DATA_DIR="$PLATFORM_DIR/raw-bench-data"
+  mkdir -p $RAW_BENCH_DATA_DIR
+
+  for FILE_SUFFIX in $BENCHDATA_FILE_SUFFIXES; do
+    FILE=bench_r${REV}_${FILE_SUFFIX}
+    DESTFILE=$RAW_BENCH_DATA_DIR/$FILE
+    if [ ! -f $DESTFILE ];
+    then
+      URL=http://chromium-skia-gm.commondatastorage.googleapis.com/playback/perfdata/${PLATFORM}/data/${FILE}
+      curl $URL --output $DESTFILE
+    fi
+  done
+}
+
 # Run bench_graph_svg.py across the data from platform $1,
 # writing its output to output-actual and comparing those results against
 # output-expected.
@@ -87,20 +116,11 @@ function benchgraph_test {
   PLATFORM="$1"
 
   PLATFORM_DIR="tools/tests/benchgraphs/$PLATFORM"
-  TARBALL_DIR="$PLATFORM_DIR/tarballs"
   RAW_BENCH_DATA_DIR="$PLATFORM_DIR/raw-bench-data"
   ACTUAL_OUTPUT_DIR="$PLATFORM_DIR/output-actual"
   EXPECTED_OUTPUT_DIR="$PLATFORM_DIR/output-expected"
 
-  # First, unpack raw bench data from tarballs.
-  # (The raw bench data files are large, so this saves space in our SVN repo.)
-  rm -rf $RAW_BENCH_DATA_DIR
-  mkdir -p $RAW_BENCH_DATA_DIR
-  for TARBALL in $TARBALL_DIR/*.tgz ; do
-    tar --extract --gunzip --directory $RAW_BENCH_DATA_DIR --file $TARBALL
-  done
-
-  # Now that we have the input files we need, run bench_graph_svg.py .
+  # Run bench_graph_svg.py .
   rm -rf $ACTUAL_OUTPUT_DIR
   mkdir -p $ACTUAL_OUTPUT_DIR
   COMMAND="python bench/bench_graph_svg.py -d $RAW_BENCH_DATA_DIR -r -150 -f -150 -x 1024 -y 768 -l Title -m 25th -o $ACTUAL_OUTPUT_DIR/graph.xhtml"
@@ -116,6 +136,9 @@ function benchgraph_test {
   compare_directories $EXPECTED_OUTPUT_DIR $ACTUAL_OUTPUT_DIR
 }
 
+benchgraph_download_rawdata Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32 7671
+benchgraph_download_rawdata Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32 7679
+benchgraph_download_rawdata Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32 7686
 benchgraph_test Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32
 
 echo "All tests passed."