Commit aed3d65b by Cody Northrop Committed by Commit Bot

Tests: Add NBA2K20 trace

Test: angle_perftests --gtest_filter="TracePerfTest.Run/*nba*" Bug: b/160014453 Bug: angleproject:4048 Change-Id: I4899af05d48ad2900e6d5e44adc5f5e0bdba157e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2326911 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarIan Elliott <ianelliott@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 248d754a
...@@ -9,14 +9,16 @@ ...@@ -9,14 +9,16 @@
"8f72f02cfb21ad18c3558d38b77320cc", "8f72f02cfb21ad18c3558d38b77320cc",
"src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1":
"752781119592a190cc02b773adf38fc3", "752781119592a190cc02b773adf38fc3",
"src/tests/perf_tests/restricted_traces/nba2k20_800.tar.gz.sha1":
"8116f333229108515aa4824d1c922d0b",
"src/tests/perf_tests/restricted_traces/restricted_traces.json": "src/tests/perf_tests/restricted_traces/restricted_traces.json":
"de1d1c2086bd4f5249f5bdbdf0d2a854", "aefeb34167e491c2b869b7fe8c51e3ca",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp":
"0b4538715b26b64facf54896c61a8179", "f2f54a682b7d793e0d3a380a00d278e2",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni":
"255b551ced99cbd6fc4ceef99751d25e", "7edfef5f418500f6092127065e3e894f",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h":
"d4a6af9481d496bd66f5b6144f4622ba", "38e25e80888e80d149e236456fed1715",
"src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1":
"a47a797dd227f5025439b47cee80dbc9", "a47a797dd227f5025439b47cee80dbc9",
"src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1":
......
ea8481153b443e993ff058b10925a9f2b55e002f
\ No newline at end of file
{ {
"description": [ "description": [
"Copyright 2020 The ANGLE Project Authors. All rights reserved.", "Copyright 2020 The ANGLE Project Authors. All rights reserved.",
"Use of this source code is governed by a BSD-style license that can be", "Use of this source code is governed by a BSD-style license that can be",
"found in the LICENSE file.", "found in the LICENSE file.",
"", "",
"restricted_traces.json: List of restricted trace tests in ANGLE." "restricted_traces.json: List of restricted trace tests in ANGLE."
], ],
"traces": [ "traces": [
"angry_birds_2_1500", "angry_birds_2_1500",
"candy_crush_500", "candy_crush_500",
"egypt_1500", "egypt_1500",
"manhattan_10", "manhattan_10",
"subway_surfer_500", "nba2k20_800",
"temple_run_300", "subway_surfer_500",
"trex_200" "temple_run_300",
] "trex_200"
]
} }
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "candy_crush_500/candy_crush_500_capture_context2.h" #include "candy_crush_500/candy_crush_500_capture_context2.h"
#include "egypt_1500/egypt_1500_capture_context6.h" #include "egypt_1500/egypt_1500_capture_context6.h"
#include "manhattan_10/manhattan_10_capture_context6.h" #include "manhattan_10/manhattan_10_capture_context6.h"
#include "nba2k20_800/nba2k20_800_capture_context1.h"
#include "subway_surfer_500/subway_surfer_500_capture_context4.h" #include "subway_surfer_500/subway_surfer_500_capture_context4.h"
#include "temple_run_300/temple_run_300_capture_context3.h" #include "temple_run_300/temple_run_300_capture_context3.h"
#include "trex_200/trex_200_capture_context6.h" #include "trex_200/trex_200_capture_context6.h"
...@@ -39,6 +40,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -39,6 +40,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd, {manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight, manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight,
"manhattan_10"}}, "manhattan_10"}},
{RestrictedTraceID::nba2k20_800,
{nba2k20_800::kReplayFrameStart, nba2k20_800::kReplayFrameEnd,
nba2k20_800::kReplayDrawSurfaceWidth, nba2k20_800::kReplayDrawSurfaceHeight, "nba2k20_800"}},
{RestrictedTraceID::subway_surfer_500, {RestrictedTraceID::subway_surfer_500,
{subway_surfer_500::kReplayFrameStart, subway_surfer_500::kReplayFrameEnd, {subway_surfer_500::kReplayFrameStart, subway_surfer_500::kReplayFrameEnd,
subway_surfer_500::kReplayDrawSurfaceWidth, subway_surfer_500::kReplayDrawSurfaceHeight, subway_surfer_500::kReplayDrawSurfaceWidth, subway_surfer_500::kReplayDrawSurfaceHeight,
...@@ -73,6 +77,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -73,6 +77,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ReplayContext6Frame(frameIndex); manhattan_10::ReplayContext6Frame(frameIndex);
break; break;
case RestrictedTraceID::nba2k20_800:
nba2k20_800::ReplayContext1Frame(frameIndex);
break;
case RestrictedTraceID::subway_surfer_500: case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::ReplayContext4Frame(frameIndex); subway_surfer_500::ReplayContext4Frame(frameIndex);
break; break;
...@@ -105,6 +112,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -105,6 +112,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ResetContext6Replay(); manhattan_10::ResetContext6Replay();
break; break;
case RestrictedTraceID::nba2k20_800:
nba2k20_800::ResetContext1Replay();
break;
case RestrictedTraceID::subway_surfer_500: case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::ResetContext4Replay(); subway_surfer_500::ResetContext4Replay();
break; break;
...@@ -137,6 +147,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -137,6 +147,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetupContext6Replay(); manhattan_10::SetupContext6Replay();
break; break;
case RestrictedTraceID::nba2k20_800:
nba2k20_800::SetupContext1Replay();
break;
case RestrictedTraceID::subway_surfer_500: case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::SetupContext4Replay(); subway_surfer_500::SetupContext4Replay();
break; break;
...@@ -169,6 +182,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -169,6 +182,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDir(dataDir); manhattan_10::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::nba2k20_800:
nba2k20_800::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::subway_surfer_500: case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::SetBinaryDataDir(dataDir); subway_surfer_500::SetBinaryDataDir(dataDir);
break; break;
...@@ -201,6 +217,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -201,6 +217,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDecompressCallback(callback); manhattan_10::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::nba2k20_800:
nba2k20_800::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::subway_surfer_500: case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::SetBinaryDataDecompressCallback(callback); subway_surfer_500::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -13,6 +13,7 @@ angle_restricted_traces = [ ...@@ -13,6 +13,7 @@ angle_restricted_traces = [
"candy_crush_500 2", "candy_crush_500 2",
"egypt_1500 6", "egypt_1500 6",
"manhattan_10 6", "manhattan_10 6",
"nba2k20_800 1",
"subway_surfer_500 4", "subway_surfer_500 4",
"temple_run_300 3", "temple_run_300 3",
"trex_200 6", "trex_200 6",
......
...@@ -36,6 +36,7 @@ enum class RestrictedTraceID ...@@ -36,6 +36,7 @@ enum class RestrictedTraceID
candy_crush_500, candy_crush_500,
egypt_1500, egypt_1500,
manhattan_10, manhattan_10,
nba2k20_800,
subway_surfer_500, subway_surfer_500,
temple_run_300, temple_run_300,
trex_200, trex_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