Commit 48560f67 by Cody Northrop Committed by Commit Bot

Tests: Add Real Cricket 20 trace

Test: angle_perftests --gtest_filter="*real_cricket_20*" Bug: b/183165790 Bug: angleproject:5777 Change-Id: I1f350e3ea458a599396412e2c5ca80d6c7887d73 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2776554 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent c4b1f366
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"c29171b000c2d404c49cced86e674361", "24d49f46fdfd0758737db4ffef33e80e",
"src/tests/restricted_traces/aliexpress.tar.gz.sha1": "src/tests/restricted_traces/aliexpress.tar.gz.sha1":
"12f48ff0c4ca7980ea879c81b0c9518b", "12f48ff0c4ca7980ea879c81b0c9518b",
"src/tests/restricted_traces/among_us.tar.gz.sha1": "src/tests/restricted_traces/among_us.tar.gz.sha1":
...@@ -97,16 +97,18 @@ ...@@ -97,16 +97,18 @@
"18b0f7f021bd65340f25a70b79dd4789", "18b0f7f021bd65340f25a70b79dd4789",
"src/tests/restricted_traces/real_commando_secret_mission.tar.gz.sha1": "src/tests/restricted_traces/real_commando_secret_mission.tar.gz.sha1":
"4b484dd9c53a79100ec13b6f1c86040d", "4b484dd9c53a79100ec13b6f1c86040d",
"src/tests/restricted_traces/real_cricket_20.tar.gz.sha1":
"c03e3ca87a7a992e39d664f7b16a22ca",
"src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1": "src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1":
"c85be329035a760edad673eb2ca7c3f1", "c85be329035a760edad673eb2ca7c3f1",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"7db9f776c0d0b4097b6b57f5e73e719c", "c0c306f167628f727a9516f016fd08a4",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"1d2f1267d9c6f9d4d7fd82798a75a4e2", "de7ab1e146944a3db14d0d84fa0d7822",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"c2fdaa88969fb4c588900fdb4e05228e", "e9c67294eb60275115ad90152f824acd",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"b6d05e2c2bf19135af3c1dee6900a4cf", "3c853089df2a7fb2f616b5d69ef65b50",
"src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1": "src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1":
"d4618f857c44f0dfa642ae3af8f161d9", "d4618f857c44f0dfa642ae3af8f161d9",
"src/tests/restricted_traces/romancing_saga.tar.gz.sha1": "src/tests/restricted_traces/romancing_saga.tar.gz.sha1":
......
...@@ -448,6 +448,15 @@ TracePerfTest::TracePerfTest() ...@@ -448,6 +448,15 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::real_cricket_20)
{
// TODO: http://anglebug.com/5777 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();
......
...@@ -92,6 +92,8 @@ raid_shadow_legends.tar.gz ...@@ -92,6 +92,8 @@ raid_shadow_legends.tar.gz
raid_shadow_legends/ raid_shadow_legends/
real_commando_secret_mission.tar.gz real_commando_secret_mission.tar.gz
real_commando_secret_mission/ real_commando_secret_mission/
real_cricket_20.tar.gz
real_cricket_20/
real_gangster_crime.tar.gz real_gangster_crime.tar.gz
real_gangster_crime/ real_gangster_crime/
rise_of_kingdoms.tar.gz rise_of_kingdoms.tar.gz
......
e19aac74efb2ab406749a08ec4355d8071c7ccb3
\ No newline at end of file
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
"ragnarok_m_eternal_love", "ragnarok_m_eternal_love",
"raid_shadow_legends", "raid_shadow_legends",
"real_commando_secret_mission", "real_commando_secret_mission",
"real_cricket_20",
"real_gangster_crime", "real_gangster_crime",
"rise_of_kingdoms", "rise_of_kingdoms",
"romancing_saga", "romancing_saga",
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#include "ragnarok_m_eternal_love/ragnarok_m_eternal_love_capture_context3.h" #include "ragnarok_m_eternal_love/ragnarok_m_eternal_love_capture_context3.h"
#include "raid_shadow_legends/raid_shadow_legends_capture_context2.h" #include "raid_shadow_legends/raid_shadow_legends_capture_context2.h"
#include "real_commando_secret_mission/real_commando_secret_mission_capture_context1.h" #include "real_commando_secret_mission/real_commando_secret_mission_capture_context1.h"
#include "real_cricket_20/real_cricket_20_capture_context2.h"
#include "real_gangster_crime/real_gangster_crime_capture_context3.h" #include "real_gangster_crime/real_gangster_crime_capture_context3.h"
#include "rise_of_kingdoms/rise_of_kingdoms_capture_context4.h" #include "rise_of_kingdoms/rise_of_kingdoms_capture_context4.h"
#include "romancing_saga/romancing_saga_capture_context3.h" #include "romancing_saga/romancing_saga_capture_context3.h"
...@@ -305,6 +306,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -305,6 +306,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
real_commando_secret_mission::kReplayFrameEnd, real_commando_secret_mission::kReplayFrameEnd,
real_commando_secret_mission::kReplayDrawSurfaceWidth, real_commando_secret_mission::kReplayDrawSurfaceWidth,
real_commando_secret_mission::kReplayDrawSurfaceHeight, "real_commando_secret_mission"}}, real_commando_secret_mission::kReplayDrawSurfaceHeight, "real_commando_secret_mission"}},
{RestrictedTraceID::real_cricket_20,
{real_cricket_20::kReplayContextClientMajorVersion,
real_cricket_20::kReplayContextClientMinorVersion, real_cricket_20::kReplayFrameStart,
real_cricket_20::kReplayFrameEnd, real_cricket_20::kReplayDrawSurfaceWidth,
real_cricket_20::kReplayDrawSurfaceHeight, "real_cricket_20"}},
{RestrictedTraceID::real_gangster_crime, {RestrictedTraceID::real_gangster_crime,
{kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion, {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
real_gangster_crime::kReplayFrameStart, real_gangster_crime::kReplayFrameEnd, real_gangster_crime::kReplayFrameStart, real_gangster_crime::kReplayFrameEnd,
...@@ -539,6 +545,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -539,6 +545,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::real_commando_secret_mission: case RestrictedTraceID::real_commando_secret_mission:
real_commando_secret_mission::ReplayContext1Frame(frameIndex); real_commando_secret_mission::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::real_cricket_20:
real_cricket_20::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::real_gangster_crime: case RestrictedTraceID::real_gangster_crime:
real_gangster_crime::ReplayContext3Frame(frameIndex); real_gangster_crime::ReplayContext3Frame(frameIndex);
break; break;
...@@ -742,6 +751,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -742,6 +751,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::real_commando_secret_mission: case RestrictedTraceID::real_commando_secret_mission:
real_commando_secret_mission::ResetContext1Replay(); real_commando_secret_mission::ResetContext1Replay();
break; break;
case RestrictedTraceID::real_cricket_20:
real_cricket_20::ResetContext2Replay();
break;
case RestrictedTraceID::real_gangster_crime: case RestrictedTraceID::real_gangster_crime:
real_gangster_crime::ResetContext3Replay(); real_gangster_crime::ResetContext3Replay();
break; break;
...@@ -945,6 +957,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -945,6 +957,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::real_commando_secret_mission: case RestrictedTraceID::real_commando_secret_mission:
real_commando_secret_mission::SetupContext1Replay(); real_commando_secret_mission::SetupContext1Replay();
break; break;
case RestrictedTraceID::real_cricket_20:
real_cricket_20::SetupContext2Replay();
break;
case RestrictedTraceID::real_gangster_crime: case RestrictedTraceID::real_gangster_crime:
real_gangster_crime::SetupContext3Replay(); real_gangster_crime::SetupContext3Replay();
break; break;
...@@ -1148,6 +1163,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -1148,6 +1163,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::real_commando_secret_mission: case RestrictedTraceID::real_commando_secret_mission:
real_commando_secret_mission::SetBinaryDataDir(dataDir); real_commando_secret_mission::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::real_cricket_20:
real_cricket_20::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::real_gangster_crime: case RestrictedTraceID::real_gangster_crime:
real_gangster_crime::SetBinaryDataDir(dataDir); real_gangster_crime::SetBinaryDataDir(dataDir);
break; break;
...@@ -1351,6 +1369,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -1351,6 +1369,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::real_commando_secret_mission: case RestrictedTraceID::real_commando_secret_mission:
real_commando_secret_mission::SetBinaryDataDecompressCallback(callback); real_commando_secret_mission::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::real_cricket_20:
real_cricket_20::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::real_gangster_crime: case RestrictedTraceID::real_gangster_crime:
real_gangster_crime::SetBinaryDataDecompressCallback(callback); real_gangster_crime::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -56,6 +56,7 @@ angle_restricted_traces = [ ...@@ -56,6 +56,7 @@ angle_restricted_traces = [
"ragnarok_m_eternal_love 3", "ragnarok_m_eternal_love 3",
"raid_shadow_legends 2", "raid_shadow_legends 2",
"real_commando_secret_mission 1", "real_commando_secret_mission 1",
"real_cricket_20 2",
"real_gangster_crime 3", "real_gangster_crime 3",
"rise_of_kingdoms 4", "rise_of_kingdoms 4",
"romancing_saga 3", "romancing_saga 3",
......
...@@ -101,6 +101,7 @@ enum class RestrictedTraceID ...@@ -101,6 +101,7 @@ enum class RestrictedTraceID
ragnarok_m_eternal_love, ragnarok_m_eternal_love,
raid_shadow_legends, raid_shadow_legends,
real_commando_secret_mission, real_commando_secret_mission,
real_cricket_20,
real_gangster_crime, real_gangster_crime,
rise_of_kingdoms, rise_of_kingdoms,
romancing_saga, romancing_saga,
......
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