Add Win10 FYI x64 Release (Intel UHD 630)

Adds "Win10 FYI x64 Release (Intel UHD 630)" to chromium.gpu.fyi, which
is identical to "Win10 FYI x64 Release (Intel HD 630)" except that it
triggers tests on a machine with a newer GPU.

Bug: 986939
Change-Id: Ia7408cad7b862738d7562f954cf213e2bd9355c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1734166
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Auto-Submit: Brian Sheedy <bsheedy@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684067}

infra/config/cr-buildbucket.cfg

@@ -2311,6 +2311,10 @@ buckets {
       name: "Win10 FYI x64 Release (Intel HD 630)"
       mixins: "linux-gpu-fyi-ci-tester"
     }
+    builders {
+      name: "Win10 FYI x64 Release (Intel UHD 630)"
+      mixins: "linux-gpu-fyi-ci-tester"
+    }
     builders {
       name: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
       mixins: "linux-gpu-fyi-ci-tester"

infra/config/luci-milo.cfg

@@ -3211,6 +3211,11 @@ consoles {
     category: "Windows|10|x64|Intel"
     short_name: "rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (Intel UHD 630)"
+    category: "Windows|10|x64|Intel"
+    short_name: "uhd"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (NVIDIA)"
     category: "Windows|10|x64|Nvidia"

infra/config/luci-scheduler.cfg

@@ -2678,6 +2678,17 @@ job {
   }
 }
 
+job {
+  id: "Win10 FYI x64 Release (Intel UHD 630)"
+  # Triggered by "GPU FYI Win x64 Builder"
+  acl_sets: "triggered-by-parent-builders"
+  buildbucket: {
+    server: "cr-buildbucket.appspot.com"
+    bucket: "luci.chromium.ci"
+    builder: "Win10 FYI x64 Release (Intel UHD 630)"
+  }
+}
+
 job {
   id: "Win10 FYI x64 dEQP Release (Intel HD 630)"
   # Triggered by "GPU FYI Win x64 dEQP Builder"

testing/buildbot/generate_buildbot_json.py

@@ -673,6 +673,8 @@ class BBJSONGenerator(object):
         gpu = ['10de', '1cb3']
       elif gpu.startswith('intel-hd-630'):
         gpu = ['8086', '5912']
+      elif gpu.startswith('intel-uhd-630'):
+        gpu = ['8086', '3e92']
       else:
         gpu = gpu.split('-')[0].split(':')
       substitutions['gpu_vendor_id'] = gpu[0]

testing/buildbot/generate_buildbot_json_unittest.py

@@ -391,6 +391,30 @@ INTEL_GPU_TELEMETRY_TEST_WATERFALL = """\
 ]
 """
 
+INTEL_UHD_GPU_TELEMETRY_TEST_WATERFALL = """\
+[
+  {
+    'name': 'chromium.test',
+    'machines': {
+      'Fake Tester': {
+        'os_type': 'win',
+        'browser_config': 'release',
+        'swarming': {
+          'dimension_sets': [
+            {
+              'gpu': 'intel-uhd-630-win10-stable',
+            },
+          ],
+        },
+        'test_suites': {
+          'gpu_telemetry_tests': 'composition_tests',
+        },
+      },
+    },
+  },
+]
+"""
+
 UNKNOWN_TEST_SUITE_WATERFALL = """\
 [
   {
@@ -1455,6 +1479,47 @@ INTEL_GPU_TELEMETRY_TEST_OUTPUT = """\
 }
 """
 
+INTEL_UHD_GPU_TELEMETRY_TEST_OUTPUT = """\
+{
+  "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
+  "AAAAA2 See generate_buildbot_json.py to make changes": {},
+  "Fake Tester": {
+    "isolated_scripts": [
+      {
+        "args": [
+          "foo",
+          "--show-stdout",
+          "--browser=release",
+          "--passthrough",
+          "-v",
+          "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
+          "--gpu-vendor-id",
+          "8086",
+          "--gpu-device-id",
+          "3e92"
+        ],
+        "isolate_name": "telemetry_gpu_integration_test",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "foo_tests",
+        "should_retry_with_patch": false,
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "gpu": "intel-uhd-630-win10-stable"
+            }
+          ],
+          "idempotent": false
+        }
+      }
+    ]
+  }
+}
+"""
+
 ANDROID_WATERFALL_OUTPUT = """\
 {
   "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
@@ -2231,6 +2296,16 @@ class UnitTest(unittest.TestCase):
     fbb.check_output_file_consistency(verbose=True)
     self.assertFalse(fbb.printed_lines)
 
+  def test_intel_uhd_gpu_telemetry_tests(self):
+    fbb = FakeBBGen(INTEL_UHD_GPU_TELEMETRY_TEST_WATERFALL,
+                    COMPOSITION_SUITE_WITH_GPU_ARGS,
+                    NO_BAR_TEST_EXCEPTIONS,
+                    EMPTY_PYL_FILE,
+                    LUCI_MILO_CFG)
+    fbb.files['chromium.test.json'] = INTEL_UHD_GPU_TELEMETRY_TEST_OUTPUT
+    fbb.check_output_file_consistency(verbose=True)
+    self.assertFalse(fbb.printed_lines)
+
   def test_instrumentation_tests_with_different_names(self):
     fbb = FakeBBGen(FOO_INSTRUMENTATION_TEST_WATERFALL,
                     INSTRUMENTATION_TESTS_WITH_DIFFERENT_NAMES,

testing/buildbot/mixins.pyl

@@ -591,6 +591,16 @@
       },
     },
   },
+  'win10_intel_uhd_630_stable': {
+    'swarming': {
+      'dimensions': {
+        # Defined in bot_config.py in internal infradata/config workspace
+        'gpu': 'intel-uhd-630-win10-stable',
+        'os': 'Windows-10',
+        'pool': 'Chrome-GPU',
+      },
+    },
+  },
   'win10_nvidia_geforce_gtx_1660': {
     'swarming': {
       'dimensions': {

testing/buildbot/test_suite_exceptions.pyl

@@ -1617,6 +1617,7 @@
       'ANGLE GPU Win10 x64 Release (Intel HD 630)',
       'Optional Win10 x64 Release (Intel HD 630)',
       'Win10 FYI x64 Release (Intel HD 630)',
+      'Win10 FYI x64 Release (Intel UHD 630)',
       'Win10 FYI x64 Exp Release (Intel HD 630)',
     ],
   },

testing/buildbot/waterfalls.pyl

@@ -3034,6 +3034,18 @@
           'gpu_telemetry_tests': 'gpu_fyi_win_intel_release_telemetry_tests',
         },
       },
+      'Win10 FYI x64 Release (Intel UHD 630)': {
+        'os_type': 'win',
+        'browser_config': 'release_x64',
+        'mixins': [
+          'win10_intel_uhd_630_stable',
+        ],
+        'test_suites': {
+          'gtest_tests': 'gpu_fyi_win_gtests',
+          'isolated_scripts': 'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts',
+          'gpu_telemetry_tests': 'gpu_fyi_win_intel_release_telemetry_tests',
+        },
+      },
       'Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)': {
         # This bot currently only has one piece of hardware behind it,
         # and is being qualified for potential scale-out.