Skip to content

A
angle
Commit 43e39e1e by Cody Northrop Committed by Commit Bot
Options

Tests: Add Manhattan 3.1 trace

Note: This trace is longer than most at 100 frames. This is to help get more accurate data on how transform feedback is behaving. It also allows us the opportunity to trim to smaller sections if we wish, and get more reliable results on unstable systems. Test: angle_perftests --gtest_filter="*manhattan_31*" Bug: angleproject:5589 Bug: angleproject:5591 Change-Id: I76db8a56832d04ea4d335bd81ff98ba1679add5f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2659850Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 7e81056a
Showing with 43 additions and 5 deletions
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"c4ba3bd0ed205049e330d359a5dffe3d", "2c775f1c9d9e46c43e8c050869d92e1f",
"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":
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
"e31a9dcfc1734a407d3f54183941f965", "e31a9dcfc1734a407d3f54183941f965",
"src/tests/restricted_traces/manhattan_10.tar.gz.sha1": "src/tests/restricted_traces/manhattan_10.tar.gz.sha1":
"f24ffb3d8150ea69b71df0e391af2fed", "f24ffb3d8150ea69b71df0e391af2fed",
"src/tests/restricted_traces/manhattan_31.tar.gz.sha1":
"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/mobile_legends.tar.gz.sha1": "src/tests/restricted_traces/mobile_legends.tar.gz.sha1":
...@@ -56,13 +58,13 @@ ...@@ -56,13 +58,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":
"99d86b7111aba0d57920c0e919ef4a1c", "9ae233f47c0857d525882d4a313d8449",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"491499eb56598c3b2d6ea04f57b6b4cd", "498f967b07e0569a921a589fb164d45e",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"2fd18528154eafb0cb218f03825f691f", "40b3ca546d28bb3bd20309abba8487f0",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"55aa327f99db1eb716cc3f6aad221271", "fa27226508cb56b1eff8a70eb15272a7",
"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/subway_surfers.tar.gz.sha1": "src/tests/restricted_traces/subway_surfers.tar.gz.sha1":
......
src/tests/perf_tests/TracePerfTest.cpp
...@@ -334,6 +334,15 @@ TracePerfTest::TracePerfTest() ...@@ -334,6 +334,15 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::manhattan_31)
{
// TODO: http://anglebug.com/5591 Trace crashes on Pixel 2 in vulkan driver
if (IsPixel2() && 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();
......
src/tests/restricted_traces/.gitignore
...@@ -38,6 +38,8 @@ magic_tiles_3.tar.gz ...@@ -38,6 +38,8 @@ magic_tiles_3.tar.gz
magic_tiles_3/ magic_tiles_3/
manhattan_10.tar.gz manhattan_10.tar.gz
manhattan_10/ manhattan_10/
manhattan_31.tar.gz
manhattan_31/
marvel_contest_of_champions.tar.gz marvel_contest_of_champions.tar.gz
marvel_contest_of_champions/ marvel_contest_of_champions/
mobile_legends.tar.gz mobile_legends.tar.gz
......
src/tests/restricted_traces/manhattan_31.tar.gz.sha1 0 → 100644
d654e25bb600a5871329543b5a5ce96bb9803406
\ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"lego_legacy", "lego_legacy",
"magic_tiles_3", "magic_tiles_3",
"manhattan_10", "manhattan_10",
"manhattan_31",
"marvel_contest_of_champions", "marvel_contest_of_champions",
"mobile_legends", "mobile_legends",
"nba2k20_800", "nba2k20_800",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "lego_legacy/lego_legacy_capture_context2.h" #include "lego_legacy/lego_legacy_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 "marvel_contest_of_champions/marvel_contest_of_champions_capture_context1.h" #include "marvel_contest_of_champions/marvel_contest_of_champions_capture_context1.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"
...@@ -121,6 +122,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -121,6 +122,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd, {manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight, manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight,
"manhattan_10"}}, "manhattan_10"}},
{RestrictedTraceID::manhattan_31,
{manhattan_31::kReplayFrameStart, manhattan_31::kReplayFrameEnd,
manhattan_31::kReplayDrawSurfaceWidth, manhattan_31::kReplayDrawSurfaceHeight,
"manhattan_31"}},
{RestrictedTraceID::marvel_contest_of_champions, {RestrictedTraceID::marvel_contest_of_champions,
{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,
...@@ -242,6 +247,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -242,6 +247,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ReplayContext1Frame(frameIndex); manhattan_10::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::manhattan_31:
manhattan_31::ReplayContext6Frame(frameIndex);
break;
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;
...@@ -352,6 +360,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -352,6 +360,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ResetContext1Replay(); manhattan_10::ResetContext1Replay();
break; break;
case RestrictedTraceID::manhattan_31:
manhattan_31::ResetContext6Replay();
break;
case RestrictedTraceID::marvel_contest_of_champions: case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::ResetContext1Replay(); marvel_contest_of_champions::ResetContext1Replay();
break; break;
...@@ -462,6 +473,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -462,6 +473,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetupContext1Replay(); manhattan_10::SetupContext1Replay();
break; break;
case RestrictedTraceID::manhattan_31:
manhattan_31::SetupContext6Replay();
break;
case RestrictedTraceID::marvel_contest_of_champions: case RestrictedTraceID::marvel_contest_of_champions:
marvel_contest_of_champions::SetupContext1Replay(); marvel_contest_of_champions::SetupContext1Replay();
break; break;
...@@ -572,6 +586,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -572,6 +586,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDir(dataDir); manhattan_10::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::manhattan_31:
manhattan_31::SetBinaryDataDir(dataDir);
break;
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;
...@@ -682,6 +699,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -682,6 +699,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetBinaryDataDecompressCallback(callback); manhattan_10::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::manhattan_31:
manhattan_31::SetBinaryDataDecompressCallback(callback);
break;
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;
......
src/tests/restricted_traces/restricted_traces_autogen.gni
...@@ -29,6 +29,7 @@ angle_restricted_traces = [ ...@@ -29,6 +29,7 @@ angle_restricted_traces = [
"lego_legacy 2", "lego_legacy 2",
"magic_tiles_3 2", "magic_tiles_3 2",
"manhattan_10 1", "manhattan_10 1",
"manhattan_31 6",
"marvel_contest_of_champions 1", "marvel_contest_of_champions 1",
"mobile_legends 1", "mobile_legends 1",
"nba2k20_800 1", "nba2k20_800 1",
......
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -74,6 +74,7 @@ enum class RestrictedTraceID ...@@ -74,6 +74,7 @@ enum class RestrictedTraceID
lego_legacy, lego_legacy,
magic_tiles_3, magic_tiles_3,
manhattan_10, manhattan_10,
manhattan_31,
marvel_contest_of_champions, marvel_contest_of_champions,
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