Skip to content

A
angle
Commit da0a1ee9 by Cody Northrop Committed by Commit Bot
Options

Tests: Add 3DMark Slingshot Test 2 trace

This trace is ES 3.0 based and shader heavy. Test: angle_perftests --gtest_filter="*slingshot_test2*" Tbr: jmadill@google.com,timvp@google.com Bug: b/185595371 Bug: angleproject:5877 Change-Id: I3d66a5f818b33581b4237e8a9efc56af5666d98b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2832657Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent fc136cf8
Showing with 27 additions and 6 deletions
DEPS
...@@ -1022,6 +1022,16 @@ deps = { ...@@ -1022,6 +1022,16 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces', 'condition': 'checkout_angle_restricted_traces',
}, },
'src/tests/restricted_traces/slingshot_test2': {
'packages': [
{
'package': 'angle/traces/slingshot_test2',
'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': [
{ {
......
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"f962982feb82de1d649264364a6ba6cf", "bd3d5fc52de73d76502956cd18b74e3a",
"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":
"3ba76703bf9a0c724877d084cafa2750", "9cc53f3713702dcaff5328b26c19638a",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"1304c5fb9566a6df505839cfd5b5d0c8", "6b806747344062c37d7e499b88a32065",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"fe91cb7b8b2bff5f89ffeb765a58f262", "a69264be2f2a4292c82b5e65cb744bd1",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"e940a8ab011edc46b5b7a4df84fa1043" "df1c1747bb35fb8a3bb827c480a48e8a"
} }
\ No newline at end of file
src/tests/perf_tests/TracePerfTest.cpp
...@@ -864,7 +864,8 @@ TracePerfTest::TracePerfTest() ...@@ -864,7 +864,8 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::slingshot_test1) if (param.testID == RestrictedTraceID::slingshot_test1 ||
param.testID == RestrictedTraceID::slingshot_test2)
{ {
// TODO: http://anglebug.com/5877 Trace crashes on Pixel 2 in vulkan driver // TODO: http://anglebug.com/5877 Trace crashes on Pixel 2 in vulkan driver
if (IsPixel2() && param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE) if (IsPixel2() && param.getRenderer() == EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
......
src/tests/restricted_traces/.gitignore
...@@ -61,6 +61,7 @@ rope_hero_vice_town/ ...@@ -61,6 +61,7 @@ rope_hero_vice_town/
saint_seiya_awakening/ saint_seiya_awakening/
shadow_fight_2/ shadow_fight_2/
slingshot_test1/ slingshot_test1/
slingshot_test2/
sniper_3d/ sniper_3d/
standoff_2/ standoff_2/
subway_surfers/ subway_surfers/
......
src/tests/restricted_traces/restricted_traces.json
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
"saint_seiya_awakening 1", "saint_seiya_awakening 1",
"shadow_fight_2 1", "shadow_fight_2 1",
"slingshot_test1 1", "slingshot_test1 1",
"slingshot_test2 1",
"sniper_3d 1", "sniper_3d 1",
"standoff_2 1", "standoff_2 1",
"subway_surfers 1", "subway_surfers 1",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
#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 "slingshot_test1/slingshot_test1_capture_context2.h"
#include "slingshot_test2/slingshot_test2_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"
...@@ -401,6 +402,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -401,6 +402,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
slingshot_test1::kReplayContextClientMinorVersion, slingshot_test1::kReplayFrameStart, slingshot_test1::kReplayContextClientMinorVersion, slingshot_test1::kReplayFrameStart,
slingshot_test1::kReplayFrameEnd, slingshot_test1::kReplayDrawSurfaceWidth, slingshot_test1::kReplayFrameEnd, slingshot_test1::kReplayDrawSurfaceWidth,
slingshot_test1::kReplayDrawSurfaceHeight, "slingshot_test1"}}, slingshot_test1::kReplayDrawSurfaceHeight, "slingshot_test1"}},
{RestrictedTraceID::slingshot_test2,
{slingshot_test2::kReplayContextClientMajorVersion,
slingshot_test2::kReplayContextClientMinorVersion, slingshot_test2::kReplayFrameStart,
slingshot_test2::kReplayFrameEnd, slingshot_test2::kReplayDrawSurfaceWidth,
slingshot_test2::kReplayDrawSurfaceHeight, "slingshot_test2"}},
{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,
......
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -117,6 +117,7 @@ enum class RestrictedTraceID ...@@ -117,6 +117,7 @@ enum class RestrictedTraceID
saint_seiya_awakening, saint_seiya_awakening,
shadow_fight_2, shadow_fight_2,
slingshot_test1, slingshot_test1,
slingshot_test2,
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