Update [dm|nanobench]_flags for CPU/GPU split

tools/dm_flags.json

Index: tools/dm_flags.json
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 724bb50f24e57a8e7dfb77a9d500f26953f039cc..b44afffcf4f70c71611282840c6eff20e8a9289f 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -1,5 +1,5 @@
 {
-  "Test-Android-GalaxyS3-Mali400-Arm7-Debug": [
+  "Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug": [
     "--config", 
     "565", 
     "8888", 
@@ -86,10 +86,9 @@
     "--match", 
     "~WritePixels", 
     "~tabl_mozilla_0", 
-    "~desk_yahoonews_0", 
-    "--nocpu"
+    "~desk_yahoonews_0"
   ], 
-  "Test-Android-Nexus7-Tegra3-Arm7-Release": [
+  "Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release": [
     "--config", 
     "565", 
     "8888", 
@@ -175,10 +174,9 @@
     "_", 
     "--match", 
     "~tabl_mozilla_0", 
-    "~desk_yahoonews_0", 
-    "--nocpu"
+    "~desk_yahoonews_0"
   ], 
-  "Test-Android-NexusPlayer-PowerVR-x86-Release": [
+  "Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
     "--config", 
     "565", 
     "8888", 
@@ -261,7 +259,7 @@
     "~desk_yahoonews_0", 
     "~ResourceCache"
   ], 
-  "Test-Android-Xoom-Tegra2-Arm7-Release": [
+  "Test-Android-GCC-Xoom-GPU-Tegra2-Arm7-Release": [
     "--config", 
     "565", 
     "8888", 
@@ -346,7 +344,7 @@
     "~tabl_mozilla_0", 
     "~desk_yahoonews_0"
   ], 
-  "Test-ChromeOS-Alex-GMA3150-x86-Debug": [
+  "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN": [
     "--config", 
     "565", 
     "8888", 
@@ -413,10 +411,10 @@
     "_", 
     "image", 
     "Hopstarter-Mac-Folders-Apple.ico", 
-    "--threads", 
-    "1"
+    "--match", 
+    "~Math"
   ], 
-  "Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU": [
+  "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind": [
     "--config", 
     "565", 
     "8888", 
@@ -428,7 +426,6 @@
     "tiles_rt-8888", 
     "pipe-8888", 
     "tiles_rt-gpu", 
-    "--nocpu", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -499,77 +496,7 @@
     "--match", 
     "~Threaded"
   ], 
-  "Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN": [
-    "--config", 
-    "565", 
-    "8888", 
-    "gpu", 
-    "msaa16", 
-    "nvprmsaa16", 
-    "pdf", 
-    "serialize-8888", 
-    "tiles_rt-8888", 
-    "pipe-8888", 
-    "tiles_rt-gpu", 
-    "--blacklist", 
-    "gpu", 
-    "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
-    "_", 
-    "PANO_20121023_214540.jpg", 
-    "_", 
-    "image", 
-    "pal8os2v2.bmp", 
-    "_", 
-    "image", 
-    "pal8v4.bmp", 
-    "_", 
-    "image", 
-    "pal8v5.bmp", 
-    "_", 
-    "image", 
-    "rgb16-565.bmp", 
-    "_", 
-    "image", 
-    "rgb16-565pal.bmp", 
-    "_", 
-    "image", 
-    "rgb32-111110.bmp", 
-    "_", 
-    "image", 
-    "rgb32bf.bmp", 
-    "_", 
-    "image", 
-    "rgba32.bmp", 
-    "_", 
-    "image", 
-    "rgba32abf.bmp", 
-    "_", 
-    "image", 
-    "rgb24largepal.bmp", 
-    "_", 
-    "image", 
-    "pal8os2v2-16.bmp", 
-    "_", 
-    "image", 
-    "pal8oversizepal.bmp", 
-    "_", 
-    "subset", 
-    "rgb24largepal.bmp", 
-    "_", 
-    "subset", 
-    "pal8os2v2-16.bmp", 
-    "_", 
-    "subset", 
-    "pal8oversizepal.bmp", 
-    "_", 
-    "image", 
-    "Hopstarter-Mac-Folders-Apple.ico", 
-    "--match", 
-    "~Math"
-  ], 
-  "Test-Ubuntu14-GCE-NoGPU-x86_64-Release-Valgrind_CPU": [
+  "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": [
     "--config", 
     "565", 
     "8888", 
@@ -581,7 +508,6 @@
     "tiles_rt-8888", 
     "pipe-8888", 
     "tiles_rt-gpu", 
-    "--nogpu", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -652,7 +578,7 @@
     "--match", 
     "~Threaded"
   ], 
-  "Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE": [
+  "Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [
     "--config", 
     "565", 
     "8888",