Synced repos to: 63271

5 files changed, 7 insertions, 10 deletions

diff --git a/crosperf/experiment_files/aes_perf b/crosperf/experiment_files/aes_perf
index b298e91c..0c54ccbd 100644
--- a/crosperf/experiment_files/aes_perf
+++ b/crosperf/experiment_files/aes_perf
@@ -1,8 +1,7 @@
 # This experiment just runs a short autotest which measures the performance of
 # aes encryption. In addition, it profiles
 
-profile_type: record
-profile_counters: instructions cycles
+profile_args: record -e cycles -e instructions
 
 benchmark: platform_AesThroughput {
 }
diff --git a/crosperf/experiment_files/bloat_perf b/crosperf/experiment_files/bloat_perf
index a95d2cbf..f8258ee1 100644
--- a/crosperf/experiment_files/bloat_perf
+++ b/crosperf/experiment_files/bloat_perf
@@ -1,5 +1,4 @@
-profile_type: record
-profile_counters: cycles instructions
+perf_args: record -e cycles
 
 benchmark: bloat {
 	autotest_name: desktopui_PyAutoPerfTests
diff --git a/crosperf/experiment_files/morejs_perf b/crosperf/experiment_files/morejs_perf
index d7ab45bb..a02f15f5 100644
--- a/crosperf/experiment_files/morejs_perf
+++ b/crosperf/experiment_files/morejs_perf
@@ -1,5 +1,4 @@
-profile_type: record
-profile_counters: cycles instructions
+perf_args: record -e cycles
 
 benchmark: morejs {
 	autotest_name: desktopui_PyAutoPerfTests
diff --git a/crosperf/experiment_files/page_cycler_perf b/crosperf/experiment_files/page_cycler_perf
index 866fb751..7f5e7118 100644
--- a/crosperf/experiment_files/page_cycler_perf
+++ b/crosperf/experiment_files/page_cycler_perf
@@ -1,7 +1,6 @@
 # This experiment profiles all page cyclers.
 
-profile_type: record
-profile_counters: cycles
+perf_args: record -e cycles
 
 benchmark: morejs {
 	autotest_name: desktopui_PyAutoPerfTests
diff --git a/crosperf/experiment_files/toolchain b/crosperf/experiment_files/toolchain
index c6790505..9156998b 100644
--- a/crosperf/experiment_files/toolchain
+++ b/crosperf/experiment_files/toolchain
@@ -5,11 +5,12 @@ benchmark: bvt {
 }
 
 benchmark: suite_Smoke {
-  auotest_name: suite:smoke
+  autotest_name: suite:smoke
 }
 
 benchmark: PyAutoPerfTests {
 }
 
-benchmark: AndroidBench {
+benchmark: BootPerfServer {
+  autotest_name: ^server/site_tests/platform_BootPerfServer/control$
 }