Add gpu and cc perf tests to new fyi tester

Also refactors generate_perf_json.py a bit. BUG=639530 Review-Url: https://codereview.chromium.org/2408283002 Cr-Commit-Position: refs/heads/master@{#424637}
feiyue1206 · Oct 12, 2016 · 5e8b08e · 5e8b08e
1 parent 85149a4
commit 5e8b08e
Show file tree

Hide file tree

Showing 3 changed files with 224 additions and 155 deletions.
diff --git a/testing/buildbot/chromium.perf.fyi.json b/testing/buildbot/chromium.perf.fyi.json
@@ -1,18 +1,36 @@
 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
-  "AAAAA2 See generate_perf_json.py to make changes": {},
+  "AAAAA2 See //tools/perf/generate_perf_json.py to make changes": {},
+  "Android Galaxy S5 Perf (1)": {
+    "scripts": [
+      {
+        "args": [
+          "cc_perftests"
+        ],
+        "name": "cc_perftests",
+        "script": "gtest_perf_test.py"
+      },
+      {
+        "args": [
+          "gpu_perftests"
+        ],
+        "name": "gpu_perftests",
+        "script": "gtest_perf_test.py"
+      }
+    ]
+  },
   "Win 10 Low-End Perf Tests": {
     "isolated_scripts": [
       {
         "args": [
-          "smoothness.top_25_smooth",
+          "dromaeo.cssqueryjquery",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "smoothness.top_25_smooth",
+        "name": "dromaeo.cssqueryjquery",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -31,15 +49,15 @@
       },
       {
         "args": [
-          "smoothness.top_25_smooth",
+          "dromaeo.cssqueryjquery",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=reference",
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "smoothness.top_25_smooth.reference",
+        "name": "dromaeo.cssqueryjquery.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -58,14 +76,14 @@
       },
       {
         "args": [
-          "sunspider",
+          "page_cycler_v2.intl_hi_ru",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "sunspider",
+        "name": "page_cycler_v2.intl_hi_ru",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -84,15 +102,15 @@
       },
       {
         "args": [
-          "sunspider",
+          "page_cycler_v2.intl_hi_ru",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=reference",
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "sunspider.reference",
+        "name": "page_cycler_v2.intl_hi_ru.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -111,14 +129,14 @@
       },
       {
         "args": [
-          "system_health.webview_startup",
+          "smoothness.top_25_smooth",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "system_health.webview_startup",
+        "name": "smoothness.top_25_smooth",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -137,15 +155,15 @@
       },
       {
         "args": [
-          "system_health.webview_startup",
+          "smoothness.top_25_smooth",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=reference",
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "system_health.webview_startup.reference",
+        "name": "smoothness.top_25_smooth.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -164,14 +182,14 @@
       },
       {
         "args": [
-          "page_cycler_v2.intl_hi_ru",
+          "sunspider",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "page_cycler_v2.intl_hi_ru",
+        "name": "sunspider",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -190,15 +208,15 @@
       },
       {
         "args": [
-          "page_cycler_v2.intl_hi_ru",
+          "sunspider",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=reference",
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "page_cycler_v2.intl_hi_ru.reference",
+        "name": "sunspider.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -217,14 +235,14 @@
       },
       {
         "args": [
-          "dromaeo.cssqueryjquery",
+          "system_health.webview_startup",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=release_x64"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "dromaeo.cssqueryjquery",
+        "name": "system_health.webview_startup",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],
@@ -243,15 +261,15 @@
       },
       {
         "args": [
-          "dromaeo.cssqueryjquery",
+          "system_health.webview_startup",
           "-v",
           "--upload-results",
           "--output-format=chartjson",
           "--browser=reference",
           "--output-trace-tag=_ref"
         ],
         "isolate_name": "telemetry_perf_tests",
-        "name": "dromaeo.cssqueryjquery.reference",
+        "name": "system_health.webview_startup.reference",
         "override_compile_targets": [
           "telemetry_perf_tests"
         ],

diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json
@@ -1,6 +1,6 @@
 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
-  "AAAAA2 See generate_perf_json.py to make changes": {},
+  "AAAAA2 See //tools/perf/generate_perf_json.py to make changes": {},
   "Android Galaxy S5 Perf (3)": {
     "scripts": [
       {