Commit d98e436a by Cody Northrop Committed by Commit Bot

Tests: Add Lineage M trace

Test: angle_perftests --gtest_filter="*lineage_m*" TBR: jmadill@google.com,timvp@google.com Bug: b/182491024 Bug: angleproject:5748 Change-Id: I901b68eef1ddac98ce6e1a4640e2b034d1027a45 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2752894Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent cb5441ed
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"b8258f89dc44e6ec67eda213285595f7", "83d16125dfbbfa783bdceacb5379c5dd",
"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":
...@@ -63,6 +63,8 @@ ...@@ -63,6 +63,8 @@
"8f467e30dd52312c0a1c257d76db9589", "8f467e30dd52312c0a1c257d76db9589",
"src/tests/restricted_traces/lego_legacy.tar.gz.sha1": "src/tests/restricted_traces/lego_legacy.tar.gz.sha1":
"543b6beed660d7206c2839c6811aa9f4", "543b6beed660d7206c2839c6811aa9f4",
"src/tests/restricted_traces/lineage_m.tar.gz.sha1":
"dff18018a646039b905aa1fc18900778",
"src/tests/restricted_traces/magic_tiles_3.tar.gz.sha1": "src/tests/restricted_traces/magic_tiles_3.tar.gz.sha1":
"e31a9dcfc1734a407d3f54183941f965", "e31a9dcfc1734a407d3f54183941f965",
"src/tests/restricted_traces/manhattan_10.tar.gz.sha1": "src/tests/restricted_traces/manhattan_10.tar.gz.sha1":
...@@ -90,13 +92,13 @@ ...@@ -90,13 +92,13 @@
"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":
"89efa0342ac35c3c9e9e24638ea9c28f", "7880ad4c4e91c5846229cd284cb41c77",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"ea1ca2bdf1eb3e381e965562fe6903fe", "f9142bd09a7ded41d7150e318cd6a83c",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"e73d4a44957e38f49dc217f2ad9de9a3", "7af9b67cac7f45a909132faae86252aa",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"22e3ffdc20fa3cb5728b24db7935fa3b", "43aac5e082749b30978740020e8e7e8d",
"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":
......
...@@ -413,6 +413,15 @@ TracePerfTest::TracePerfTest() ...@@ -413,6 +413,15 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr"); addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
} }
if (param.testID == RestrictedTraceID::lineage_m)
{
// TODO: http://anglebug.com/5748 Vulkan device is lost on Nvidia Linux
if (IsLinux() && IsNVIDIA() && param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
{
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();
......
...@@ -58,6 +58,8 @@ klondike_adventures.tar.gz ...@@ -58,6 +58,8 @@ klondike_adventures.tar.gz
klondike_adventures/ klondike_adventures/
lego_legacy.tar.gz lego_legacy.tar.gz
lego_legacy/ lego_legacy/
lineage_m.tar.gz
lineage_m/
magic_tiles_3.tar.gz magic_tiles_3.tar.gz
magic_tiles_3/ magic_tiles_3/
manhattan_10.tar.gz manhattan_10.tar.gz
......
879a935c39e609d85122e0fb6240f5a90ef77c00
\ No newline at end of file
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
"kartrider_rush", "kartrider_rush",
"klondike_adventures", "klondike_adventures",
"lego_legacy", "lego_legacy",
"lineage_m",
"magic_tiles_3", "magic_tiles_3",
"manhattan_10", "manhattan_10",
"manhattan_31", "manhattan_31",
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "kartrider_rush/kartrider_rush_capture_context1.h" #include "kartrider_rush/kartrider_rush_capture_context1.h"
#include "klondike_adventures/klondike_adventures_capture_context2.h" #include "klondike_adventures/klondike_adventures_capture_context2.h"
#include "lego_legacy/lego_legacy_capture_context2.h" #include "lego_legacy/lego_legacy_capture_context2.h"
#include "lineage_m/lineage_m_capture_context2.h"
#include "magic_tiles_3/magic_tiles_3_capture_context2.h" #include "magic_tiles_3/magic_tiles_3_capture_context2.h"
#include "manhattan_10/manhattan_10_capture_context1.h" #include "manhattan_10/manhattan_10_capture_context1.h"
#include "manhattan_31/manhattan_31_capture_context6.h" #include "manhattan_31/manhattan_31_capture_context6.h"
...@@ -217,6 +218,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -217,6 +218,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion, {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
lego_legacy::kReplayFrameStart, lego_legacy::kReplayFrameEnd, lego_legacy::kReplayFrameStart, lego_legacy::kReplayFrameEnd,
lego_legacy::kReplayDrawSurfaceWidth, lego_legacy::kReplayDrawSurfaceHeight, "lego_legacy"}}, lego_legacy::kReplayDrawSurfaceWidth, lego_legacy::kReplayDrawSurfaceHeight, "lego_legacy"}},
{RestrictedTraceID::lineage_m,
{lineage_m::kReplayContextClientMajorVersion, lineage_m::kReplayContextClientMinorVersion,
lineage_m::kReplayFrameStart, lineage_m::kReplayFrameEnd, lineage_m::kReplayDrawSurfaceWidth,
lineage_m::kReplayDrawSurfaceHeight, "lineage_m"}},
{RestrictedTraceID::magic_tiles_3, {RestrictedTraceID::magic_tiles_3,
{kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion, {kDefaultReplayContextClientMajorVersion, kDefaultReplayContextClientMinorVersion,
magic_tiles_3::kReplayFrameStart, magic_tiles_3::kReplayFrameEnd, magic_tiles_3::kReplayFrameStart, magic_tiles_3::kReplayFrameEnd,
...@@ -459,6 +464,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -459,6 +464,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::lego_legacy: case RestrictedTraceID::lego_legacy:
lego_legacy::ReplayContext2Frame(frameIndex); lego_legacy::ReplayContext2Frame(frameIndex);
break; break;
case RestrictedTraceID::lineage_m:
lineage_m::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::magic_tiles_3: case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::ReplayContext2Frame(frameIndex); magic_tiles_3::ReplayContext2Frame(frameIndex);
break; break;
...@@ -647,6 +655,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -647,6 +655,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::lego_legacy: case RestrictedTraceID::lego_legacy:
lego_legacy::ResetContext2Replay(); lego_legacy::ResetContext2Replay();
break; break;
case RestrictedTraceID::lineage_m:
lineage_m::ResetContext2Replay();
break;
case RestrictedTraceID::magic_tiles_3: case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::ResetContext2Replay(); magic_tiles_3::ResetContext2Replay();
break; break;
...@@ -835,6 +846,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -835,6 +846,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::lego_legacy: case RestrictedTraceID::lego_legacy:
lego_legacy::SetupContext2Replay(); lego_legacy::SetupContext2Replay();
break; break;
case RestrictedTraceID::lineage_m:
lineage_m::SetupContext2Replay();
break;
case RestrictedTraceID::magic_tiles_3: case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::SetupContext2Replay(); magic_tiles_3::SetupContext2Replay();
break; break;
...@@ -1023,6 +1037,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -1023,6 +1037,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::lego_legacy: case RestrictedTraceID::lego_legacy:
lego_legacy::SetBinaryDataDir(dataDir); lego_legacy::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::lineage_m:
lineage_m::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::magic_tiles_3: case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::SetBinaryDataDir(dataDir); magic_tiles_3::SetBinaryDataDir(dataDir);
break; break;
...@@ -1211,6 +1228,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -1211,6 +1228,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::lego_legacy: case RestrictedTraceID::lego_legacy:
lego_legacy::SetBinaryDataDecompressCallback(callback); lego_legacy::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::lineage_m:
lineage_m::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::magic_tiles_3: case RestrictedTraceID::magic_tiles_3:
magic_tiles_3::SetBinaryDataDecompressCallback(callback); magic_tiles_3::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -39,6 +39,7 @@ angle_restricted_traces = [ ...@@ -39,6 +39,7 @@ angle_restricted_traces = [
"kartrider_rush 1", "kartrider_rush 1",
"klondike_adventures 2", "klondike_adventures 2",
"lego_legacy 2", "lego_legacy 2",
"lineage_m 2",
"magic_tiles_3 2", "magic_tiles_3 2",
"manhattan_10 1", "manhattan_10 1",
"manhattan_31 6", "manhattan_31 6",
......
...@@ -84,6 +84,7 @@ enum class RestrictedTraceID ...@@ -84,6 +84,7 @@ enum class RestrictedTraceID
kartrider_rush, kartrider_rush,
klondike_adventures, klondike_adventures,
lego_legacy, lego_legacy,
lineage_m,
magic_tiles_3, magic_tiles_3,
manhattan_10, manhattan_10,
manhattan_31, manhattan_31,
......
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