Skip to content

A
angle
Commit 1800d1d9 by Cody Northrop Committed by Commit Bot
Options

Tests: Add Ludo King trace

Test: angle_perftests --gtest_filter="*ludo_king*" Tbr: jmadill@google.com,timvp@google.com Bug: b/186121782 Bug: angleproject:5888 Change-Id: I41cd5924c109e4d9448227c535a9fb92a5b52cb3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2845374Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 7b108b3d
Showing with 65 additions and 5 deletions
DEPS
...@@ -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/ludo_king': {
'packages': [
{
'package': 'angle/traces/ludo_king',
'version': 'version:1',
},
],
'dep_type': 'cipd',
'condition': 'checkout_angle_restricted_traces',
},
'src/tests/restricted_traces/magic_tiles_3': { 'src/tests/restricted_traces/magic_tiles_3': {
'packages': [ 'packages': [
{ {
......
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"1b9dd180c13ecd22d0da719a0f184c23", "ee7ecd28a525ee120022a19dbe553c4d",
"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":
"74f895ad92dda9226789cf2dfcde2b9a", "27080926b41006e6c46acf24dded8639",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"245cd028b3a0ac0595147f65319910a9", "bfd8f53f57d3b0f8c92f47fb79ca7672",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"9e8df0786ec04fd18f1a8d03d0807a71", "2f6ad61e49c1fd3153f0343ee0b722d8",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"c28fc302286d57c569ddb5fb6313b4a3" "5cd50b13eddc6d61f690f0fa6b04b116"
} }
\ No newline at end of file
src/tests/perf_tests/TracePerfTest.cpp
...@@ -883,6 +883,11 @@ TracePerfTest::TracePerfTest() ...@@ -883,6 +883,11 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::ludo_king)
{
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
}
// 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
...@@ -39,6 +39,7 @@ klondike_adventures/ ...@@ -39,6 +39,7 @@ klondike_adventures/
league_of_legends_wild_rift/ league_of_legends_wild_rift/
lego_legacy/ lego_legacy/
lineage_m/ lineage_m/
ludo_king/
magic_tiles_3/ magic_tiles_3/
manhattan_10/ manhattan_10/
manhattan_31/ manhattan_31/
......
src/tests/restricted_traces/restricted_traces.json
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
"league_of_legends_wild_rift 1", "league_of_legends_wild_rift 1",
"lego_legacy 1", "lego_legacy 1",
"lineage_m 1", "lineage_m 1",
"ludo_king 1",
"magic_tiles_3 1", "magic_tiles_3 1",
"manhattan_10 1", "manhattan_10 1",
"manhattan_31 1", "manhattan_31 1",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include "league_of_legends_wild_rift/league_of_legends_wild_rift_capture_context1.h" #include "league_of_legends_wild_rift/league_of_legends_wild_rift_capture_context1.h"
#include "lego_legacy/lego_legacy_capture_context1.h" #include "lego_legacy/lego_legacy_capture_context1.h"
#include "lineage_m/lineage_m_capture_context1.h" #include "lineage_m/lineage_m_capture_context1.h"
#include "ludo_king/ludo_king_capture_context1.h"
#include "magic_tiles_3/magic_tiles_3_capture_context1.h" #include "magic_tiles_3/magic_tiles_3_capture_context1.h"
#include "manhattan_10/manhattan_10_capture_context1.h" #include "manhattan_10/manhattan_10_capture_context1.h"
#include "manhattan_31/manhattan_31_capture_context1.h" #include "manhattan_31/manhattan_31_capture_context1.h"
...@@ -289,6 +290,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -289,6 +290,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{lineage_m::kReplayContextClientMajorVersion, lineage_m::kReplayContextClientMinorVersion, {lineage_m::kReplayContextClientMajorVersion, lineage_m::kReplayContextClientMinorVersion,
lineage_m::kReplayFrameStart, lineage_m::kReplayFrameEnd, lineage_m::kReplayDrawSurfaceWidth, lineage_m::kReplayFrameStart, lineage_m::kReplayFrameEnd, lineage_m::kReplayDrawSurfaceWidth,
lineage_m::kReplayDrawSurfaceHeight, "lineage_m"}}, lineage_m::kReplayDrawSurfaceHeight, "lineage_m"}},
{RestrictedTraceID::ludo_king,
{ludo_king::kReplayContextClientMajorVersion, ludo_king::kReplayContextClientMinorVersion,
ludo_king::kReplayFrameStart, ludo_king::kReplayFrameEnd, ludo_king::kReplayDrawSurfaceWidth,
ludo_king::kReplayDrawSurfaceHeight, "ludo_king"}},
{RestrictedTraceID::magic_tiles_3, {RestrictedTraceID::magic_tiles_3,
{magic_tiles_3::kReplayContextClientMajorVersion, {magic_tiles_3::kReplayContextClientMajorVersion,
magic_tiles_3::kReplayContextClientMinorVersion, magic_tiles_3::kReplayFrameStart, magic_tiles_3::kReplayContextClientMinorVersion, magic_tiles_3::kReplayFrameStart,
......
src/tests/restricted_traces/restricted_traces_autogen.gni
...@@ -2219,6 +2219,42 @@ angle_restricted_traces = [ ...@@ -2219,6 +2219,42 @@ angle_restricted_traces = [
], ],
], ],
[ [
"ludo_king",
1,
[
"ludo_king/ludo_king_capture_context1_frame001.cpp",
"ludo_king/ludo_king_capture_context1_frame002.cpp",
"ludo_king/ludo_king_capture_context1_frame003.cpp",
"ludo_king/ludo_king_capture_context1_frame004.cpp",
"ludo_king/ludo_king_capture_context1_frame005.cpp",
"ludo_king/ludo_king_capture_context1_frame006.cpp",
"ludo_king/ludo_king_capture_context1_frame007.cpp",
"ludo_king/ludo_king_capture_context1_frame008.cpp",
"ludo_king/ludo_king_capture_context1_frame009.cpp",
"ludo_king/ludo_king_capture_context1_frame010.cpp",
"ludo_king/ludo_king_capture_context1_frame011.cpp",
"ludo_king/ludo_king_capture_context1_frame012.cpp",
"ludo_king/ludo_king_capture_context1_frame013.cpp",
"ludo_king/ludo_king_capture_context1_frame014.cpp",
"ludo_king/ludo_king_capture_context1_frame015.cpp",
"ludo_king/ludo_king_capture_context1_frame016.cpp",
"ludo_king/ludo_king_capture_context1_frame017.cpp",
"ludo_king/ludo_king_capture_context1_frame018.cpp",
"ludo_king/ludo_king_capture_context1_frame019.cpp",
"ludo_king/ludo_king_capture_context1_frame020.cpp",
"ludo_king/ludo_king_capture_context1_frame021.cpp",
"ludo_king/ludo_king_capture_context1_frame022.cpp",
"ludo_king/ludo_king_capture_context1_frame023.cpp",
"ludo_king/ludo_king_capture_context1_frame024.cpp",
"ludo_king/ludo_king_capture_context1_frame025.cpp",
"ludo_king/ludo_king_capture_context1_frame026.cpp",
"ludo_king/ludo_king_capture_context1_frame027.cpp",
"ludo_king/ludo_king_capture_context1_frame028.cpp",
"ludo_king/ludo_king_capture_context1_frame029.cpp",
"ludo_king/ludo_king_capture_context1_frame030.cpp",
],
],
[
"magic_tiles_3", "magic_tiles_3",
1, 1,
[ [
......
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -95,6 +95,7 @@ enum class RestrictedTraceID ...@@ -95,6 +95,7 @@ enum class RestrictedTraceID
league_of_legends_wild_rift, league_of_legends_wild_rift,
lego_legacy, lego_legacy,
lineage_m, lineage_m,
ludo_king,
magic_tiles_3, magic_tiles_3,
manhattan_10, manhattan_10,
manhattan_31, manhattan_31,
......
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