Run DM on GalaxyS* in one thread

Drive-by cleanup of Xoom

BUG=skia:3214

Review URL: https://codereview.chromium.org/1106173004

2 files changed, 8 insertions, 153 deletions

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index be2bd7e052..c6484085c6 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -9,6 +9,8 @@
     "tiles_rt-8888", 
     "pipe-8888", 
     "tiles_rt-gpu", 
+    "--threads", 
+    "0", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -600,153 +602,6 @@
     "~desk_yahoonews_0", 
     "~ResourceCache"
   ], 
-  "Test-Android-GCC-Xoom-GPU-Tegra2-Arm7-Release": [
-    "--config", 
-    "565", 
-    "8888", 
-    "gpu", 
-    "--blacklist", 
-    "gpu", 
-    "_", 
-    "_", 
-    "PANO_20121023_214540.jpg", 
-    "msaa", 
-    "_", 
-    "_", 
-    "PANO_20121023_214540.jpg", 
-    "_", 
-    "image", 
-    "decode", 
-    "pal8os2v2.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "pal8v4.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "pal8v5.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "rgb16-565.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "rgb16-565pal.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "rgb32-111110.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "rgb32bf.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "rgba32.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "rgba32abf.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "rgb24largepal.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "pal8os2v2-16.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "pal8oversizepal.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "pal4rletrns.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "pal8rletrns.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "4bpp-pixeldata-cropped.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "8bpp-pixeldata-cropped.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "24bpp-pixeldata-cropped.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "32bpp-pixeldata-cropped.bmp", 
-    "_", 
-    "image", 
-    "subset", 
-    "rgb24largepal.bmp", 
-    "_", 
-    "image", 
-    "subset", 
-    "pal8os2v2-16.bmp", 
-    "_", 
-    "image", 
-    "subset", 
-    "pal8oversizepal.bmp", 
-    "_", 
-    "image", 
-    "subset", 
-    "4bpp-pixeldata-cropped.bmp", 
-    "_", 
-    "image", 
-    "subset", 
-    "8bpp-pixeldata-cropped.bmp", 
-    "_", 
-    "image", 
-    "subset", 
-    "24bpp-pixeldata-cropped.bmp", 
-    "_", 
-    "image", 
-    "subset", 
-    "32bpp-pixeldata-cropped.bmp", 
-    "_", 
-    "image", 
-    "decode", 
-    "Hopstarter-Mac-Folders-Apple.ico", 
-    "gpu", 
-    "skp", 
-    "_", 
-    "_", 
-    "msaa", 
-    "skp", 
-    "_", 
-    "_", 
-    "gpu", 
-    "image", 
-    "decode", 
-    "_", 
-    "msaa", 
-    "image", 
-    "decode", 
-    "_", 
-    "gpu", 
-    "image", 
-    "subset", 
-    "_", 
-    "msaa", 
-    "image", 
-    "subset", 
-    "_", 
-    "--match", 
-    "~WritePixels", 
-    "~tabl_mozilla_0", 
-    "~desk_yahoonews_0"
-  ], 
   "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN": [
     "--config", 
     "565", 
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 1ae7c80f06..7715a07f58 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -41,7 +41,6 @@ def get_args(bot):
   # MSAA.  The Tegra2 and Tegra3 just don't support it.
   if ('GalaxyS4'    not in bot and
       'NexusPlayer' not in bot and
-      'Tegra2'      not in bot and
       'Tegra3'      not in bot):
     if 'Android' in bot:
       configs.append('msaa4')
@@ -51,9 +50,8 @@ def get_args(bot):
   if 'Android' not in bot and 'Daisy' not in bot:
     configs.append('pdf')
 
-  # Xoom and NP are running out of RAM when we run all these modes.  skia:3255
-  if ('Xoom'        not in bot and
-      'NexusPlayer' not in bot):
+  # NP is running out of RAM when we run all these modes.  skia:3255
+  if 'NexusPlayer' not in bot:
     configs.extend(mode + '-8888' for mode in
                    ['serialize', 'tiles_rt', 'pipe'])
     configs.append('tiles_rt-gpu')
@@ -62,6 +60,9 @@ def get_args(bot):
   args.append('--config')
   args.extend(configs)
 
+  if 'GalaxyS' in bot:
+    args.extend(('--threads', '0'))
+
   blacklist = []
   # This image is too large to be a texture for many GPUs.
   blacklist.extend('gpu _ _ PANO_20121023_214540.jpg'.split(' '))
@@ -136,7 +137,7 @@ def get_args(bot):
   if 'TSAN' in bot: # skia:3562
     match.append('~Math')
 
-  if 'Xoom' in bot or 'GalaxyS3' in bot:  # skia:1699
+  if 'GalaxyS3' in bot:  # skia:1699
     match.append('~WritePixels')
 
   # skia:3249: these images flakily don't decode on Android.
@@ -163,7 +164,6 @@ def self_test():
     'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug',
     'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
     'Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release',
-    'Test-Android-GCC-Xoom-GPU-Tegra2-Arm7-Release',
     'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind',