From aa6470af8ee401831958a9ce35ae3e3ed36e31cc Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Fri, 15 Feb 2013 16:42:21 +0000 Subject: bench_graph_svg self-test: add non-tile bench data TBR=benchen Review URL: https://codereview.appspot.com/7317048 git-svn-id: http://skia.googlecode.com/svn/trunk@7750 2bbb7eff-a529-9590-31e7-b0007b416f81 --- .../output-expected/graph.xhtml | 611 ++++++++++++++++++--- tools/tests/run.sh | 20 +- 2 files changed, 561 insertions(+), 70 deletions(-) (limited to 'tools/tests') diff --git a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/output-expected/graph.xhtml b/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/output-expected/graph.xhtml index ac36dc8e2e..89d6322b68 100644 --- a/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/output-expected/graph.xhtml +++ b/tools/tests/benchgraphs/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/output-expected/graph.xhtml @@ -93,6 +93,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> } } //]]> + + + + + + + + @@ -117,6 +125,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -141,6 +157,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -165,6 +189,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -189,6 +221,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -213,6 +253,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -237,6 +285,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -261,6 +317,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -285,6 +349,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -309,6 +381,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -333,6 +413,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -357,6 +445,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -381,6 +477,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -405,6 +509,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -429,6 +541,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -453,6 +573,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -477,6 +605,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -501,6 +637,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -525,6 +669,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -549,6 +701,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -573,6 +733,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -597,6 +765,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -621,6 +797,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -645,6 +829,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -669,6 +861,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -693,6 +893,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -717,6 +925,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -741,6 +957,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -765,6 +989,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -789,6 +1021,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -813,6 +1053,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -837,6 +1085,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -861,6 +1117,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -885,6 +1149,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -909,6 +1181,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -933,6 +1213,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -957,6 +1245,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -981,6 +1277,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1005,6 +1309,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1029,6 +1341,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1053,6 +1373,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1077,6 +1405,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1101,6 +1437,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1125,6 +1469,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1149,6 +1501,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1173,6 +1533,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1197,6 +1565,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1221,6 +1597,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1245,6 +1629,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1269,6 +1661,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1293,6 +1693,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1317,6 +1725,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1341,6 +1757,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1365,6 +1789,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1389,6 +1821,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1413,6 +1853,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1437,6 +1885,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1461,6 +1917,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1485,6 +1949,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1509,6 +1981,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> + + + + + + + + @@ -1637,77 +2117,78 @@ stroke: #0000dd; text-decoration: underline; diff --git a/tools/tests/run.sh b/tools/tests/run.sh index 6cb31cc900..1ce11f36e4 100755 --- a/tools/tests/run.sh +++ b/tools/tests/run.sh @@ -18,7 +18,11 @@ cd $(dirname $0)/../.. 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" +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 "\ +"data_skp_device_bitmap_mode_record_bbh_rtree" # Compare contents of all files within directories $1 and $2, # EXCEPT for any dotfiles. @@ -100,6 +104,7 @@ function benchgraph_download_rawdata { if [ ! -f $DESTFILE ]; then URL=http://chromium-skia-gm.commondatastorage.googleapis.com/playback/perfdata/${PLATFORM}/data/${FILE} + echo Downloading $URL ... curl $URL --output $DESTFILE fi done @@ -136,9 +141,14 @@ 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 +# Parse a collection of bench data leading up to +# http://70.32.156.53:10117/builders/Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32/builds/878/steps/GenerateWebpagePictureBenchGraphs/logs/stdio +# (this was during the period when the bench data included a ton of per-tile, +# per-iteration data) +PLATFORM=Skia_Shuttle_Ubuntu12_ATI5770_Float_Bench_32 +benchgraph_download_rawdata $PLATFORM 7671 +benchgraph_download_rawdata $PLATFORM 7679 +benchgraph_download_rawdata $PLATFORM 7686 +benchgraph_test $PLATFORM echo "All tests passed." -- cgit v1.2.3