[Benchmarking] Updated the dimension to ensure homogeneous fleets: MacHigh

In order to ensure homogeneous fleets, we need to have more specific
dimension values when looking for bots. This set of CLs updated some
existing dimensions, and added the synthetic_product_name values for
dimensions if appropriate.

This CL updated the dimensions for mac-10_13_laptop_high_end-perf:
 - Added synthetic product name 'MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0';
 - Updated OS from 'Mac-10.13' to 'Mac-10.13.3'
 - Updated GPU from '1002:6821' to '1002:6821-4.0.20-3.2.8' (This shows
   a equivalent list as using '8086:0d26-4.0.20-3.2.8'. Those bots seem
   having two graphic cards. E.g., https://chrome-swarming.appspot.com/bot?id=build139-a7)

Please check the link below for the available bots based on the
old/new dimensions:
https://chrome-swarming.appspot.com/botlist?c=id&c=task&c=gpu&c=os&c=pool&c=status&c=synthetic_product_name&d=desc&f=gpu%3A1002%3A6821&f=os%3AMac-10.13&f=cpu%3Ax86-64&f=pool%3Achrome.tests.perf&s=gpu

Bug: chromium:996830
Change-Id: Ia88a6af8f543f90cf28528ad293f0d0479f6e8b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865141
Commit-Queue: Wenbin Zhang <wenbinzhang@google.com>
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707429}

testing/buildbot/chromium.perf.json

@@ -1906,9 +1906,10 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "1002:6821",
-              "os": "Mac-10.13",
-              "pool": "chrome.tests.perf"
+              "gpu": "1002:6821-4.0.20-3.2.8",
+              "os": "Mac-10.13.3",
+              "pool": "chrome.tests.perf",
+              "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0"
             }
           ],
           "expiration": 7200,
@@ -1943,9 +1944,10 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "1002:6821",
-              "os": "Mac-10.13",
-              "pool": "chrome.tests.perf"
+              "gpu": "1002:6821-4.0.20-3.2.8",
+              "os": "Mac-10.13.3",
+              "pool": "chrome.tests.perf",
+              "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0"
             }
           ],
           "expiration": 7200,
@@ -1980,9 +1982,10 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "1002:6821",
-              "os": "Mac-10.13",
-              "pool": "chrome.tests.perf"
+              "gpu": "1002:6821-4.0.20-3.2.8",
+              "os": "Mac-10.13.3",
+              "pool": "chrome.tests.perf",
+              "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0"
             }
           ],
           "expiration": 7200,
@@ -2017,9 +2020,10 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "1002:6821",
-              "os": "Mac-10.13",
-              "pool": "chrome.tests.perf"
+              "gpu": "1002:6821-4.0.20-3.2.8",
+              "os": "Mac-10.13.3",
+              "pool": "chrome.tests.perf",
+              "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0"
             }
           ],
           "expiration": 7200,
@@ -2054,9 +2058,10 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "1002:6821",
-              "os": "Mac-10.13",
-              "pool": "chrome.tests.perf"
+              "gpu": "1002:6821-4.0.20-3.2.8",
+              "os": "Mac-10.13.3",
+              "pool": "chrome.tests.perf",
+              "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0"
             }
           ],
           "expiration": 7200,
@@ -2091,9 +2096,10 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "1002:6821",
-              "os": "Mac-10.13",
-              "pool": "chrome.tests.perf"
+              "gpu": "1002:6821-4.0.20-3.2.8",
+              "os": "Mac-10.13.3",
+              "pool": "chrome.tests.perf",
+              "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0"
             }
           ],
           "expiration": 7200,
@@ -2132,9 +2138,10 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
-              "gpu": "1002:6821",
-              "os": "Mac-10.13",
-              "pool": "chrome.tests.perf"
+              "gpu": "1002:6821-4.0.20-3.2.8",
+              "os": "Mac-10.13.3",
+              "pool": "chrome.tests.perf",
+              "synthetic_product_name": "MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0"
             }
           ],
           "expiration": 7200,

tools/perf/core/perf_data_generator.py

@@ -4,6 +4,7 @@
 # found in the LICENSE file.
 
 # pylint: disable=too-many-lines
+# pylint: disable=line-too-long
 
 """Generates chromium.perf{,.fyi}.json from a set of condensed configs.
 
@@ -815,13 +816,15 @@ BUILDERS = {
     ],
     'platform': 'mac',
     'dimension': {
-      'pool': 'chrome.tests.perf',
-      'os': 'Mac-10.13',
-      'gpu': '1002:6821'
+        'gpu': '1002:6821-4.0.20-3.2.8',
+        'os': 'Mac-10.13.3',
+        'pool': 'chrome.tests.perf',
+        'synthetic_product_name': 'MacBookPro11,5_x86-64-i7-4870HQ_AMD Radeon R8 M370X 4.0.20 [3.2.8]_Intel Haswell Iris Pro Graphics 5200 4.0.20 [3.2.8]_16384_1_475936.0',
     },
   },
 }
 
+# pylint: enable=line-too-long
 
 def update_all_tests(builders_dict, file_path):
   tests = {}