Skip to content

GitLab

T
tangled
Commit 8ae85144 authored by Kai Ninomiya's avatar Kai Ninomiya Committed by Commit Bot
Browse files
Options

Add camera_to_webgl perf test to ToughWebglCases 

This adds a new perf test case for camera-to-WebGL uploads.
This new case is intended to detect the performance improvements
being made in issue 867368.

Bug: 867368
Change-Id: Ia8b05f422e15bb7625491ac10f33903dcc1c55d0
Reviewed-on: https://chromium-review.googlesource.com/1170033Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: default avatarNed Nguyen <nednguyen@google.com>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583957}
parent 10c0c8c0
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 27 deletions
tools/perf/page_sets/data/rendering_desktop.json
View file @ 8ae85144
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
"DEFAULT": "rendering_desktop_002.wprgo" "DEFAULT": "rendering_desktop_002.wprgo"
}, },
"animometer_webgl": { "animometer_webgl": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"aquarium": { "aquarium": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"aquarium_20k": { "aquarium_20k": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"blob": { "blob": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"blogspot_2018": { "blogspot_2018": {
"DEFAULT": "rendering_desktop_000.wprgo" "DEFAULT": "rendering_desktop_000.wprgo"
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
"booking_pinch_2018": { "booking_pinch_2018": {
"DEFAULT": "rendering_desktop_007.wprgo" "DEFAULT": "rendering_desktop_007.wprgo"
}, },
"camera_to_webgl": {
"DEFAULT": "rendering_desktop_011.wprgo"
},
"cats_unscaled": { "cats_unscaled": {
"DEFAULT": "rendering_desktop_008.wprgo" "DEFAULT": "rendering_desktop_008.wprgo"
}, },
...@@ -67,10 +70,10 @@ ...@@ -67,10 +70,10 @@
"DEFAULT": "rendering_desktop_004.wprgo" "DEFAULT": "rendering_desktop_004.wprgo"
}, },
"dynamic_cube_map": { "dynamic_cube_map": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"earth": { "earth": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"ebay_2018": { "ebay_2018": {
"DEFAULT": "rendering_desktop_000.wprgo" "DEFAULT": "rendering_desktop_000.wprgo"
...@@ -172,7 +175,7 @@ ...@@ -172,7 +175,7 @@
"DEFAULT": "rendering_desktop_004.wprgo" "DEFAULT": "rendering_desktop_004.wprgo"
}, },
"many_planets_deep": { "many_planets_deep": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"maps_move_2018": { "maps_move_2018": {
"DEFAULT": "rendering_desktop_001.wprgo" "DEFAULT": "rendering_desktop_001.wprgo"
...@@ -223,10 +226,10 @@ ...@@ -223,10 +226,10 @@
"DEFAULT": "rendering_desktop_010.wprgo" "DEFAULT": "rendering_desktop_010.wprgo"
}, },
"nvidia_vertex_buffer_object": { "nvidia_vertex_buffer_object": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"particles": { "particles": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"pinterest_2018": { "pinterest_2018": {
"DEFAULT": "rendering_desktop_000.wprgo" "DEFAULT": "rendering_desktop_000.wprgo"
...@@ -235,7 +238,7 @@ ...@@ -235,7 +238,7 @@
"DEFAULT": "rendering_desktop_004.wprgo" "DEFAULT": "rendering_desktop_004.wprgo"
}, },
"san_angeles": { "san_angeles": {
"DEFAULT": "rendering_desktop_006.wprgo" "DEFAULT": "rendering_desktop_011.wprgo"
}, },
"smash_cat": { "smash_cat": {
"DEFAULT": "rendering_desktop_004.wprgo" "DEFAULT": "rendering_desktop_004.wprgo"
......
tools/perf/page_sets/data/rendering_desktop_006.wprgo.sha1 deleted 100644 → 0
View file @ 10c0c8c0
7fcc3ca13fa01e90d62be4ffe5568c680a61b9c0
\ No newline at end of file
tools/perf/page_sets/data/rendering_desktop_011.wprgo.sha1 0 → 100644
View file @ 8ae85144
cea8e34f634f897f4b06541fd6273c113dfdf6aa
\ No newline at end of file
tools/perf/page_sets/data/rendering_mobile.json
View file @ 8ae85144
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
"DEFAULT": "rendering_mobile_011.wprgo" "DEFAULT": "rendering_mobile_011.wprgo"
}, },
"animometer_webgl": { "animometer_webgl": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"aquarium": { "aquarium": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"aquarium_20k": { "aquarium_20k": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"baidu_mobile_2018": { "baidu_mobile_2018": {
"DEFAULT": "rendering_mobile_011.wprgo" "DEFAULT": "rendering_mobile_011.wprgo"
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
"DEFAULT": "rendering_mobile_011.wprgo" "DEFAULT": "rendering_mobile_011.wprgo"
}, },
"blob": { "blob": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"blogspot_2018": { "blogspot_2018": {
"DEFAULT": "rendering_mobile_000.wprgo" "DEFAULT": "rendering_mobile_000.wprgo"
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
"booking.com_mobile_sync_scroll_2018": { "booking.com_mobile_sync_scroll_2018": {
"DEFAULT": "rendering_mobile_011.wprgo" "DEFAULT": "rendering_mobile_011.wprgo"
}, },
"camera_to_webgl": {
"DEFAULT": "rendering_mobile_026.wprgo"
},
"capitolvolkswagen_mobile_2018": { "capitolvolkswagen_mobile_2018": {
"DEFAULT": "rendering_mobile_011.wprgo" "DEFAULT": "rendering_mobile_011.wprgo"
}, },
...@@ -163,10 +166,10 @@ ...@@ -163,10 +166,10 @@
"DEFAULT": "rendering_mobile_011.wprgo" "DEFAULT": "rendering_mobile_011.wprgo"
}, },
"dynamic_cube_map": { "dynamic_cube_map": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"earth": { "earth": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"ebay_2018": { "ebay_2018": {
"DEFAULT": "rendering_mobile_000.wprgo" "DEFAULT": "rendering_mobile_000.wprgo"
...@@ -367,7 +370,7 @@ ...@@ -367,7 +370,7 @@
"DEFAULT": "rendering_mobile_004.wprgo" "DEFAULT": "rendering_mobile_004.wprgo"
}, },
"many_planets_deep": { "many_planets_deep": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"mask_transition_animation": { "mask_transition_animation": {
"DEFAULT": "rendering_mobile_020.wprgo" "DEFAULT": "rendering_mobile_020.wprgo"
...@@ -427,7 +430,7 @@ ...@@ -427,7 +430,7 @@
"DEFAULT": "rendering_mobile_010.wprgo" "DEFAULT": "rendering_mobile_010.wprgo"
}, },
"nvidia_vertex_buffer_object": { "nvidia_vertex_buffer_object": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"nyc_gov_scroll_2018": { "nyc_gov_scroll_2018": {
"DEFAULT": "rendering_mobile_016.wprgo" "DEFAULT": "rendering_mobile_016.wprgo"
...@@ -469,7 +472,7 @@ ...@@ -469,7 +472,7 @@
"DEFAULT": "rendering_mobile_020.wprgo" "DEFAULT": "rendering_mobile_020.wprgo"
}, },
"particles": { "particles": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"pbs_pathological_2018": { "pbs_pathological_2018": {
"DEFAULT": "rendering_mobile_025.wprgo" "DEFAULT": "rendering_mobile_025.wprgo"
...@@ -505,7 +508,7 @@ ...@@ -505,7 +508,7 @@
"DEFAULT": "rendering_mobile_004.wprgo" "DEFAULT": "rendering_mobile_004.wprgo"
}, },
"san_angeles": { "san_angeles": {
"DEFAULT": "rendering_mobile_006.wprgo" "DEFAULT": "rendering_mobile_026.wprgo"
}, },
"sfgate_mobile_2018": { "sfgate_mobile_2018": {
"DEFAULT": "rendering_mobile_011.wprgo" "DEFAULT": "rendering_mobile_011.wprgo"
......
tools/perf/page_sets/data/rendering_mobile_006.wprgo.sha1 deleted 100644 → 0
View file @ 10c0c8c0
7fcc3ca13fa01e90d62be4ffe5568c680a61b9c0
\ No newline at end of file
tools/perf/page_sets/data/rendering_mobile_026.wprgo.sha1 0 → 100644
View file @ 8ae85144
35ec13d127d4f6bcd4a05da4e8f34745cd66a6fb
\ No newline at end of file
tools/perf/page_sets/rendering/rendering_stories.py
View file @ 8ae85144
...@@ -40,9 +40,21 @@ class RenderingStorySet(story.StorySet): ...@@ -40,9 +40,21 @@ class RenderingStorySet(story.StorySet):
platform not in story_class.SUPPORTED_PLATFORMS): platform not in story_class.SUPPORTED_PLATFORMS):
continue continue
required_args = []
if (story_class.TAGS and
story_tags.USE_FAKE_CAMERA_DEVICE in story_class.TAGS):
required_args += [
# Use a fake camera showing a placeholder video.
'--use-fake-device-for-media-stream',
# Don't prompt for camera access. (Conveniently,
# this takes precedent over --deny-permission-prompts.)
'--use-fake-ui-for-media-stream',
]
self.AddStory(story_class( self.AddStory(story_class(
page_set=self, page_set=self,
shared_page_state_class=shared_page_state_class)) shared_page_state_class=shared_page_state_class,
extra_browser_args=required_args))
if (platform == platforms.MOBILE and if (platform == platforms.MOBILE and
story_class.TAGS and story_class.TAGS and
...@@ -51,7 +63,9 @@ class RenderingStorySet(story.StorySet): ...@@ -51,7 +63,9 @@ class RenderingStorySet(story.StorySet):
page_set=self, page_set=self,
shared_page_state_class=shared_page_state_class, shared_page_state_class=shared_page_state_class,
name_suffix='_desktop_gpu_raster', name_suffix='_desktop_gpu_raster',
extra_browser_args=['--force-gpu-rasterization'])) extra_browser_args=required_args + [
'--force-gpu-rasterization',
]))
if (platform == platforms.MOBILE and if (platform == platforms.MOBILE and
story_class.TAGS and story_class.TAGS and
...@@ -60,7 +74,9 @@ class RenderingStorySet(story.StorySet): ...@@ -60,7 +74,9 @@ class RenderingStorySet(story.StorySet):
page_set=self, page_set=self,
shared_page_state_class=shared_page_state_class, shared_page_state_class=shared_page_state_class,
name_suffix='_sync_scroll', name_suffix='_sync_scroll',
extra_browser_args=['--disable-threaded-scrolling'])) extra_browser_args=required_args + [
'--disable-threaded-scrolling',
]))
if (platform == platforms.MOBILE and if (platform == platforms.MOBILE and
story_class.TAGS and story_class.TAGS and
...@@ -69,8 +85,10 @@ class RenderingStorySet(story.StorySet): ...@@ -69,8 +85,10 @@ class RenderingStorySet(story.StorySet):
page_set=self, page_set=self,
shared_page_state_class=shared_page_state_class, shared_page_state_class=shared_page_state_class,
name_suffix='_gpu_rasterization_and_decoding', name_suffix='_gpu_rasterization_and_decoding',
extra_browser_args=['--force-gpu-rasterization', extra_browser_args=required_args + [
'--enable-accelerated-jpeg-decoding'])) '--force-gpu-rasterization',
'--enable-accelerated-jpeg-decoding',
]))
class DesktopRenderingStorySet(RenderingStorySet): class DesktopRenderingStorySet(RenderingStorySet):
......
tools/perf/page_sets/rendering/story_tags.py
View file @ 8ae85144
...@@ -19,6 +19,8 @@ FASTPATH = Tag( ...@@ -19,6 +19,8 @@ FASTPATH = Tag(
'fastpath', 'Fast path stories.') 'fastpath', 'Fast path stories.')
REQUIRED_WEBGL = Tag( REQUIRED_WEBGL = Tag(
'required_webgl', 'Stories that are skipped if no webgl support') 'required_webgl', 'Stories that are skipped if no webgl support')
USE_FAKE_CAMERA_DEVICE = Tag(
'use_fake_camera_device', 'Story requires a camera device for media')
# Below are tags for filtering by page sets # Below are tags for filtering by page sets
......
tools/perf/page_sets/rendering/tough_webgl_cases.py
View file @ 8ae85144
...@@ -91,3 +91,10 @@ class KenRussellPage(ToughWebglPage): ...@@ -91,3 +91,10 @@ class KenRussellPage(ToughWebglPage):
BASE_NAME = 'animometer_webgl' BASE_NAME = 'animometer_webgl'
# pylint: disable=line-too-long # pylint: disable=line-too-long
URL = 'http://kenrussell.github.io/webgl-animometer/Animometer/tests/3d/webgl.html' URL = 'http://kenrussell.github.io/webgl-animometer/Animometer/tests/3d/webgl.html'
class CameraToWebGLPage(ToughWebglPage):
TAGS = ToughWebglPage.TAGS + [story_tags.USE_FAKE_CAMERA_DEVICE]
BASE_NAME = 'camera_to_webgl'
# pylint: disable=line-too-long
URL = 'https://www.khronos.org/registry/webgl/sdk/tests/extra/texture-from-camera-stress.html?uploadsPerFrame=200'
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