gpu: Update AMD bot configs, and add dEQP tests.

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 174 matching lines @@
           # TODO(kbr): add device PCI ID 6613 once deployed
           # http://crbug.com/639353
           'gpu': '1002',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
+    'Win7 Release (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6613',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'win',
+    },
     'Win7 Debug (ATI)': {
       'swarming_dimensions': [
         {
           # TODO(kbr): add device PCI ID 6613 once deployed
           # http://crbug.com/639353
           'gpu': '1002',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Debug',
       'swarming': True,
       'os_type': 'win',
     },
+    'Win7 Debug (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6613',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
+      'build_config': 'Debug',
+      'swarming': True,
+      'os_type': 'win',
+    },
     'Win7 Release (Intel)': {
       'swarming_dimensions': [
         {
           'gpu': '8086:041a',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
@@ skipping 45 matching lines @@
           'gpu': '1002:6613',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'win',
     },
+    'Win7 Release (AMD R5 230)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6779',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
+      'build_config': 'Release',
+      # This bot is a one-off and doesn't have similar slaves in the
+      # swarming pool.
+      'swarming': False,
+      'os_type': 'win',
+    },
     'Win7 x64 Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Release_x64',
       'swarming': True,
       'os_type': 'win',
@@ skipping 37 matching lines @@
           'gpu': '1002:679e',
           'os': 'Mac-10.10'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'mac',
     },
+    'Mac 10.10 Release (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:679e',
+          'os': 'Mac-10.10'
+        },
+      ],
+      'build_config': 'Release',
+      # This bot is a one-off and doesn't have similar slaves in the
+      # swarming pool.
+      'swarming': False,
+      'os_type': 'mac',
+    },
     'Mac 10.10 Debug (ATI)': {
       'swarming_dimensions': [
         {
           'gpu': '1002:679e',
           'os': 'Mac-10.10'
         },
       ],
       'build_config': 'Debug',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'mac',
     },
+    'Mac 10.10 Debug (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:679e',
+          'os': 'Mac-10.10'
+        },
+      ],
+      'build_config': 'Debug',
+      # This bot is a one-off and doesn't have similar slaves in the
+      # swarming pool.
+      'swarming': False,
+      'os_type': 'mac',
+    },
     'Mac Retina Release': {
       'swarming_dimensions': [
         {
           'gpu': '10de:0fe9',
           'hidpi': '1',
           'os': 'Mac'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
@@ skipping 95 matching lines @@
           'gpu': '1002:6779',
           'os': 'Linux'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
       'swarming': False,
       'os_type': 'linux',
     },
+    'Linux Release (AMD R5 230)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6779',
+          'os': 'Linux'
+        },
+      ],
+      'build_config': 'Release',
+      # This bot is a one-off and doesn't have similar slaves in the
+      # swarming pool.
+      'swarming': False,
+      'os_type': 'linux',
+    },
     'Linux Release (NVIDIA GeForce 730)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:0f02',
           'os': 'Linux'
         },
       ],
       'build_config': 'Release',
       # This bot is a one-off and doesn't have similar slaves in the
       # swarming pool.
@@ skipping 160 matching lines @@
           # TODO(kbr): add device PCI ID 6613 once deployed
           # http://crbug.com/639353
           'gpu': '1002',
           'os': 'Windows-2008ServerR2-SP1'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'win',
     },
+    'Optional Win7 Release (AMD)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6613',
+          'os': 'Windows-2008ServerR2-SP1'
+        },
+      ],
+      'build_config': 'Release',
+      'swarming': True,
+      'os_type': 'win',
+    },
     'Optional Mac 10.10 Release (Intel)': {
       'swarming_dimensions': [
         {
           'gpu': '8086:0a2e',
           'os': 'Mac-10.10'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
@@ skipping 759 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())