[benchmark] disable ANGLE on win 7 GPU bots

Removing ANGLE test from WIN 7 test builder.

Bug: chromium:1137628
Change-Id: Ib234e8351716b77261bf9a4efb4ab9804f0424f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466621Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Wenbin Zhang <wenbinzhang@google.com>
Cr-Commit-Position: refs/heads/master@{#816761}

tools/perf/core/bot_platforms.py

@@ -347,7 +347,6 @@ _WIN_7_BENCHMARK_CONFIGS = PerfSuite([
 ])
 _WIN_7_GPU_BENCHMARK_CONFIGS = PerfSuite(['rendering.desktop']).Abridge(
     ['rendering.desktop'])
-_WIN_7_GPU_EXECUTABLE_CONFIGS = frozenset([_ANGLE_PERFTESTS])
 _ANDROID_GO_BENCHMARK_CONFIGS = PerfSuite([
     _GetBenchmarkConfig('system_health.memory_mobile'),
     _GetBenchmarkConfig('system_health.common_mobile'),
@@ -455,9 +454,8 @@ WIN_10 = PerfPlatform(
     ' Intel Kaby Lake HD Graphics 630', _WIN_10_BENCHMARK_CONFIGS,
     26, 'win', executables=_WIN_10_EXECUTABLE_CONFIGS)
 WIN_7 = PerfPlatform('Win 7 Perf', 'N/A', _WIN_7_BENCHMARK_CONFIGS, 4, 'win')
-WIN_7_GPU = PerfPlatform(
-    'Win 7 Nvidia GPU Perf', 'N/A', _WIN_7_GPU_BENCHMARK_CONFIGS,
-    4, 'win', executables=_WIN_7_GPU_EXECUTABLE_CONFIGS)
+WIN_7_GPU = PerfPlatform('Win 7 Nvidia GPU Perf', 'N/A',
+                         _WIN_7_GPU_BENCHMARK_CONFIGS, 4, 'win')
 
 # Android
 ANDROID_GO = PerfPlatform(

tools/perf/core/shard_maps/android-pixel2-perf-fyi_map.json

@@ -65,4 +65,4 @@
         "shard #2": 6924.0,
         "shard #3": 6598.0
     }
-}
+}
\ No newline at end of file

tools/perf/core/shard_maps/linux-perf-fyi_map.json

@@ -20,4 +20,4 @@
         "predicted_max_shard_index": 0,
         "shard #0": 4368.0
     }
-}
+}
\ No newline at end of file

tools/perf/core/shard_maps/timing_data/win_7_nvidia_gpu_perf_timing.json

@@ -6,9 +6,5 @@
     {
         "duration": "21.0",
         "name": "rendering.desktop/main_30fps_impl_60fps"
-    },
-    {
-        "duration": "1988.0",
-        "name": "angle_perftests/_gtest_"
     }
 ]
\ No newline at end of file

tools/perf/core/shard_maps/win-10_laptop_low_end-perf_hp-candidate_map.json

@@ -17,4 +17,4 @@
         "predicted_max_shard_index": 0,
         "shard #0": 2360.0
     }
-}
+}
\ No newline at end of file

tools/perf/core/shard_maps/win_7_nvidia_gpu_perf_map.json

 {
     "0": {
-        "benchmarks": {}
+        "benchmarks": {
+            "rendering.desktop": {
+                "end": 4,
+                "abridged": true
+            }
+        }
     },
     "1": {
-        "executables": {
-            "angle_perftests": {
-                "path": "angle_perftests",
-                "arguments": [
-                    "--test-launcher-retry-limit=0",
-                    "--test-launcher-jobs=1"
-                ]
+        "benchmarks": {
+            "rendering.desktop": {
+                "begin": 4,
+                "end": 6,
+                "abridged": true
             }
         }
     },
     "2": {
-        "benchmarks": {}
+        "benchmarks": {
+            "rendering.desktop": {
+                "begin": 6,
+                "end": 8,
+                "abridged": true
+            }
+        }
     },
     "3": {
         "benchmarks": {
             "rendering.desktop": {
+                "begin": 8,
                 "abridged": true
             }
         }
     },
     "extra_infos": {
-        "num_stories": 13,
-        "predicted_min_shard_time": 0,
-        "predicted_min_shard_index": 0,
-        "predicted_max_shard_time": 3976.0,
-        "predicted_max_shard_index": 1,
-        "shard #0": 0,
-        "shard #1": 3976.0,
-        "shard #2": 0,
-        "shard #3": 284.0
+        "num_stories": 12,
+        "predicted_min_shard_time": 31.0,
+        "predicted_min_shard_index": 1,
+        "predicted_max_shard_time": 40,
+        "predicted_max_shard_index": 0,
+        "shard #0": 40,
+        "shard #1": 31.0,
+        "shard #2": 31.0,
+        "shard #3": 40
     }
 }
\ No newline at end of file