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

content/test/gpu/generate_buildbot_json.py

Index: content/test/gpu/generate_buildbot_json.py
diff --git a/content/test/gpu/generate_buildbot_json.py b/content/test/gpu/generate_buildbot_json.py
index 0e433c3d537990f8b787ce1fe197ccb078c45b45..92473f3053b03908b249539ac6a34c353f3f652f 100755
--- a/content/test/gpu/generate_buildbot_json.py
+++ b/content/test/gpu/generate_buildbot_json.py
@@ -192,6 +192,17 @@ FYI_WATERFALL = {
       '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': [
         {
@@ -205,6 +216,17 @@ FYI_WATERFALL = {
       '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': [
         {
@@ -270,6 +292,19 @@ FYI_WATERFALL = {
       'swarming': False,
       'os_type': 'win',
     },
+    'Win7 Release (AMD R5 230)': {
+      'swarming_dimensions': [
+        {
+          'gpu': '1002:6613',

[Ken Russell (switch to Gerrit), 2016/10/26 21:58:10]

The device ID for this card is 0x6779 per the bots' logs. (It's at the top of
the stdio for any Telemetry based test.) This isn't critical since this bot
doesn't use Swarming but it's good to keep the bookkeeping straight.

[Jamie Madill, 2016/10/27 16:48:36]

Good catch, fixed. This is important because it governs if we run the dEQP tests
or not.

+          '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': [
         {
@@ -327,6 +362,19 @@ FYI_WATERFALL = {
       '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': [
         {
@@ -340,6 +388,19 @@ FYI_WATERFALL = {
       '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': [
         {
@@ -455,6 +516,19 @@ FYI_WATERFALL = {
       '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': [
         {
@@ -635,6 +709,17 @@ FYI_WATERFALL = {
       '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': [
         {