Skip to content

GitLab

T
tangled
Commit 7d83e07d authored by Chris Blume's avatar Chris Blume Committed by Commit Bot
Browse files
Options

Use new telemetry test on SkiaRenderer GL bot 

This CL runs pixel_skia_gold_test on the
'Android FYI SkiaRenderer GL (Nexus 5X)' bot with SkiaRenderer, the
GLES backend, and OOP rasterization.

Bug: 969855
Change-Id: Icde25c694e22c89e2547def673340607afc897b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786871
Commit-Queue: Chris Blume <cblume@chromium.org>
Reviewed-by: default avatarJonathan Ross <jonross@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699644}
parent 5de18031
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 195 deletions
content/test/gpu/gpu_tests/gpu_helper.py
View file @ 7d83e07d
...@@ -133,6 +133,16 @@ def GetSkiaRenderer(extra_browser_args): ...@@ -133,6 +133,16 @@ def GetSkiaRenderer(extra_browser_args):
return 'no-skia-renderer' return 'no-skia-renderer'
# Used to parse additional options sent to the browser instance via
# '--extra-browser-args', looking for '--use-gl='.
def GetGL(extra_browser_args):
if extra_browser_args:
for o in extra_browser_args:
if "--use-gl=" in o:
return 'use-gl'
return 'no-use-gl'
# Used to parse additional options sent to the browser instance via # Used to parse additional options sent to the browser instance via
# '--extra-browser-args', looking for '--use-vulkan='. # '--extra-browser-args', looking for '--use-vulkan='.
def GetVulkan(extra_browser_args): def GetVulkan(extra_browser_args):
......
content/test/gpu/gpu_tests/gpu_integration_test.py
View file @ 7d83e07d
...@@ -315,6 +315,9 @@ class GpuIntegrationTest( ...@@ -315,6 +315,9 @@ class GpuIntegrationTest(
skia_renderer = gpu_helper.GetSkiaRenderer(\ skia_renderer = gpu_helper.GetSkiaRenderer(\
browser._browser_backend.browser_options.extra_browser_args) browser._browser_backend.browser_options.extra_browser_args)
tags.extend([skia_renderer]) tags.extend([skia_renderer])
use_gl = gpu_helper.GetGL(\
browser._browser_backend.browser_options.extra_browser_args)
tags.extend([use_gl])
use_vulkan = gpu_helper.GetVulkan(\ use_vulkan = gpu_helper.GetVulkan(\
browser._browser_backend.browser_options.extra_browser_args) browser._browser_backend.browser_options.extra_browser_args)
tags.extend([use_vulkan]) tags.extend([use_vulkan])
......
content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt
View file @ 7d83e07d
# tags: [ android chromeos highsierra linux mac mojave win ] # tags: [ android chromeos highsierra linux mac mojave win ]
# tags: [ android-chromium android-webview-instrumentation debug ] # tags: [ android-chromium android-webview-instrumentation debug ]
# tags: [ skia-renderer no-skia-renderer ] # tags: [ skia-renderer no-skia-renderer ]
# tags: [ use-gl no-use-gl ]
# tags: [ use-vulkan no-use-vulkan ] # tags: [ use-vulkan no-use-vulkan ]
# tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 intel intel-0xa2e intel-0x5912 # tags: [ amd amd-0x6613 amd-0x679e amd-0x6821 intel intel-0xa2e intel-0x5912
# intel-0xd26 nvidia qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418 # intel-0xd26 nvidia qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
...@@ -132,11 +133,11 @@ crbug.com/948141 Pixel_CanvasDisplaySRGBAccelerated2D [ Skip ] ...@@ -132,11 +133,11 @@ crbug.com/948141 Pixel_CanvasDisplaySRGBAccelerated2D [ Skip ]
# Fails on Nexus 5, 6 and 6P # Fails on Nexus 5, 6 and 6P
crbug.com/883500 [ android no-skia-renderer qualcomm-adreno-(tm)-330 ] Pixel_BackgroundImage [ Skip ] crbug.com/883500 [ android no-skia-renderer qualcomm-adreno-(tm)-330 ] Pixel_BackgroundImage [ Skip ]
crbug.com/883500 [ android no-use-vulkan qualcomm-adreno-(tm)-420 ] Pixel_BackgroundImage [ Skip ] crbug.com/883500 [ android no-use-gl no-use-vulkan qualcomm-adreno-(tm)-420 ] Pixel_BackgroundImage [ Skip ]
crbug.com/883500 [ android no-use-vulkan qualcomm-adreno-(tm)-430 ] Pixel_BackgroundImage [ Skip ] crbug.com/883500 [ android no-use-gl no-use-vulkan qualcomm-adreno-(tm)-430 ] Pixel_BackgroundImage [ Skip ]
# Flakes on Nexus 5X. # Flakes on Nexus 5X.
crbug.com/883500 [ android-chromium no-use-vulkan qualcomm-adreno-(tm)-418 ] Pixel_BackgroundImage [ RetryOnFailure ] crbug.com/883500 [ android-chromium no-use-gl no-use-vulkan qualcomm-adreno-(tm)-418 ] Pixel_BackgroundImage [ RetryOnFailure ]
# We do not have software H.264 decoding on Android, so it can't survive a # We do not have software H.264 decoding on Android, so it can't survive a
# context loss which results in hardware decoder loss. # context loss which results in hardware decoder loss.
...@@ -222,6 +223,19 @@ crbug.com/991291 [ android skia-renderer use-vulkan ] Pixel_Video_MP4_FourColors ...@@ -222,6 +223,19 @@ crbug.com/991291 [ android skia-renderer use-vulkan ] Pixel_Video_MP4_FourColors
crbug.com/991291 [ android skia-renderer use-vulkan ] Pixel_Video_MP4_FourColors_Rot_90 [ Skip ] crbug.com/991291 [ android skia-renderer use-vulkan ] Pixel_Video_MP4_FourColors_Rot_90 [ Skip ]
crbug.com/991291 [ android skia-renderer use-vulkan ] Pixel_Video_VP9 [ Skip ] crbug.com/991291 [ android skia-renderer use-vulkan ] Pixel_Video_VP9 [ Skip ]
# Fails when the browser features SkiaRenderer & GL are enabled on Android.
# The more specific matching criteria is to prevent collisions with other expectations.
crbug.com/969864 [ android skia-renderer use-gl no-use-vulkan ] Pixel_BackgroundImage [ Skip ]
crbug.com/969864 [ android skia-renderer use-gl no-use-vulkan ] Pixel_CanvasDisplayLinearRGBAccelerated2D [ Skip ]
crbug.com/969864 [ android android-chromium skia-renderer use-gl no-use-vulkan ] Pixel_OffscreenCanvasTransferAfterStyleResize [ Skip ]
crbug.com/969864 [ android android-chromium skia-renderer use-gl no-use-vulkan ] Pixel_OffscreenCanvasTransferBeforeStyleResize [ Skip ]
crbug.com/969864 [ android skia-renderer use-gl no-use-vulkan ] Pixel_Video_MP4 [ Skip ]
crbug.com/969864 [ android skia-renderer use-gl no-use-vulkan ] Pixel_Video_MP4_FourColors_Aspect_4x3 [ Skip ]
crbug.com/969864 [ android skia-renderer use-gl no-use-vulkan ] Pixel_Video_MP4_FourColors_Rot_180 [ Skip ]
crbug.com/969864 [ android skia-renderer use-gl no-use-vulkan ] Pixel_Video_MP4_FourColors_Rot_270 [ Skip ]
crbug.com/969864 [ android skia-renderer use-gl no-use-vulkan ] Pixel_Video_MP4_FourColors_Rot_90 [ Skip ]
crbug.com/969864 [ android skia-renderer use-gl no-use-vulkan ] Pixel_Video_VP9 [ Skip ]
# Produces blank images on Intel HD 630 w/ Mesa 19.0.2 # Produces blank images on Intel HD 630 w/ Mesa 19.0.2
crbug.com/976861 [ linux intel-0x5912 ] Pixel_OffscreenCanvasTransferToImageBitmap [ Skip ] crbug.com/976861 [ linux intel-0x5912 ] Pixel_OffscreenCanvasTransferToImageBitmap [ Skip ]
......
testing/buildbot/chromium.gpu.fyi.json
View file @ 7d83e07d
...@@ -6795,194 +6795,6 @@ ...@@ -6795,194 +6795,6 @@
}, },
"Android FYI SkiaRenderer GL (Nexus 5X)": { "Android FYI SkiaRenderer GL (Nexus 5X)": {
"isolated_scripts": [ "isolated_scripts": [
{
"args": [
"context_lost",
"--show-stdout",
"--browser=android-chromium",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=UseSkiaRenderer"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "context_lost_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"idempotent": false
}
},
{
"args": [
"depth_capture",
"--show-stdout",
"--browser=android-chromium",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=UseSkiaRenderer"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "depth_capture_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"idempotent": false
}
},
{
"args": [
"gpu_process",
"--show-stdout",
"--browser=android-chromium",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=UseSkiaRenderer"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "gpu_process_launch_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"idempotent": false
}
},
{
"args": [
"hardware_accelerated_feature",
"--show-stdout",
"--browser=android-chromium",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=UseSkiaRenderer"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "hardware_accelerated_feature_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"idempotent": false
}
},
{
"args": [
"maps",
"--show-stdout",
"--browser=android-chromium",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=UseSkiaRenderer",
"--dont-restore-color-profile-after-test",
"--os-type",
"android",
"--build-revision",
"${got_revision}",
"--test-machine-name",
"${buildername}"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "maps_pixel_test",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"idempotent": false
}
},
{
"args": [
"screenshot_sync",
"--show-stdout",
"--browser=android-chromium",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=UseSkiaRenderer",
"--dont-restore-color-profile-after-test"
],
"isolate_name": "telemetry_gpu_integration_test",
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"name": "screenshot_sync_tests",
"should_retry_with_patch": false,
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "MMB29Q",
"device_os_type": "userdebug",
"device_type": "bullhead",
"os": "Android"
}
],
"idempotent": false
}
},
{ {
"args": [ "args": [
"pixel", "pixel",
...@@ -6990,7 +6802,7 @@ ...@@ -6990,7 +6802,7 @@
"--browser=android-chromium", "--browser=android-chromium",
"--passthrough", "--passthrough",
"-v", "-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=UseSkiaRenderer", "--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --enable-features=VizDisplayCompositor,UseSkiaRenderer,UseSkiaForGLReadback --use-gl=egl --enable-gpu-rasterization --force-gpu-rasterization --enable-oop-rasterization --disable-software-compositing-fallback --disable-headless-mode",
"--dont-restore-color-profile-after-test", "--dont-restore-color-profile-after-test",
"--os-type", "--os-type",
"android", "android",
...@@ -6999,13 +6811,12 @@ ...@@ -6999,13 +6811,12 @@
"--test-machine-name", "--test-machine-name",
"${buildername}" "${buildername}"
], ],
"experiment_percentage": 100,
"isolate_name": "telemetry_gpu_integration_test", "isolate_name": "telemetry_gpu_integration_test",
"merge": { "merge": {
"args": [], "args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py" "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
}, },
"name": "skia_renderer_pixel_skia_gold_test", "name": "egl_pixel_skia_gold_test",
"precommit_args": [ "precommit_args": [
"--review-patch-issue", "--review-patch-issue",
"${patch_issue}", "${patch_issue}",
......
testing/buildbot/test_suites.pyl
View file @ 7d83e07d
...@@ -3713,6 +3713,37 @@ ...@@ -3713,6 +3713,37 @@
} }
}, },
'gpu_skia_renderer_egl_telemetry_tests': {
'egl_pixel_skia': {
'name': 'egl_pixel_skia_gold_test',
'args': [
'--dont-restore-color-profile-after-test',
'--os-type',
'${os_type}',
'--build-revision',
'${got_revision}',
'--test-machine-name',
'${buildername}',
'--extra-browser-args=--enable-features=VizDisplayCompositor,UseSkiaRenderer,UseSkiaForGLReadback --use-gl=egl --enable-gpu-rasterization --force-gpu-rasterization --enable-oop-rasterization --disable-software-compositing-fallback --disable-headless-mode',
],
'precommit_args': [
# Gerrit issue ID
'--review-patch-issue',
'${patch_issue}',
# Patch set number
'--review-patch-set',
'${patch_set}',
# Buildbucket ID
'--buildbucket-build-id',
'${buildbucket_build_id}',
],
'swarming': {
'service_account': 'chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com'
},
'telemetry_test_name': 'pixel',
},
},
'gpu_skia_renderer_non_vulkan_telemetry_tests': { 'gpu_skia_renderer_non_vulkan_telemetry_tests': {
'skia_renderer_pixel_skia_gold_test': { 'skia_renderer_pixel_skia_gold_test': {
'name': 'skia_renderer_pixel_skia_gold_test', 'name': 'skia_renderer_pixel_skia_gold_test',
......
testing/buildbot/waterfalls.pyl
View file @ 7d83e07d
...@@ -2592,7 +2592,7 @@ ...@@ -2592,7 +2592,7 @@
'bullhead', 'bullhead',
], ],
'test_suites': { 'test_suites': {
'gpu_telemetry_tests': 'gpu_skia_renderer_non_vulkan_telemetry_tests', 'gpu_telemetry_tests': 'gpu_skia_renderer_egl_telemetry_tests',
} }
}, },
'Android FYI SkiaRenderer Vulkan (Pixel 2)': { 'Android FYI SkiaRenderer Vulkan (Pixel 2)': {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment