Switch Win10 GPU.FYI experimental and one-off bots to 64-bit

Start running tests on Win10 x64 Intel experimental bot.

TBR=kbr

Bug: 988833
Change-Id: Iadea428fd44ec07477c574d06d1cd8dc7d52890f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1726758Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682536}

infra/config/cr-buildbucket.cfg

@@ -2292,37 +2292,37 @@ buckets {
       mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
-      name: "Win10 FYI Exp Release (NVIDIA)"
+      name: "Win10 FYI Release (Intel HD 630)"
       mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
-      name: "Win10 FYI Release (Intel HD 630)"
+      name: "Win10 FYI dEQP Release (Intel HD 630)"
       mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
-      name: "Win10 FYI dEQP Release (Intel HD 630)"
+      name: "Win10 FYI Release (NVIDIA)"
       mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
-      name: "Win10 FYI Exp Release (Intel HD 630)"
+      name: "Win10 FYI Release XR Perf (NVIDIA)"
       mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
-      name: "Win10 FYI Release (NVIDIA)"
+      name: "Win10 FYI x64 Exp Release (Intel HD 630)"
       mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
-      name: "Win10 FYI Release (AMD RX 550)"
+      name: "Win10 FYI x64 Exp Release (NVIDIA)"
       mixins: "linux-gpu-fyi-ci-tester"
     }
     builders {
-      name: "Win10 FYI Release (NVIDIA GeForce GTX 1660)"
+      name: "Win10 FYI x64 Release (AMD RX 550)"
       mixins: "linux-gpu-fyi-ci-tester"
-      execution_timeout_secs: 64800 # 18h.
     }
     builders {
-      name: "Win10 FYI Release XR Perf (NVIDIA)"
+      name: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
       mixins: "linux-gpu-fyi-ci-tester"
+      execution_timeout_secs: 64800 # 18h.
     }
     builders {
       name: "Win7 FYI Debug (AMD)"
@@ -4425,7 +4425,7 @@ buckets {
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-fyi-try-win10-intel-exp"
+      name: "gpu-fyi-try-win10-intel-exp-64"
     }
     builders {
       mixins: "win-optional-gpu-try"
@@ -4441,7 +4441,7 @@ buckets {
     }
     builders {
       mixins: "win-optional-gpu-try"
-      name: "gpu-fyi-try-win10-nvidia-exp"
+      name: "gpu-fyi-try-win10-nvidia-exp-64"
     }
     builders {
       mixins: "win-optional-gpu-try"

infra/config/luci-milo.cfg

@@ -3199,43 +3199,53 @@ consoles {
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Win10 FYI Debug (NVIDIA)"
-    category: "Windows|10|Nvidia"
+    category: "Windows|10-x86|Nvidia"
     short_name: "dbg"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Win10 FYI Release (Intel HD 630)"
-    category: "Windows|10|Intel"
+    category: "Windows|10-x86|Intel"
     short_name: "rel"
   }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (NVIDIA)"
+    category: "Windows|10-x86|Nvidia"
+    short_name: "rel"
+  }
+  builders {
+    name: "buildbucket/luci.chromium.ci/Win10 FYI Release XR Perf (NVIDIA)"
+    category: "Windows|10-x86|Nvidia"
+    short_name: "xr"
+  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win10 FYI dEQP Release (Intel HD 630)"
-    category: "Windows|10|Intel"
+    category: "Windows|10-x86|Intel"
     short_name: "dqp"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI Exp Release (Intel HD 630)"
-    category: "Windows|10|Intel"
-    short_name: "exp"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI dEQP Release (NVIDIA)"
+    category: "Windows|10-x86|Nvidia"
+    short_name: "dqp"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (NVIDIA)"
-    category: "Windows|10|Nvidia"
-    short_name: "rel"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Exp Release (Intel HD 630)"
+    category: "Windows|10-x64|Intel"
+    short_name: "exp"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (NVIDIA GeForce GTX 1660)"
-    category: "Windows|10|Nvidia"
-    short_name: "gtx"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Exp Release (NVIDIA)"
+    category: "Windows|10-x64|Nvidia"
+    short_name: "exp"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI Release XR Perf (NVIDIA)"
-    category: "Windows|10|Nvidia"
-    short_name: "xr"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (AMD RX 550)"
+    category: "Windows|10-x64|AMD"
+    short_name: "rel"
   }
   builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI Release (AMD RX 550)"
-    category: "Windows|10|AMD"
-    short_name: "rel"
+    name: "buildbucket/luci.chromium.ci/Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
+    category: "Windows|10-x64|Nvidia"
+    short_name: "gtx"
   }
   builders {
     name: "buildbucket/luci.chromium.ci/Win7 FYI Debug (AMD)"
@@ -3252,21 +3262,11 @@ consoles {
     category: "Windows|7|AMD"
     short_name: "rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI Exp Release (NVIDIA)"
-    category: "Windows|10|Nvidia"
-    short_name: "exp"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win7 FYI Release (NVIDIA)"
     category: "Windows|7|Nvidia"
     short_name: "rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Win10 FYI dEQP Release (NVIDIA)"
-    category: "Windows|10|Nvidia"
-    short_name: "dqp"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Win7 FYI x64 Release (NVIDIA)"
     category: "Windows|7|Nvidia|x64"
@@ -4530,7 +4530,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-dqp"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-exp"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-exp-64"
   }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-rel"
@@ -4542,7 +4542,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-dqp"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-exp"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-exp-64"
   }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-rel"
@@ -4877,7 +4877,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-dqp"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-exp"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-exp-64"
   }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-intel-rel"
