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

Move FxAA jobs to Win2k8, Clang, GCE, 64-bit; run fewer configs.

Browse Source 
These jobs were originally added in
https://skia-review.googlesource.com/c/skia/+/60540.

No-Try: true
Change-Id: I38677933dbb05dac8df9ea236af9a5d7b8227623
Reviewed-on: https://skia-review.googlesource.com/63742
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Yuqian Li <liyuqian@google.com>
This commit is contained in:
Ben Wagner 2017-10-26 13:12:39 -04:00 committed by Skia Commit-Bot
parent 7621d9f04b
commit 077710b06f
7 changed files with 560 additions and 807 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infra/bots/README.recipes.md
View File

@ -837,17 +837,17 @@ benchmark Skia using skpbench.
[DEPS](/infra/bots/recipes/test.py#9): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [core](#recipe_modules-core), [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars)
&mdash; **def [RunSteps](/infra/bots/recipes/test.py#855)(api):**
&mdash; **def [RunSteps](/infra/bots/recipes/test.py#860)(api):**
&mdash; **def [dm\_flags](/infra/bots/recipes/test.py#27)(api, bot):**
&mdash; **def [key\_params](/infra/bots/recipes/test.py#711)(api):**
&mdash; **def [key\_params](/infra/bots/recipes/test.py#716)(api):**
Build a unique key from the builder name (as a list).
E.g. arch x86 gpu GeForce320M mode MacMini4.1 os Mac10.6
&mdash; **def [test\_steps](/infra/bots/recipes/test.py#727)(api):**
&mdash; **def [test\_steps](/infra/bots/recipes/test.py#732)(api):**
Run the DM test.
### *recipes* / [update\_meta\_config](/infra/bots/recipes/update_meta_config.py)

12
infra/bots/jobs.json
View File

@ -449,8 +449,14 @@
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE",
"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-GDI",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FAAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FDAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-FSAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Release-All-GDI",
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug-All",
"Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release-All",
@ -461,13 +467,7 @@
"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All",
"Test-Win7-Clang-Golo-CPU-AVX-x86_64-Release-All-GDI",
"Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All",
"Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FAAA",
"Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FDAA",
"Test-Win7-MSVC-Golo-CPU-AVX-x86-Debug-All-FSAA",
"Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All",
"Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FAAA",
"Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FDAA",
"Test-Win7-MSVC-Golo-CPU-AVX-x86-Release-All-FSAA",
"Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All",
"Test-Win8-Clang-Golo-CPU-AVX-x86_64-Debug-All-GDI",
"Test-Win8-Clang-Golo-CPU-AVX-x86_64-Release-All",

122
infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FAAA.json → infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
View File

@ -191,7 +191,7 @@
"gitHash",
"abc123",
"builder",
"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FAAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
@ -206,15 +206,15 @@
"configuration",
"Debug",
"cpu_or_gpu",
"GPU",
"CPU",
"cpu_or_gpu_value",
"GTX1070",
"AVX2",
"extra_config",
"Vulkan_FAAA",
"FAAA",
"model",
"ZBOX",
"GCE",
"os",
"Win10",
"Win2k8",
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
@ -222,21 +222,17 @@
"--dont_write",
"pdf",
"--randomProcessorTest",
"--nocpu",
"--nogpu",
"--config",
"vk",
"8888",
"tiles_rt-8888",
"--src",
"tests",
"gm",
"image",
"colorImage",
"svg",
"--blacklist",
"_",
"svg",
"_",
"svgparse_",
"_",
"image",
"gen_platf",
"pal8os2v2.bmp",
@ -273,6 +269,10 @@
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
"_",
"gm",
"_",
"composeshader_bitmap",
"_",
"image",
"gen_platf",
"testimgari.jpg",
@ -284,98 +284,14 @@
"image",
"gen_platf",
"rle4-height-negative.bmp",
"tiles_rt-8888",
"gm",
"_",
"image",
"complexclip4_bw",
"tiles_rt-8888",
"gm",
"_",
"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",
"complexclip4_aa",
"--deltaAA",
"false",
"--forceAnalyticAA",

122
infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FDAA.json → infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA.json
View File

@ -191,7 +191,7 @@
"gitHash",
"abc123",
"builder",
"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FDAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
@ -206,15 +206,15 @@
"configuration",
"Debug",
"cpu_or_gpu",
"GPU",
"CPU",
"cpu_or_gpu_value",
"GTX1070",
"AVX2",
"extra_config",
"Vulkan_FDAA",
"FDAA",
"model",
"ZBOX",
"GCE",
"os",
"Win10",
"Win2k8",
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
@ -222,21 +222,17 @@
"--dont_write",
"pdf",
"--randomProcessorTest",
"--nocpu",
"--nogpu",
"--config",
"vk",
"8888",
"tiles_rt-8888",
"--src",
"tests",
"gm",
"image",
"colorImage",
"svg",
"--blacklist",
"_",
"svg",
"_",
"svgparse_",
"_",
"image",
"gen_platf",
"pal8os2v2.bmp",
@ -273,6 +269,10 @@
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
"_",
"gm",
"_",
"composeshader_bitmap",
"_",
"image",
"gen_platf",
"testimgari.jpg",
@ -284,98 +284,14 @@
"image",
"gen_platf",
"rle4-height-negative.bmp",
"tiles_rt-8888",
"gm",
"_",
"image",
"complexclip4_bw",
"tiles_rt-8888",
"gm",
"_",
"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",
"complexclip4_aa",
"--deltaAA",
"--forceDeltaAA",
"--verbose"

122
infra/bots/recipes/test.expected/Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FSAA.json → infra/bots/recipes/test.expected/Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
View File

@ -191,7 +191,7 @@
"gitHash",
"abc123",
"builder",
"Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FSAA",
"Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
@ -206,15 +206,15 @@
"configuration",
"Debug",
"cpu_or_gpu",
"GPU",
"CPU",
"cpu_or_gpu_value",
"GTX1070",
"AVX2",
"extra_config",
"Vulkan_FSAA",
"FSAA",
"model",
"ZBOX",
"GCE",
"os",
"Win10",
"Win2k8",
"--uninterestingHashesFile",
"[START_DIR]\\tmp\\uninteresting_hashes.txt",
"--writePath",
@ -222,21 +222,17 @@
"--dont_write",
"pdf",
"--randomProcessorTest",
"--nocpu",
"--nogpu",
"--config",
"vk",
"8888",
"tiles_rt-8888",
"--src",
"tests",
"gm",
"image",
"colorImage",
"svg",
"--blacklist",
"_",
"svg",
"_",
"svgparse_",
"_",
"image",
"gen_platf",
"pal8os2v2.bmp",
@ -273,6 +269,10 @@
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
"_",
"gm",
"_",
"composeshader_bitmap",
"_",
"image",
"gen_platf",
"testimgari.jpg",
@ -284,98 +284,14 @@
"image",
"gen_platf",
"rle4-height-negative.bmp",
"tiles_rt-8888",
"gm",
"_",
"image",
"complexclip4_bw",
"tiles_rt-8888",
"gm",
"_",
"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",
"complexclip4_aa",
"--analyticAA",
"false",
"--deltaAA",

11
infra/bots/recipes/test.py
View File

@ -106,6 +106,11 @@ def dm_flags(api, bot):
if 'SK_FORCE_RASTER_PIPELINE_BLITTER' in bot:
configs = ['8888', 'srgb']
if 'FSAA' in bot or 'FAAA' in bot or 'FDAA' in bot:
# Scan converters shouldn't really be sensitive to different color
# configurations.
configs = ['8888', 'tiles_rt-8888']
elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU':
args.append('--nocpu')
@ -922,9 +927,9 @@ TEST_BUILDERS = [
'Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan',
'Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE',
'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan',
'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FSAA',
'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FAAA',
'Test-Win10-Clang-ZBOX-GPU-GTX1070-x86_64-Debug-All-Vulkan_FDAA',
'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA',
'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FDAA',
'Test-Win2k8-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA',
'Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug-All',
'Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All',
]

972
infra/bots/tasks.json
View File

File diff suppressed because it is too large Load Diff