Commit 9193a909 by Cody Northrop Committed by Angle LUCI CQ

Tests: Add Genshin Impact trace

Test: angle_perftests --gtest_filter="*genshin_impact*" Bug: b/181794064 Bug: angleproject:6023 Bug: angleproject:6024 Change-Id: Ic0debb1e284d672b8ab179ac24cd711c9e5d7e9d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2921069Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
parent a474fd7d
...@@ -952,6 +952,16 @@ deps = { ...@@ -952,6 +952,16 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces', 'condition': 'checkout_angle_restricted_traces',
}, },
'src/tests/restricted_traces/genshin_impact': {
'packages': [
{
'package': 'angle/traces/genshin_impact',
'version': 'version:2',
},
],
'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces',
},
'src/tests/restricted_traces/google_maps': { 'src/tests/restricted_traces/google_maps': {
'packages': [ 'packages': [
{ {
......
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"4fc38021f1d007f9747c5f0aab2a69e9", "f1fb918056b671445f3723e1d18fc49f",
"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":
"1d682b7993ab52c02b4d62e73f5dd56e", "9d0d469fddef1bb8fd9858a4637a7145",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"28c859c9ea919ab788674bfd64202964", "a08247e8eb092a7e8d42e450f68d502a",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"c84fc442c8f5f388a1c32930f104f167", "3e7a3e36f5622cf84f8e89a4b85d2d1f",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"c48072a120e2aa305fa8324d0cfe5ede" "59baab446ce6b76e1db7f1e6e9440c52"
} }
\ No newline at end of file
...@@ -969,6 +969,17 @@ TracePerfTest::TracePerfTest() ...@@ -969,6 +969,17 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::genshin_impact)
{
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
// TODO: http://anglebug.com/6023 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();
......
...@@ -31,6 +31,7 @@ fate_grand_order/ ...@@ -31,6 +31,7 @@ fate_grand_order/
fifa_mobile/ fifa_mobile/
free_fire/ free_fire/
gardenscapes/ gardenscapes/
genshin_impact/
google_maps/ google_maps/
happy_color/ happy_color/
hay_day/ hay_day/
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
"fifa_mobile 1", "fifa_mobile 1",
"free_fire 1", "free_fire 1",
"gardenscapes 1", "gardenscapes 1",
"genshin_impact 2",
"google_maps 1", "google_maps 1",
"happy_color 1", "happy_color 1",
"hay_day 1", "hay_day 1",
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "fifa_mobile/fifa_mobile_capture_context1.h" #include "fifa_mobile/fifa_mobile_capture_context1.h"
#include "free_fire/free_fire_capture_context1.h" #include "free_fire/free_fire_capture_context1.h"
#include "gardenscapes/gardenscapes_capture_context1.h" #include "gardenscapes/gardenscapes_capture_context1.h"
#include "genshin_impact/genshin_impact_capture_context3.h"
#include "google_maps/google_maps_capture_context1.h" #include "google_maps/google_maps_capture_context1.h"
#include "happy_color/happy_color_capture_context1.h" #include "happy_color/happy_color_capture_context1.h"
#include "hay_day/hay_day_capture_context1.h" #include "hay_day/hay_day_capture_context1.h"
...@@ -266,6 +267,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -266,6 +267,11 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
gardenscapes::kReplayContextClientMinorVersion, gardenscapes::kReplayFrameStart, gardenscapes::kReplayContextClientMinorVersion, gardenscapes::kReplayFrameStart,
gardenscapes::kReplayFrameEnd, gardenscapes::kReplayDrawSurfaceWidth, gardenscapes::kReplayFrameEnd, gardenscapes::kReplayDrawSurfaceWidth,
gardenscapes::kReplayDrawSurfaceHeight, "gardenscapes"}}, gardenscapes::kReplayDrawSurfaceHeight, "gardenscapes"}},
{RestrictedTraceID::genshin_impact,
{genshin_impact::kReplayContextClientMajorVersion,
genshin_impact::kReplayContextClientMinorVersion, genshin_impact::kReplayFrameStart,
genshin_impact::kReplayFrameEnd, genshin_impact::kReplayDrawSurfaceWidth,
genshin_impact::kReplayDrawSurfaceHeight, "genshin_impact"}},
{RestrictedTraceID::google_maps, {RestrictedTraceID::google_maps,
{google_maps::kReplayContextClientMajorVersion, google_maps::kReplayContextClientMinorVersion, {google_maps::kReplayContextClientMajorVersion, google_maps::kReplayContextClientMinorVersion,
google_maps::kReplayFrameStart, google_maps::kReplayFrameEnd, google_maps::kReplayFrameStart, google_maps::kReplayFrameEnd,
......
...@@ -1002,6 +1002,112 @@ angle_restricted_traces = [ ...@@ -1002,6 +1002,112 @@ angle_restricted_traces = [
], ],
], ],
[ [
"genshin_impact",
3,
[
"genshin_impact/genshin_impact_capture_context3_frame001.cpp",
"genshin_impact/genshin_impact_capture_context3_frame002.cpp",
"genshin_impact/genshin_impact_capture_context3_frame003.cpp",
"genshin_impact/genshin_impact_capture_context3_frame004.cpp",
"genshin_impact/genshin_impact_capture_context3_frame005.cpp",
"genshin_impact/genshin_impact_capture_context3_frame006.cpp",
"genshin_impact/genshin_impact_capture_context3_frame007.cpp",
"genshin_impact/genshin_impact_capture_context3_frame008.cpp",
"genshin_impact/genshin_impact_capture_context3_frame009.cpp",
"genshin_impact/genshin_impact_capture_context3_frame010.cpp",
"genshin_impact/genshin_impact_capture_context3_frame011.cpp",
"genshin_impact/genshin_impact_capture_context3_frame012.cpp",
"genshin_impact/genshin_impact_capture_context3_frame013.cpp",
"genshin_impact/genshin_impact_capture_context3_frame014.cpp",
"genshin_impact/genshin_impact_capture_context3_frame015.cpp",
"genshin_impact/genshin_impact_capture_context3_frame016.cpp",
"genshin_impact/genshin_impact_capture_context3_frame017.cpp",
"genshin_impact/genshin_impact_capture_context3_frame018.cpp",
"genshin_impact/genshin_impact_capture_context3_frame019.cpp",
"genshin_impact/genshin_impact_capture_context3_frame020.cpp",
"genshin_impact/genshin_impact_capture_context3_frame021.cpp",
"genshin_impact/genshin_impact_capture_context3_frame022.cpp",
"genshin_impact/genshin_impact_capture_context3_frame023.cpp",
"genshin_impact/genshin_impact_capture_context3_frame024.cpp",
"genshin_impact/genshin_impact_capture_context3_frame025.cpp",
"genshin_impact/genshin_impact_capture_context3_frame026.cpp",
"genshin_impact/genshin_impact_capture_context3_frame027.cpp",
"genshin_impact/genshin_impact_capture_context3_frame028.cpp",
"genshin_impact/genshin_impact_capture_context3_frame029.cpp",
"genshin_impact/genshin_impact_capture_context3_frame030.cpp",
"genshin_impact/genshin_impact_capture_context3_frame031.cpp",
"genshin_impact/genshin_impact_capture_context3_frame032.cpp",
"genshin_impact/genshin_impact_capture_context3_frame033.cpp",
"genshin_impact/genshin_impact_capture_context3_frame034.cpp",
"genshin_impact/genshin_impact_capture_context3_frame035.cpp",
"genshin_impact/genshin_impact_capture_context3_frame036.cpp",
"genshin_impact/genshin_impact_capture_context3_frame037.cpp",
"genshin_impact/genshin_impact_capture_context3_frame038.cpp",
"genshin_impact/genshin_impact_capture_context3_frame039.cpp",
"genshin_impact/genshin_impact_capture_context3_frame040.cpp",
"genshin_impact/genshin_impact_capture_context3_frame041.cpp",
"genshin_impact/genshin_impact_capture_context3_frame042.cpp",
"genshin_impact/genshin_impact_capture_context3_frame043.cpp",
"genshin_impact/genshin_impact_capture_context3_frame044.cpp",
"genshin_impact/genshin_impact_capture_context3_frame045.cpp",
"genshin_impact/genshin_impact_capture_context3_frame046.cpp",
"genshin_impact/genshin_impact_capture_context3_frame047.cpp",
"genshin_impact/genshin_impact_capture_context3_frame048.cpp",
"genshin_impact/genshin_impact_capture_context3_frame049.cpp",
"genshin_impact/genshin_impact_capture_context3_frame050.cpp",
"genshin_impact/genshin_impact_capture_context3_frame051.cpp",
"genshin_impact/genshin_impact_capture_context3_frame052.cpp",
"genshin_impact/genshin_impact_capture_context3_frame053.cpp",
"genshin_impact/genshin_impact_capture_context3_frame054.cpp",
"genshin_impact/genshin_impact_capture_context3_frame055.cpp",
"genshin_impact/genshin_impact_capture_context3_frame056.cpp",
"genshin_impact/genshin_impact_capture_context3_frame057.cpp",
"genshin_impact/genshin_impact_capture_context3_frame058.cpp",
"genshin_impact/genshin_impact_capture_context3_frame059.cpp",
"genshin_impact/genshin_impact_capture_context3_frame060.cpp",
"genshin_impact/genshin_impact_capture_context3_frame061.cpp",
"genshin_impact/genshin_impact_capture_context3_frame062.cpp",
"genshin_impact/genshin_impact_capture_context3_frame063.cpp",
"genshin_impact/genshin_impact_capture_context3_frame064.cpp",
"genshin_impact/genshin_impact_capture_context3_frame065.cpp",
"genshin_impact/genshin_impact_capture_context3_frame066.cpp",
"genshin_impact/genshin_impact_capture_context3_frame067.cpp",
"genshin_impact/genshin_impact_capture_context3_frame068.cpp",
"genshin_impact/genshin_impact_capture_context3_frame069.cpp",
"genshin_impact/genshin_impact_capture_context3_frame070.cpp",
"genshin_impact/genshin_impact_capture_context3_frame071.cpp",
"genshin_impact/genshin_impact_capture_context3_frame072.cpp",
"genshin_impact/genshin_impact_capture_context3_frame073.cpp",
"genshin_impact/genshin_impact_capture_context3_frame074.cpp",
"genshin_impact/genshin_impact_capture_context3_frame075.cpp",
"genshin_impact/genshin_impact_capture_context3_frame076.cpp",
"genshin_impact/genshin_impact_capture_context3_frame077.cpp",
"genshin_impact/genshin_impact_capture_context3_frame078.cpp",
"genshin_impact/genshin_impact_capture_context3_frame079.cpp",
"genshin_impact/genshin_impact_capture_context3_frame080.cpp",
"genshin_impact/genshin_impact_capture_context3_frame081.cpp",
"genshin_impact/genshin_impact_capture_context3_frame082.cpp",
"genshin_impact/genshin_impact_capture_context3_frame083.cpp",
"genshin_impact/genshin_impact_capture_context3_frame084.cpp",
"genshin_impact/genshin_impact_capture_context3_frame085.cpp",
"genshin_impact/genshin_impact_capture_context3_frame086.cpp",
"genshin_impact/genshin_impact_capture_context3_frame087.cpp",
"genshin_impact/genshin_impact_capture_context3_frame088.cpp",
"genshin_impact/genshin_impact_capture_context3_frame089.cpp",
"genshin_impact/genshin_impact_capture_context3_frame090.cpp",
"genshin_impact/genshin_impact_capture_context3_frame091.cpp",
"genshin_impact/genshin_impact_capture_context3_frame092.cpp",
"genshin_impact/genshin_impact_capture_context3_frame093.cpp",
"genshin_impact/genshin_impact_capture_context3_frame094.cpp",
"genshin_impact/genshin_impact_capture_context3_frame095.cpp",
"genshin_impact/genshin_impact_capture_context3_frame096.cpp",
"genshin_impact/genshin_impact_capture_context3_frame097.cpp",
"genshin_impact/genshin_impact_capture_context3_frame098.cpp",
"genshin_impact/genshin_impact_capture_context3_frame099.cpp",
"genshin_impact/genshin_impact_capture_context3_frame100.cpp",
],
],
[
"google_maps", "google_maps",
1, 1,
[ [
......
...@@ -87,6 +87,7 @@ enum class RestrictedTraceID ...@@ -87,6 +87,7 @@ enum class RestrictedTraceID
fifa_mobile, fifa_mobile,
free_fire, free_fire,
gardenscapes, gardenscapes,
genshin_impact,
google_maps, google_maps,
happy_color, happy_color,
hay_day, hay_day,
......
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