@@ -4889,7 +4889,7 @@ consoles {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-dqp"
   }
   builders {
-    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-exp"
+    name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-exp-64"
   }
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win10-nvidia-rel"

infra/config/luci-scheduler.cfg

@@ -2710,90 +2710,90 @@ job {
 }
 
 job {
-  id: "Win10 FYI Exp Release (Intel HD 630)"
+  id: "Win10 FYI Release (Intel HD 630)"
   # Triggered by "GPU FYI Win Builder"
   acl_sets: "triggered-by-parent-builders"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Win10 FYI Exp Release (Intel HD 630)"
+    builder: "Win10 FYI Release (Intel HD 630)"
   }
 }
 
 job {
-  id: "Win10 FYI Exp Release (NVIDIA)"
-  # Triggered by "GPU FYI Win Builder"
+  id: "Win10 FYI dEQP Release (Intel HD 630)"
+  # Triggered by "GPU FYI Win dEQP Builder"
   acl_sets: "triggered-by-parent-builders"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Win10 FYI Exp Release (NVIDIA)"
+    builder: "Win10 FYI dEQP Release (Intel HD 630)"
   }
 }
 
 job {
-  id: "Win10 FYI Release (AMD RX 550)"
+  id: "Win10 FYI Release (NVIDIA)"
   # Triggered by "GPU FYI Win Builder"
   acl_sets: "triggered-by-parent-builders"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Win10 FYI Release (AMD RX 550)"
+    builder: "Win10 FYI Release (NVIDIA)"
   }
 }
 
 job {
-  id: "Win10 FYI Release (Intel HD 630)"
+  id: "Win10 FYI Release XR Perf (NVIDIA)"
   # Triggered by "GPU FYI Win Builder"
   acl_sets: "triggered-by-parent-builders"
   buildbucket: {
     server: "cr-buildbucket.appspot.com"
     bucket: "luci.chromium.ci"
-    builder: "Win10 FYI Release (Intel HD 630)"
+    builder: "Win10 FYI Release XR Perf (NVIDIA)"
   }
 }
 
 job {
-  id: "Win10 FYI dEQP Release (Intel HD 630)"
-  # Triggered by "GPU FYI Win dEQP Builder"
+  id: "Win10 FYI x64 Exp Release (Intel HD 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 dEQP Release (Intel HD 630)"
+    builder: "Win10 FYI x64 Exp Release (Intel HD 630)"
   }
 }
 
 job {
-  id: "Win10 FYI Release (NVIDIA)"
-  # Triggered by "GPU FYI Win Builder"
+  id: "Win10 FYI x64 Exp Release (NVIDIA)"
+  # 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 Release (NVIDIA)"
+    builder: "Win10 FYI x64 Exp Release (NVIDIA)"
   }
 }
 
 job {
-  id: "Win10 FYI Release (NVIDIA GeForce GTX 1660)"
-  # Triggered by "GPU FYI Win Builder"
+  id: "Win10 FYI x64 Release (AMD RX 550)"
+  # 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 Release (NVIDIA GeForce GTX 1660)"
+    builder: "Win10 FYI x64 Release (AMD RX 550)"
   }
 }
 
 job {
-  id: "Win10 FYI Release XR Perf (NVIDIA)"
-  # Triggered by "GPU FYI Win Builder"
+  id: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
+  # 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 Release XR Perf (NVIDIA)"
+    builder: "Win10 FYI x64 Release (NVIDIA GeForce GTX 1660)"
   }
 }
 

testing/buildbot/test_suite_exceptions.pyl

