Synced repos to: 60708

11 files changed, 113 insertions, 7 deletions

diff --git a/crosperf/benchmark_run.py b/crosperf/benchmark_run.py
index 9b50bac6..c20b24e0 100644
--- a/crosperf/benchmark_run.py
+++ b/crosperf/benchmark_run.py
@@ -12,7 +12,6 @@ from results_cache import Result
 from utils import logger
 from utils import command_executer
 from autotest_runner import AutotestRunner
-from perf_processor import PerfProcessor
 from results_cache import ResultsCache
 
 
@@ -51,13 +50,11 @@ class BenchmarkRun(threading.Thread):
     self.machine_manager = machine_manager
     self.cache = ResultsCache()
     self.autotest_runner = AutotestRunner(self._logger)
-    self.perf_processor = None
     self.machine = None
     self.full_name = self.autotest_name
     self.cache_conditions = cache_conditions
     self.runs_complete = 0
     self.cache_hit = False
-    self.perf_results = None
     self.failure_reason = ""
     self.autotest_args = "%s %s" % (autotest_args, self._GetExtraAutotestArgs())
     self._ce = command_executer.GetCommandExecuter(self._logger)
diff --git a/crosperf/benchmark_run_unittest.py b/crosperf/benchmark_run_unittest.py
index a449a33b..c4c3fdf1 100755
--- a/crosperf/benchmark_run_unittest.py
+++ b/crosperf/benchmark_run_unittest.py
@@ -8,7 +8,6 @@ import unittest
 from autotest_runner import MockAutotestRunner
 from benchmark_run import BenchmarkRun
 from machine_manager import MockMachineManager
-from perf_processor import MockPerfProcessor
 from results_cache import MockResultsCache
 from utils import logger
 
@@ -33,7 +32,6 @@ class BenchmarkRunTest(unittest.TestCase):
                      m,
                      MockResultsCache(),
                      MockAutotestRunner(),
-                     MockPerfProcessor(),
                      logger.GetLogger())
     b.start()
 
diff --git a/crosperf/experiment.py b/crosperf/experiment.py
index 8ac1a700..3f68f8be 100644
--- a/crosperf/experiment.py
+++ b/crosperf/experiment.py
@@ -7,7 +7,6 @@ import time
 from autotest_runner import AutotestRunner
 from benchmark_run import BenchmarkRun
 from machine_manager import MachineManager
-from perf_processor import PerfProcessor
 from results_cache import ResultsCache
 from results_report import HTMLResultsReport
 from utils import logger
diff --git a/crosperf/experiment_files/README b/crosperf/experiment_files/README
new file mode 100644
index 00000000..5c0e3d41
--- /dev/null
+++ b/crosperf/experiment_files/README
@@ -0,0 +1,26 @@
+To use these experiment files, add board, remote and images and run crosperf
+on them.
+
+Further information about crosperf:
+https://sites.google.com/a/google.com/compiler-chromeos-workflows/crosperf
+
+The final experiment file should look something like the following:
+
+board: <board>
+remote: <ip address or machine name>
+
+# Add images you want to test:
+label: myimage {
+  chromeos_image: <path to image>
+}
+
+# Paste experiment benchmarks here. Example, I pasted aes_perf here.
+
+# 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
+
+benchmark: platform_AesThroughput {
+}
diff --git a/crosperf/experiment_files/aes_perf b/crosperf/experiment_files/aes_perf
new file mode 100644
index 00000000..b298e91c
--- /dev/null
+++ b/crosperf/experiment_files/aes_perf
@@ -0,0 +1,8 @@
+# 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
+
+benchmark: platform_AesThroughput {
+}
diff --git a/crosperf/experiment_files/bloat_perf b/crosperf/experiment_files/bloat_perf
new file mode 100644
index 00000000..a95d2cbf
--- /dev/null
+++ b/crosperf/experiment_files/bloat_perf
@@ -0,0 +1,7 @@
+profile_type: record
+profile_counters: cycles instructions
+
+benchmark: bloat {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=1 perf.PageCyclerTest.testBloatFile'
+}
diff --git a/crosperf/experiment_files/morejs_perf b/crosperf/experiment_files/morejs_perf
new file mode 100644
index 00000000..d7ab45bb
--- /dev/null
+++ b/crosperf/experiment_files/morejs_perf
@@ -0,0 +1,7 @@
+profile_type: record
+profile_counters: cycles instructions
+
+benchmark: morejs {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=1 perf.PageCyclerTest.testMoreJSFile'
+}
diff --git a/crosperf/experiment_files/page_cycler b/crosperf/experiment_files/page_cycler
new file mode 100644
index 00000000..ada9ed67
--- /dev/null
+++ b/crosperf/experiment_files/page_cycler
@@ -0,0 +1,6 @@
+# This experiment runs page cycler tests.
+
+benchmark: AllPageCyclers {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='perf.PageCyclerTest'
+}
diff --git a/crosperf/experiment_files/page_cycler_perf b/crosperf/experiment_files/page_cycler_perf
new file mode 100644
index 00000000..866fb751
--- /dev/null
+++ b/crosperf/experiment_files/page_cycler_perf
@@ -0,0 +1,44 @@
+# This experiment profiles all page cyclers.
+
+profile_type: record
+profile_counters: cycles
+
+benchmark: morejs {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=10 perf.PageCyclerTest.testMoreJSFile'
+}
+
+benchmark: alexa {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=10 perf.PageCyclerTest.testAlexaFile'
+}
+
+benchmark: bloat {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=10 perf.PageCyclerTest.testBloatFile'
+}
+
+benchmark: dhtml {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=10 perf.PageCyclerTest.testDHTMLFile'
+}
+
+benchmark: intl1 {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=10 perf.PageCyclerTest.testIntl1File'
+}
+
+benchmark: intl2 {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=10 perf.PageCyclerTest.testIntl2File'
+}
+
+benchmark: moz {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=10 perf.PageCyclerTest.testMozFile'
+}
+
+benchmark: moz2 {
+	autotest_name: desktopui_PyAutoPerfTests
+	autotest_args: --args='--iterations=10 perf.PageCyclerTest.testMoz2File'
+}
diff --git a/crosperf/experiment_files/toolchain b/crosperf/experiment_files/toolchain
new file mode 100644
index 00000000..c6790505
--- /dev/null
+++ b/crosperf/experiment_files/toolchain
@@ -0,0 +1,15 @@
+# Use this experiment whenever the toolchain is upgraded.
+
+benchmark: bvt {
+  autotest_name: suite:bvt
+}
+
+benchmark: suite_Smoke {
+  auotest_name: suite:smoke
+}
+
+benchmark: PyAutoPerfTests {
+}
+
+benchmark: AndroidBench {
+}
diff --git a/crosperf/results_cache.py b/crosperf/results_cache.py
index 4c25321f..6e222c06 100644
--- a/crosperf/results_cache.py
+++ b/crosperf/results_cache.py
@@ -11,7 +11,6 @@ import re
 import tempfile
 
 from image_checksummer import ImageChecksummer
-from perf_processor import PerfProcessor
 from utils import command_executer
 from utils import logger
 from utils import misc