Commit fc136cf8 by Cody Northrop Committed by Commit Bot

Tests: Add 3DMark Slingshot Test 1 trace

This trace is ES 3.0 based and geometry heavy. Test: angle_perftests --gtest_filter="*slingshot_test1*" Tbr: jmadill@google.com,timvp@google.com Bug: b/185595371 Bug: angleproject:5877 Change-Id: I8528d399fedbe6ea3a07297a869f33de4605c946 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2832672Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent c750129e
...@@ -1012,6 +1012,16 @@ deps = { ...@@ -1012,6 +1012,16 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces', 'condition': 'checkout_angle_restricted_traces',
}, },
'src/tests/restricted_traces/slingshot_test1': {
'packages': [
{
'package': 'angle/traces/slingshot_test1',
'version': 'version:1',
},
],
'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces',
},
'src/tests/restricted_traces/sniper_3d': { 'src/tests/restricted_traces/sniper_3d': {
'packages': [ 'packages': [
{ {
......
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"9e34de23403add0a73d889d998971292", "f962982feb82de1d649264364a6ba6cf",
"src/tests/restricted_traces/gen_restricted_traces.py": "src/tests/restricted_traces/gen_restricted_traces.py":
"f700505c2ba8299a6ce68962763d7f2d", "f700505c2ba8299a6ce68962763d7f2d",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"1ba9185b74b0c64bcbd98226219f0e3c", "3ba76703bf9a0c724877d084cafa2750",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"b6bee35644bdb5c6465f125f70869b2b", "1304c5fb9566a6df505839cfd5b5d0c8",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"d2b29e25bb607b9638243c794acc2fd7", "fe91cb7b8b2bff5f89ffeb765a58f262",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"8d1705e00a2c1957adaf429a0261867f" "e940a8ab011edc46b5b7a4df84fa1043"
} }
\ No newline at end of file
...@@ -864,6 +864,15 @@ TracePerfTest::TracePerfTest() ...@@ -864,6 +864,15 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::slingshot_test1)
{
// TODO: http://anglebug.com/5877 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();
......
...@@ -60,6 +60,7 @@ romancing_saga/ ...@@ -60,6 +60,7 @@ romancing_saga/
rope_hero_vice_town/ rope_hero_vice_town/
saint_seiya_awakening/ saint_seiya_awakening/
shadow_fight_2/ shadow_fight_2/
slingshot_test1/
sniper_3d/ sniper_3d/
standoff_2/ standoff_2/
subway_surfers/ subway_surfers/
......
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
"rope_hero_vice_town 1", "rope_hero_vice_town 1",
"saint_seiya_awakening 1", "saint_seiya_awakening 1",
"shadow_fight_2 1", "shadow_fight_2 1",
"slingshot_test1 1",
"sniper_3d 1", "sniper_3d 1",
"standoff_2 1", "standoff_2 1",
"subway_surfers 1", "subway_surfers 1",
......
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
#include "rope_hero_vice_town/rope_hero_vice_town_capture_context1.h" #include "rope_hero_vice_town/rope_hero_vice_town_capture_context1.h"
#include "saint_seiya_awakening/saint_seiya_awakening_capture_context1.h" #include "saint_seiya_awakening/saint_seiya_awakening_capture_context1.h"
#include "shadow_fight_2/shadow_fight_2_capture_context1.h" #include "shadow_fight_2/shadow_fight_2_capture_context1.h"
#include "slingshot_test1/slingshot_test1_capture_context2.h"
#include "sniper_3d/sniper_3d_capture_context1.h" #include "sniper_3d/sniper_3d_capture_context1.h"
#include "standoff_2/standoff_2_capture_context1.h" #include "standoff_2/standoff_2_capture_context1.h"
#include "subway_surfers/subway_surfers_capture_context1.h" #include "subway_surfers/subway_surfers_capture_context1.h"
...@@ -395,6 +396,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -395,6 +396,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
shadow_fight_2::kReplayContextClientMinorVersion, shadow_fight_2::kReplayFrameStart, shadow_fight_2::kReplayContextClientMinorVersion, shadow_fight_2::kReplayFrameStart,
shadow_fight_2::kReplayFrameEnd, shadow_fight_2::kReplayDrawSurfaceWidth, shadow_fight_2::kReplayFrameEnd, shadow_fight_2::kReplayDrawSurfaceWidth,
shadow_fight_2::kReplayDrawSurfaceHeight, "shadow_fight_2"}}, shadow_fight_2::kReplayDrawSurfaceHeight, "shadow_fight_2"}},
{RestrictedTraceID::slingshot_test1,
{slingshot_test1::kReplayContextClientMajorVersion,
slingshot_test1::kReplayContextClientMinorVersion, slingshot_test1::kReplayFrameStart,
slingshot_test1::kReplayFrameEnd, slingshot_test1::kReplayDrawSurfaceWidth,
slingshot_test1::kReplayDrawSurfaceHeight, "slingshot_test1"}},
{RestrictedTraceID::sniper_3d, {RestrictedTraceID::sniper_3d,
{sniper_3d::kReplayContextClientMajorVersion, sniper_3d::kReplayContextClientMinorVersion, {sniper_3d::kReplayContextClientMajorVersion, sniper_3d::kReplayContextClientMinorVersion,
sniper_3d::kReplayFrameStart, sniper_3d::kReplayFrameEnd, sniper_3d::kReplayDrawSurfaceWidth, sniper_3d::kReplayFrameStart, sniper_3d::kReplayFrameEnd, sniper_3d::kReplayDrawSurfaceWidth,
......
...@@ -116,6 +116,7 @@ enum class RestrictedTraceID ...@@ -116,6 +116,7 @@ enum class RestrictedTraceID
rope_hero_vice_town, rope_hero_vice_town,
saint_seiya_awakening, saint_seiya_awakening,
shadow_fight_2, shadow_fight_2,
slingshot_test1,
sniper_3d, sniper_3d,
standoff_2, standoff_2,
subway_surfers, subway_surfers,
......
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