@@ -1590,7 +1590,7 @@
       'ANGLE GPU Win10 Release (Intel HD 630)',
       'Optional Win10 Release (Intel HD 630)',
       'Win10 FYI Release (Intel HD 630)',
-      'Win10 FYI Exp Release (Intel HD 630)',
+      'Win10 FYI x64 Exp Release (Intel HD 630)',
     ],
   },
   'viz_unittests': {

testing/buildbot/test_suites.pyl

@@ -3551,16 +3551,18 @@
       },
     },
 
-    'gpu_noop_sleep_telemetry_test': {
+    # Temporarily disabled, since all experimental bots are active now.
+    # TODO(ynovikov): Re-enable once Win10 Intel is switched to x64 crbug.com/988833
+    #'gpu_noop_sleep_telemetry_test': {
       # The former GPU-specific generator script contained logic to
       # detect whether the so-called "experimental" GPU bots, which test
       # newer driver versions, were identical to the "stable" versions
       # of the bots, and if so to mirror their configurations. We prefer
       # to keep this new script simpler and to just configure this by
       # hand in waterfalls.pyl.
-      'noop_sleep': {
-      }
-    },
+      #'noop_sleep': {
+      #}
+    #},
 
     'gpu_skia_renderer_telemetry_tests': {
       'skia_renderer_pixel_skia_gold_test': {

testing/buildbot/waterfalls.pyl

@@ -3058,117 +3058,116 @@
           'gpu_telemetry_tests': 'gpu_fyi_win_debug_telemetry_tests',
         },
       },
