Add Jetstream2 to certain perf builers

win-10-perf, linux-perf, mac-10_13_laptop_high_end-perf, and android-pixel2-perf

Commands used to update/generate the data are:
src/tools/perf/generate_perf_data
src/tools/perf/generate_perf_sharding update \
  -b win-10-perf \
  -b linux-perf \
  -b mac-10_13_laptop_high_end-perf \
  -b android-pixel2-perf

Bug: 954861
Change-Id: Ia22c8b5b07d61b1eed186f21c5ad85d522f7fedc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1756090
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: Michael Hablich <hablich@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688696}

tools/perf/benchmark.csv

 AUTOGENERATED FILE DO NOT EDIT
 See https://bit.ly/update-benchmarks-info to make changes
 Benchmark name,Individual owners,Component,Documentation,Tags
-UNSCHEDULED_jetstream2,"hablich@chromium.org, tcwang@chromium.org",Blink>JavaScript,https://browserbench.org/JetStream/in-depth.html,
 angle_perftests,"jmadill@chromium.org, chrome-gpu-perf-owners@chromium.org",Internals>GPU>ANGLE,,
 base_perftests,"skyostil@chromium.org, gab@chromium.org",Internals>SequenceManager,https://chromium.googlesource.com/chromium/src/+/HEAD/base/README.md#performance-testing,
 blink_perf.accessibility,dmazzoni@chromium.org,Blink>Accessibility,https://bit.ly/blink-perf-benchmarks,
@@ -24,6 +23,7 @@ dummy_benchmark.noisy_benchmark_1,crouleau@chromium.org,Speed>Telemetry,,
 dummy_benchmark.stable_benchmark_1,crouleau@chromium.org,Speed>Telemetry,,
 gpu_perftests,"reveman@chromium.org, chrome-gpu-perf-owners@chromium.org",Internals>GPU,,
 jetstream,hablich@chromium.org,Blink>JavaScript,,
+jetstream2,"hablich@chromium.org, tcwang@chromium.org",Blink>JavaScript,https://browserbench.org/JetStream/in-depth.html,
 kraken,hablich@chromium.org,Blink>JavaScript,,
 load_library_perf_tests,"xhwang@chromium.org, crouleau@chromium.org",Internals>Media>Encrypted,,
 loading.desktop,"kouhei@chromium.org, ksakamoto@chromium.org",Blink>Loader,https://bit.ly/loading-benchmarks,"cache_temperature_cold,cache_temperature_warm,international,intl_ar_fa_he,intl_es_fr_pt_BR,intl_hi_ru,intl_ja_zh,intl_ko_th_vi,typical"

tools/perf/benchmarks/jetstream2.py

@@ -38,7 +38,7 @@ class Jetstream2(press._PressBenchmark): # pylint: disable=protected-access
   """
   @classmethod
   def Name(cls):
-    return 'UNSCHEDULED_jetstream2'
+    return 'jetstream2'
 
   def CreateStorySet(self, options):
     return page_sets.Jetstream2StorySet()

tools/perf/core/bot_platforms.py

@@ -95,17 +95,23 @@ class PerfPlatform(object):
 OFFICIAL_BENCHMARK_NAMES = frozenset(
     b.Name() for b in OFFICIAL_BENCHMARKS)
 _DL_BENCHMARK_NAMES = frozenset(['blink_perf.display_locking'])
+_JETSTREAM2 = frozenset(['jetstream2'])
+
 _OFFICIAL_EXCEPT_DISPLAY_LOCKING = (
     OFFICIAL_BENCHMARK_NAMES - _DL_BENCHMARK_NAMES)
+_OFFICIAL_EXCEPT_JETSTREAM2 = (
+    OFFICIAL_BENCHMARK_NAMES - _JETSTREAM2)
+_OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2 = (
+    OFFICIAL_BENCHMARK_NAMES - _DL_BENCHMARK_NAMES - _JETSTREAM2)
 
 _LINUX_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
 _MAC_HIGH_END_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
-_MAC_LOW_END_BENCHMARK_NAMES = OFFICIAL_BENCHMARK_NAMES
+_MAC_LOW_END_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_JETSTREAM2
 _WIN_10_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
 _WIN_10_LOW_END_HP_CANDIDATE_BENCHMARK_NAMES = frozenset([
     'v8.browsing_desktop'])
-_WIN_7_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
-_WIN_7_GPU_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
+_WIN_7_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2
+_WIN_7_GPU_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2
 _ANDROID_GO_BENCHMARK_NAMES = frozenset([
     'system_health.memory_mobile',
     'system_health.common_mobile',
@@ -115,12 +121,15 @@ _ANDROID_GO_BENCHMARK_NAMES = frozenset([
     'speedometer',
     'speedometer2'])
 _ANDROID_GO_WEBVIEW_BENCHMARK_NAMES = _ANDROID_GO_BENCHMARK_NAMES
-_ANDROID_NEXUS_5_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
-_ANDROID_NEXUS_5X_BENCHMARK_NAMES = OFFICIAL_BENCHMARK_NAMES
-_ANDROID_NEXUS_5X_WEBVIEW_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
-_ANDROID_NEXUS_6_WEBVIEW_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
+_ANDROID_NEXUS_5_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2
+_ANDROID_NEXUS_5X_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_JETSTREAM2
+_ANDROID_NEXUS_5X_WEBVIEW_BENCHMARK_NAMES = (
+    _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2)
+_ANDROID_NEXUS_6_WEBVIEW_BENCHMARK_NAMES = (
+    _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2)
 _ANDROID_PIXEL2_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
-_ANDROID_PIXEL2_WEBVIEW_BENCHMARK_NAMES = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
+_ANDROID_PIXEL2_WEBVIEW_BENCHMARK_NAMES = (
+    _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2)
 _ANDROID_NEXUS5X_FYI_BENCHMARK_NAMES = frozenset([
     'heap_profiling.mobile.disabled',
     'heap_profiling.mobile.native',