Adding two perf tests on fyi bots using custom trigger logic.

In essence re-landing crrev.com/734990 after crrev.com/868031 is landed to continue troubleshooting swarming trigger logic. Bug: 757933 Change-Id: I202a4869a208644bd9832a136cf7a527894fb6c5 Reviewed-on: https://chromium-review.googlesource.com/814595 Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: John Budorick <jbudorick@chromium.org> Commit-Queue: Emily Hanley <eyaich@chromium.org> Cr-Commit-Position: refs/heads/master@{#529827}
marcosholgado · Jan 17, 2018 · edab9e5 · edab9e5
1 parent 669cfa8
commit edab9e5
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 19 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -1034,6 +1034,7 @@ group("chromium_builder_perf") {
     data_deps = [
       "//cc:cc_perftests",
       "//chrome/test:load_library_perf_tests",
+      "//chrome/test:performance_test_suite",
       "//chrome/test:telemetry_perf_tests",
       "//components/tracing:tracing_perftests",
       "//gpu:command_buffer_perftests",

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -2042,9 +2042,6 @@ group("telemetry_perf_unittests") {
 
     # For smoke testing run_telemetry_benchmark_as_googletest
     "//testing/scripts/run_telemetry_benchmark_as_googletest.py",
-
-    # For smoke testing run_multiple_telemetry_benchmarks_as_googletest
-    "//testing/scripts/run_multiple_telemetry_benchmarks_as_googletest.py",
   ]
 
   if (enable_mus) {
@@ -2069,29 +2066,27 @@ group("telemetry_perf_tests") {
   ]
 }
 
-# Difference between this and telemetry_perf_tests is that this runs a devil
-# script before the build, to remove the system webview. See
-# //testing/buildbot/gn_isolate_map.pyl
-group("telemetry_perf_webview_tests") {
+# New target that will replace telemetry_perf_tests when testing
+# is done.
+group("performance_test_suite") {
   testonly = true
   deps = [
     "//chrome/test:telemetry_perf_tests",
   ]
+
+  data = [
+    "//testing/scripts/run_performance_tests.py",
+  ]
 }
 
-# New target for new script we're using to execute perf tests. Will replace the
-# current version, once testing has been done. See
-# //testing/buildbot/gn_isolate_map.pyl for differences.
-group("telemetry_perf_tests_new") {
+# Difference between this and telemetry_perf_tests is that this runs a devil
+# script before the build, to remove the system webview. See
+# //testing/buildbot/gn_isolate_map.pyl
+group("telemetry_perf_webview_tests") {
   testonly = true
   deps = [
     "//chrome/test:telemetry_perf_tests",
   ]
-
-  data = [
-    # Needed for isolate script to execute.
-    "//testing/scripts/run_multiple_telemetry_benchmarks_as_googletest.py",
-  ]
 }
 
 group("angle_perftests") {

diff --git a/testing/buildbot/chromium.perf.fyi.json b/testing/buildbot/chromium.perf.fyi.json
@@ -471,6 +471,45 @@
           "ignore_task_failure": false,
           "io_timeout": 3600
         }
+      },
+      {
+        "args": [
+          "-v",
+          "--output-format=histograms",
+          "--output-format=json-test-results",
+          "--xvfb",
+          "--browser=release"
+        ],
+        "isolate_name": "performance_test_suite",
+        "merge": {
+          "args": [],
+          "script": "//tools/perf/upload_perf_results.py"
+        },
+        "name": "performance_test_suite",
+        "override_compile_targets": [
+          "peformance_test_suite"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "pool": "Chrome-perf-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 10800,
+          "ignore_task_failure": false,
+          "io_timeout": 3600
+        },
+        "trigger_script": {
+          "args": [
+            "--bot-id",
+            "swarm846-c4",
+            "--bot-id",
+            "swarm847-c4"
+          ],
+          "script": "//tools/perf/perf_device_trigger.py"
+        }
       }
     ]
   },

diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
@@ -978,6 +978,14 @@
       "../../tools/perf/run_benchmark",
     ],
   },
+  "performance_test_suite": {
+    "label": "//chrome/test:performance_test_suite",
+    "type": "script",
+    "script": "//testing/scripts/run_performance_tests.py",
+    "args": [
+      "../../tools/perf/run_benchmark",
+    ],
+  },
   "telemetry_perf_webview_tests": {
     "label": "//chrome/test:telemetry_perf_webview_tests",
     "type": "script",

diff --git a/testing/scripts/OWNERS b/testing/scripts/OWNERS
@@ -13,6 +13,5 @@ per-file run_gpu*=nednguyen@google.com
 per-file run_telemetry*=kbr@chromium.org
 per-file run_telemetry*=nednguyen@google.com
 per-file run_telemetry*=eyaich@chromium.org
-per-file run_multiple_telemetry*=martiniss@chromium.org
-per-file run_multiple_telemetry*=eyaich@chromium.org
+per-file run_performance_tests*=eyaich@chromium.org
 per-file run_gtest*=eyaich@chromium.org
diff --git a/...ple_telemetry_benchmarks_as_googletest.py → testing/scripts/run_performance_tests.py b/...ple_telemetry_benchmarks_as_googletest.py → testing/scripts/run_performance_tests.py
@@ -56,7 +56,7 @@
 def sharding_map_path():
   return os.path.join(
       os.path.dirname(__file__), '..', '..', 'tools', 'perf', 'core',
-      'benchmark_sharding_map.json')
+      'benchmark_bot_map.json')
 
 def main():
   parser = argparse.ArgumentParser()

diff --git a/tools/perf/chromium.perf.fyi.extras.json b/tools/perf/chromium.perf.fyi.extras.json
@@ -340,6 +340,44 @@
           "ignore_task_failure": false,
           "io_timeout": 3600
         }
+      },
+      {
+        "args": [
+          "-v",
+          "--output-format=histograms",
+          "--output-format=json-test-results",
+          "--xvfb",
+          "--browser=release"
+        ],
+        "isolate_name": "performance_test_suite",
+        "name": "performance_test_suite",
+        "override_compile_targets": [
+          "peformance_test_suite"
+        ],
+        "merge": {
+          "args": [
+          ],
+          "script": "//tools/perf/upload_perf_results.py"
+        },
+        "trigger_script": {
+          "args": [
+	    "--bot-id", "swarm846-c4",
+	    "--bot-id", "swarm847-c4"
+          ],
+          "script": "//tools/perf/perf_device_trigger.py"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "pool": "Chrome-perf-fyi"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 10800,
+          "ignore_task_failure": false,
+          "io_timeout": 3600
+        }
       }
     ]
   },

diff --git a/tools/perf/core/benchmark_bot_map.json b/tools/perf/core/benchmark_bot_map.json
@@ -0,0 +1,12 @@
+{
+  "swarm846-c4": {
+    "benchmarks": [
+      "dummy_benchmark.stable_benchmark_1"
+    ]
+  },
+  "swarm847-c4": {
+    "benchmarks": [
+      "dummy_benchmark.histogram_benchmark_1"
+    ]
+  }
+}