Skip to content

A
angle
Commit ff170c6f by Tim Van Patten Committed by Commit Bot
Options

Tests: Add Real Gangster Crime trace

Note: Hand edits required to capture this trace: CaptureMidExecutionSetup(): // Check for supported textures ASSERT(index.getType() == gl::TextureType::_2D || index.getType() == gl::TextureType::_3D || index.getType() == gl::TextureType::_2DArray || index.getType() == gl::TextureType::CubeMap || index.getType() == gl::TextureType::External); <<--- add Test: angle_perftests --gtest_filter=TracePerfTest.Run/*real_gangster_crime* Bug: angleproject:5550 Change-Id: I32391cc8de0b4307334bb873af4f3c5899b584f2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2626357 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 3d39b7c5
Showing with 40 additions and 5 deletions
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"4003908a2d8c910c80fc728b4053f11e", "c446e4696290f8b9952833cb7db4d5cf",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"2b5d6505d6a8b6f3bbfbad2c8405a89d", "2b5d6505d6a8b6f3bbfbad2c8405a89d",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1": "src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
...@@ -45,14 +45,16 @@ ...@@ -45,14 +45,16 @@
"6a77372489ee4b43639b684a39ab8d71", "6a77372489ee4b43639b684a39ab8d71",
"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_gangster_crime.tar.gz.sha1":
"c85be329035a760edad673eb2ca7c3f1",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"78f508f059516f77db7944c00596a1d6", "8a4be53b19bb5199ede62bf34ec5528f",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"7d8d99db13002f091b10738c70c2d79a", "a9dc9213e1aca6126eea5bfe9efec808",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"aba82e135789d353da2a25ec4c2c09a0", "463ec977962c8164a86ab64cb70ca8d2",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"41985b9537e97dd7501c30aac4e4d023", "5db394f1def7715bda2aa1523d681482",
"src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1": "src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1":
"c9cde6bdfd9096a44d5f03d905a45a4f", "c9cde6bdfd9096a44d5f03d905a45a4f",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
......
src/tests/perf_tests/TracePerfTest.cpp
...@@ -307,6 +307,12 @@ TracePerfTest::TracePerfTest() ...@@ -307,6 +307,12 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr"); addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
} }
if (param.testID == RestrictedTraceID::real_gangster_crime)
{
// Linux+Nvidia doesn't support GL_KHR_texture_compression_astc_ldr (possibly others also)
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
}
// 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
...@@ -40,6 +40,8 @@ pubg_mobile_lite.tar.gz ...@@ -40,6 +40,8 @@ pubg_mobile_lite.tar.gz
pubg_mobile_lite/ pubg_mobile_lite/
real_commando_secret_mission.tar.gz real_commando_secret_mission.tar.gz
real_commando_secret_mission/ real_commando_secret_mission/
real_gangster_crime.tar.gz
real_gangster_crime/
saint_seiya_awakening.tar.gz saint_seiya_awakening.tar.gz
saint_seiya_awakening/ saint_seiya_awakening/
temple_run_300.tar.gz temple_run_300.tar.gz
......
src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1 0 → 100644
9c4fd0b64f9a6b630b47ecdb95734e126d352315
\ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
"nba2k20_800", "nba2k20_800",
"pubg_mobile_lite", "pubg_mobile_lite",
"real_commando_secret_mission", "real_commando_secret_mission",
"real_gangster_crime",
"saint_seiya_awakening", "saint_seiya_awakening",
"temple_run_300", "temple_run_300",
"trex_200", "trex_200",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "nba2k20_800/nba2k20_800_capture_context1.h" #include "nba2k20_800/nba2k20_800_capture_context1.h"
#include "pubg_mobile_lite/pubg_mobile_lite_capture_context1.h" #include "pubg_mobile_lite/pubg_mobile_lite_capture_context1.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_gangster_crime/real_gangster_crime_capture_context3.h"
#include "saint_seiya_awakening/saint_seiya_awakening_capture_context2.h" #include "saint_seiya_awakening/saint_seiya_awakening_capture_context2.h"
#include "temple_run_300/temple_run_300_capture_context1.h" #include "temple_run_300/temple_run_300_capture_context1.h"
#include "trex_200/trex_200_capture_context1.h" #include "trex_200/trex_200_capture_context1.h"
...@@ -121,6 +122,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -121,6 +122,10 @@ 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_gangster_crime,
{real_gangster_crime::kReplayFrameStart, real_gangster_crime::kReplayFrameEnd,
real_gangster_crime::kReplayDrawSurfaceWidth, real_gangster_crime::kReplayDrawSurfaceHeight,
"real_gangster_crime"}},
{RestrictedTraceID::saint_seiya_awakening, {RestrictedTraceID::saint_seiya_awakening,
{saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd, {saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd,
saint_seiya_awakening::kReplayDrawSurfaceWidth, saint_seiya_awakening::kReplayDrawSurfaceWidth,
...@@ -217,6 +222,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -217,6 +222,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_gangster_crime:
real_gangster_crime::ReplayContext3Frame(frameIndex);
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::ReplayContext2Frame(frameIndex); saint_seiya_awakening::ReplayContext2Frame(frameIndex);
break; break;
...@@ -309,6 +317,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -309,6 +317,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_gangster_crime:
real_gangster_crime::ResetContext3Replay();
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::ResetContext2Replay(); saint_seiya_awakening::ResetContext2Replay();
break; break;
...@@ -401,6 +412,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -401,6 +412,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_gangster_crime:
real_gangster_crime::SetupContext3Replay();
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetupContext2Replay(); saint_seiya_awakening::SetupContext2Replay();
break; break;
...@@ -493,6 +507,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -493,6 +507,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_gangster_crime:
real_gangster_crime::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetBinaryDataDir(dataDir); saint_seiya_awakening::SetBinaryDataDir(dataDir);
break; break;
...@@ -585,6 +602,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -585,6 +602,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_gangster_crime:
real_gangster_crime::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::saint_seiya_awakening: case RestrictedTraceID::saint_seiya_awakening:
saint_seiya_awakening::SetBinaryDataDecompressCallback(callback); saint_seiya_awakening::SetBinaryDataDecompressCallback(callback);
break; break;
......
src/tests/restricted_traces/restricted_traces_autogen.gni
...@@ -30,6 +30,7 @@ angle_restricted_traces = [ ...@@ -30,6 +30,7 @@ angle_restricted_traces = [
"nba2k20_800 1", "nba2k20_800 1",
"pubg_mobile_lite 1", "pubg_mobile_lite 1",
"real_commando_secret_mission 1", "real_commando_secret_mission 1",
"real_gangster_crime 3",
"saint_seiya_awakening 2", "saint_seiya_awakening 2",
"temple_run_300 1", "temple_run_300 1",
"trex_200 1", "trex_200 1",
......
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -75,6 +75,7 @@ enum class RestrictedTraceID ...@@ -75,6 +75,7 @@ enum class RestrictedTraceID
nba2k20_800, nba2k20_800,
pubg_mobile_lite, pubg_mobile_lite,
real_commando_secret_mission, real_commando_secret_mission,
real_gangster_crime,
saint_seiya_awakening, saint_seiya_awakening,
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