Commit 4b608a6c by Cody Northrop Committed by Commit Bot

Tests: Add Messenger Lite trace

Test: angle_perftests --gtest_filter="*messenger_lite*" Bug: b/180562361 Bug: angleproject:5659 Bug: angleproject:5663 Change-Id: I9938b925962ea13fd626f2b82676655d07d78c0d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2703733Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 4afd0f27
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"f515811fc13d80f8537a4645a316030d", "2d8dfb6d78cc28197b5fa37a7dcf2b51",
"src/tests/restricted_traces/aliexpress.tar.gz.sha1": "src/tests/restricted_traces/aliexpress.tar.gz.sha1":
"12f48ff0c4ca7980ea879c81b0c9518b", "12f48ff0c4ca7980ea879c81b0c9518b",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
"12256b955ea6f318e99c8bcd8ab97d2d", "12256b955ea6f318e99c8bcd8ab97d2d",
"src/tests/restricted_traces/marvel_contest_of_champions.tar.gz.sha1": "src/tests/restricted_traces/marvel_contest_of_champions.tar.gz.sha1":
"80cf00c9a348c2ea95d538e9257375dd", "80cf00c9a348c2ea95d538e9257375dd",
"src/tests/restricted_traces/messenger_lite.tar.gz.sha1":
"8972e27c2d12ff8d3ac8f5b8104d6b4c",
"src/tests/restricted_traces/minecraft.tar.gz.sha1": "src/tests/restricted_traces/minecraft.tar.gz.sha1":
"f9f4e3d480c83b03a1de55d63a04a207", "f9f4e3d480c83b03a1de55d63a04a207",
"src/tests/restricted_traces/mobile_legends.tar.gz.sha1": "src/tests/restricted_traces/mobile_legends.tar.gz.sha1":
...@@ -82,13 +84,13 @@ ...@@ -82,13 +84,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":
"76c5854d9b9924005f0dcb61720475ac", "030dab939ec64fcdabdfbe6b05662e53",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"530f704cfc2289698acc715a235e8b49", "aea362cf1696f1014b8751c584748190",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"7f98c20536e7486ec8b2757e36e8170d", "16b9118b91f903331c934c7b1786fe7f",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"bc47103e5dd89f5f16f9935503997cd2", "d3e0d3469baea6837bcaae8a9d85a5d0",
"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":
......
...@@ -373,6 +373,16 @@ TracePerfTest::TracePerfTest() ...@@ -373,6 +373,16 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::messenger_lite)
{
// TODO: https://anglebug.com/5663 Incorrect pixels on Nvidia Windows for first frame
if (IsWindows() && 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();
......
...@@ -60,6 +60,8 @@ manhattan_31.tar.gz ...@@ -60,6 +60,8 @@ manhattan_31.tar.gz
manhattan_31/ manhattan_31/
marvel_contest_of_champions.tar.gz marvel_contest_of_champions.tar.gz
marvel_contest_of_champions/ marvel_contest_of_champions/
messenger_lite.tar.gz
messenger_lite/
minecraft.tar.gz minecraft.tar.gz
minecraft/ minecraft/
mobile_legends.tar.gz mobile_legends.tar.gz
......
dd5540ad7fb10d5345003f8a77eca4c2381eab02
\ No newline at end of file
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
"manhattan_10", "manhattan_10",
"manhattan_31", "manhattan_31",
"marvel_contest_of_champions", "marvel_contest_of_champions",
"messenger_lite",
"minecraft", "minecraft",
"mobile_legends", "mobile_legends",
"nba2k20_800", "nba2k20_800",
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#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"
#include "marvel_contest_of_champions/marvel_contest_of_champions_capture_context1.h" #include "marvel_contest_of_champions/marvel_contest_of_champions_capture_context1.h"
#include "messenger_lite/messenger_lite_capture_context1.h"
#include "minecraft/minecraft_capture_context2.h" #include "minecraft/minecraft_capture_context2.h"
#include "mobile_legends/mobile_legends_capture_context1.h" #include "mobile_legends/mobile_legends_capture_context1.h"
#include "nba2k20_800/nba2k20_800_capture_context1.h" #include "nba2k20_800/nba2k20_800_capture_context1.h"
...@@ -180,6 +181,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -180,6 +181,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{marvel_contest_of_champions::kReplayFrameStart, marvel_contest_of_champions::kReplayFrameEnd, {marvel_contest_of_champions::kReplayFrameStart, marvel_contest_of_champions::kReplayFrameEnd,
marvel_contest_of_champions::kReplayDrawSurfaceWidth, marvel_contest_of_champions::kReplayDrawSurfaceWidth,
marvel_contest_of_champions::kReplayDrawSurfaceHeight, "marvel_contest_of_champions"}}, marvel_contest_of_champions::kReplayDrawSurfaceHeight, "marvel_contest_of_champions"}},
{RestrictedTraceID::messenger_lite,
{messenger_lite::kReplayFrameStart, messenger_lite::kReplayFrameEnd,
messenger_lite::kReplayDrawSurfaceWidth, messenger_lite::kReplayDrawSurfaceHeight,
"messenger_lite"}},
{RestrictedTraceID::minecraft, {RestrictedTraceID::minecraft,
{minecraft::kReplayFrameStart, minecraft::kReplayFrameEnd, minecraft::kReplayDrawSurfaceWidth, {minecraft::kReplayFrameStart, minecraft::kReplayFrameEnd, minecraft::kReplayDrawSurfaceWidth,
minecraft::kReplayDrawSurfaceHeight, "minecraft"}}, minecraft::kReplayDrawSurfaceHeight, "minecraft"}},
...@@ -364,6 +369,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -364,6 +369,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::marvel_contest_of_champions: case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::ReplayContext1Frame(frameIndex); marvel_contest_of_champions::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::messenger_lite:
messenger_lite::ReplayContext1Frame(frameIndex);
break;
case RestrictedTraceID::minecraft: case RestrictedTraceID::minecraft:
minecraft::ReplayContext2Frame(frameIndex); minecraft::ReplayContext2Frame(frameIndex);
break; break;
...@@ -531,6 +539,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -531,6 +539,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::marvel_contest_of_champions: case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::ResetContext1Replay(); marvel_contest_of_champions::ResetContext1Replay();
break; break;
case RestrictedTraceID::messenger_lite:
messenger_lite::ResetContext1Replay();
break;
case RestrictedTraceID::minecraft: case RestrictedTraceID::minecraft:
minecraft::ResetContext2Replay(); minecraft::ResetContext2Replay();
break; break;
...@@ -698,6 +709,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -698,6 +709,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::marvel_contest_of_champions: case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::SetupContext1Replay(); marvel_contest_of_champions::SetupContext1Replay();
break; break;
case RestrictedTraceID::messenger_lite:
messenger_lite::SetupContext1Replay();
break;
case RestrictedTraceID::minecraft: case RestrictedTraceID::minecraft:
minecraft::SetupContext2Replay(); minecraft::SetupContext2Replay();
break; break;
...@@ -865,6 +879,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -865,6 +879,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::marvel_contest_of_champions: case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::SetBinaryDataDir(dataDir); marvel_contest_of_champions::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::messenger_lite:
messenger_lite::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::minecraft: case RestrictedTraceID::minecraft:
minecraft::SetBinaryDataDir(dataDir); minecraft::SetBinaryDataDir(dataDir);
break; break;
...@@ -1032,6 +1049,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -1032,6 +1049,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::marvel_contest_of_champions: case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::SetBinaryDataDecompressCallback(callback); marvel_contest_of_champions::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::messenger_lite:
messenger_lite::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::minecraft: case RestrictedTraceID::minecraft:
minecraft::SetBinaryDataDecompressCallback(callback); minecraft::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -40,6 +40,7 @@ angle_restricted_traces = [ ...@@ -40,6 +40,7 @@ angle_restricted_traces = [
"manhattan_10 1", "manhattan_10 1",
"manhattan_31 6", "manhattan_31 6",
"marvel_contest_of_champions 1", "marvel_contest_of_champions 1",
"messenger_lite 1",
"minecraft 2", "minecraft 2",
"mobile_legends 1", "mobile_legends 1",
"nba2k20_800 1", "nba2k20_800 1",
......
...@@ -85,6 +85,7 @@ enum class RestrictedTraceID ...@@ -85,6 +85,7 @@ enum class RestrictedTraceID
manhattan_10, manhattan_10,
manhattan_31, manhattan_31,
marvel_contest_of_champions, marvel_contest_of_champions,
messenger_lite,
minecraft, minecraft,
mobile_legends, mobile_legends,
nba2k20_800, nba2k20_800,
......
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