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

Pipe ReducedOpsTaskSplitting into skpbench.py

Browse Source 
This ought to help!

Bug: skia:10877
Change-Id: I8265c26dc4146ab78c125f27b533915cfb61aae8
Cq-Include-Trybots: luci.skia.skia.primary:Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_ReduceOpsTaskSplitting_Skpbench,Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_ReduceOpsTaskSplitting_Skpbench,Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-ASAN_ReduceOpsTaskSplitting_Vulkan
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/369756
Commit-Queue: Adlai Holler <adlai@google.com>
Auto-Submit: Adlai Holler <adlai@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Adlai Holler 2021-02-12 12:17:20 -05:00 committed by Skia Commit-Bot
parent 3354f8c4f8
commit 79426194de
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,7 +448,7 @@ Recipe for the Skia RecreateSKPs Bot.
[DEPS](/infra/bots/recipes/skpbench.py#12): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [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], [recipe\_engine/time][recipe_engine/recipe_modules/time], [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars)
&mdash; **def [RunSteps](/infra/bots/recipes/skpbench.py#150)(api):**
&mdash; **def [RunSteps](/infra/bots/recipes/skpbench.py#154)(api):**
&mdash; **def [skpbench\_steps](/infra/bots/recipes/skpbench.py#41)(api):**

1
infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_ReduceOpsTaskSplitting_Skpbench.json
View File

@ -343,6 +343,7 @@
"--internalSamples",
"4",
"-v5",
"--reduceOpsTaskSplitting",
"--adb",
"--adb_binary",
"adb.1.0.35",

4
infra/bots/recipes/skpbench.py
View File

@ -47,6 +47,7 @@ def skpbench_steps(api):
is_mskp = 'Mskp' in api.vars.builder_name
is_ddl = 'DDL' in api.vars.builder_name
is_9x9 = '9x9' in api.vars.builder_name
is_reduce_ops_task_splitting = 'ReduceOpsTaskSplitting' in api.vars.builder_name
api.file.ensure_directory(
'makedirs perf_dir', api.flavor.host_dirs.perf_data_dir)
@ -85,6 +86,9 @@ def skpbench_steps(api):
skpbench_args += [
'--ddlNumRecordingThreads', 9,
'--ddlTilingWidthHeight', 3]
if is_reduce_ops_task_splitting:
skpbench_args += [
'--reduceOpsTaskSplitting']
if is_android:
skpbench_args += [
'--adb',

5
tools/skpbench/skpbench.py
View File

@ -78,6 +78,8 @@ __argparse.add_argument('--ddlNumRecordingThreads',
help="number of DDL recording threads (0=num_cores)")
__argparse.add_argument('--ddlTilingWidthHeight',
type=int, default=0, help="number of tiles along one edge when in DDL mode")
__argparse.add_argument('--reduceOpsTaskSplitting',
action='store_true', help="reorder GPU tasks to reduce render target swaps")
__argparse.add_argument('--gpuThreads',
type=int, default=-1,
help="Create this many extra threads to assist with GPU work, including"
@ -157,6 +159,9 @@ class SKPBench:
if FLAGS.ddlTilingWidthHeight:
ARGV.extend(['--ddlTilingWidthHeight', str(FLAGS.ddlTilingWidthHeight)])
if FLAGS.reduceOpsTaskSplitting:
ARGV.extend(['--reduceOpsTaskSplitting'])
if FLAGS.adb:
if FLAGS.device_serial is None:
ARGV[:0] = [FLAGS.adb_binary, 'shell']