From 46df2a137232e1e25223770c5810d69256d6bcec Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 21 Feb 2017 19:10:24 -0500 Subject: Split Valgrind jobs -- one DM/NB run per task. Reland of https://skia-review.googlesource.com/c/8723/1 BUG=skia:2789 NOTRY=true Change-Id: I1fbd314457a9d411543c8d7af4df166608d1acc7 Reviewed-on: https://skia-review.googlesource.com/8832 Reviewed-by: Ben Wagner Commit-Queue: Ben Wagner --- infra/bots/gen_tasks.go | 2 + infra/bots/jobs.json | 3 + infra/bots/recipe_modules/perf/api.py | 14 +- ...ttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json | 71 -- ...-x86_64-Release-Valgrind_AbandonGpuContext.json | 138 ++++ .../example.expected/recipe_with_gerrit_patch.json | 71 -- infra/bots/recipe_modules/perf/example.py | 3 +- infra/bots/recipe_modules/sktest/api.py | 19 +- ...ttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json | 782 --------------------- ...-x86_64-Release-Valgrind_AbandonGpuContext.json | 458 ++++++++++++ ...6_64-Release-Valgrind_PreAbandonGpuContext.json | 458 ++++++++++++ infra/bots/recipe_modules/sktest/example.py | 4 + infra/bots/tasks.json | 162 +++++ 13 files changed, 1237 insertions(+), 948 deletions(-) create mode 100644 infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json create mode 100644 infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json create mode 100644 infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index 1dc4c95d23..df66942777 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -86,6 +86,8 @@ func deriveCompileTaskName(jobName string, parts map[string]string) string { task_os := parts["os"] ec := parts["extra_config"] ec = strings.TrimSuffix(ec, "_Skpbench") + ec = strings.TrimSuffix(ec, "_AbandonGpuContext") + ec = strings.TrimSuffix(ec, "_PreAbandonGpuContext") if task_os == "Android" { if ec == "Vulkan" { ec = "Android_Vulkan" diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index f8b2521d20..4570e41961 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -123,6 +123,7 @@ "Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs", "Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs", "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind", + "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext", "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug", "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release", "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug", @@ -223,6 +224,8 @@ "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release", "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD", "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind", + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext", + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext", "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug", "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release", "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug", diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py index b3ad2d74e4..e59ae418d3 100644 --- a/infra/bots/recipe_modules/perf/api.py +++ b/infra/bots/recipe_modules/perf/api.py @@ -214,20 +214,14 @@ def perf_steps(api): 'LIBGL_DRIVERS_PATH': dri_path, }) + # See skia:2789. + if '_AbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''): + args.extend(['--abandonGpuContext', '--nocpu']) + api.run(api.flavor.step, target, cmd=args, abort_on_failure=False, env=env) - # See skia:2789. - if ('Valgrind' in api.vars.builder_name and - api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU'): - abandonGpuContext = list(args) - abandonGpuContext.extend(['--abandonGpuContext', '--nocpu']) - api.run(api.flavor.step, - '%s --abandonGpuContext' % target, - cmd=abandonGpuContext, abort_on_failure=False, - env=api.vars.default_env) - # Copy results to swarming out dir. if api.vars.upload_perf_results: api.file.makedirs('perf_dir', api.vars.perf_data_dir) diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index ff596e3b53..4aa61d9bfc 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -128,77 +128,6 @@ }, "name": "nanobench" }, - { - "cmd": [ - "valgrind", - "--gen-suppressions=all", - "--leak-check=full", - "--track-origins=yes", - "--error-exitcode=1", - "--num-callers=40", - "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--loops", - "1", - "--samples", - "1", - "--keepAlive", - "true", - "--match", - "~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", - "--abandonGpuContext", - "--nocpu" - ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, - "name": "nanobench --abandonGpuContext" - }, { "name": "$result", "recipe_result": null, diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json new file mode 100644 index 0000000000..252b1219fd --- /dev/null +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json @@ -0,0 +1,138 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SKP VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SKP_VERSION" + ], + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded skimage VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SK_IMAGE_VERSION" + ], + "name": "write SK_IMAGE_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SVG VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SVG_VERSION" + ], + "name": "write SVG_VERSION" + }, + { + "cmd": [ + "valgrind", + "--gen-suppressions=all", + "--leak-check=full", + "--track-origins=yes", + "--error-exitcode=1", + "--num-callers=40", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/nanobench", + "--undefok", + "-i", + "[START_DIR]/skia/resources", + "--skps", + "[START_DIR]/skp", + "--images", + "[START_DIR]/skimage/nanobench", + "--nocpu", + "--pre_log", + "--images", + "--gpuStatsDump", + "true", + "--scales", + "1.0", + "1.1", + "--config", + "8888", + "gpu", + "nonrendering", + "hwui", + "f16", + "srgb", + "msaa16", + "nvpr16", + "nvprdit16", + "--loops", + "1", + "--samples", + "1", + "--keepAlive", + "true", + "--match", + "~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", + "--abandonGpuContext", + "--nocpu" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "nanobench" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +] \ No newline at end of file diff --git a/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json index ed45dac5ab..d66501e631 100644 --- a/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json +++ b/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json @@ -150,77 +150,6 @@ }, "name": "nanobench" }, - { - "cmd": [ - "valgrind", - "--gen-suppressions=all", - "--leak-check=full", - "--track-origins=yes", - "--error-exitcode=1", - "--num-callers=40", - "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/nanobench", - "--undefok", - "-i", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/nanobench", - "--nocpu", - "--pre_log", - "--images", - "--gpuStatsDump", - "true", - "--scales", - "1.0", - "1.1", - "--config", - "8888", - "gpu", - "nonrendering", - "hwui", - "f16", - "srgb", - "msaa16", - "nvpr16", - "nvprdit16", - "--loops", - "1", - "--samples", - "1", - "--keepAlive", - "true", - "--match", - "~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", - "--abandonGpuContext", - "--nocpu" - ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, - "name": "nanobench --abandonGpuContext" - }, { "name": "$result", "recipe_result": null, diff --git a/infra/bots/recipe_modules/perf/example.py b/infra/bots/recipe_modules/perf/example.py index eca7f1fdf8..391a21c0f3 100644 --- a/infra/bots/recipe_modules/perf/example.py +++ b/infra/bots/recipe_modules/perf/example.py @@ -32,6 +32,8 @@ TEST_BUILDERS = { 'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN', 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE', 'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', + ('Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' + + '_AbandonGpuContext'), 'Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan', 'Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release', 'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug', @@ -183,4 +185,3 @@ def GenTests(api): api.step_data('push [START_DIR]/skia/resources/* '+ '/sdcard/revenge_of_the_skiabot/resources', retcode=1) ) - diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py index 03b933b982..5fe943886e 100644 --- a/infra/bots/recipe_modules/sktest/api.py +++ b/infra/bots/recipe_modules/sktest/api.py @@ -570,6 +570,12 @@ def test_steps(api): 'LIBGL_DRIVERS_PATH': dri_path, }) + # See skia:2789. + if '_AbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''): + args.append('--abandonGpuContext') + if '_PreAbandonGpuContext' in api.vars.builder_cfg.get('extra_config', ''): + args.append('--preAbandonGpuContext') + api.run(api.flavor.step, 'dm', cmd=args, abort_on_failure=False, env=env) @@ -579,19 +585,6 @@ def test_steps(api): api.flavor.copy_directory_contents_to_host( api.flavor.device_dirs.dm_dir, api.vars.dm_dir) - # See skia:2789. - if ('Valgrind' in api.vars.builder_name and - api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU'): - abandonGpuContext = list(args) - abandonGpuContext.append('--abandonGpuContext') - api.run(api.flavor.step, 'dm --abandonGpuContext', - cmd=abandonGpuContext, abort_on_failure=False) - preAbandonGpuContext = list(args) - preAbandonGpuContext.append('--preAbandonGpuContext') - api.run(api.flavor.step, 'dm --preAbandonGpuContext', - cmd=preAbandonGpuContext, abort_on_failure=False, - env=api.vars.default_env) - class TestApi(recipe_api.RecipeApi): def run(self): diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 3cfa9a4141..814e6011bc 100644 --- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -449,788 +449,6 @@ }, "name": "dm" }, - { - "cmd": [ - "valgrind", - "--gen-suppressions=all", - "--leak-check=full", - "--track-origins=yes", - "--error-exitcode=1", - "--num-callers=40", - "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/dm", - "--undefok", - "--resourcePath", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/dm", - "--colorImages", - "[START_DIR]/skimage/colorspace", - "--nameByHash", - "--properties", - "gitHash", - "abc123", - "master", - "client.skia", - "builder", - "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind", - "build_number", - "5", - "--svgs", - "[START_DIR]/svg", - "--key", - "arch", - "x86_64", - "compiler", - "GCC", - "configuration", - "Release", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "GTX550Ti", - "extra_config", - "Valgrind", - "model", - "ShuttleA", - "os", - "Ubuntu", - "--nocpu", - "--config", - "8888", - "srgb", - "gpu", - "gpudft", - "gpusrgb", - "pdf", - "msaa16", - "nvprdit16", - "serialize-8888", - "tiles_rt-8888", - "pic-8888", - "--src", - "tests", - "gm", - "image", - "colorImage", - "svg", - "--blacklist", - "gpusrgb", - "image", - "_", - "_", - "8888", - "image", - "_", - "_", - "pdf", - "gm", - "_", - "fontmgr_iter", - "pdf", - "_", - "_", - "PANO_20121023_214540.jpg", - "pdf", - "skp", - "_", - "worldjournal", - "pdf", - "skp", - "_", - "desk_baidu.skp", - "pdf", - "skp", - "_", - "desk_wikipedia.skp", - "_", - "svg", - "_", - "_", - "serialize-8888", - "gm", - "_", - "bleed_image", - "serialize-8888", - "gm", - "_", - "c_gms", - "serialize-8888", - "gm", - "_", - "colortype", - "serialize-8888", - "gm", - "_", - "colortype_xfermodes", - "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", - "_", - "imagemasksubset", - "serialize-8888", - "gm", - "_", - "bitmapfilters", - "serialize-8888", - "gm", - "_", - "bitmapshaders", - "serialize-8888", - "gm", - "_", - "bleed", - "serialize-8888", - "gm", - "_", - "bleed_alpha_bmp", - "serialize-8888", - "gm", - "_", - "bleed_alpha_bmp_shader", - "serialize-8888", - "gm", - "_", - "convex_poly_clip", - "serialize-8888", - "gm", - "_", - "extractalpha", - "serialize-8888", - "gm", - "_", - "filterbitmap_checkerboard_32_32_g8", - "serialize-8888", - "gm", - "_", - "filterbitmap_image_mandrill_64", - "serialize-8888", - "gm", - "_", - "shadows", - "serialize-8888", - "gm", - "_", - "simpleaaclip_aaclip", - "serialize-8888", - "gm", - "_", - "composeshader_bitmap", - "serialize-8888", - "gm", - "_", - "scaled_tilemodes_npot", - "serialize-8888", - "gm", - "_", - "scaled_tilemodes", - "serialize-8888", - "gm", - "_", - "typefacerendering_pfaMac", - "serialize-8888", - "gm", - "_", - "parsedpaths", - "serialize-8888", - "gm", - "_", - "ImageGeneratorExternal_rect", - "serialize-8888", - "gm", - "_", - "ImageGeneratorExternal_shader", - "serialize-8888", - "gm", - "_", - "shadow_utils", - "serialize-8888", - "gm", - "_", - "bleed_alpha_image", - "serialize-8888", - "gm", - "_", - "bleed_alpha_image_shader", - "pic-8888", - "gm", - "_", - "drawfilter", - "pic-8888", - "gm", - "_", - "image-cacherator-from-picture", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-picture", - "pic-8888", - "gm", - "_", - "image-cacherator-from-raster", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-raster", - "pic-8888", - "gm", - "_", - "image-cacherator-from-ctable", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-ctable", - "pic-8888", - "gm", - "_", - "gamut", - "serialize-8888", - "gm", - "_", - "gamut", - "pic-8888", - "gm", - "_", - "complexclip4_bw", - "serialize-8888", - "gm", - "_", - "complexclip4_bw", - "pic-8888", - "gm", - "_", - "complexclip4_aa", - "serialize-8888", - "gm", - "_", - "complexclip4_aa", - "tiles_rt-8888", - "gm", - "_", - "complexclip4_bw", - "tiles_rt-8888", - "gm", - "_", - "complexclip4_aa", - "_", - "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", - "--match", - "~Threaded", - "--abandonGpuContext" - ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, - "name": "dm --abandonGpuContext" - }, - { - "cmd": [ - "valgrind", - "--gen-suppressions=all", - "--leak-check=full", - "--track-origins=yes", - "--error-exitcode=1", - "--num-callers=40", - "--suppressions=[START_DIR]/skia/tools/valgrind.supp", - "[START_DIR]/out/Release/dm", - "--undefok", - "--resourcePath", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/dm", - "--colorImages", - "[START_DIR]/skimage/colorspace", - "--nameByHash", - "--properties", - "gitHash", - "abc123", - "master", - "client.skia", - "builder", - "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind", - "build_number", - "5", - "--svgs", - "[START_DIR]/svg", - "--key", - "arch", - "x86_64", - "compiler", - "GCC", - "configuration", - "Release", - "cpu_or_gpu", - "GPU", - "cpu_or_gpu_value", - "GTX550Ti", - "extra_config", - "Valgrind", - "model", - "ShuttleA", - "os", - "Ubuntu", - "--nocpu", - "--config", - "8888", - "srgb", - "gpu", - "gpudft", - "gpusrgb", - "pdf", - "msaa16", - "nvprdit16", - "serialize-8888", - "tiles_rt-8888", - "pic-8888", - "--src", - "tests", - "gm", - "image", - "colorImage", - "svg", - "--blacklist", - "gpusrgb", - "image", - "_", - "_", - "8888", - "image", - "_", - "_", - "pdf", - "gm", - "_", - "fontmgr_iter", - "pdf", - "_", - "_", - "PANO_20121023_214540.jpg", - "pdf", - "skp", - "_", - "worldjournal", - "pdf", - "skp", - "_", - "desk_baidu.skp", - "pdf", - "skp", - "_", - "desk_wikipedia.skp", - "_", - "svg", - "_", - "_", - "serialize-8888", - "gm", - "_", - "bleed_image", - "serialize-8888", - "gm", - "_", - "c_gms", - "serialize-8888", - "gm", - "_", - "colortype", - "serialize-8888", - "gm", - "_", - "colortype_xfermodes", - "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", - "_", - "imagemasksubset", - "serialize-8888", - "gm", - "_", - "bitmapfilters", - "serialize-8888", - "gm", - "_", - "bitmapshaders", - "serialize-8888", - "gm", - "_", - "bleed", - "serialize-8888", - "gm", - "_", - "bleed_alpha_bmp", - "serialize-8888", - "gm", - "_", - "bleed_alpha_bmp_shader", - "serialize-8888", - "gm", - "_", - "convex_poly_clip", - "serialize-8888", - "gm", - "_", - "extractalpha", - "serialize-8888", - "gm", - "_", - "filterbitmap_checkerboard_32_32_g8", - "serialize-8888", - "gm", - "_", - "filterbitmap_image_mandrill_64", - "serialize-8888", - "gm", - "_", - "shadows", - "serialize-8888", - "gm", - "_", - "simpleaaclip_aaclip", - "serialize-8888", - "gm", - "_", - "composeshader_bitmap", - "serialize-8888", - "gm", - "_", - "scaled_tilemodes_npot", - "serialize-8888", - "gm", - "_", - "scaled_tilemodes", - "serialize-8888", - "gm", - "_", - "typefacerendering_pfaMac", - "serialize-8888", - "gm", - "_", - "parsedpaths", - "serialize-8888", - "gm", - "_", - "ImageGeneratorExternal_rect", - "serialize-8888", - "gm", - "_", - "ImageGeneratorExternal_shader", - "serialize-8888", - "gm", - "_", - "shadow_utils", - "serialize-8888", - "gm", - "_", - "bleed_alpha_image", - "serialize-8888", - "gm", - "_", - "bleed_alpha_image_shader", - "pic-8888", - "gm", - "_", - "drawfilter", - "pic-8888", - "gm", - "_", - "image-cacherator-from-picture", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-picture", - "pic-8888", - "gm", - "_", - "image-cacherator-from-raster", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-raster", - "pic-8888", - "gm", - "_", - "image-cacherator-from-ctable", - "serialize-8888", - "gm", - "_", - "image-cacherator-from-ctable", - "pic-8888", - "gm", - "_", - "gamut", - "serialize-8888", - "gm", - "_", - "gamut", - "pic-8888", - "gm", - "_", - "complexclip4_bw", - "serialize-8888", - "gm", - "_", - "complexclip4_bw", - "pic-8888", - "gm", - "_", - "complexclip4_aa", - "serialize-8888", - "gm", - "_", - "complexclip4_aa", - "tiles_rt-8888", - "gm", - "_", - "complexclip4_bw", - "tiles_rt-8888", - "gm", - "_", - "complexclip4_aa", - "_", - "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", - "--match", - "~Threaded", - "--preAbandonGpuContext" - ], - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "SKIA_OUT": "[START_DIR]/out" - }, - "name": "dm --preAbandonGpuContext" - }, { "name": "$result", "recipe_result": null, diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json new file mode 100644 index 0000000000..fc1ee40f04 --- /dev/null +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json @@ -0,0 +1,458 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SKP VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SKP_VERSION" + ], + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded skimage VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SK_IMAGE_VERSION" + ], + "name": "write SK_IMAGE_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SVG VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SVG_VERSION" + ], + "name": "write SVG_VERSION" + }, + { + "cmd": [ + "valgrind", + "--gen-suppressions=all", + "--leak-check=full", + "--track-origins=yes", + "--error-exitcode=1", + "--num-callers=40", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/dm", + "--undefok", + "--resourcePath", + "[START_DIR]/skia/resources", + "--skps", + "[START_DIR]/skp", + "--images", + "[START_DIR]/skimage/dm", + "--colorImages", + "[START_DIR]/skimage/colorspace", + "--nameByHash", + "--properties", + "gitHash", + "abc123", + "master", + "client.skia", + "builder", + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext", + "build_number", + "5", + "--svgs", + "[START_DIR]/svg", + "--key", + "arch", + "x86_64", + "compiler", + "GCC", + "configuration", + "Release", + "cpu_or_gpu", + "GPU", + "cpu_or_gpu_value", + "GTX550Ti", + "extra_config", + "Valgrind_AbandonGpuContext", + "model", + "ShuttleA", + "os", + "Ubuntu", + "--nocpu", + "--config", + "8888", + "srgb", + "gpu", + "gpudft", + "gpusrgb", + "pdf", + "msaa16", + "nvprdit16", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "colorImage", + "svg", + "--blacklist", + "gpusrgb", + "image", + "_", + "_", + "8888", + "image", + "_", + "_", + "pdf", + "gm", + "_", + "fontmgr_iter", + "pdf", + "_", + "_", + "PANO_20121023_214540.jpg", + "pdf", + "skp", + "_", + "worldjournal", + "pdf", + "skp", + "_", + "desk_baidu.skp", + "pdf", + "skp", + "_", + "desk_wikipedia.skp", + "_", + "svg", + "_", + "_", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "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", + "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "typefacerendering_pfaMac", + "serialize-8888", + "gm", + "_", + "parsedpaths", + "serialize-8888", + "gm", + "_", + "ImageGeneratorExternal_rect", + "serialize-8888", + "gm", + "_", + "ImageGeneratorExternal_shader", + "serialize-8888", + "gm", + "_", + "shadow_utils", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "pic-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "complexclip4_bw", + "serialize-8888", + "gm", + "_", + "complexclip4_bw", + "pic-8888", + "gm", + "_", + "complexclip4_aa", + "serialize-8888", + "gm", + "_", + "complexclip4_aa", + "tiles_rt-8888", + "gm", + "_", + "complexclip4_bw", + "tiles_rt-8888", + "gm", + "_", + "complexclip4_aa", + "_", + "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", + "--match", + "~Threaded", + "--abandonGpuContext" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "dm" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +] \ No newline at end of file diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json new file mode 100644 index 0000000000..de313f7bb5 --- /dev/null +++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json @@ -0,0 +1,458 @@ +[ + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/skp/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SKP VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SKP_VERSION" + ], + "name": "write SKP_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded skimage VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SK_IMAGE_VERSION" + ], + "name": "write SK_IMAGE_VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "[START_DIR]/skia/infra/bots/assets/svg/VERSION", + "/path/to/tmp/" + ], + "name": "Get downloaded SVG VERSION" + }, + { + "cmd": [ + "python", + "-u", + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "42", + "[START_DIR]/tmp/SVG_VERSION" + ], + "name": "write SVG_VERSION" + }, + { + "cmd": [ + "valgrind", + "--gen-suppressions=all", + "--leak-check=full", + "--track-origins=yes", + "--error-exitcode=1", + "--num-callers=40", + "--suppressions=[START_DIR]/skia/tools/valgrind.supp", + "[START_DIR]/out/Release/dm", + "--undefok", + "--resourcePath", + "[START_DIR]/skia/resources", + "--skps", + "[START_DIR]/skp", + "--images", + "[START_DIR]/skimage/dm", + "--colorImages", + "[START_DIR]/skimage/colorspace", + "--nameByHash", + "--properties", + "gitHash", + "abc123", + "master", + "client.skia", + "builder", + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext", + "build_number", + "5", + "--svgs", + "[START_DIR]/svg", + "--key", + "arch", + "x86_64", + "compiler", + "GCC", + "configuration", + "Release", + "cpu_or_gpu", + "GPU", + "cpu_or_gpu_value", + "GTX550Ti", + "extra_config", + "Valgrind_PreAbandonGpuContext", + "model", + "ShuttleA", + "os", + "Ubuntu", + "--nocpu", + "--config", + "8888", + "srgb", + "gpu", + "gpudft", + "gpusrgb", + "pdf", + "msaa16", + "nvprdit16", + "serialize-8888", + "tiles_rt-8888", + "pic-8888", + "--src", + "tests", + "gm", + "image", + "colorImage", + "svg", + "--blacklist", + "gpusrgb", + "image", + "_", + "_", + "8888", + "image", + "_", + "_", + "pdf", + "gm", + "_", + "fontmgr_iter", + "pdf", + "_", + "_", + "PANO_20121023_214540.jpg", + "pdf", + "skp", + "_", + "worldjournal", + "pdf", + "skp", + "_", + "desk_baidu.skp", + "pdf", + "skp", + "_", + "desk_wikipedia.skp", + "_", + "svg", + "_", + "_", + "serialize-8888", + "gm", + "_", + "bleed_image", + "serialize-8888", + "gm", + "_", + "c_gms", + "serialize-8888", + "gm", + "_", + "colortype", + "serialize-8888", + "gm", + "_", + "colortype_xfermodes", + "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", + "_", + "imagemasksubset", + "serialize-8888", + "gm", + "_", + "bitmapfilters", + "serialize-8888", + "gm", + "_", + "bitmapshaders", + "serialize-8888", + "gm", + "_", + "bleed", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp", + "serialize-8888", + "gm", + "_", + "bleed_alpha_bmp_shader", + "serialize-8888", + "gm", + "_", + "convex_poly_clip", + "serialize-8888", + "gm", + "_", + "extractalpha", + "serialize-8888", + "gm", + "_", + "filterbitmap_checkerboard_32_32_g8", + "serialize-8888", + "gm", + "_", + "filterbitmap_image_mandrill_64", + "serialize-8888", + "gm", + "_", + "shadows", + "serialize-8888", + "gm", + "_", + "simpleaaclip_aaclip", + "serialize-8888", + "gm", + "_", + "composeshader_bitmap", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes_npot", + "serialize-8888", + "gm", + "_", + "scaled_tilemodes", + "serialize-8888", + "gm", + "_", + "typefacerendering_pfaMac", + "serialize-8888", + "gm", + "_", + "parsedpaths", + "serialize-8888", + "gm", + "_", + "ImageGeneratorExternal_rect", + "serialize-8888", + "gm", + "_", + "ImageGeneratorExternal_shader", + "serialize-8888", + "gm", + "_", + "shadow_utils", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image", + "serialize-8888", + "gm", + "_", + "bleed_alpha_image_shader", + "pic-8888", + "gm", + "_", + "drawfilter", + "pic-8888", + "gm", + "_", + "image-cacherator-from-picture", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-picture", + "pic-8888", + "gm", + "_", + "image-cacherator-from-raster", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-raster", + "pic-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "serialize-8888", + "gm", + "_", + "image-cacherator-from-ctable", + "pic-8888", + "gm", + "_", + "gamut", + "serialize-8888", + "gm", + "_", + "gamut", + "pic-8888", + "gm", + "_", + "complexclip4_bw", + "serialize-8888", + "gm", + "_", + "complexclip4_bw", + "pic-8888", + "gm", + "_", + "complexclip4_aa", + "serialize-8888", + "gm", + "_", + "complexclip4_aa", + "tiles_rt-8888", + "gm", + "_", + "complexclip4_bw", + "tiles_rt-8888", + "gm", + "_", + "complexclip4_aa", + "_", + "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", + "--match", + "~Threaded", + "--preAbandonGpuContext" + ], + "env": { + "BUILDTYPE": "Release", + "CHROME_HEADLESS": "1", + "SKIA_OUT": "[START_DIR]/out" + }, + "name": "dm" + }, + { + "name": "$result", + "recipe_result": null, + "status_code": 0 + } +] \ No newline at end of file diff --git a/infra/bots/recipe_modules/sktest/example.py b/infra/bots/recipe_modules/sktest/example.py index c921557367..458f408e0c 100644 --- a/infra/bots/recipe_modules/sktest/example.py +++ b/infra/bots/recipe_modules/sktest/example.py @@ -42,6 +42,10 @@ TEST_BUILDERS = { 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared', 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN', 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', + ('Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' + + '_AbandonGpuContext'), + ('Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' + + '_PreAbandonGpuContext'), 'Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan', 'Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release', 'Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE', diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 20a2e2618a..80bc58effc 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -746,6 +746,12 @@ "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind" ] }, + "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": { + "priority": 0.8, + "tasks": [ + "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext" + ] + }, "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": { "priority": 0.8, "tasks": [ @@ -1347,6 +1353,18 @@ "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind" ] }, + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": { + "priority": 0.8, + "tasks": [ + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext" + ] + }, + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": { + "priority": 0.8, + "tasks": [ + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext" + ] + }, "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": { "priority": 0.8, "tasks": [ @@ -6275,6 +6293,54 @@ "isolate": "perf_skia.isolate", "priority": 0.8 }, + "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:21" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:36" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:3" + } + ], + "dependencies": [ + "Build-Ubuntu-GCC-x86_64-Release-Valgrind" + ], + "dimensions": [ + "gpu:10de:1244", + "os:Ubuntu-14.04", + "pool:Skia" + ], + "execution_timeout_ns": 32400000000000, + "expiration_ns": 172800000000000, + "extra_args": [ + "--workdir", + "../../..", + "swarm_perf", + "repository=<(REPO)", + "buildername=Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 3600000000000, + "isolate": "perf_skia.isolate", + "priority": 0.8 + }, "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": { "cipd_packages": [ { @@ -11128,6 +11194,102 @@ "isolate": "test_skia.isolate", "priority": 0.8 }, + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:21" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:36" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:3" + } + ], + "dependencies": [ + "Build-Ubuntu-GCC-x86_64-Release-Valgrind" + ], + "dimensions": [ + "gpu:10de:1244", + "os:Ubuntu-14.04", + "pool:Skia" + ], + "execution_timeout_ns": 32400000000000, + "expiration_ns": 172800000000000, + "extra_args": [ + "--workdir", + "../../..", + "swarm_test", + "repository=<(REPO)", + "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 3600000000000, + "isolate": "test_skia.isolate", + "priority": 0.8 + }, + "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext": { + "cipd_packages": [ + { + "name": "skia/bots/skimage", + "path": "skimage", + "version": "version:21" + }, + { + "name": "skia/bots/skp", + "path": "skp", + "version": "version:36" + }, + { + "name": "skia/bots/svg", + "path": "svg", + "version": "version:3" + } + ], + "dependencies": [ + "Build-Ubuntu-GCC-x86_64-Release-Valgrind" + ], + "dimensions": [ + "gpu:10de:1244", + "os:Ubuntu-14.04", + "pool:Skia" + ], + "execution_timeout_ns": 32400000000000, + "expiration_ns": 172800000000000, + "extra_args": [ + "--workdir", + "../../..", + "swarm_test", + "repository=<(REPO)", + "buildername=Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext", + "mastername=fake-master", + "buildnumber=2", + "slavename=fake-buildslave", + "nobuildbot=True", + "swarm_out_dir=${ISOLATED_OUTDIR}", + "revision=<(REVISION)", + "patch_storage=<(PATCH_STORAGE)", + "patch_issue=<(ISSUE)", + "patch_set=<(PATCHSET)" + ], + "io_timeout_ns": 3600000000000, + "isolate": "test_skia.isolate", + "priority": 0.8 + }, "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug": { "cipd_packages": [ { -- cgit v1.2.3