Commit 9d160b0b by Cody Northrop Committed by Commit Bot

Tests: Add Brawl Stars trace

Test: angle_perftests --gtest_filter="*brawl_stars*" Bug: b/171043467 Change-Id: Ide04fbbfd69145554c6dbb544d6ee4daa51df9cc Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2481154Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 637786a9
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"324d4adc8f7e4c2d7ba71f21092010cd", "644aa71b45cf940d7f3a43f307401897",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"44fc5437c4a84012e338b3da4b6fc28a", "44fc5437c4a84012e338b3da4b6fc28a",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1": "src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
"d271919091590d490ea68b9223b7eb06", "d271919091590d490ea68b9223b7eb06",
"src/tests/restricted_traces/brawl_stars.tar.gz.sha1":
"a6b023409f36ca174b890dbeb842da7e",
"src/tests/restricted_traces/candy_crush_500.tar.gz.sha1": "src/tests/restricted_traces/candy_crush_500.tar.gz.sha1":
"55de8a400b02e570ff2380436bda269d", "55de8a400b02e570ff2380436bda269d",
"src/tests/restricted_traces/cod_mobile.tar.gz.sha1": "src/tests/restricted_traces/cod_mobile.tar.gz.sha1":
...@@ -20,13 +22,13 @@ ...@@ -20,13 +22,13 @@
"src/tests/restricted_traces/nba2k20_800.tar.gz.sha1": "src/tests/restricted_traces/nba2k20_800.tar.gz.sha1":
"03df0dcf41c18bc59edfc0b088ca4a87", "03df0dcf41c18bc59edfc0b088ca4a87",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"82aaa1b40ff66196e3f61a96168d552e", "25177bd24c3a25605542a68f014bc756",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"245d2c9473e36b66be984f38a24b7599", "33ace8a15f1f1a0185cfc435b087d90a",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"4f4415e57d4f5dc4314171cbd1442f35", "f43f0f4ba23b08dc182e97f3b9f0c055",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"3ee6e9d7bedddb29ac91f835d635e8bd", "784ee62ede462af7039f82e877da6d95",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
"77475b0186ee0380eeb9db47433d0457", "77475b0186ee0380eeb9db47433d0457",
"src/tests/restricted_traces/trex_200.tar.gz.sha1": "src/tests/restricted_traces/trex_200.tar.gz.sha1":
......
...@@ -235,6 +235,11 @@ TracePerfTest::TracePerfTest() ...@@ -235,6 +235,11 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_OES_EGL_image_external"); addExtensionPrerequisite("GL_OES_EGL_image_external");
} }
if (param.testID == RestrictedTraceID::brawl_stars)
{
addExtensionPrerequisite("GL_EXT_shadow_samplers");
}
// 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();
......
...@@ -2,6 +2,8 @@ angry_birds_2_1500.tar.gz ...@@ -2,6 +2,8 @@ angry_birds_2_1500.tar.gz
angry_birds_2_1500/ angry_birds_2_1500/
arena_of_valor.tar.gz arena_of_valor.tar.gz
arena_of_valor/ arena_of_valor/
brawl_stars.tar.gz
brawl_stars/
candy_crush_500.tar.gz candy_crush_500.tar.gz
candy_crush_500/ candy_crush_500/
cod_mobile.tar.gz cod_mobile.tar.gz
......
a5f88b7b64c5337c9d3dcab9ce10e71310017d7e
\ No newline at end of file
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"traces": [ "traces": [
"angry_birds_2_1500", "angry_birds_2_1500",
"arena_of_valor", "arena_of_valor",
"brawl_stars",
"candy_crush_500", "candy_crush_500",
"cod_mobile", "cod_mobile",
"egypt_1500", "egypt_1500",
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "angry_birds_2_1500/angry_birds_2_1500_capture_context2.h" #include "angry_birds_2_1500/angry_birds_2_1500_capture_context2.h"
#include "arena_of_valor/arena_of_valor_capture_context3.h" #include "arena_of_valor/arena_of_valor_capture_context3.h"
#include "brawl_stars/brawl_stars_capture_context2.h"
#include "candy_crush_500/candy_crush_500_capture_context1.h" #include "candy_crush_500/candy_crush_500_capture_context1.h"
#include "cod_mobile/cod_mobile_capture_context4.h" #include "cod_mobile/cod_mobile_capture_context4.h"
#include "egypt_1500/egypt_1500_capture_context6.h" #include "egypt_1500/egypt_1500_capture_context6.h"
...@@ -35,6 +36,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -35,6 +36,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{arena_of_valor::kReplayFrameStart, arena_of_valor::kReplayFrameEnd, {arena_of_valor::kReplayFrameStart, arena_of_valor::kReplayFrameEnd,
arena_of_valor::kReplayDrawSurfaceWidth, arena_of_valor::kReplayDrawSurfaceHeight, arena_of_valor::kReplayDrawSurfaceWidth, arena_of_valor::kReplayDrawSurfaceHeight,
"arena_of_valor"}}, "arena_of_valor"}},
{RestrictedTraceID::brawl_stars,
{brawl_stars::kReplayFrameStart, brawl_stars::kReplayFrameEnd,
brawl_stars::kReplayDrawSurfaceWidth, brawl_stars::kReplayDrawSurfaceHeight, "brawl_stars"}},
{RestrictedTraceID::candy_crush_500, {RestrictedTraceID::candy_crush_500,
{candy_crush_500::kReplayFrameStart, candy_crush_500::kReplayFrameEnd, {candy_crush_500::kReplayFrameStart, candy_crush_500::kReplayFrameEnd,
candy_crush_500::kReplayDrawSurfaceWidth, candy_crush_500::kReplayDrawSurfaceHeight, candy_crush_500::kReplayDrawSurfaceWidth, candy_crush_500::kReplayDrawSurfaceHeight,
...@@ -80,6 +84,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -80,6 +84,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::ReplayContext3Frame(frameIndex); arena_of_valor::ReplayContext3Frame(frameIndex);
break; break;
case RestrictedTraceID::brawl_stars:
brawl_stars::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::ReplayContext1Frame(frameIndex); candy_crush_500::ReplayContext1Frame(frameIndex);
break; break;
...@@ -121,6 +128,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -121,6 +128,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::ResetContext3Replay(); arena_of_valor::ResetContext3Replay();
break; break;
case RestrictedTraceID::brawl_stars:
brawl_stars::ResetContext2Replay();
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::ResetContext1Replay(); candy_crush_500::ResetContext1Replay();
break; break;
...@@ -162,6 +172,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -162,6 +172,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::SetupContext3Replay(); arena_of_valor::SetupContext3Replay();
break; break;
case RestrictedTraceID::brawl_stars:
brawl_stars::SetupContext2Replay();
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetupContext1Replay(); candy_crush_500::SetupContext1Replay();
break; break;
...@@ -203,6 +216,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -203,6 +216,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::SetBinaryDataDir(dataDir); arena_of_valor::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::brawl_stars:
brawl_stars::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetBinaryDataDir(dataDir); candy_crush_500::SetBinaryDataDir(dataDir);
break; break;
...@@ -244,6 +260,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -244,6 +260,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::SetBinaryDataDecompressCallback(callback); arena_of_valor::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::brawl_stars:
brawl_stars::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetBinaryDataDecompressCallback(callback); candy_crush_500::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
angle_restricted_traces = [ angle_restricted_traces = [
"angry_birds_2_1500 2", "angry_birds_2_1500 2",
"arena_of_valor 3", "arena_of_valor 3",
"brawl_stars 2",
"candy_crush_500 1", "candy_crush_500 1",
"cod_mobile 4", "cod_mobile 4",
"egypt_1500 6", "egypt_1500 6",
......
...@@ -42,6 +42,7 @@ enum class RestrictedTraceID ...@@ -42,6 +42,7 @@ enum class RestrictedTraceID
{ {
angry_birds_2_1500, angry_birds_2_1500,
arena_of_valor, arena_of_valor,
brawl_stars,
candy_crush_500, candy_crush_500,
cod_mobile, cod_mobile,
egypt_1500, egypt_1500,
......
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