Try throttling x86 desktop bots down with fewer threads.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1825163002
Review URL: https://codereview.chromium.org/1825163002
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index d8744f3..c9b97e8 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -1747,18 +1747,6 @@
"image",
"_",
"_",
- "_",
- "image",
- "_",
- "interlaced1.png",
- "_",
- "image",
- "_",
- "interlaced2.png",
- "_",
- "image",
- "_",
- "interlaced3.png",
"serialize-8888",
"gm",
"_",
@@ -1977,18 +1965,6 @@
"_",
"_",
"image",
- "_",
- "interlaced1.png",
- "_",
- "image",
- "_",
- "interlaced2.png",
- "_",
- "image",
- "_",
- "interlaced3.png",
- "_",
- "image",
"gen_platf",
"rgba32abf.bmp",
"_",
@@ -2236,18 +2212,6 @@
"image",
"_",
"_",
- "_",
- "image",
- "_",
- "interlaced1.png",
- "_",
- "image",
- "_",
- "interlaced2.png",
- "_",
- "image",
- "_",
- "interlaced3.png",
"serialize-8888",
"gm",
"_",
@@ -2468,18 +2432,6 @@
"image",
"_",
"_",
- "_",
- "image",
- "_",
- "interlaced1.png",
- "_",
- "image",
- "_",
- "interlaced2.png",
- "_",
- "image",
- "_",
- "interlaced3.png",
"serialize-8888",
"gm",
"_",
@@ -2717,18 +2669,6 @@
"skp",
"_",
"desk_wikipedia.skp",
- "_",
- "image",
- "_",
- "interlaced1.png",
- "_",
- "image",
- "_",
- "interlaced2.png",
- "_",
- "image",
- "_",
- "interlaced3.png",
"serialize-8888",
"gm",
"_",
@@ -2965,18 +2905,6 @@
"skp",
"_",
"desk_wikipedia.skp",
- "_",
- "image",
- "_",
- "interlaced1.png",
- "_",
- "image",
- "_",
- "interlaced2.png",
- "_",
- "image",
- "_",
- "interlaced3.png",
"serialize-8888",
"gm",
"_",
@@ -3245,6 +3173,7 @@
"~Threaded"
],
"Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [
+ "--threads 4",
"--config",
"565",
"8888",
@@ -3283,18 +3212,6 @@
"fontmgr_iter_factory",
"_",
"image",
- "_",
- "interlaced1.png",
- "_",
- "image",
- "_",
- "interlaced2.png",
- "_",
- "image",
- "_",
- "interlaced3.png",
- "_",
- "image",
"gen_platf",
"rle8-height-negative.bmp",
"_",
@@ -3601,86 +3518,6 @@
"image",
"_",
".SRW",
- "_",
- "image",
- "_",
- ".arw",
- "_",
- "image",
- "_",
- ".cr2",
- "_",
- "image",
- "_",
- ".dng",
- "_",
- "image",
- "_",
- ".nef",
- "_",
- "image",
- "_",
- ".nrw",
- "_",
- "image",
- "_",
- ".orf",
- "_",
- "image",
- "_",
- ".raf",
- "_",
- "image",
- "_",
- ".rw2",
- "_",
- "image",
- "_",
- ".pef",
- "_",
- "image",
- "_",
- ".srw",
- "_",
- "image",
- "_",
- ".ARW",
- "_",
- "image",
- "_",
- ".CR2",
- "_",
- "image",
- "_",
- ".DNG",
- "_",
- "image",
- "_",
- ".NEF",
- "_",
- "image",
- "_",
- ".NRW",
- "_",
- "image",
- "_",
- ".ORF",
- "_",
- "image",
- "_",
- ".RAF",
- "_",
- "image",
- "_",
- ".RW2",
- "_",
- "image",
- "_",
- ".PEF",
- "_",
- "image",
- "_",
- ".SRW",
"--match",
"~GLPrograms"
]
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index d3caf11..1d9034b 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -29,6 +29,11 @@
def get_args(bot):
args = []
+ # 32-bit desktop bots tend to run out of memory, because they have relatively
+ # far more cores than RAM (e.g. 32 cores, 3G RAM). Hold them back a bit.
+ if '-x86-' in bot and not 'NexusPlayer' in bot:
+ args.append('--threads 4')
+
configs = ['565', '8888', 'gpu']
if '-GCE-' in bot:
@@ -107,12 +112,6 @@
blacklist.extend('gpu skp _ _ msaa skp _ _'.split(' '))
blacklist.extend('msaa16 gm _ tilemodesProcess'.split(' '))
- # the 32-bit GCE bots run out of memory in DM when running these large images
- if 'x86' in bot and not 'x86-64' in bot:
- blacklist.extend('_ image _ interlaced1.png'.split(' '))
- blacklist.extend('_ image _ interlaced2.png'.split(' '))
- blacklist.extend('_ image _ interlaced3.png'.split(' '))
-
if 'Mac' in bot or 'iOS' in bot:
# CG fails on questionable bmps
blacklist.extend('_ image gen_platf rgba32abf.bmp'.split(' '))
@@ -122,7 +121,7 @@
blacklist.extend('_ image gen_platf 4bpp-pixeldata-cropped.bmp'.split(' '))
blacklist.extend('_ image gen_platf 32bpp-pixeldata-cropped.bmp'.split(' '))
blacklist.extend('_ image gen_platf 24bpp-pixeldata-cropped.bmp'.split(' '))
-
+
# CG has unpredictable behavior on this questionable gif
# It's probably using uninitialized memory
blacklist.extend('_ image gen_platf frame_larger_than_image.gif'.split(' '))
@@ -193,11 +192,6 @@
for raw_ext in r:
blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))
- # Blacklist RAW images on some 32-bit machines due to out-of-memory issues
- if (('Win' in bot or 'Ubuntu' in bot) and not '64' in bot):
- for raw_ext in r:
- blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))
-
match = []
if 'Valgrind' in bot: # skia:3021
match.append('~Threaded')