-      'Win10 FYI Exp Release (Intel HD 630)': {
+      'Win10 FYI Release (Intel HD 630)': {
         'os_type': 'win',
         'browser_config': 'release',
         'mixins': [
-          'limited_capacity_bot',
-          'win10_intel_hd_630_experimental',
+          'win10_intel_hd_630_stable',
         ],
-        # Currently the experimental driver is identical to the stable
-        # driver. If it's upgraded, change these test_suites to be the same as
-        # 'Win10 FYI Release (Intel HD 630)'.
         'test_suites': {
-          'gpu_telemetry_tests': 'gpu_noop_sleep_telemetry_test',
+          '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',
         },
       },
-      # TODO(kbr): "Experimental" caused too-long path names pre-LUCI.
-      # crbug.com/812000
-      'Win10 FYI Exp Release (NVIDIA)': {
+      'Win10 FYI Release (NVIDIA)': {
         'os_type': 'win',
         'browser_config': 'release',
         'mixins': [
-          'limited_capacity_bot',
-          'win10_nvidia_quadro_p400_experimental',
+          'win10_nvidia_quadro_p400_stable',
         ],
         'test_suites': {
           'gtest_tests': 'gpu_fyi_win_gtests',
           'isolated_scripts': 'gpu_angle_fyi_win_optional_and_representative_perf_isolated_scripts',
           'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
         },
+        # We keep this value enabled to provide minimal regression testing.
+        'use_multi_dimension_trigger_script': True,
       },
-      'Win10 FYI Release (AMD RX 550)': {
-        # This bot currently only has one piece of hardware behind it,
-        # and is being qualified for potential scale-out.
+      'Win10 FYI Release XR Perf (NVIDIA)': {
         'os_type': 'win',
         'browser_config': 'release',
         'mixins': [
-          'limited_capacity_bot',
-          'win10_amd_rx_550',
+          'win10_nvidia_quadro_p400_stable',
         ],
         'test_suites': {
-          'gtest_tests': 'gpu_fyi_win_gtests',
-          'gpu_telemetry_tests': 'gpu_fyi_win_amd_telemetry_tests',
+          'isolated_scripts': 'win_specific_xr_perf_tests',
         },
       },
-      'Win10 FYI Release (Intel HD 630)': {
+      'Win10 FYI dEQP Release (Intel HD 630)': {
         'os_type': 'win',
-        'browser_config': 'release',
         'mixins': [
           'win10_intel_hd_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',
+          'gtest_tests': 'gpu_angle_deqp_gles2_d3d11_gtests',
         },
       },
-      'Win10 FYI Release (NVIDIA GeForce GTX 1660)': {
-        # This bot currently only has one piece of hardware behind it,
-        # and is being qualified for potential scale-out.
+      'Win10 FYI dEQP Release (NVIDIA)': {
         'os_type': 'win',
-        'browser_config': 'release',
         'mixins': [
-          'limited_capacity_bot',
-          'win10_nvidia_geforce_gtx_1660',
+          'win10_nvidia_quadro_p400_stable',
         ],
         'test_suites': {
-          'gtest_tests': 'gpu_fyi_win_and_dawn_gtests',
-          'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
+          'gtest_tests': 'gpu_angle_deqp_win_nvidia_gtests',
         },
+        'use_multi_dimension_trigger_script': True,
       },
-      'Win10 FYI Release (NVIDIA)': {
+      # TODO(kbr): "Experimental" caused too-long path names pre-LUCI.
+      # crbug.com/812000
+      'Win10 FYI x64 Exp Release (Intel HD 630)': {
         'os_type': 'win',
-        'browser_config': 'release',
+        'browser_config': 'release_x64',
         'mixins': [
-          'win10_nvidia_quadro_p400_stable',
+          'limited_capacity_bot',
+          'win10_intel_hd_630_experimental',
         ],
         'test_suites': {
           'gtest_tests': 'gpu_fyi_win_gtests',
-          'isolated_scripts': 'gpu_angle_fyi_win_optional_and_representative_perf_isolated_scripts',
-          'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
+          'isolated_scripts': 'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts',
+          'gpu_telemetry_tests': 'gpu_fyi_win_intel_release_telemetry_tests',
         },
-        # We keep this value enabled to provide minimal regression testing.
-        'use_multi_dimension_trigger_script': True,
       },
-      'Win10 FYI Release XR Perf (NVIDIA)': {
+      'Win10 FYI x64 Exp Release (NVIDIA)': {
         'os_type': 'win',
-        'browser_config': 'release',
+        'browser_config': 'release_x64',
         'mixins': [
-          'win10_nvidia_quadro_p400_stable',
+          'limited_capacity_bot',
+          'win10_nvidia_quadro_p400_experimental',
         ],
         'test_suites': {
-          'isolated_scripts': 'win_specific_xr_perf_tests',
+          'gtest_tests': 'gpu_fyi_win_gtests',
+          'isolated_scripts': 'gpu_angle_fyi_win_optional_and_representative_perf_isolated_scripts',
+          'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
         },
       },
-      'Win10 FYI dEQP Release (Intel HD 630)': {
+      'Win10 FYI x64 Release (AMD RX 550)': {
+        # This bot currently only has one piece of hardware behind it,
+        # and is being qualified for potential scale-out.
         'os_type': 'win',
+        'browser_config': 'release_x64',
         'mixins': [
-          'win10_intel_hd_630_stable',
+          'limited_capacity_bot',
+          'win10_amd_rx_550',
         ],
         'test_suites': {
-          'gtest_tests': 'gpu_angle_deqp_gles2_d3d11_gtests',
+          'gtest_tests': 'gpu_fyi_win_gtests',
+          'gpu_telemetry_tests': 'gpu_fyi_win_amd_telemetry_tests',
         },
       },
-      'Win10 FYI dEQP Release (NVIDIA)': {
+      '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.
         'os_type': 'win',
+        'browser_config': 'release_x64',
         'mixins': [
-          'win10_nvidia_quadro_p400_stable',
+          'limited_capacity_bot',
+          'win10_nvidia_geforce_gtx_1660',
         ],
         'test_suites': {
-          'gtest_tests': 'gpu_angle_deqp_win_nvidia_gtests',
+          'gtest_tests': 'gpu_fyi_win_and_dawn_gtests',
+          'gpu_telemetry_tests': 'gpu_fyi_win_release_telemetry_tests',
         },
-        'use_multi_dimension_trigger_script': True,
       },
       # This tryserver doesn't actually exist; it's a separate
       # configuration from the Win AMD bot on this waterfall because we

tools/mb/mb_config.pyl

@@ -848,11 +848,11 @@
       'gpu-fyi-try-win7-nvidia-rel': 'gpu_fyi_tests_release_trybot_x86',
       'gpu-fyi-try-win7-nvidia-rel-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-dqp': 'deqp_release_trybot_x86',
-      'gpu-fyi-try-win10-intel-exp': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-fyi-try-win10-intel-exp-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-intel-rel': 'gpu_fyi_tests_release_trybot_x86',
       'gpu-fyi-try-win10-nvidia-dbg': 'gpu_fyi_tests_debug_trybot_x86',
       'gpu-fyi-try-win10-nvidia-dqp': 'deqp_release_trybot_x86',
-      'gpu-fyi-try-win10-nvidia-exp': 'gpu_fyi_tests_release_trybot_x86',
+      'gpu-fyi-try-win10-nvidia-exp-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-nvidia-rel': 'gpu_fyi_tests_release_trybot_x86',
       'gpu-try-win10-nvidia-dbg': 'gpu_tests_debug_trybot_x86',
       'gpu-try-win10-nvidia-rel': 'gpu_tests_release_trybot_x86_resource_whitelisting',