From 8d16e15e43f8c98097871d4b4d9d083d2aef0dbf Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Mon, 17 May 2021 23:16:59 -0600 Subject: [PATCH] Tests: Add SAKURA School Simulator trace Test: angle_perftests --gtest_filter="*sakura_school_simulator*" Tbr: timvp@google.com,jmadill@chromium.org Bug: b/188488065 Bug: angleproject:5987 Change-Id: Idf9966c32de8c2720edf1b7575722052c5cd294a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2902443 Reviewed-by: Cody Northrop Commit-Queue: Cody Northrop --- DEPS | 10 ++++++ .../restricted_traces.json | 10 +++--- src/tests/restricted_traces/.gitignore | 1 + .../restricted_traces/restricted_traces.json | 1 + .../restricted_traces_autogen.cpp | 7 ++++ .../restricted_traces_autogen.gni | 36 +++++++++++++++++++ .../restricted_traces_autogen.h | 1 + 7 files changed, 61 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index e7497a6e4..94cc1fea1 100644 --- a/DEPS +++ b/DEPS @@ -1307,6 +1307,16 @@ deps = { 'dep_type': 'cipd', 'condition': 'checkout_angle_restricted_traces', }, + 'src/tests/restricted_traces/sakura_school_simulator': { + 'packages': [ + { + 'package': 'angle/traces/sakura_school_simulator', + 'version': 'version:1', + }, + ], + 'dep_type': 'cipd', + 'condition': 'checkout_angle_restricted_traces', + }, 'src/tests/restricted_traces/shadow_fight_2': { 'packages': [ { diff --git a/scripts/code_generation_hashes/restricted_traces.json b/scripts/code_generation_hashes/restricted_traces.json index 807900b45..6c589d77f 100644 --- a/scripts/code_generation_hashes/restricted_traces.json +++ b/scripts/code_generation_hashes/restricted_traces.json @@ -1,14 +1,14 @@ { "src/tests/restricted_traces/.gitignore": - "a6aff5fb32481afb8294db73a0632f61", + "775fff410fcc8c76e39474ba0d6a11fb", "src/tests/restricted_traces/gen_restricted_traces.py": "f700505c2ba8299a6ce68962763d7f2d", "src/tests/restricted_traces/restricted_traces.json": - "31384d02adcf414a86a54fbd1ecb3298", + "9471d5dd1e3e47369c7a0798b08e1f9e", "src/tests/restricted_traces/restricted_traces_autogen.cpp": - "baf97fd5f64731e9d2ad7e488cfb6e9a", + "0be6e2ee101fbc54dc8729205366c86e", "src/tests/restricted_traces/restricted_traces_autogen.gni": - "da2bdde7a68fe9e63b788252e1f54a11", + "0bfc5ba5c3e1db2857e1313193b88153", "src/tests/restricted_traces/restricted_traces_autogen.h": - "c740b490d5ef35b13fd83eaff7da769a" + "960548fb78fd24e52cd51548f845136c" } \ No newline at end of file diff --git a/src/tests/restricted_traces/.gitignore b/src/tests/restricted_traces/.gitignore index 473783d87..90aadbc40 100644 --- a/src/tests/restricted_traces/.gitignore +++ b/src/tests/restricted_traces/.gitignore @@ -67,6 +67,7 @@ rise_of_kingdoms/ romancing_saga/ rope_hero_vice_town/ saint_seiya_awakening/ +sakura_school_simulator/ shadow_fight_2/ slingshot_test1/ slingshot_test2/ diff --git a/src/tests/restricted_traces/restricted_traces.json b/src/tests/restricted_traces/restricted_traces.json index c580b93f3..101ed4afb 100644 --- a/src/tests/restricted_traces/restricted_traces.json +++ b/src/tests/restricted_traces/restricted_traces.json @@ -77,6 +77,7 @@ "romancing_saga 1", "rope_hero_vice_town 1", "saint_seiya_awakening 1", + "sakura_school_simulator 1", "shadow_fight_2 1", "slingshot_test1 1", "slingshot_test2 1", diff --git a/src/tests/restricted_traces/restricted_traces_autogen.cpp b/src/tests/restricted_traces/restricted_traces_autogen.cpp index 4387f3b68..37babe608 100644 --- a/src/tests/restricted_traces/restricted_traces_autogen.cpp +++ b/src/tests/restricted_traces/restricted_traces_autogen.cpp @@ -81,6 +81,7 @@ #include "romancing_saga/romancing_saga_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 "sakura_school_simulator/sakura_school_simulator_capture_context2.h" #include "shadow_fight_2/shadow_fight_2_capture_context1.h" #include "slingshot_test1/slingshot_test1_capture_context2.h" #include "slingshot_test2/slingshot_test2_capture_context2.h" @@ -439,6 +440,12 @@ constexpr angle::PackedEnumMap kTraceInfos = { saint_seiya_awakening::kReplayFrameStart, saint_seiya_awakening::kReplayFrameEnd, saint_seiya_awakening::kReplayDrawSurfaceWidth, saint_seiya_awakening::kReplayDrawSurfaceHeight, "saint_seiya_awakening"}}, + {RestrictedTraceID::sakura_school_simulator, + {sakura_school_simulator::kReplayContextClientMajorVersion, + sakura_school_simulator::kReplayContextClientMinorVersion, + sakura_school_simulator::kReplayFrameStart, sakura_school_simulator::kReplayFrameEnd, + sakura_school_simulator::kReplayDrawSurfaceWidth, + sakura_school_simulator::kReplayDrawSurfaceHeight, "sakura_school_simulator"}}, {RestrictedTraceID::shadow_fight_2, {shadow_fight_2::kReplayContextClientMajorVersion, shadow_fight_2::kReplayContextClientMinorVersion, shadow_fight_2::kReplayFrameStart, diff --git a/src/tests/restricted_traces/restricted_traces_autogen.gni b/src/tests/restricted_traces/restricted_traces_autogen.gni index 243af5666..4db855509 100644 --- a/src/tests/restricted_traces/restricted_traces_autogen.gni +++ b/src/tests/restricted_traces/restricted_traces_autogen.gni @@ -3228,6 +3228,42 @@ angle_restricted_traces = [ "saint_seiya_awakening/saint_seiya_awakening_capture_context1_frame010.cpp", ], ], + [ + "sakura_school_simulator", + 2, + [ + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame001.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame002.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame003.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame004.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame005.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame006.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame007.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame008.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame009.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame010.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame011.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame012.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame013.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame014.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame015.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame016.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame017.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame018.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame019.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame020.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame021.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame022.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame023.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame024.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame025.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame026.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame027.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame028.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame029.cpp", + "sakura_school_simulator/sakura_school_simulator_capture_context2_frame030.cpp", + ], + ], [ "shadow_fight_2", 1, diff --git a/src/tests/restricted_traces/restricted_traces_autogen.h b/src/tests/restricted_traces/restricted_traces_autogen.h index cad7bdd22..28ffe9927 100644 --- a/src/tests/restricted_traces/restricted_traces_autogen.h +++ b/src/tests/restricted_traces/restricted_traces_autogen.h @@ -123,6 +123,7 @@ enum class RestrictedTraceID romancing_saga, rope_hero_vice_town, saint_seiya_awakening, + sakura_school_simulator, shadow_fight_2, slingshot_test1, slingshot_test2,