Unomit passing tests for Radeon.
Bug: skia:7677 skia:7096
Change-Id: I59604a140f453ab415b0774a1f3b99efa2607de4
Reviewed-on: https://skia-review.googlesource.com/150620
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
deleted file mode 100644
index 48c59bd..0000000
--- a/infra/bots/recipes/perf.expected/Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan.json
+++ /dev/null
@@ -1,250 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[START_DIR]\\tmp"
- ],
- "infra_step": true,
- "name": "makedirs tmp_dir"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get skp VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]\\tmp\\SKP_VERSION"
- ],
- "infra_step": true,
- "name": "write SKP_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get skimage VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]\\tmp\\SK_IMAGE_VERSION"
- ],
- "infra_step": true,
- "name": "write SK_IMAGE_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get svg VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]\\tmp\\SVG_VERSION"
- ],
- "infra_step": true,
- "name": "write SVG_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[START_DIR]\\[SWARM_OUT_DIR]"
- ],
- "infra_step": true,
- "name": "rmtree [SWARM_OUT_DIR]"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[START_DIR]\\[SWARM_OUT_DIR]"
- ],
- "infra_step": true,
- "name": "makedirs [SWARM_OUT_DIR]"
- },
- {
- "cmd": [
- "python",
- "-u",
- "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
- ],
- "name": "get swarming bot id",
- "stdout": "/path/to/tmp/",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@import os@@@",
- "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
- ],
- "name": "get swarming task id",
- "stdout": "/path/to/tmp/",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@import os@@@",
- "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\build\\nanobench",
- "-i",
- "[START_DIR]\\skia\\resources",
- "--skps",
- "[START_DIR]\\skp",
- "--images",
- "[START_DIR]\\skimage\\nanobench",
- "--svgs",
- "[START_DIR]\\svg",
- "--pre_log",
- "--images",
- "--gpuStatsDump",
- "true",
- "--scales",
- "1.0",
- "1.1",
- "--nocpu",
- "--config",
- "vk",
- "--match",
- "~path_text_clipped_uncached",
- "~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",
- "--outResultsFile",
- "[START_DIR]\\[SWARM_OUT_DIR]\\nanobench_abc123_1337000001.json",
- "--properties",
- "gitHash",
- "abc123",
- "swarming_bot_id",
- "skia-bot-123",
- "swarming_task_id",
- "123456",
- "--key",
- "arch",
- "x86_64",
- "compiler",
- "Clang",
- "cpu_or_gpu",
- "GPU",
- "cpu_or_gpu_value",
- "RadeonR9M470X",
- "extra_config",
- "Vulkan",
- "model",
- "AlphaR2",
- "os",
- "Win10"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "nanobench"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[START_DIR]\\[SWARM_OUT_DIR]"
- ],
- "infra_step": true,
- "name": "makedirs perf_dir"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index d5de696..4ad33df 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -181,10 +181,6 @@
# skia:6863
match.append('~desk_skbug6850overlay2')
match.append('~desk_carsvg')
- if ('Vulkan' in bot and ('RadeonR9M470X' in bot or 'RadeonHD7770' in bot) and
- 'Win' in bot):
- # skia:7677
- match.append('~path_text_clipped_uncached')
if 'MoltenVK' in bot:
# skbug.com/7962
match.append('~^path_text_clipped_uncached$')
@@ -376,7 +372,6 @@
'MoltenVK_Vulkan'),
('Perf-Ubuntu17-GCC-Golo-GPU-QuadroP400-x86_64-Release-All-'
'Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41'),
- 'Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan',
'Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE',
'Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE',
'Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan',
diff --git a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
deleted file mode 100644
index 9368737..0000000
--- a/infra/bots/recipes/test.expected/Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE.json
+++ /dev/null
@@ -1,430 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[START_DIR]\\tmp"
- ],
- "infra_step": true,
- "name": "makedirs tmp_dir"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get skp VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]\\tmp\\SKP_VERSION"
- ],
- "infra_step": true,
- "name": "write SKP_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get skimage VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]\\tmp\\SK_IMAGE_VERSION"
- ],
- "infra_step": true,
- "name": "write SK_IMAGE_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION",
- "/path/to/tmp/"
- ],
- "infra_step": true,
- "name": "Get svg VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "42",
- "[START_DIR]\\tmp\\SVG_VERSION"
- ],
- "infra_step": true,
- "name": "write SVG_VERSION"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "rmtree",
- "[START_DIR]\\test"
- ],
- "infra_step": true,
- "name": "rmtree test"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[START_DIR]\\test"
- ],
- "infra_step": true,
- "name": "makedirs test"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = sys.argv[1]\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[2], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n",
- "https://example.com/hashes.txt",
- "[START_DIR]\\tmp\\uninteresting_hashes.txt"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "infra_step": true,
- "name": "get uninteresting hashes",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
- "@@@STEP_LOG_LINE@python.inline@import math@@@",
- "@@@STEP_LOG_LINE@python.inline@import socket@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@import time@@@",
- "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@HASHES_URL = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@",
- "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@",
- "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
- "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
- "@@@STEP_LOG_LINE@python.inline@ try:@@@",
- "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@",
- "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@",
- "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@",
- "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@",
- "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@",
- "@@@STEP_LOG_LINE@python.inline@ break@@@",
- "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@",
- "@@@STEP_LOG_LINE@python.inline@ print e@@@",
- "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@",
- "@@@STEP_LOG_LINE@python.inline@ raise@@@",
- "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@",
- "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
- ],
- "name": "get swarming bot id",
- "stdout": "/path/to/tmp/",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@import os@@@",
- "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
- ],
- "name": "get swarming task id",
- "stdout": "/path/to/tmp/",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@import os@@@",
- "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]\\build\\dm",
- "--resourcePath",
- "[START_DIR]\\skia\\resources",
- "--skps",
- "[START_DIR]\\skp",
- "--images",
- "[START_DIR]\\skimage\\dm",
- "--colorImages",
- "[START_DIR]\\skimage\\colorspace",
- "--nameByHash",
- "--properties",
- "gitHash",
- "abc123",
- "builder",
- "Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE",
- "buildbucket_build_id",
- "123454321",
- "swarming_bot_id",
- "skia-bot-123",
- "swarming_task_id",
- "123456",
- "--svgs",
- "[START_DIR]\\svg",
- "--key",
- "arch",
- "x86_64",
- "compiler",
- "Clang",
- "configuration",
- "Debug",
- "cpu_or_gpu",
- "GPU",
- "cpu_or_gpu_value",
- "RadeonR9M470X",
- "extra_config",
- "ANGLE",
- "model",
- "AlphaR2",
- "os",
- "Win10",
- "--uninterestingHashesFile",
- "[START_DIR]\\tmp\\uninteresting_hashes.txt",
- "--writePath",
- "[START_DIR]\\[SWARM_OUT_DIR]",
- "--dont_write",
- "pdf",
- "--randomProcessorTest",
- "--nocpu",
- "--config",
- "angle_d3d11_es2",
- "angle_d3d9_es2",
- "angle_gl_es2",
- "angle_d3d11_es3",
- "angle_d3d11_es2_msaa8",
- "angle_d3d11_es3_msaa8",
- "--src",
- "tests",
- "gm",
- "image",
- "colorImage",
- "svg",
- "--blacklist",
- "_",
- "svg",
- "_",
- "svgparse_",
- "_",
- "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",
- "_",
- "image",
- "gen_platf",
- "testimgari.jpg",
- "_",
- "image",
- "gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "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",
- "~PinnedImageTest",
- "~BlurMaskBiggerThanDest",
- "--nonativeFonts",
- "--verbose"
- ],
- "env": {
- "CHROME_HEADLESS": "1",
- "PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "dm"
- },
- {
- "name": "$result",
- "recipe_result": null,
- "status_code": 0
- }
-]
\ No newline at end of file
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index de9b4a6..4c89351 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -708,10 +708,6 @@
match.append('~^RGBA4444TextureTest$')
match.append('~^WritePixelsNonTextureMSAA_Gpu$')
- if (('RadeonR9M470X' in bot or 'RadeonHD7770' in bot) and 'ANGLE' in bot):
- # skia:7096
- match.append('~PinnedImageTest')
-
if 'ANGLE' in bot:
# skia:7835
match.append('~BlurMaskBiggerThanDest')
@@ -1015,7 +1011,6 @@
'Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1',
'Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3',
'Test-Ubuntu17-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Lottie',
- 'Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE',
'Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-BonusConfigs',
('Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All'
'-ReleaseAndAbandonGpuContext'),