AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GYP_DEFINES and DM flags for Vulkan bot

Browse Source 
BUG=skia:5186
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1885563002

Review URL: https://codereview.chromium.org/1885563002
This commit is contained in:
borenet 2016-04-12 08:13:56 -07:00 committed by Commit bot
parent 134af6b6d2
commit 71e185c060
4 changed files with 647 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

352
tools/buildbot_spec.json
View File

@ -6577,6 +6577,358 @@
"upload_dm_results": false,
"upload_perf_results": false
},
"Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": {
"build_targets": [
"dm"
],
"builder_cfg": {
"arch": "x86_64",
"compiler": "MSVC",
"configuration": "Debug",
"cpu_or_gpu": "GPU",
"cpu_or_gpu_value": "GTX660",
"extra_config": "Vulkan",
"is_trybot": false,
"model": "ShuttleA",
"os": "Win10",
"role": "Test"
},
"configuration": "Debug_x64",
"dm_flags": [
"--config",
"vk",
"--src",
"tests",
"gm",
"image",
"--blacklist",
"f16",
"_",
"_",
"dstreadshuffle",
"f16",
"image",
"_",
"_",
"srgb",
"image",
"_",
"_",
"gpusrgb",
"image",
"_",
"_",
"_",
"image",
"gen_platf",
"rle8-height-negative.bmp",
"_",
"image",
"gen_platf",
"rle4-height-negative.bmp",
"_",
"image",
"gen_platf",
"pal8os2v2.bmp",
"_",
"image",
"gen_platf",
"pal8os2v2-16.bmp",
"_",
"image",
"gen_platf",
"rgba32abf.bmp",
"_",
"image",
"gen_platf",
"rgb24prof.bmp",
"_",
"image",
"gen_platf",
"rgb24lprof.bmp",
"_",
"image",
"gen_platf",
"8bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"4bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"32bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
"serialize-8888",
"gm",
"_",
"not_native32_bitmap_config",
"serialize-8888",
"gm",
"_",
"bleed_image",
"serialize-8888",
"gm",
"_",
"bleed_alpha_image",
"serialize-8888",
"gm",
"_",
"bleed_alpha_image_shader",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
"_",
"colortype",
"serialize-8888",
"gm",
"_",
"colortype_xfermodes",
"serialize-8888",
"gm",
"_",
"colorwheelnative",
"serialize-8888",
"gm",
"_",
"drawfilter",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds_0.75_0",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds_1_-0.25",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds",
"serialize-8888",
"gm",
"_",
"fontmgr_match",
"serialize-8888",
"gm",
"_",
"fontmgr_iter",
"serialize-8888",
"gm",
"_",
"verylargebitmap",
"serialize-8888",
"gm",
"_",
"verylarge_picture_image",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
"2ndpic-8888",
"gm",
"_",
"drawfilter",
"sp-8888",
"gm",
"_",
"image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
"sp-8888",
"gm",
"_",
"image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
"sp-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"_",
"image",
"_",
"interlaced1.png",
"_",
"image",
"_",
"interlaced2.png",
"_",
"image",
"_",
"interlaced3.png",
"_",
"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"
],
"do_perf_steps": false,
"do_test_steps": true,
"env": {
"GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_vulkan=1 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
},
"nanobench_flags": [
"--pre_log",
"--images",
"--gpuStatsDump",
"true",
"--scales",
"1.0",
"1.1",
"--config",
"565",
"8888",
"gpu",
"nonrendering",
"angle",
"hwui",
"msaa16",
"nvpr16",
"nvprdit16",
"--match",
"~interlaced1.png",
"~interlaced2.png",
"~interlaced3.png",
"~inc0.gif",
"~inc1.gif",
"~incInterlaced.gif",
"~inc0.jpg",
"~incGray.jpg",
"~inc0.wbmp",
"~inc1.wbmp",
"~inc0.webp",
"~inc1.webp",
"~inc0.ico",
"~inc1.ico",
"~inc0.png",
"~inc1.png",
"~inc2.png",
"~inc12.png",
"~inc13.png",
"~inc14.png",
"~inc0.webp",
"~inc1.webp"
],
"upload_dm_results": true,
"upload_perf_results": false
},
"Test-Win8-MSVC-ShuttleA-CPU-AVX-x86_64-Debug": {
"build_targets": [
"dm"

5
tools/buildbot_spec.py
View File

@ -164,6 +164,10 @@ def gyp_defines(builder_dict):
if builder_dict.get('extra_config') == 'CommandBuffer':
gyp_defs['skia_command_buffer'] = '1'
# Vulkan.
if builder_dict.get('extra_config') == 'Vulkan':
gyp_defs['skia_vulkan'] = '1'
return gyp_defs
@ -378,6 +382,7 @@ def self_test():
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Fast',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared',
'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan',
'Test-Win8-MSVC-ShuttleB-GPU-HD4600-x86-Release-ANGLE',
'Test-Win8-MSVC-ShuttleA-CPU-AVX-x86_64-Debug',
]

285
tools/dm_flags.json
View File

@ -3324,6 +3324,291 @@
"--match",
"~Threaded"
],
"Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan": [
"--config",
"vk",
"--src",
"tests",
"gm",
"image",
"--blacklist",
"f16",
"_",
"_",
"dstreadshuffle",
"f16",
"image",
"_",
"_",
"srgb",
"image",
"_",
"_",
"gpusrgb",
"image",
"_",
"_",
"_",
"image",
"gen_platf",
"rle8-height-negative.bmp",
"_",
"image",
"gen_platf",
"rle4-height-negative.bmp",
"_",
"image",
"gen_platf",
"pal8os2v2.bmp",
"_",
"image",
"gen_platf",
"pal8os2v2-16.bmp",
"_",
"image",
"gen_platf",
"rgba32abf.bmp",
"_",
"image",
"gen_platf",
"rgb24prof.bmp",
"_",
"image",
"gen_platf",
"rgb24lprof.bmp",
"_",
"image",
"gen_platf",
"8bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"4bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"32bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
"serialize-8888",
"gm",
"_",
"not_native32_bitmap_config",
"serialize-8888",
"gm",
"_",
"bleed_image",
"serialize-8888",
"gm",
"_",
"bleed_alpha_image",
"serialize-8888",
"gm",
"_",
"bleed_alpha_image_shader",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
"_",
"colortype",
"serialize-8888",
"gm",
"_",
"colortype_xfermodes",
"serialize-8888",
"gm",
"_",
"colorwheelnative",
"serialize-8888",
"gm",
"_",
"drawfilter",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds_0.75_0",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds_1_-0.25",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds",
"serialize-8888",
"gm",
"_",
"fontmgr_match",
"serialize-8888",
"gm",
"_",
"fontmgr_iter",
"serialize-8888",
"gm",
"_",
"verylargebitmap",
"serialize-8888",
"gm",
"_",
"verylarge_picture_image",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
"2ndpic-8888",
"gm",
"_",
"drawfilter",
"sp-8888",
"gm",
"_",
"image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
"sp-8888",
"gm",
"_",
"image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
"sp-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"_",
"image",
"_",
"interlaced1.png",
"_",
"image",
"_",
"interlaced2.png",
"_",
"image",
"_",
"interlaced3.png",
"_",
"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"
],
"Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [
"--threads",
"4",

6
tools/dm_flags.py
View File

@ -92,11 +92,14 @@ def get_args(bot):
if 'CommandBuffer' in bot:
configs = ['command_buffer']
# Vulkan bot *only* runs the vk config.
if 'Vulkan' in bot:
configs = ['vk']
args.append('--config')
args.extend(configs)
# Run tests, gms, and image decoding tests everywhere.
# TODO: remove skp from default --src list?
args.extend('--src tests gm image'.split(' '))
if 'GalaxyS' in bot:
@ -267,6 +270,7 @@ def self_test():
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind',
'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan',
'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE',
]