diff options
Diffstat (limited to 'crosperf')
| -rw-r--r-- | crosperf/default-telemetry-results.json | 26 | ||||
| -rw-r--r-- | crosperf/experiment_factory.py | 34 | ||||
| -rw-r--r-- | crosperf/experiment_files/README | 7 | ||||
| -rw-r--r-- | crosperf/experiment_files/bloat_perf.exp | 4 | ||||
| -rw-r--r-- | crosperf/experiment_files/morejs_perf.exp | 4 | ||||
| -rw-r--r-- | crosperf/experiment_files/page_cycler_perf.exp | 10 | ||||
| -rw-r--r-- | crosperf/experiment_files/telemetry-crosperf-with-profiler.exp | 2 | ||||
| -rwxr-xr-x | crosperf/experiment_files/telemetry_perf_perf | 2 | ||||
| -rw-r--r-- | crosperf/help.py | 6 | ||||
| -rwxr-xr-x | crosperf/machine_manager_unittest.py | 4 |
10 files changed, 50 insertions, 49 deletions
diff --git a/crosperf/default-telemetry-results.json b/crosperf/default-telemetry-results.json index 9339b104..2a8a50df 100644 --- a/crosperf/default-telemetry-results.json +++ b/crosperf/default-telemetry-results.json @@ -4,14 +4,14 @@ "workerContrast01__Score", "workerContrast02__Score" ], - "page_cycler.intl_hi_ru": [ + "page_cycler_v2.intl_hi_ru": [ "cold_times__page_load_time", "warm_times__page_load_time" ], "smoothness.tough_webgl_cases": [ "percentage_smooth__percentage_smooth" ], - "page_cycler.intl_es_fr_pt-BR": [ + "page_cycler_v2.intl_es_fr_pt-BR": [ "cold_times__page_load_time", "warm_times__page_load_time" ], @@ -25,15 +25,15 @@ "frame_times__frame_times", "mean_frame_time__mean_frame_time" ], - "page_cycler.morejs": [ + "page_cycler_v2.morejs": [ "warm_times__page_load_time", "cold_times__page_load_time" ], - "page_cycler.dhtml": [ + "page_cycler_v2.dhtml": [ "warm_times__page_load_time", "cold_times__page_load_time" ], - "page_cycler.bloat": [ + "page_cycler_v2.bloat": [ "warm_times__page_load_time", "cold_times__page_load_time" ], @@ -46,7 +46,7 @@ "dromaeo.jslibeventprototype": [ "jslib_event_prototype__jslib_event_prototype" ], - "page_cycler.moz": [ + "page_cycler_v2.moz": [ "warm_times__page_load_time", "cold_times__page_load_time" ], @@ -59,7 +59,7 @@ "jsgamebench": [ "Score__Score" ], - "page_cycler.indexed_db.basic_insert": [ + "page_cycler_v2.indexed_db.basic_insert": [ "warm_times__page_load_time", "cold_times__page_load_time" ], @@ -69,7 +69,7 @@ "dromaeo.jslibtraverseprototype": [ "jslib_traverse_prototype__jslib_traverse_prototype" ], - "page_cycler.netsim.top_10": [ + "page_cycler_v2.netsim.top_10": [ "cold_times__page_load_time", "warm_times__page_load_time" ], @@ -88,7 +88,7 @@ "dromaeo.jslibattrjquery": [ "jslib_attr_jquery__jslib_attr_jquery" ], - "page_cycler.typical_25": [ + "page_cycler_v2.typical_25": [ "warm_times-page_load_time__warm_times-page_load_time", "cold_times-page_load_time__cold_times-page_load_time" ], @@ -98,18 +98,18 @@ "dromaeo.domcoremodify": [ "dom_modify__dom_modify" ], - "page_cycler.intl_ar_fa_he": [ + "page_cycler_v2.intl_ar_fa_he": [ "warm_times__page_load_time", "cold_times__page_load_time" ], - "page_cycler.intl_ja_zh": [ + "page_cycler_v2.intl_ja_zh": [ "warm_times__page_load_time", "cold_times__page_load_time" ], "graphics_WebGLAquarium": [ "avg_fps_1000_fishes" ], - "page_cycler.intl_ko_th_vi": [ + "page_cycler_v2.intl_ko_th_vi": [ "warm_times__page_load_time", "cold_times__page_load_time" ], @@ -125,7 +125,7 @@ "dromaeo.jslibmodifyprototype": [ "jslib_modify_prototype__jslib_modify_prototype" ], - "page_cycler.tough_layout_cases": [ + "page_cycler_v2.tough_layout_cases": [ "warm_times__page_load_time", "cold_times__page_load_time" ], diff --git a/crosperf/experiment_factory.py b/crosperf/experiment_factory.py index ae58bbc0..0689d033 100644 --- a/crosperf/experiment_factory.py +++ b/crosperf/experiment_factory.py @@ -30,24 +30,24 @@ telemetry_perfv2_tests = ['dromaeo.domcoreattr', 'robohornet_pro', 'sunspider'] -telemetry_pagecycler_tests = ['page_cycler.intl_ar_fa_he', - 'page_cycler.intl_es_fr_pt-BR', - 'page_cycler.intl_hi_ru', - 'page_cycler.intl_ja_zh', - 'page_cycler.intl_ko_th_vi', - 'page_cycler.morejs', - 'page_cycler.moz', - 'page_cycler.netsim.top_10', - 'page_cycler.tough_layout_cases', - 'page_cycler.typical_25'] +telemetry_pagecycler_tests = ['page_cycler_v2.intl_ar_fa_he', + 'page_cycler_v2.intl_es_fr_pt-BR', + 'page_cycler_v2.intl_hi_ru', + 'page_cycler_v2.intl_ja_zh', + 'page_cycler_v2.intl_ko_th_vi', + 'page_cycler_v2.morejs', + 'page_cycler_v2.moz', + 'page_cycler_v2.netsim.top_10', + 'page_cycler_v2.tough_layout_cases', + 'page_cycler_v2.typical_25'] telemetry_toolchain_old_perf_tests = ['dromaeo.domcoremodify', - 'page_cycler.intl_es_fr_pt-BR', - 'page_cycler.intl_hi_ru', - 'page_cycler.intl_ja_zh', - 'page_cycler.intl_ko_th_vi', - 'page_cycler.netsim.top_10', - 'page_cycler.typical_25', + 'page_cycler_v2.intl_es_fr_pt-BR', + 'page_cycler_v2.intl_hi_ru', + 'page_cycler_v2.intl_ja_zh', + 'page_cycler_v2.intl_ko_th_vi', + 'page_cycler_v2.netsim.top_10', + 'page_cycler_v2.typical_25', 'robohornet_pro', 'spaceport', 'tab_switching.top_10'] @@ -57,7 +57,7 @@ telemetry_toolchain_perf_tests = ['octane', 'dromaeo.domcoreattr', 'dromaeo.domcoremodify', 'smoothness.tough_webgl_cases', - 'page_cycler.typical_25'] + 'page_cycler_v2.typical_25'] class ExperimentFactory(object): diff --git a/crosperf/experiment_files/README b/crosperf/experiment_files/README index 60073492..d9c96870 100644 --- a/crosperf/experiment_files/README +++ b/crosperf/experiment_files/README @@ -20,14 +20,15 @@ vanilla_image { build: lumpy-release/R35-5672.0.0 } -# Paste experiment benchmarks here. Example, I pasted page_cyler.morejs here. +# Paste experiment benchmarks here. Example, I pasted +# page_cycler_v2.morejs here. # This experiment just runs a short autotest which measures the performance of -# Telemetry's page_cycler.morejs. In addition, it profiles +# Telemetry's page_cycler_v2.morejs. In addition, it profiles perg_args: record -e cycles -benchmark: page_cycler.morejs { +benchmark: page_cycler_v2.morejs { suite: telemetry_Crosperf iterations: 1 } diff --git a/crosperf/experiment_files/bloat_perf.exp b/crosperf/experiment_files/bloat_perf.exp index 5fa464a0..14681778 100644 --- a/crosperf/experiment_files/bloat_perf.exp +++ b/crosperf/experiment_files/bloat_perf.exp @@ -1,5 +1,5 @@ # This experiment just runs a short telemety autotest which measures -# the performance of the page_cycler.bloat test. +# the performance of the page_cycler_v2.bloat test. # # You should replace all the placeholders, marked by angle-brackets, with the # appropriate actual values. @@ -14,7 +14,7 @@ remote: <your-remote-goes-here> perf_args: record -e cycles -benchmark: page_cycler.bloat { +benchmark: page_cycler_v2.bloat { suite: telemetry_Crosperf iterations:1 } diff --git a/crosperf/experiment_files/morejs_perf.exp b/crosperf/experiment_files/morejs_perf.exp index 79005d6b..ebc54753 100644 --- a/crosperf/experiment_files/morejs_perf.exp +++ b/crosperf/experiment_files/morejs_perf.exp @@ -1,5 +1,5 @@ # This experiment just runs a short telemety autotest which measures -# the performance of the page_cycler.morejs test. +# the performance of the page_cycler_v2.morejs test. # # You should replace all the placeholders, marked by angle-brackets, with the # appropriate actual values. @@ -14,7 +14,7 @@ remote: <your-remote-goes-here> perf_args: record -e cycles -benchmark: page_cycler.morejs { +benchmark: page_cycler_v2.morejs { suite: telemetry_Crosperf iterations: 1 } diff --git a/crosperf/experiment_files/page_cycler_perf.exp b/crosperf/experiment_files/page_cycler_perf.exp index f3f962b3..cd661737 100644 --- a/crosperf/experiment_files/page_cycler_perf.exp +++ b/crosperf/experiment_files/page_cycler_perf.exp @@ -14,27 +14,27 @@ remote: <your-remote-goes-here> perf_args: record -e cycles,instructions -benchmark: page_cycler.morejs { +benchmark: page_cycler_v2.morejs { suite: telemetry_Crosperf iterations: 10 } -benchmark: page_cycler.bloat { +benchmark: page_cycler_v2.bloat { suite: telemetry_Crosperf iterations: 10 } -benchmark: page_cycler.dhtml { +benchmark: page_cycler_v2.dhtml { suite: telemetry_Crosperf iterations: 10 } -benchmark: page_cycler.intl_ar_fa_he { +benchmark: page_cycler_v2.intl_ar_fa_he { suite: telemetry_Crosperf iterations: 10 } -benchmark: page_cycler.moz { +benchmark: page_cycler_v2.moz { suite: telemetry_Crosperf iterations: 10 } diff --git a/crosperf/experiment_files/telemetry-crosperf-with-profiler.exp b/crosperf/experiment_files/telemetry-crosperf-with-profiler.exp index 3bc39d42..4c2b88fc 100644 --- a/crosperf/experiment_files/telemetry-crosperf-with-profiler.exp +++ b/crosperf/experiment_files/telemetry-crosperf-with-profiler.exp @@ -23,7 +23,7 @@ remote: <your-remote-goes-here> # with the rest of the Crosperf results. perf_args: record -e cycles,instructions -benchmark: page_cycler.dhtml { +benchmark: page_cycler_v2.dhtml { suite: telemetry_Crosperf iterations: 1 } diff --git a/crosperf/experiment_files/telemetry_perf_perf b/crosperf/experiment_files/telemetry_perf_perf index 6e9cc67d..acdf96d0 100755 --- a/crosperf/experiment_files/telemetry_perf_perf +++ b/crosperf/experiment_files/telemetry_perf_perf @@ -28,7 +28,7 @@ function GenerateExperiment() { cat <<_EOF $perf_args -benchmark: page_cycler.typical_25 { +benchmark: page_cycler_v2.typical_25 { suite: telemetry_Crosperf } diff --git a/crosperf/help.py b/crosperf/help.py index e10035aa..61ed8ea2 100644 --- a/crosperf/help.py +++ b/crosperf/help.py @@ -52,7 +52,7 @@ name: my_experiment board: x86-alex remote: chromeos2-row1-rack4-host7.cros 172.18.122.132 -benchmark: page_cycler.morejs { +benchmark: page_cycler_v2.morejs { suite: telemetry_Crosperf iterations: 3 } @@ -73,14 +73,14 @@ device specified by it's IP address. Benchmarks will be run in parallel across these devices. There is currently no way to specify which benchmark will run on each device. -We define one "benchmark" that will be run, page_cycler.morejs. This +We define one "benchmark" that will be run, page_cycler_v2.morejs. This benchmark has two "fields", one which specifies that this benchmark is part of the telemetry_Crosperf suite (this is the common way to run most Telemetry benchmarks), and the other which specifies how many iterations it will run for. We specify one or more "labels" or images which will be compared. The -page_cycler.morejs benchmark will be run on each of these images 3 +page_cycler_v2.morejs benchmark will be run on each of these images 3 times and a result table will be output which compares them for all the images specified. diff --git a/crosperf/machine_manager_unittest.py b/crosperf/machine_manager_unittest.py index ccf2cd1e..ff97c1f1 100755 --- a/crosperf/machine_manager_unittest.py +++ b/crosperf/machine_manager_unittest.py @@ -442,8 +442,8 @@ class MachineManagerTest(unittest.TestCase): mock_logger = mock.Mock(spec=logger.Logger) - bench = Benchmark('page_cycler.netsim.top_10', # name - 'page_cycler.netsim.top_10', # test_name + bench = Benchmark('page_cycler_v2.netsim.top_10', # name + 'page_cycler_v2.netsim.top_10', # test_name '', # test_args 1, # iteratins False, # rm_chroot_tmp |