[Benchmarking] Make nexus5x use abridged rendering benchmark.

Also reshard the nexus5x perf bot.
Note that this may cause false positive regressions because it
will move some benchmarks to run on different devices.
DO NOT REVERT THIS CL if it appears to cause a perf regression.

Rendering team tells me that nexus5x has a high degree of noise for them,
so they don't mind running fewer benchmarks on it and relying instead on
nexus5 and pixel2 bots.

R=johnchen@chromium.org, sadrul@chromium.org

Bug: 1030788, 1030840
Change-Id: If7a7f2cd847989b4fddd24bc6fa56b5379795d1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1951333
Auto-Submit: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#721693}

tools/perf/core/bot_platforms.py

@@ -183,7 +183,11 @@ _ANDROID_GO_BENCHMARK_CONFIGS = frozenset([
     _GetBenchmarkConfig('speedometer2')])
 _ANDROID_GO_WEBVIEW_BENCHMARK_CONFIGS = _ANDROID_GO_BENCHMARK_CONFIGS
 _ANDROID_NEXUS_5_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2
-_ANDROID_NEXUS_5X_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_JETSTREAM2
+_ANDROID_NEXUS_5X_BENCHMARK_CONFIGS = (
+    _OFFICIAL_EXCEPT_JETSTREAM2 -
+    # Remove unabridged rendering benchmark and replace with abridged benchmark.
+    frozenset([_GetBenchmarkConfig('rendering.mobile')]) |
+    frozenset([_GetBenchmarkConfig('rendering.mobile', True)]))
 _ANDROID_NEXUS_5X_WEBVIEW_BENCHMARK_CONFIGS = (
     _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2)
 _ANDROID_NEXUS_6_WEBVIEW_BENCHMARK_CONFIGS = (

tools/perf/core/shard_maps/android-nexus5x-perf_map.json

@@ -17,33 +17,19 @@
                 "abridged": false
             },
             "blink_perf.dom": {
-                "end": 1,
+                "abridged": false
+            },
+            "blink_perf.events": {
                 "abridged": false
             }
         }
     },
     "1": {
         "benchmarks": {
-            "blink_perf.dom": {
-                "begin": 1,
-                "abridged": false
-            },
-            "blink_perf.events": {
-                "abridged": false
-            },
             "blink_perf.image_decoder": {
                 "abridged": false
             },
             "blink_perf.layout": {
-                "end": 64,
-                "abridged": false
-            }
-        }
-    },
-    "2": {
-        "benchmarks": {
-            "blink_perf.layout": {
-                "begin": 64,
                 "abridged": false
             },
             "blink_perf.owp_storage": {
@@ -53,6 +39,15 @@
                 "abridged": false
             },
             "blink_perf.parser": {
+                "end": 26,
+                "abridged": false
+            }
+        }
+    },
+    "2": {
+        "benchmarks": {
+            "blink_perf.parser": {
+                "begin": 26,
                 "abridged": false
             },
             "blink_perf.shadow_dom": {
@@ -77,7 +72,7 @@
                 "abridged": false
             },
             "loading.mobile": {
-                "end": 5,
+                "end": 67,
                 "abridged": false
             }
         }
@@ -85,16 +80,7 @@
     "3": {
         "benchmarks": {
             "loading.mobile": {
-                "begin": 5,
-                "end": 89,
-                "abridged": false
-            }
-        }
-    },
-    "4": {
-        "benchmarks": {
-            "loading.mobile": {
-                "begin": 89,
+                "begin": 67,
                 "abridged": false
             },
             "media.mobile": {
@@ -110,34 +96,7 @@
                 "abridged": false
             },
             "rendering.mobile": {
-                "end": 23,
-                "abridged": false
-            }
-        }
-    },
-    "5": {
-        "benchmarks": {
-            "rendering.mobile": {
-                "begin": 23,
-                "end": 113,
-                "abridged": false
-            }
-        }
-    },
-    "6": {
-        "benchmarks": {
-            "rendering.mobile": {
-                "begin": 113,
-                "end": 201,
-                "abridged": false
-            }
-        }
-    },
-    "7": {
-        "benchmarks": {
-            "rendering.mobile": {
-                "begin": 201,
-                "abridged": false
+                "abridged": true
             },
             "speedometer": {
                 "abridged": false
@@ -147,7 +106,11 @@
             },
             "speedometer2": {
                 "abridged": false
-            },
+            }
+        }
+    },
+    "4": {
+        "benchmarks": {
             "speedometer2-future": {
                 "abridged": false
             },
@@ -155,18 +118,45 @@
                 "abridged": false
             },
             "system_health.common_mobile": {
-                "end": 4,
+                "end": 41,
                 "abridged": false
             }
         }
     },
-    "8": {
+    "5": {
         "benchmarks": {
             "system_health.common_mobile": {
-                "begin": 4,
+                "begin": 41,
                 "abridged": false
             },
             "system_health.memory_mobile": {
+                "end": 14,
+                "abridged": false
+            }
+        }
+    },
+    "6": {
+        "benchmarks": {
+            "system_health.memory_mobile": {
+                "begin": 14,
+                "end": 36,
+                "abridged": false
+            }
+        }
+    },
+    "7": {
+        "benchmarks": {
+            "system_health.memory_mobile": {
+                "begin": 36,
+                "end": 78,
+                "abridged": false
+            }
+        }
+    },
+    "8": {
+        "benchmarks": {
+            "system_health.memory_mobile": {
+                "begin": 78,
                 "abridged": false
             },
             "system_health.webview_startup": {
@@ -176,7 +166,7 @@
                 "abridged": false
             },
             "v8.browsing_mobile": {
-                "end": 11,
+                "end": 16,
                 "abridged": false
             }
         }
@@ -184,7 +174,7 @@
     "9": {
         "benchmarks": {
             "v8.browsing_mobile": {
-                "begin": 11,
+                "begin": 16,
                 "abridged": false
             },
             "v8.browsing_mobile-future": {
@@ -196,20 +186,20 @@
         }
     },
     "extra_infos": {
-        "num_stories": 1140,
-        "predicted_min_shard_time": 4158.0,
+        "num_stories": 813,
+        "predicted_min_shard_time": 6240.0,
         "predicted_min_shard_index": 9,
-        "predicted_max_shard_time": 4342.0,
-        "predicted_max_shard_index": 8,
-        "shard #0": 4210.0,
-        "shard #1": 4252.0,
-        "shard #2": 4260.0,
-        "shard #3": 4164.0,
-        "shard #4": 4248.0,
-        "shard #5": 4258.0,
-        "shard #6": 4256.0,
-        "shard #7": 4176.0,
-        "shard #8": 4342.0,
-        "shard #9": 4158.0
+        "predicted_max_shard_time": 6624.0,
+        "predicted_max_shard_index": 7,
+        "shard #0": 6438.0,
+        "shard #1": 6466.0,
+        "shard #2": 6456.0,
+        "shard #3": 6386.0,
+        "shard #4": 6590.0,
+        "shard #5": 6366.0,
+        "shard #6": 6452.0,
+        "shard #7": 6624.0,
+        "shard #8": 6564.0,
+        "shard #9": 6240.0
     }
 }
\ No newline at end of file