From 0e06d2f3ff4a6ffd845c65973085f84814f3c204 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Mon, 23 Aug 2021 20:18:48 -0600 Subject: [PATCH] Tests: Add Scrabble Go trace Test: angle_perftests --gtest_filter="*scrabble_go*" Bug: b/197580447 Bug: angleproject:6308 Change-Id: I624c5f201dbadb6b51fe39cbb832da2454c3cb39 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3114492 Commit-Queue: Jamie Madill Reviewed-by: Jamie Madill --- DEPS | 10 +++++ .../restricted_traces.json | 10 ++--- src/tests/perf_tests/TracePerfTest.cpp | 5 +++ src/tests/restricted_traces/.gitignore | 1 + .../restricted_traces/restricted_traces.json | 1 + .../restricted_traces_autogen.cpp | 6 +++ .../restricted_traces_autogen.gni | 39 +++++++++++++++++++ .../restricted_traces_autogen.h | 1 + 8 files changed, 68 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 27fbc0b61..8d6cf2ac7 100644 --- a/DEPS +++ b/DEPS @@ -1424,6 +1424,16 @@ deps = { 'dep_type': 'cipd', 'condition': 'checkout_angle_restricted_traces', }, + 'src/tests/restricted_traces/scrabble_go': { + 'packages': [ + { + 'package': 'angle/traces/scrabble_go', + '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 db2c2d4a6..d6132ff6f 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": - "ab3f2b64ccf3135be3089fb46ad7de08", + "826210a8fa847e15bc27a929ab978d09", "src/tests/restricted_traces/gen_restricted_traces.py": "b211f1ab2e35521e13027e15ce5df1d3", "src/tests/restricted_traces/restricted_traces.json": - "7543a73b035249228431cb62861e72b7", + "001901e6907ac86a75eb1acb3ffd7f53", "src/tests/restricted_traces/restricted_traces_autogen.cpp": - "28c47e947ef99d3b2b37d5436ec21d40", + "36260a4264215ee51950bfec1cf93180", "src/tests/restricted_traces/restricted_traces_autogen.gni": - "c486af7d9053a99fa6d74d4e7bfae361", + "54291e84c77af5381aa3eafbb8ed4442", "src/tests/restricted_traces/restricted_traces_autogen.h": - "59d222c177d7b7fbc25046d42752f9cc" + "a8078efa91fec2492e1143f4b2d9d209" } \ No newline at end of file diff --git a/src/tests/perf_tests/TracePerfTest.cpp b/src/tests/perf_tests/TracePerfTest.cpp index def051c08..a7c957b7b 100644 --- a/src/tests/perf_tests/TracePerfTest.cpp +++ b/src/tests/perf_tests/TracePerfTest.cpp @@ -1008,6 +1008,11 @@ TracePerfTest::TracePerfTest(const TracePerfParams ¶ms) } } + if (mParams.testID == RestrictedTraceID::scrabble_go) + { + addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr"); + } + // We already swap in TracePerfTest::drawBenchmark, no need to swap again in the harness. disableTestHarnessSwap(); diff --git a/src/tests/restricted_traces/.gitignore b/src/tests/restricted_traces/.gitignore index f39c5904c..4acad12a7 100644 --- a/src/tests/restricted_traces/.gitignore +++ b/src/tests/restricted_traces/.gitignore @@ -77,6 +77,7 @@ romancing_saga/ rope_hero_vice_town/ saint_seiya_awakening/ sakura_school_simulator/ +scrabble_go/ 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 5a773cf46..f8e6ade75 100644 --- a/src/tests/restricted_traces/restricted_traces.json +++ b/src/tests/restricted_traces/restricted_traces.json @@ -87,6 +87,7 @@ "rope_hero_vice_town 1", "saint_seiya_awakening 1", "sakura_school_simulator 1", + "scrabble_go 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 d2c1622ee..45a5f7ab9 100644 --- a/src/tests/restricted_traces/restricted_traces_autogen.cpp +++ b/src/tests/restricted_traces/restricted_traces_autogen.cpp @@ -91,6 +91,7 @@ #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 "scrabble_go/scrabble_go_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" @@ -573,6 +574,11 @@ constexpr angle::PackedEnumMap kTraceInfos = { sakura_school_simulator::kReplayDrawSurfaceWidth, sakura_school_simulator::kReplayDrawSurfaceHeight, kDefaultReplayDrawSurfaceColorSpace, "sakura_school_simulator"}}, + {RestrictedTraceID::scrabble_go, + {scrabble_go::kReplayContextClientMajorVersion, scrabble_go::kReplayContextClientMinorVersion, + scrabble_go::kReplayFrameStart, scrabble_go::kReplayFrameEnd, + scrabble_go::kReplayDrawSurfaceWidth, scrabble_go::kReplayDrawSurfaceHeight, + scrabble_go::kReplayDrawSurfaceColorSpace, "scrabble_go"}}, {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 a28d40815..b21ed8886 100644 --- a/src/tests/restricted_traces/restricted_traces_autogen.gni +++ b/src/tests/restricted_traces/restricted_traces_autogen.gni @@ -4332,6 +4332,45 @@ angle_restricted_traces = [ ], "sakura_school_simulator/sakura_school_simulator_capture_context2.angledata.gz", ], + [ + "scrabble_go", + 2, + [ + "scrabble_go/scrabble_go_capture_context2_frame001.cpp", + "scrabble_go/scrabble_go_capture_context2_frame002.cpp", + "scrabble_go/scrabble_go_capture_context2_frame003.cpp", + "scrabble_go/scrabble_go_capture_context2_frame004.cpp", + "scrabble_go/scrabble_go_capture_context2_frame005.cpp", + "scrabble_go/scrabble_go_capture_context2_frame006.cpp", + "scrabble_go/scrabble_go_capture_context2_frame007.cpp", + "scrabble_go/scrabble_go_capture_context2_frame008.cpp", + "scrabble_go/scrabble_go_capture_context2_frame009.cpp", + "scrabble_go/scrabble_go_capture_context2_frame010.cpp", + "scrabble_go/scrabble_go_capture_context2_frame011.cpp", + "scrabble_go/scrabble_go_capture_context2_frame012.cpp", + "scrabble_go/scrabble_go_capture_context2_frame013.cpp", + "scrabble_go/scrabble_go_capture_context2_frame014.cpp", + "scrabble_go/scrabble_go_capture_context2_frame015.cpp", + "scrabble_go/scrabble_go_capture_context2_frame016.cpp", + "scrabble_go/scrabble_go_capture_context2_frame017.cpp", + "scrabble_go/scrabble_go_capture_context2_frame018.cpp", + "scrabble_go/scrabble_go_capture_context2_frame019.cpp", + "scrabble_go/scrabble_go_capture_context2_frame020.cpp", + "scrabble_go/scrabble_go_capture_context2_frame021.cpp", + "scrabble_go/scrabble_go_capture_context2_frame022.cpp", + "scrabble_go/scrabble_go_capture_context2_frame023.cpp", + "scrabble_go/scrabble_go_capture_context2_frame024.cpp", + "scrabble_go/scrabble_go_capture_context2_frame025.cpp", + "scrabble_go/scrabble_go_capture_context2_frame026.cpp", + "scrabble_go/scrabble_go_capture_context2_frame027.cpp", + "scrabble_go/scrabble_go_capture_context2_frame028.cpp", + "scrabble_go/scrabble_go_capture_context2_frame029.cpp", + "scrabble_go/scrabble_go_capture_context2_frame030.cpp", + "scrabble_go/scrabble_go_capture_context2_frame031.cpp", + "scrabble_go/scrabble_go_capture_shared.cpp", + ], + "scrabble_go/scrabble_go.angledata.gz", + ], [ "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 43eda12c5..6218515ce 100644 --- a/src/tests/restricted_traces/restricted_traces_autogen.h +++ b/src/tests/restricted_traces/restricted_traces_autogen.h @@ -108,6 +108,7 @@ enum class RestrictedTraceID rope_hero_vice_town, saint_seiya_awakening, sakura_school_simulator, + scrabble_go, shadow_fight_2, slingshot_test1, slingshot_test2,