Skip to content

A
angle
Commit eeeeed39 by Cody Northrop Committed by Angle LUCI CQ
Options

Tests: Add Cookie Run: Kingdom trace

Test: angle_perftests --gtest_filter="*cookie_run_kingdom*" Tbr: jmadill@google.com,timvp@google.com Bug: b/189788024 Bug: angleproject:6017 Change-Id: I5cd9912d099d1749b5677cf43e25fe73ee38d17c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2927509Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 6c328417
Showing with 92 additions and 5 deletions
DEPS
...@@ -812,6 +812,16 @@ deps = { ...@@ -812,6 +812,16 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces', 'condition': 'checkout_angle_restricted_traces',
}, },
'src/tests/restricted_traces/cookie_run_kingdom': {
'packages': [
{
'package': 'angle/traces/cookie_run_kingdom',
'version': 'version:1',
},
],
'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces',
},
'src/tests/restricted_traces/disney_tsum_tsum': { 'src/tests/restricted_traces/disney_tsum_tsum': {
'packages': [ 'packages': [
{ {
......
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"775fff410fcc8c76e39474ba0d6a11fb", "ba2b0f5fc7c2cec651cc3198b8338afa",
"src/tests/restricted_traces/gen_restricted_traces.py": "src/tests/restricted_traces/gen_restricted_traces.py":
"f700505c2ba8299a6ce68962763d7f2d", "f700505c2ba8299a6ce68962763d7f2d",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"9471d5dd1e3e47369c7a0798b08e1f9e", "1b620a0c21842f4f3440c2251081187f",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"0be6e2ee101fbc54dc8729205366c86e", "e807d0cbdb28e53dc3f0e506085cbb4c",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"0bfc5ba5c3e1db2857e1313193b88153", "8abf0ffd1907d993c133f1a55e1e61fc",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"960548fb78fd24e52cd51548f845136c" "8800de99917196d267d56dc37eee03e5"
} }
\ No newline at end of file
src/tests/perf_tests/TracePerfTest.cpp
...@@ -966,6 +966,17 @@ TracePerfTest::TracePerfTest() ...@@ -966,6 +966,17 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::cookie_run_kingdom)
{
addExtensionPrerequisite("GL_OES_EGL_image_external");
// TODO: http://anglebug.com/6017 ARM doesn't have enough VS storage blocks
if (IsAndroid() && IsARM())
{
mSkipTest = true;
}
}
// We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness. // We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness.
disableTestHarnessSwap(); disableTestHarnessSwap();
......
src/tests/restricted_traces/.gitignore
...@@ -17,6 +17,7 @@ clash_royale/ ...@@ -17,6 +17,7 @@ clash_royale/
cod_mobile/ cod_mobile/
coin_master/ coin_master/
command_and_conquer_rivals/ command_and_conquer_rivals/
cookie_run_kingdom/
disney_tsum_tsum/ disney_tsum_tsum/
dr_driving/ dr_driving/
dragon_ball_legends/ dragon_ball_legends/
......
src/tests/restricted_traces/restricted_traces.json
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"cod_mobile 1", "cod_mobile 1",
"coin_master 1", "coin_master 1",
"command_and_conquer_rivals 1", "command_and_conquer_rivals 1",
"cookie_run_kingdom 1",
"disney_tsum_tsum 1", "disney_tsum_tsum 1",
"dr_driving 1", "dr_driving 1",
"dragon_ball_legends 1", "dragon_ball_legends 1",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "cod_mobile/cod_mobile_capture_context1.h" #include "cod_mobile/cod_mobile_capture_context1.h"
#include "coin_master/coin_master_capture_context1.h" #include "coin_master/coin_master_capture_context1.h"
#include "command_and_conquer_rivals/command_and_conquer_rivals_capture_context2.h" #include "command_and_conquer_rivals/command_and_conquer_rivals_capture_context2.h"
#include "cookie_run_kingdom/cookie_run_kingdom_capture_context2.h"
#include "disney_tsum_tsum/disney_tsum_tsum_capture_context3.h" #include "disney_tsum_tsum/disney_tsum_tsum_capture_context3.h"
#include "dr_driving/dr_driving_capture_context3.h" #include "dr_driving/dr_driving_capture_context3.h"
#include "dragon_ball_legends/dragon_ball_legends_capture_context1.h" #include "dragon_ball_legends/dragon_ball_legends_capture_context1.h"
...@@ -196,6 +197,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -196,6 +197,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
command_and_conquer_rivals::kReplayFrameStart, command_and_conquer_rivals::kReplayFrameEnd, command_and_conquer_rivals::kReplayFrameStart, command_and_conquer_rivals::kReplayFrameEnd,
command_and_conquer_rivals::kReplayDrawSurfaceWidth, command_and_conquer_rivals::kReplayDrawSurfaceWidth,
command_and_conquer_rivals::kReplayDrawSurfaceHeight, "command_and_conquer_rivals"}}, command_and_conquer_rivals::kReplayDrawSurfaceHeight, "command_and_conquer_rivals"}},
{RestrictedTraceID::cookie_run_kingdom,
{cookie_run_kingdom::kReplayContextClientMajorVersion,
cookie_run_kingdom::kReplayContextClientMinorVersion, cookie_run_kingdom::kReplayFrameStart,
cookie_run_kingdom::kReplayFrameEnd, cookie_run_kingdom::kReplayDrawSurfaceWidth,
cookie_run_kingdom::kReplayDrawSurfaceHeight, "cookie_run_kingdom"}},
{RestrictedTraceID::disney_tsum_tsum, {RestrictedTraceID::disney_tsum_tsum,
{disney_tsum_tsum::kReplayContextClientMajorVersion, {disney_tsum_tsum::kReplayContextClientMajorVersion,
disney_tsum_tsum::kReplayContextClientMinorVersion, disney_tsum_tsum::kReplayFrameStart, disney_tsum_tsum::kReplayContextClientMinorVersion, disney_tsum_tsum::kReplayFrameStart,
......
src/tests/restricted_traces/restricted_traces_autogen.gni
...@@ -586,6 +586,62 @@ angle_restricted_traces = [ ...@@ -586,6 +586,62 @@ angle_restricted_traces = [
], ],
], ],
[ [
"cookie_run_kingdom",
2,
[
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame001.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame002.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame003.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame004.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame005.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame006.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame007.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame008.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame009.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame010.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame011.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame012.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame013.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame014.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame015.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame016.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame017.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame018.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame019.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame020.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame021.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame022.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame023.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame024.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame025.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame026.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame027.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame028.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame029.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame030.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame031.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame032.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame033.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame034.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame035.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame036.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame037.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame038.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame039.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame040.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame041.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame042.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame043.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame044.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame045.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame046.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame047.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame048.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame049.cpp",
"cookie_run_kingdom/cookie_run_kingdom_capture_context2_frame050.cpp",
],
],
[
"disney_tsum_tsum", "disney_tsum_tsum",
3, 3,
[ [
......
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -73,6 +73,7 @@ enum class RestrictedTraceID ...@@ -73,6 +73,7 @@ enum class RestrictedTraceID
cod_mobile, cod_mobile,
coin_master, coin_master,
command_and_conquer_rivals, command_and_conquer_rivals,
cookie_run_kingdom,
disney_tsum_tsum, disney_tsum_tsum,
dr_driving, dr_driving,
dragon_ball_legends, dragon_ball_legends,
......
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