Specify compile targets for chromium.perf{,.fyi} in test specs.

These compile targets are currently specified in recipe configuration.

Bug: 1091004
Change-Id: Ie69bf59618152a9f0efa7e267c7ed37bf6816a5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2391511
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#806234}

testing/buildbot/chromium.perf.fyi.json

 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
   "AAAAA2 See //tools/perf/generate_perf_data to make changes": {},
+  "android-cfi-builder-perf-fyi": {
+    "additional_compile_targets": [
+      "android_tools",
+      "cc_perftests",
+      "chrome_public_apk",
+      "chromium_builder_perf",
+      "gpu_perftests",
+      "push_apps_to_background_apk",
+      "system_webview_apk",
+      "system_webview_shell_apk"
+    ]
+  },
   "android-nexus5x-perf-fyi": {
     "isolated_scripts": [
       {
@@ -145,6 +157,23 @@
       }
     ]
   },
+  "android_arm64-cfi-builder-perf-fyi": {
+    "additional_compile_targets": [
+      "android_tools",
+      "cc_perftests",
+      "chrome_public_apk",
+      "chromium_builder_perf",
+      "gpu_perftests",
+      "push_apps_to_background_apk",
+      "system_webview_apk",
+      "system_webview_shell_apk"
+    ]
+  },
+  "chromeos-kevin-builder-perf-fyi": {
+    "additional_compile_targets": [
+      "chromium_builder_perf"
+    ]
+  },
   "chromeos-kevin-perf-fyi": {
     "isolated_scripts": [
       {

testing/buildbot/chromium.perf.json

@@ -191,7 +191,16 @@
       "microdump_stackwalk",
       "angle_perftests",
       "chrome_apk",
-      "system_webview_google_apk"
+      "system_webview_google_apk",
+      "android_tools",
+      "cc_perftests",
+      "chrome_public_apk",
+      "chromium_builder_perf",
+      "dump_syms",
+      "gpu_perftests",
+      "push_apps_to_background_apk",
+      "system_webview_apk",
+      "system_webview_shell_apk"
     ],
     "isolated_scripts": [
       {
@@ -696,7 +705,16 @@
       "microdump_stackwalk",
       "angle_perftests",
       "chrome_apk",
-      "system_webview_google_apk"
+      "system_webview_google_apk",
+      "android_tools",
+      "cc_perftests",
+      "chrome_public_apk",
+      "chromium_builder_perf",
+      "gpu_perftests",
+      "push_apps_to_background_apk",
+      "system_webview_apk",
+      "system_webview_shell_apk",
+      "telemetry_weblayer_apks"
     ],
     "isolated_scripts": [
       {
@@ -910,6 +928,9 @@
     ]
   },
   "chromeos-amd64-generic-lacros-builder-perf": {
+    "additional_compile_targets": [
+      "chrome"
+    ],
     "isolated_scripts": [
       {
         "args": [],
@@ -941,7 +962,8 @@
   },
   "linux-builder-perf": {
     "additional_compile_targets": [
-      "chromedriver"
+      "chromedriver",
+      "chromium_builder_perf"
     ]
   },
   "linux-perf": {
@@ -1120,7 +1142,8 @@
   },
   "mac-builder-perf": {
     "additional_compile_targets": [
-      "chromedriver"
+      "chromedriver",
+      "chromium_builder_perf"
     ]
   },
   "win-10-perf": {
@@ -1240,12 +1263,14 @@
   },
   "win32-builder-perf": {
     "additional_compile_targets": [
-      "chromedriver"
+      "chromedriver",
+      "chromium_builder_perf"
     ]
   },
   "win64-builder-perf": {
     "additional_compile_targets": [
-      "chromedriver"
+      "chromedriver",
+      "chromium_builder_perf"
     ]
   }
 }

testing/buildbot/gn_isolate_map.pyl

@@ -102,6 +102,10 @@
     "label": "//chrome/test:android_sync_integration_tests",
     "type": "windowed_test_launcher",
   },
+  "android_tools": {
+    "label": "//tools/android:android_tools",
+    "type": "additional_compile_target",
+  },
   "android_webview_junit_tests": {
     "label": "//android_webview/test:android_webview_junit_tests",
     "type": "junit_test",
@@ -399,6 +403,10 @@
     "label": "//media/cast:cast_unittests",
     "type": "windowed_test_launcher",
   },
+  "cc_perftests": {
+    "label": "//cc:cc_perftests",
+    "type": "additional_compile_target",
+  },
   "cc_unittests": {
     "label": "//cc:cc_unittests",
     "type": "windowed_test_launcher",
@@ -1398,6 +1406,10 @@
     "label": "//chrome/browser/metrics/perf:profile_provider_unittest",
     "type": "console_test_launcher",
   },
+  "push_apps_to_background_apk": {
+    "label": "//tools/android/push_apps_to_background:push_apps_to_background_apk",
+    "type": "additional_compile_target",
+  },
   "remoting/client:client": {
     "label": "//remoting/client:client",
     "type": "additional_compile_target",
@@ -1535,6 +1547,10 @@
     "label": "//android_webview:system_webview_apk",
     "type": "additional_compile_target",
   },
+  "system_webview_shell_apk": {
+    "label": "//android_webview/tools/system_webview_shell:system_webview_shell_apk",
+    "type": "additional_compile_target",
+  },
   "system_webview_shell_layout_test_apk": {
     "args": [
       "--replace-system-package",
@@ -1611,6 +1627,10 @@
     "script": "//testing/scripts/run_telemetry_as_googletest.py",
     "type": "script",
   },
+  "telemetry_weblayer_apks": {
+    "label": "//tools/perf/chrome_telemetry_build:telemetry_weblayer_apks",
+    "type": "additional_compile_target",
+  },
   # TODO(crbug.com/1080749): Re-add this once the test is fixed and re-enabled.
   # "test_buildbucket_api_gpu_use_cases": {
   #   "label": "//content/test:test_buildbucket_api_gpu_use_cases",

tools/perf/core/perf_data_generator.py

@@ -101,6 +101,18 @@ LIGHTWEIGHT_TESTERS = [
 ]
 
 FYI_BUILDERS = {
+    'android-cfi-builder-perf-fyi': {
+        'additional_compile_targets': [
+            'android_tools',
+            'cc_perftests',
+            'chrome_public_apk',
+            'chromium_builder_perf',
+            'gpu_perftests',
+            'push_apps_to_background_apk',
+            'system_webview_apk',
+            'system_webview_shell_apk',
+        ],
+    },
     'android-nexus5x-perf-fyi': {
         'tests': [{
             'isolate':
@@ -145,8 +157,7 @@ FYI_BUILDERS = {
         'tests': [{
             'isolate': 'performance_test_suite',
         }],
-        'platform':
-        'android-chrome-bundle',
+        'platform': 'android-chrome-bundle',
         'dimension': {
             'pool': 'chrome.tests.perf-fyi',
             'os': 'Android',
@@ -155,6 +166,18 @@ FYI_BUILDERS = {
             'device_os_flavor': 'google',
         },
     },
+    'android_arm64-cfi-builder-perf-fyi': {
+        'additional_compile_targets': [
+            'android_tools',
+            'cc_perftests',
+            'chrome_public_apk',
+            'chromium_builder_perf',
+            'gpu_perftests',
+            'push_apps_to_background_apk',
+            'system_webview_apk',
+            'system_webview_shell_apk',
+        ],
+    },
     'linux-perf-fyi': {
         'tests': [{
             'isolate':
@@ -197,6 +220,9 @@ FYI_BUILDERS = {
             'os': 'Windows-10',
         },
     },
+    'chromeos-kevin-builder-perf-fyi': {
+        'additional_compile_targets': ['chromium_builder_perf'],
+    },
     'chromeos-kevin-perf-fyi': {
         'tests': [
             {
@@ -241,8 +267,19 @@ FYI_BUILDERS = {
 BUILDERS = {
     'android-builder-perf': {
         'additional_compile_targets': [
-            'microdump_stackwalk', 'angle_perftests', 'chrome_apk',
-            'system_webview_google_apk'
+            'microdump_stackwalk',
+            'angle_perftests',
+            'chrome_apk',
+            'system_webview_google_apk',
+            'android_tools',
+            'cc_perftests',
+            'chrome_public_apk',
+            'chromium_builder_perf',
+            'dump_syms',
+            'gpu_perftests',
+            'push_apps_to_background_apk',
+            'system_webview_apk',
+            'system_webview_shell_apk',
         ],
         'tests': [
             {
@@ -291,8 +328,19 @@ BUILDERS = {
     },
     'android_arm64-builder-perf': {
         'additional_compile_targets': [
-            'microdump_stackwalk', 'angle_perftests', 'chrome_apk',
-            'system_webview_google_apk'
+            'microdump_stackwalk',
+            'angle_perftests',
+            'chrome_apk',
+            'system_webview_google_apk',
+            'android_tools',
+            'cc_perftests',
+            'chrome_public_apk',
+            'chromium_builder_perf',
+            'gpu_perftests',
+            'push_apps_to_background_apk',
+            'system_webview_apk',
+            'system_webview_shell_apk',
+            'telemetry_weblayer_apks',
         ],
         'tests': [
             {
@@ -345,16 +393,16 @@ BUILDERS = {
         False,
     },
     'linux-builder-perf': {
-        'additional_compile_targets': ['chromedriver'],
+        'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
     },
     'mac-builder-perf': {
-        'additional_compile_targets': ['chromedriver'],
+        'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
     },
     'win32-builder-perf': {
-        'additional_compile_targets': ['chromedriver'],
+        'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
     },
     'win64-builder-perf': {
-        'additional_compile_targets': ['chromedriver'],
+        'additional_compile_targets': ['chromedriver', 'chromium_builder_perf'],
     },
     'android-go-perf': {
         'tests': [{
@@ -466,9 +514,10 @@ BUILDERS = {
                 '--experimental-tbmv3-metrics',
             ],
         }],
-        'platform': 'android-chrome',
+        'platform':
+        'android-chrome',
         'dimension': {
-            'pool': 'chrome.tests.pinpoint', # Sharing Pinpoint pool
+            'pool': 'chrome.tests.pinpoint',  # Sharing Pinpoint pool
             'os': 'Android',
             'device_type': 'sunfish',
             'device_os': 'QD4A.200102.001.A1',
@@ -655,6 +704,7 @@ BUILDERS = {
         'perf_processor': True,
     },
     'chromeos-amd64-generic-lacros-builder-perf': {
+        'additional_compile_targets': ['chrome'],
         'tests': [
             {
                 'name': 'resource_sizes_lacros_chrome',
@@ -667,7 +717,8 @@ BUILDERS = {
             'os': 'Ubuntu-16.04',
             'pool': 'chrome.tests',
         },
-        'perf_trigger': False,
+        'perf_trigger':
+        False,
     }
 }