Commit dd6ac664 by Cody Northrop Committed by Commit Bot

Tests: Add Asphalt 8 trace

Test: angle_perftests --gtest_filter="*asphalt_8*" Bug: b/150484427 Change-Id: I6a5f1feec61466eae55c1a2464272aba797ed56c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2636602Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent f45e625f
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"c446e4696290f8b9952833cb7db4d5cf", "16cd6b4675c7622534ac41b1a69455cc",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"2b5d6505d6a8b6f3bbfbad2c8405a89d", "2b5d6505d6a8b6f3bbfbad2c8405a89d",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1": "src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
"b775f6c42b1a09065c9c19660fb82113", "b775f6c42b1a09065c9c19660fb82113",
"src/tests/restricted_traces/asphalt_8.tar.gz.sha1":
"83e8aa4663fa6130db0bff09fb915f36",
"src/tests/restricted_traces/brawl_stars.tar.gz.sha1": "src/tests/restricted_traces/brawl_stars.tar.gz.sha1":
"8b1cf8ebd8a1099b4d298bb3b446e8bd", "8b1cf8ebd8a1099b4d298bb3b446e8bd",
"src/tests/restricted_traces/candy_crush_500.tar.gz.sha1": "src/tests/restricted_traces/candy_crush_500.tar.gz.sha1":
...@@ -48,13 +50,13 @@ ...@@ -48,13 +50,13 @@
"src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1": "src/tests/restricted_traces/real_gangster_crime.tar.gz.sha1":
"c85be329035a760edad673eb2ca7c3f1", "c85be329035a760edad673eb2ca7c3f1",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"8a4be53b19bb5199ede62bf34ec5528f", "385a77abaa8edbdd091097df9033d7f6",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"a9dc9213e1aca6126eea5bfe9efec808", "2d7ec2e024521cf9903714ef7bfa2ac6",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"463ec977962c8164a86ab64cb70ca8d2", "a823b385687142833b41a0d3d8d598e0",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"5db394f1def7715bda2aa1523d681482", "d1278695bd9c09a4d74228c2c5c7f942",
"src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1": "src/tests/restricted_traces/saint_seiya_awakening.tar.gz.sha1":
"c9cde6bdfd9096a44d5f03d905a45a4f", "c9cde6bdfd9096a44d5f03d905a45a4f",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
......
...@@ -313,6 +313,11 @@ TracePerfTest::TracePerfTest() ...@@ -313,6 +313,11 @@ TracePerfTest::TracePerfTest()
addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr"); addExtensionPrerequisite("GL_KHR_texture_compression_astc_ldr");
} }
if (param.testID == RestrictedTraceID::asphalt_8)
{
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();
......
...@@ -2,6 +2,8 @@ angry_birds_2_1500.tar.gz ...@@ -2,6 +2,8 @@ angry_birds_2_1500.tar.gz
angry_birds_2_1500/ angry_birds_2_1500/
arena_of_valor.tar.gz arena_of_valor.tar.gz
arena_of_valor/ arena_of_valor/
asphalt_8.tar.gz
asphalt_8/
brawl_stars.tar.gz brawl_stars.tar.gz
brawl_stars/ brawl_stars/
candy_crush_500.tar.gz candy_crush_500.tar.gz
......
61d230cbbdf0b750b32b95922eaefe5fc4fd2de6
\ No newline at end of file
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"traces": [ "traces": [
"angry_birds_2_1500", "angry_birds_2_1500",
"arena_of_valor", "arena_of_valor",
"asphalt_8",
"brawl_stars", "brawl_stars",
"candy_crush_500", "candy_crush_500",
"clash_of_clans", "clash_of_clans",
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "angry_birds_2_1500/angry_birds_2_1500_capture_context1.h" #include "angry_birds_2_1500/angry_birds_2_1500_capture_context1.h"
#include "arena_of_valor/arena_of_valor_capture_context1.h" #include "arena_of_valor/arena_of_valor_capture_context1.h"
#include "asphalt_8/asphalt_8_capture_context2.h"
#include "brawl_stars/brawl_stars_capture_context1.h" #include "brawl_stars/brawl_stars_capture_context1.h"
#include "candy_crush_500/candy_crush_500_capture_context1.h" #include "candy_crush_500/candy_crush_500_capture_context1.h"
#include "clash_of_clans/clash_of_clans_capture_context1.h" #include "clash_of_clans/clash_of_clans_capture_context1.h"
...@@ -53,6 +54,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -53,6 +54,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{arena_of_valor::kReplayFrameStart, arena_of_valor::kReplayFrameEnd, {arena_of_valor::kReplayFrameStart, arena_of_valor::kReplayFrameEnd,
arena_of_valor::kReplayDrawSurfaceWidth, arena_of_valor::kReplayDrawSurfaceHeight, arena_of_valor::kReplayDrawSurfaceWidth, arena_of_valor::kReplayDrawSurfaceHeight,
"arena_of_valor"}}, "arena_of_valor"}},
{RestrictedTraceID::asphalt_8,
{asphalt_8::kReplayFrameStart, asphalt_8::kReplayFrameEnd, asphalt_8::kReplayDrawSurfaceWidth,
asphalt_8::kReplayDrawSurfaceHeight, "asphalt_8"}},
{RestrictedTraceID::brawl_stars, {RestrictedTraceID::brawl_stars,
{brawl_stars::kReplayFrameStart, brawl_stars::kReplayFrameEnd, {brawl_stars::kReplayFrameStart, brawl_stars::kReplayFrameEnd,
brawl_stars::kReplayDrawSurfaceWidth, brawl_stars::kReplayDrawSurfaceHeight, "brawl_stars"}}, brawl_stars::kReplayDrawSurfaceWidth, brawl_stars::kReplayDrawSurfaceHeight, "brawl_stars"}},
...@@ -165,6 +169,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -165,6 +169,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::ReplayContext1Frame(frameIndex); arena_of_valor::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::asphalt_8:
asphalt_8::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::ReplayContext1Frame(frameIndex); brawl_stars::ReplayContext1Frame(frameIndex);
break; break;
...@@ -260,6 +267,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -260,6 +267,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::ResetContext1Replay(); arena_of_valor::ResetContext1Replay();
break; break;
case RestrictedTraceID::asphalt_8:
asphalt_8::ResetContext2Replay();
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::ResetContext1Replay(); brawl_stars::ResetContext1Replay();
break; break;
...@@ -355,6 +365,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -355,6 +365,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::SetupContext1Replay(); arena_of_valor::SetupContext1Replay();
break; break;
case RestrictedTraceID::asphalt_8:
asphalt_8::SetupContext2Replay();
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetupContext1Replay(); brawl_stars::SetupContext1Replay();
break; break;
...@@ -450,6 +463,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -450,6 +463,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::SetBinaryDataDir(dataDir); arena_of_valor::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::asphalt_8:
asphalt_8::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetBinaryDataDir(dataDir); brawl_stars::SetBinaryDataDir(dataDir);
break; break;
...@@ -545,6 +561,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -545,6 +561,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::arena_of_valor: case RestrictedTraceID::arena_of_valor:
arena_of_valor::SetBinaryDataDecompressCallback(callback); arena_of_valor::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::asphalt_8:
asphalt_8::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetBinaryDataDecompressCallback(callback); brawl_stars::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
angle_restricted_traces = [ angle_restricted_traces = [
"angry_birds_2_1500 1", "angry_birds_2_1500 1",
"arena_of_valor 1", "arena_of_valor 1",
"asphalt_8 2",
"brawl_stars 1", "brawl_stars 1",
"candy_crush_500 1", "candy_crush_500 1",
"clash_of_clans 1", "clash_of_clans 1",
......
...@@ -56,6 +56,7 @@ enum class RestrictedTraceID ...@@ -56,6 +56,7 @@ enum class RestrictedTraceID
{ {
angry_birds_2_1500, angry_birds_2_1500,
arena_of_valor, arena_of_valor,
asphalt_8,
brawl_stars, brawl_stars,
candy_crush_500, candy_crush_500,
clash_of_clans, clash_of_clans,
......
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