//tools/perf: Add compile target to linux builder

Also creates cleaner way to add additional compile targets to builders.

NOTRY=true # win chromium rel ng seems flaky

Bug: 758630
Change-Id: I03f2b599d8f953f21d3a6d0e57d8db90d8d13999
Reviewed-on: https://chromium-review.googlesource.com/691065
Commit-Queue: Stephen Martinis <martiniss@chromium.org>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#505251}

testing/buildbot/chromium.perf.json

@@ -29834,6 +29834,11 @@
       "microdump_stackwalk"
     ]
   },
+  "Linux Builder": {
+    "additional_compile_targets": [
+      "telemetry_perf_tests_new"
+    ]
+  },
   "Linux Perf": {
     "isolated_scripts": [
       {

tools/perf/core/perf_data_generator.py

@@ -122,17 +122,21 @@ def get_fyi_waterfall_config():
   return waterfall
 
 
+# Additional compile targets to add to builders.
+BUILDER_ADDITIONAL_COMPILE_TARGETS = {
+    'Android Compile': ['microdump_stackwalk'],
+    'Android arm64 Compile': ['microdump_stackwalk'],
+    # crbug.com/758630. Test builder, will be removed.
+    'Linux Builder': ['telemetry_perf_tests_new'],
+}
+
+
 def get_waterfall_config():
   waterfall = {'builders':{}, 'testers': {}}
 
-  waterfall = add_builder(
-      waterfall, 'Android Compile', additional_compile_targets=[
-          'microdump_stackwalk'
-      ])
-  waterfall = add_builder(
-      waterfall, 'Android arm64 Compile', additional_compile_targets=[
-          'microdump_stackwalk'
-      ])
+  for builder, targets in BUILDER_ADDITIONAL_COMPILE_TARGETS.items():
+    waterfall = add_builder(
+        waterfall, builder, additional_compile_targets=targets)
 
   # These configurations are taken from chromium_perf.py in
   # build/scripts/slave/recipe_modules/chromium_tests and must be kept in sync
@@ -1049,9 +1053,8 @@ def verify_all_tests_in_benchmark_csv(tests, benchmark_metadata):
     elif 'scripts' in tests[t]:
       scripts = tests[t]['scripts']
     else:
-      assert('Android Compile' == t
-        or 'Android arm64 Compile' == t
-        or t.startswith('AAAAA')), 'Unknown test data %s' % t
+      assert(t in BUILDER_ADDITIONAL_COMPILE_TARGETS
+             or t.startswith('AAAAA')), 'Unknown test data %s' % t
     for s in scripts:
       name = s['name']
       name = re.sub('\\.reference$', '', name)