Skip to content

A
angle
Commit 61b13f8f by Cody Northrop Committed by Commit Bot
Options

Tests: Update two traces, remove one

* Update candy_crush and temple_run to use more recent capture headers. * Remove subway_surfer because the app no longer uses GLES. Its Unity backend now runs Vulkan, so we can't re-record it. Test: angle_perftests --gtest_filter="*Trace*" Bug: angleproject:4845 Change-Id: I9d219f2be05813c50b31287a65bfc099787d114c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2441851 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 505a8d05
Showing with 21 additions and 50 deletions
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"0eb7d74b8842c59d8b4692842bf31209", "e029ca2a15934ba1e6bc2d4aef9f2112",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"44fc5437c4a84012e338b3da4b6fc28a", "44fc5437c4a84012e338b3da4b6fc28a",
"src/tests/restricted_traces/candy_crush_500.tar.gz.sha1": "src/tests/restricted_traces/candy_crush_500.tar.gz.sha1":
"ef00d8872fe818250df07f761d440bfb", "55de8a400b02e570ff2380436bda269d",
"src/tests/restricted_traces/cod_mobile.tar.gz.sha1": "src/tests/restricted_traces/cod_mobile.tar.gz.sha1":
"dffd3bed0d0e53481f43b414309bf152", "dffd3bed0d0e53481f43b414309bf152",
"src/tests/restricted_traces/egypt_1500.tar.gz.sha1": "src/tests/restricted_traces/egypt_1500.tar.gz.sha1":
...@@ -18,17 +18,15 @@ ...@@ -18,17 +18,15 @@
"src/tests/restricted_traces/nba2k20_800.tar.gz.sha1": "src/tests/restricted_traces/nba2k20_800.tar.gz.sha1":
"03df0dcf41c18bc59edfc0b088ca4a87", "03df0dcf41c18bc59edfc0b088ca4a87",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"60be7da4acc21fd21e715f941fe9ba78", "7ce556105923b7bcf5d81ee99625a040",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"a82eccc731512d0db843799b0190dd72", "d310de925bb7aa8347ff4d2378d9816f",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"58f17776b329492ba094e809cffbcf2a", "2e79405fce094f458c9f36defecfa2cd",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"cf1a5ee60842ea8367225facc10c1ae3", "86dc00986d282c3b032fbbb0a81662b6",
"src/tests/restricted_traces/subway_surfer_500.tar.gz.sha1":
"a47a797dd227f5025439b47cee80dbc9",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
"e912c0a0e93efe73088211d63b4a30af", "77475b0186ee0380eeb9db47433d0457",
"src/tests/restricted_traces/trex_200.tar.gz.sha1": "src/tests/restricted_traces/trex_200.tar.gz.sha1":
"ca2d91a527f4a4317f944afc96c35268" "ca2d91a527f4a4317f944afc96c35268"
} }
\ No newline at end of file
src/tests/restricted_traces/.gitignore
...@@ -12,8 +12,6 @@ mobile_legends.tar.gz ...@@ -12,8 +12,6 @@ mobile_legends.tar.gz
mobile_legends/ mobile_legends/
nba2k20_800.tar.gz nba2k20_800.tar.gz
nba2k20_800/ nba2k20_800/
subway_surfer_500.tar.gz
subway_surfer_500/
temple_run_300.tar.gz temple_run_300.tar.gz
temple_run_300/ temple_run_300/
trex_200.tar.gz trex_200.tar.gz
......
src/tests/restricted_traces/candy_crush_500.tar.gz.sha1
be50ae17cbc2169d80eace51248c6ffca478981b 85b785166b0b98c1f980e492800604e8796ec10d
\ No newline at end of file \ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
"manhattan_10", "manhattan_10",
"mobile_legends", "mobile_legends",
"nba2k20_800", "nba2k20_800",
"subway_surfer_500",
"temple_run_300", "temple_run_300",
"trex_200" "trex_200"
] ]
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -12,14 +12,13 @@ ...@@ -12,14 +12,13 @@
#include "common/PackedEnums.h" #include "common/PackedEnums.h"
#include "angry_birds_2_1500/angry_birds_2_1500_capture_context2.h" #include "angry_birds_2_1500/angry_birds_2_1500_capture_context2.h"
#include "candy_crush_500/candy_crush_500_capture_context2.h" #include "candy_crush_500/candy_crush_500_capture_context1.h"
#include "cod_mobile/cod_mobile_capture_context4.h" #include "cod_mobile/cod_mobile_capture_context4.h"
#include "egypt_1500/egypt_1500_capture_context6.h" #include "egypt_1500/egypt_1500_capture_context6.h"
#include "manhattan_10/manhattan_10_capture_context6.h" #include "manhattan_10/manhattan_10_capture_context6.h"
#include "mobile_legends/mobile_legends_capture_context3.h" #include "mobile_legends/mobile_legends_capture_context3.h"
#include "nba2k20_800/nba2k20_800_capture_context1.h" #include "nba2k20_800/nba2k20_800_capture_context1.h"
#include "subway_surfer_500/subway_surfer_500_capture_context4.h" #include "temple_run_300/temple_run_300_capture_context1.h"
#include "temple_run_300/temple_run_300_capture_context3.h"
#include "trex_200/trex_200_capture_context6.h" #include "trex_200/trex_200_capture_context6.h"
namespace angle namespace angle
...@@ -52,10 +51,6 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -52,10 +51,6 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{RestrictedTraceID::nba2k20_800, {RestrictedTraceID::nba2k20_800,
{nba2k20_800::kReplayFrameStart, nba2k20_800::kReplayFrameEnd, {nba2k20_800::kReplayFrameStart, nba2k20_800::kReplayFrameEnd,
nba2k20_800::kReplayDrawSurfaceWidth, nba2k20_800::kReplayDrawSurfaceHeight, "nba2k20_800"}}, nba2k20_800::kReplayDrawSurfaceWidth, nba2k20_800::kReplayDrawSurfaceHeight, "nba2k20_800"}},
{RestrictedTraceID::subway_surfer_500,
{subway_surfer_500::kReplayFrameStart, subway_surfer_500::kReplayFrameEnd,
subway_surfer_500::kReplayDrawSurfaceWidth, subway_surfer_500::kReplayDrawSurfaceHeight,
"subway_surfer_500"}},
{RestrictedTraceID::temple_run_300, {RestrictedTraceID::temple_run_300,
{temple_run_300::kReplayFrameStart, temple_run_300::kReplayFrameEnd, {temple_run_300::kReplayFrameStart, temple_run_300::kReplayFrameEnd,
temple_run_300::kReplayDrawSurfaceWidth, temple_run_300::kReplayDrawSurfaceHeight, temple_run_300::kReplayDrawSurfaceWidth, temple_run_300::kReplayDrawSurfaceHeight,
...@@ -78,7 +73,7 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -78,7 +73,7 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
angry_birds_2_1500::ReplayContext2Frame(frameIndex); angry_birds_2_1500::ReplayContext2Frame(frameIndex);
break; break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::ReplayContext2Frame(frameIndex); candy_crush_500::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::cod_mobile: case RestrictedTraceID::cod_mobile:
cod_mobile::ReplayContext4Frame(frameIndex); cod_mobile::ReplayContext4Frame(frameIndex);
...@@ -95,11 +90,8 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -95,11 +90,8 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::nba2k20_800: case RestrictedTraceID::nba2k20_800:
nba2k20_800::ReplayContext1Frame(frameIndex); nba2k20_800::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::ReplayContext4Frame(frameIndex);
break;
case RestrictedTraceID::temple_run_300: case RestrictedTraceID::temple_run_300:
temple_run_300::ReplayContext3Frame(frameIndex); temple_run_300::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::ReplayContext6Frame(frameIndex); trex_200::ReplayContext6Frame(frameIndex);
...@@ -119,7 +111,7 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -119,7 +111,7 @@ void ResetReplay(RestrictedTraceID traceID)
angry_birds_2_1500::ResetContext2Replay(); angry_birds_2_1500::ResetContext2Replay();
break; break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::ResetContext2Replay(); candy_crush_500::ResetContext1Replay();
break; break;
case RestrictedTraceID::cod_mobile: case RestrictedTraceID::cod_mobile:
cod_mobile::ResetContext4Replay(); cod_mobile::ResetContext4Replay();
...@@ -136,11 +128,8 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -136,11 +128,8 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::nba2k20_800: case RestrictedTraceID::nba2k20_800:
nba2k20_800::ResetContext1Replay(); nba2k20_800::ResetContext1Replay();
break; break;
case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::ResetContext4Replay();
break;
case RestrictedTraceID::temple_run_300: case RestrictedTraceID::temple_run_300:
temple_run_300::ResetContext3Replay(); temple_run_300::ResetContext1Replay();
break; break;
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::ResetContext6Replay(); trex_200::ResetContext6Replay();
...@@ -160,7 +149,7 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -160,7 +149,7 @@ void SetupReplay(RestrictedTraceID traceID)
angry_birds_2_1500::SetupContext2Replay(); angry_birds_2_1500::SetupContext2Replay();
break; break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetupContext2Replay(); candy_crush_500::SetupContext1Replay();
break; break;
case RestrictedTraceID::cod_mobile: case RestrictedTraceID::cod_mobile:
cod_mobile::SetupContext4Replay(); cod_mobile::SetupContext4Replay();
...@@ -177,11 +166,8 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -177,11 +166,8 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::nba2k20_800: case RestrictedTraceID::nba2k20_800:
nba2k20_800::SetupContext1Replay(); nba2k20_800::SetupContext1Replay();
break; break;
case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::SetupContext4Replay();
break;
case RestrictedTraceID::temple_run_300: case RestrictedTraceID::temple_run_300:
temple_run_300::SetupContext3Replay(); temple_run_300::SetupContext1Replay();
break; break;
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::SetupContext6Replay(); trex_200::SetupContext6Replay();
...@@ -218,9 +204,6 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -218,9 +204,6 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::nba2k20_800: case RestrictedTraceID::nba2k20_800:
nba2k20_800::SetBinaryDataDir(dataDir); nba2k20_800::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::temple_run_300: case RestrictedTraceID::temple_run_300:
temple_run_300::SetBinaryDataDir(dataDir); temple_run_300::SetBinaryDataDir(dataDir);
break; break;
...@@ -259,9 +242,6 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -259,9 +242,6 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::nba2k20_800: case RestrictedTraceID::nba2k20_800:
nba2k20_800::SetBinaryDataDecompressCallback(callback); nba2k20_800::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::temple_run_300: case RestrictedTraceID::temple_run_300:
temple_run_300::SetBinaryDataDecompressCallback(callback); temple_run_300::SetBinaryDataDecompressCallback(callback);
break; break;
......
src/tests/restricted_traces/restricted_traces_autogen.gni
...@@ -10,13 +10,12 @@ ...@@ -10,13 +10,12 @@
angle_restricted_traces = [ angle_restricted_traces = [
"angry_birds_2_1500 2", "angry_birds_2_1500 2",
"candy_crush_500 2", "candy_crush_500 1",
"cod_mobile 4", "cod_mobile 4",
"egypt_1500 6", "egypt_1500 6",
"manhattan_10 6", "manhattan_10 6",
"mobile_legends 3", "mobile_legends 3",
"nba2k20_800 1", "nba2k20_800 1",
"subway_surfer_500 4", "temple_run_300 1",
"temple_run_300 3",
"trex_200 6", "trex_200 6",
] ]
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -47,7 +47,6 @@ enum class RestrictedTraceID ...@@ -47,7 +47,6 @@ enum class RestrictedTraceID
manhattan_10, manhattan_10,
mobile_legends, mobile_legends,
nba2k20_800, nba2k20_800,
subway_surfer_500,
temple_run_300, temple_run_300,
trex_200, trex_200,
InvalidEnum, InvalidEnum,
......
src/tests/restricted_traces/subway_surfer_500.tar.gz.sha1 deleted 100644 → 0
7e001c7a67118c09d1ceb73f0f8add0e36564739
\ No newline at end of file
src/tests/restricted_traces/temple_run_300.tar.gz.sha1
e595223fa11e83e9995055a54bd8e62faa16f87e 07178051377f3d30d53decd6ab66e57bce34db06
\ No newline at end of file
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