Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 8feb5c8

Browse files
cnorthropCommit Bot
authored andcommitted
Tests: Add Marvel Contest of Champions trace
Test: angle_perftests --gtest_filter="*marvel_contest_of_champions*" Bug: b/171334313 Change-Id: Ia1195a5647ad2805e3cabd23c15719eb1ebc3534 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2487764 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>
1 parent 032431a commit 8feb5c8

File tree

8 files changed

+38
-5
lines changed

8 files changed

+38
-5
lines changed

scripts/code_generation_hashes/restricted_traces.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"src/tests/restricted_traces/.gitignore":
3-
"df7b65db17f6db84e1c1c45f1027bdb1",
3+
"cababe61df13c60c4bf75017178a867e",
44
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
55
"44fc5437c4a84012e338b3da4b6fc28a",
66
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
@@ -19,18 +19,20 @@
1919
"a520ef50175b1b9a20383a884e293b54",
2020
"src/tests/restricted_traces/manhattan_10.tar.gz.sha1":
2121
"752781119592a190cc02b773adf38fc3",
22+
"src/tests/restricted_traces/marvel_contest_of_champions.tar.gz.sha1":
23+
"d95d5167639b7b72ae9ae51f77b70f7e",
2224
"src/tests/restricted_traces/mobile_legends.tar.gz.sha1":
2325
"a3fe48a3acc2165a7fb3eb6cf01b441f",
2426
"src/tests/restricted_traces/nba2k20_800.tar.gz.sha1":
2527
"03df0dcf41c18bc59edfc0b088ca4a87",
2628
"src/tests/restricted_traces/restricted_traces.json":
27-
"03d84b1e4d3e5a3cfadd050750b9b1ce",
29+
"92754f0dc16c9aa4e2c31699c78ed771",
2830
"src/tests/restricted_traces/restricted_traces_autogen.cpp":
29-
"bf2e36f2de6c095228ad8a9655eae0a9",
31+
"90c4690798c3a0208f1e3dc15938762b",
3032
"src/tests/restricted_traces/restricted_traces_autogen.gni":
31-
"b6f1670b97ae0ea561f107721de4ca90",
33+
"5c41df13ceeb7a41a59ab8e86b223eab",
3234
"src/tests/restricted_traces/restricted_traces_autogen.h":
33-
"522c35f107b20fc2031da4b87590fe85",
35+
"d242dcd3e814076b84d3fdf54e67f545",
3436
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
3537
"77475b0186ee0380eeb9db47433d0457",
3638
"src/tests/restricted_traces/trex_200.tar.gz.sha1":

src/tests/perf_tests/TracePerfTest.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,11 @@ TracePerfTest::TracePerfTest()
245245
addExtensionPrerequisite("GL_OES_EGL_image_external");
246246
}
247247

248+
if (param.testID == RestrictedTraceID::marvel_contest_of_champions)
249+
{
250+
addExtensionPrerequisite("GL_EXT_color_buffer_half_float");
251+
}
252+
248253
// We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness.
249254
disableTestHarnessSwap();
250255

src/tests/restricted_traces/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ free_fire.tar.gz
1414
free_fire/
1515
manhattan_10.tar.gz
1616
manhattan_10/
17+
marvel_contest_of_champions.tar.gz
18+
marvel_contest_of_champions/
1719
mobile_legends.tar.gz
1820
mobile_legends/
1921
nba2k20_800.tar.gz
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a18181372a664461b640d4935e519fe2096892ca

src/tests/restricted_traces/restricted_traces.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"egypt_1500",
1616
"free_fire",
1717
"manhattan_10",
18+
"marvel_contest_of_champions",
1819
"mobile_legends",
1920
"nba2k20_800",
2021
"temple_run_300",

