Commit 60c3f404 by Tim Van Patten Committed by Commit Bot

Tests: Add Bus Simulator Indonesia trace

Bug: angleproject:5612 Test: angle_perftests --gtest_filter=TracePerfTest.Run/*bus_simulator_indonesia* Change-Id: I067795b237fc32406d63785e347324b423978768 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2674305 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent a7df19c8
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"8276cfead325374129bf3f51eda15396", "9f8c06acdef42593c7e64fc16c73ebd8",
"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":
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
"83e8aa4663fa6130db0bff09fb915f36", "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/bus_simulator_indonesia.tar.gz.sha1":
"0d9c9de640f997cec3aee06f6a38de89",
"src/tests/restricted_traces/candy_crush_500.tar.gz.sha1": "src/tests/restricted_traces/candy_crush_500.tar.gz.sha1":
"b0772c8cf2d3d49e49fea9fe7cff0446", "b0772c8cf2d3d49e49fea9fe7cff0446",
"src/tests/restricted_traces/clash_of_clans.tar.gz.sha1": "src/tests/restricted_traces/clash_of_clans.tar.gz.sha1":
...@@ -78,13 +80,13 @@ ...@@ -78,13 +80,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":
"53c585aa83dd759880b28985c201ff01", "3268b18d8e847d9c799a85a0467d6ddf",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"5c37ea28d54e55aaec22bbbbf2f21f57", "f0bef406ba544b4aad8276b3734004c7",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"1a4e928383dacb34d0c616cbc0c00d7e", "297936bf8a465953a24e94c408506017",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"52d1b2d802eb1d915883d4bb0df445fb", "9d4592e09551a0795ba7531f423d9ec0",
"src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1": "src/tests/restricted_traces/rise_of_kingdoms.tar.gz.sha1":
"d4618f857c44f0dfa642ae3af8f161d9", "d4618f857c44f0dfa642ae3af8f161d9",
"src/tests/restricted_traces/romancing_saga.tar.gz.sha1": "src/tests/restricted_traces/romancing_saga.tar.gz.sha1":
......
...@@ -362,6 +362,15 @@ TracePerfTest::TracePerfTest() ...@@ -362,6 +362,15 @@ TracePerfTest::TracePerfTest()
} }
} }
if (param.testID == RestrictedTraceID::bus_simulator_indonesia)
{
// TODO(https://anglebug.com/5629) Linux+Intel native GLES generates GL_INVALID_OPERATION
if (IsLinux() && IsIntel() && param.getRenderer() != EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE)
{
mSkipTest = true;
}
}
// 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();
......
...@@ -6,6 +6,8 @@ asphalt_8.tar.gz ...@@ -6,6 +6,8 @@ asphalt_8.tar.gz
asphalt_8/ asphalt_8/
brawl_stars.tar.gz brawl_stars.tar.gz
brawl_stars/ brawl_stars/
bus_simulator_indonesia.tar.gz
bus_simulator_indonesia/
candy_crush_500.tar.gz candy_crush_500.tar.gz
candy_crush_500/ candy_crush_500/
clash_of_clans.tar.gz clash_of_clans.tar.gz
......
069f4d8054c431d4eba80e4e29204199079f95e3
\ No newline at end of file
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
"arena_of_valor", "arena_of_valor",
"asphalt_8", "asphalt_8",
"brawl_stars", "brawl_stars",
"bus_simulator_indonesia",
"candy_crush_500", "candy_crush_500",
"clash_of_clans", "clash_of_clans",
"clash_royale", "clash_royale",
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#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 "asphalt_8/asphalt_8_capture_context2.h"
#include "brawl_stars/brawl_stars_capture_context1.h" #include "brawl_stars/brawl_stars_capture_context1.h"
#include "bus_simulator_indonesia/bus_simulator_indonesia_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"
#include "clash_royale/clash_royale_capture_context2.h" #include "clash_royale/clash_royale_capture_context2.h"
...@@ -81,6 +82,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -81,6 +82,10 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{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"}},
{RestrictedTraceID::bus_simulator_indonesia,
{bus_simulator_indonesia::kReplayFrameStart, bus_simulator_indonesia::kReplayFrameEnd,
bus_simulator_indonesia::kReplayDrawSurfaceWidth,
bus_simulator_indonesia::kReplayDrawSurfaceHeight, "bus_simulator_indonesia"}},
{RestrictedTraceID::candy_crush_500, {RestrictedTraceID::candy_crush_500,
{candy_crush_500::kReplayFrameStart, candy_crush_500::kReplayFrameEnd, {candy_crush_500::kReplayFrameStart, candy_crush_500::kReplayFrameEnd,
candy_crush_500::kReplayDrawSurfaceWidth, candy_crush_500::kReplayDrawSurfaceHeight, candy_crush_500::kReplayDrawSurfaceWidth, candy_crush_500::kReplayDrawSurfaceHeight,
...@@ -274,6 +279,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -274,6 +279,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::ReplayContext1Frame(frameIndex); brawl_stars::ReplayContext1Frame(frameIndex);
break; break;
case RestrictedTraceID::bus_simulator_indonesia:
bus_simulator_indonesia::ReplayContext1Frame(frameIndex);
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::ReplayContext1Frame(frameIndex); candy_crush_500::ReplayContext1Frame(frameIndex);
break; break;
...@@ -435,6 +443,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -435,6 +443,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::ResetContext1Replay(); brawl_stars::ResetContext1Replay();
break; break;
case RestrictedTraceID::bus_simulator_indonesia:
bus_simulator_indonesia::ResetContext1Replay();
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::ResetContext1Replay(); candy_crush_500::ResetContext1Replay();
break; break;
...@@ -596,6 +607,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -596,6 +607,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetupContext1Replay(); brawl_stars::SetupContext1Replay();
break; break;
case RestrictedTraceID::bus_simulator_indonesia:
bus_simulator_indonesia::SetupContext1Replay();
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetupContext1Replay(); candy_crush_500::SetupContext1Replay();
break; break;
...@@ -757,6 +771,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -757,6 +771,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetBinaryDataDir(dataDir); brawl_stars::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::bus_simulator_indonesia:
bus_simulator_indonesia::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetBinaryDataDir(dataDir); candy_crush_500::SetBinaryDataDir(dataDir);
break; break;
...@@ -918,6 +935,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -918,6 +935,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::brawl_stars: case RestrictedTraceID::brawl_stars:
brawl_stars::SetBinaryDataDecompressCallback(callback); brawl_stars::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::bus_simulator_indonesia:
bus_simulator_indonesia::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetBinaryDataDecompressCallback(callback); candy_crush_500::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -13,6 +13,7 @@ angle_restricted_traces = [ ...@@ -13,6 +13,7 @@ angle_restricted_traces = [
"arena_of_valor 1", "arena_of_valor 1",
"asphalt_8 2", "asphalt_8 2",
"brawl_stars 1", "brawl_stars 1",
"bus_simulator_indonesia 1",
"candy_crush_500 1", "candy_crush_500 1",
"clash_of_clans 1", "clash_of_clans 1",
"clash_royale 2", "clash_royale 2",
......
...@@ -58,6 +58,7 @@ enum class RestrictedTraceID ...@@ -58,6 +58,7 @@ enum class RestrictedTraceID
arena_of_valor, arena_of_valor,
asphalt_8, asphalt_8,
brawl_stars, brawl_stars,
bus_simulator_indonesia,
candy_crush_500, candy_crush_500,
clash_of_clans, clash_of_clans,
clash_royale, clash_royale,
......
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