commit 13e51f91ef39597430de8f318263f105ce14ba40
author borenet <borenet@google.com> Mon Mar 09 06:59:16 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Mar 09 06:59:16 2015 -0700
tree c7ff888728afe302cacbf6f55d858ebd219ea6a6
parent 1b110d6bf4aebd4452687a8294d222e3d7e1ed38

Run Valgrind bots with --nogpu and --nocpu as appropriate

BUG=skia:3506
NOPRESUBMIT=true

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

tools/dm_flags.json

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 07a9588..4d44514 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -99,7 +99,7 @@
     "--threads", 
     "1"
   ], 
-  "Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind": [
+  "Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_CPU": [
     "--config", 
     "565", 
     "8888", 
@@ -111,6 +111,33 @@
     "tiles_rt-8888", 
     "pipe-8888", 
     "tiles_rt-gpu", 
+    "--nogpu", 
+    "--blacklist", 
+    "gpu", 
+    "_", 
+    "PANO_20121023_214540.jpg", 
+    "msaa", 
+    "_", 
+    "PANO_20121023_214540.jpg", 
+    "pdf", 
+    "_", 
+    ".webp", 
+    "--match", 
+    "~Threaded"
+  ], 
+  "Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU": [
+    "--config", 
+    "565", 
+    "8888", 
+    "gpu", 
+    "msaa16", 
+    "nvprmsaa16", 
+    "pdf", 
+    "serialize-8888", 
+    "tiles_rt-8888", 
+    "pipe-8888", 
+    "tiles_rt-gpu", 
+    "--nocpu", 
     "--blacklist", 
     "gpu", 
     "_", 

tools/dm_flags.py

diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index bf194d1..2361242 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -61,6 +61,10 @@
   # PDF + .webp -> jumps depending on uninitialized memory.  skia:3505
   if 'Valgrind' in bot:
     blacklist.extend('pdf _ .webp'.split(' '))
+    if 'GPU' in bot:
+      args.append('--nocpu')
+    elif 'CPU' in bot:
+      args.append('--nogpu')
 
   if blacklist:
     args.append('--blacklist')
@@ -103,7 +107,8 @@
     'Test-Android-Nexus7-Tegra3-Arm7-Release',
     'Test-Android-Xoom-Tegra2-Arm7-Release',
     'Test-ChromeOS-Alex-GMA3150-x86-Debug',
-    'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind',
+    'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_CPU',
+    'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU',
     'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
   ]
 

tools/nanobench_flags.json

diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index 2317123..a9aa6cd 100644
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -34,7 +34,7 @@
     "--match", 
     "skp"
   ], 
-  "Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind": [
+  "Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_CPU": [
     "--scales", 
     "1.0", 
     "1.1", 
@@ -50,7 +50,27 @@
     "--loops", 
     "1", 
     "--samples", 
-    "1"
+    "1", 
+    "--nogpu"
+  ], 
+  "Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU": [
+    "--scales", 
+    "1.0", 
+    "1.1", 
+    "--config", 
+    "565", 
+    "8888", 
+    "gpu", 
+    "nonrendering", 
+    "angle", 
+    "hwui", 
+    "msaa16", 
+    "nvprmsaa16", 
+    "--loops", 
+    "1", 
+    "--samples", 
+    "1", 
+    "--nocpu"
   ], 
   "Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE": [
     "--scales", 

tools/nanobench_flags.py

diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index cb862a6..cec48a1 100755
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -40,6 +40,10 @@
     # Don't care about Valgrind performance.
     args.extend(['--loops',   '1'])
     args.extend(['--samples', '1'])
+    if 'GPU' in bot:
+      args.append('--nocpu')
+    elif 'CPU' in bot:
+      args.append('--nogpu')
 
   match = []
   if 'Android' in bot:
@@ -69,7 +73,8 @@
   cases = [
     'Perf-Android-GalaxyS3-Mali400-Arm7-Release',
     'Perf-Android-Nexus7-Tegra3-Arm7-Release',
-    'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind',
+    'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_CPU',
+    'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU',
     'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
   ]