src/tests/restricted_traces/restricted_traces_autogen.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "egypt_1500/egypt_1500_capture_context6.h"
2020
#include "free_fire/free_fire_capture_context3.h"
2121
#include "manhattan_10/manhattan_10_capture_context6.h"
22+
#include "marvel_contest_of_champions/marvel_contest_of_champions_capture_context2.h"
2223
#include "mobile_legends/mobile_legends_capture_context3.h"
2324
#include "nba2k20_800/nba2k20_800_capture_context1.h"
2425
#include "temple_run_300/temple_run_300_capture_context1.h"
@@ -57,6 +58,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
5758
{manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
5859
manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight,
5960
"manhattan_10"}},
61+
{RestrictedTraceID::marvel_contest_of_champions,
62+
{marvel_contest_of_champions::kReplayFrameStart, marvel_contest_of_champions::kReplayFrameEnd,
63+
marvel_contest_of_champions::kReplayDrawSurfaceWidth,
64+
marvel_contest_of_champions::kReplayDrawSurfaceHeight, "marvel_contest_of_champions"}},
6065
{RestrictedTraceID::mobile_legends,
6166
{mobile_legends::kReplayFrameStart, mobile_legends::kReplayFrameEnd,
6267
mobile_legends::kReplayDrawSurfaceWidth, mobile_legends::kReplayDrawSurfaceHeight,
@@ -106,6 +111,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
106111
case RestrictedTraceID::manhattan_10:
107112
manhattan_10::ReplayContext6Frame(frameIndex);
108113
break;
114+
case RestrictedTraceID::marvel_contest_of_champions:
115+
marvel_contest_of_champions::ReplayContext2Frame(frameIndex);
116+
break;
109117
case RestrictedTraceID::mobile_legends:
110118
mobile_legends::ReplayContext3Frame(frameIndex);
111119
break;
@@ -153,6 +161,9 @@ void ResetReplay(RestrictedTraceID traceID)
153161
case RestrictedTraceID::manhattan_10:
154162
manhattan_10::ResetContext6Replay();
155163
break;
164+
case RestrictedTraceID::marvel_contest_of_champions:
165+
marvel_contest_of_champions::ResetContext2Replay();
166+
break;
156167
case RestrictedTraceID::mobile_legends:
157168
mobile_legends::ResetContext3Replay();
158169
break;
@@ -200,6 +211,9 @@ void SetupReplay(RestrictedTraceID traceID)
200211
case RestrictedTraceID::manhattan_10:
201212
manhattan_10::SetupContext6Replay();
202213
break;
214+
case RestrictedTraceID::marvel_contest_of_champions:
215+
marvel_contest_of_champions::SetupContext2Replay();
216+
break;
203217
case RestrictedTraceID::mobile_legends:
204218
mobile_legends::SetupContext3Replay();
205219
break;
@@ -247,6 +261,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
247261
case RestrictedTraceID::manhattan_10:
248262
manhattan_10::SetBinaryDataDir(dataDir);
249263
break;
264+
case RestrictedTraceID::marvel_contest_of_champions:
265+
marvel_contest_of_champions::SetBinaryDataDir(dataDir);
266+
break;
250267
case RestrictedTraceID::mobile_legends:
251268
mobile_legends::SetBinaryDataDir(dataDir);
252269
break;
@@ -294,6 +311,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
294311
case RestrictedTraceID::manhattan_10:
295312
manhattan_10::SetBinaryDataDecompressCallback(callback);
296313
break;
314+
case RestrictedTraceID::marvel_contest_of_champions:
315+
marvel_contest_of_champions::SetBinaryDataDecompressCallback(callback);
316+
break;
297317
case RestrictedTraceID::mobile_legends:
298318
mobile_legends::SetBinaryDataDecompressCallback(callback);
299319
break;

src/tests/restricted_traces/restricted_traces_autogen.gni

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ angle_restricted_traces = [
1717
"egypt_1500 6",
1818
"free_fire 3",
1919
"manhattan_10 6",
20+
"marvel_contest_of_champions 2",
2021
"mobile_legends 3",
2122
"nba2k20_800 1",
2223
"temple_run_300 1",

src/tests/restricted_traces/restricted_traces_autogen.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ enum class RestrictedTraceID
4848
egypt_1500,
4949
free_fire,
5050
manhattan_10,
51+
marvel_contest_of_champions,
5152
mobile_legends,
5253
nba2k20_800,
5354
temple_run_300,

0 commit comments

Comments
 (0)