Commit c4a82aaa by Cody Northrop Committed by Commit Bot

Tests: Add COD:Mobile trace

Test: angle_perftests --gtest_filter=TracePerfTest.Run/*cod_mobile* Bug: b/164426913 Bug: angleproject:4048 Change-Id: I306714632b635c728fa212ed793f076c6b889227 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2360047 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent 0d421b60
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"44fc5437c4a84012e338b3da4b6fc28a", "44fc5437c4a84012e338b3da4b6fc28a",
"src/tests/perf_tests/restricted_traces/candy_crush_500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/candy_crush_500.tar.gz.sha1":
"ef00d8872fe818250df07f761d440bfb", "ef00d8872fe818250df07f761d440bfb",
"src/tests/perf_tests/restricted_traces/cod_mobile.tar.gz.sha1":
"dffd3bed0d0e53481f43b414309bf152",
"src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1":
"1d80caa37b937f83c95cd053b1bdd4ac", "1d80caa37b937f83c95cd053b1bdd4ac",
"src/tests/perf_tests/restricted_traces/gen_restricted_traces.py": "src/tests/perf_tests/restricted_traces/gen_restricted_traces.py":
...@@ -14,13 +16,13 @@ ...@@ -14,13 +16,13 @@
"src/tests/perf_tests/restricted_traces/nba2k20_800.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/nba2k20_800.tar.gz.sha1":
"03df0dcf41c18bc59edfc0b088ca4a87", "03df0dcf41c18bc59edfc0b088ca4a87",
"src/tests/perf_tests/restricted_traces/restricted_traces.json": "src/tests/perf_tests/restricted_traces/restricted_traces.json":
"3d86078bb5432589b43ab6c7cd5b23d9", "60be7da4acc21fd21e715f941fe9ba78",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp":
"578f3bdda73da6474e71e9685142cacd", "a82eccc731512d0db843799b0190dd72",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni":
"da6ac463c74450b162738e7d25a649ef", "58f17776b329492ba094e809cffbcf2a",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h":
"9f7247aa84c1850adab8fa67e652267e", "cf1a5ee60842ea8367225facc10c1ae3",
"src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1":
"a47a797dd227f5025439b47cee80dbc9", "a47a797dd227f5025439b47cee80dbc9",
"src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1":
......
...@@ -138,6 +138,20 @@ TracePerfTest::TracePerfTest() ...@@ -138,6 +138,20 @@ TracePerfTest::TracePerfTest()
mSkipTest = true; mSkipTest = true;
} }
if (param.testID == RestrictedTraceID::cod_mobile)
{
// TODO: http://anglebug.com/4967 Vulkan: GL_EXT_color_buffer_float not supported on Pixel 2
// The COD:Mobile trace uses a framebuffer attachment with:
// format = GL_RGB
// type = GL_UNSIGNED_INT_10F_11F_11F_REV
// That combination is only renderable if GL_EXT_color_buffer_float is supported.
// It happens to not be supported on Pixel 2's Vulkan driver.
addExtensionPrerequisite("GL_EXT_color_buffer_float");
// TODO: http://anglebug.com/4731 This extension is missing on older Intel drivers.
addExtensionPrerequisite("GL_OES_EGL_image_external");
}
// 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();
......
f60b5022182ddd880e6ea93991831ea296ffe48a
\ No newline at end of file
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"traces": [ "traces": [
"angry_birds_2_1500", "angry_birds_2_1500",
"candy_crush_500", "candy_crush_500",
"cod_mobile",
"egypt_1500", "egypt_1500",
"manhattan_10", "manhattan_10",
"mobile_legends", "mobile_legends",
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#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_context2.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"
...@@ -34,6 +35,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -34,6 +35,9 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{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,
"candy_crush_500"}}, "candy_crush_500"}},
{RestrictedTraceID::cod_mobile,
{cod_mobile::kReplayFrameStart, cod_mobile::kReplayFrameEnd,
cod_mobile::kReplayDrawSurfaceWidth, cod_mobile::kReplayDrawSurfaceHeight, "cod_mobile"}},
{RestrictedTraceID::egypt_1500, {RestrictedTraceID::egypt_1500,
{egypt_1500::kReplayFrameStart, egypt_1500::kReplayFrameEnd, {egypt_1500::kReplayFrameStart, egypt_1500::kReplayFrameEnd,
egypt_1500::kReplayDrawSurfaceWidth, egypt_1500::kReplayDrawSurfaceHeight, "egypt_1500"}}, egypt_1500::kReplayDrawSurfaceWidth, egypt_1500::kReplayDrawSurfaceHeight, "egypt_1500"}},
...@@ -76,6 +80,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -76,6 +80,9 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::ReplayContext2Frame(frameIndex); candy_crush_500::ReplayContext2Frame(frameIndex);
break; break;
case RestrictedTraceID::cod_mobile:
cod_mobile::ReplayContext4Frame(frameIndex);
break;
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::ReplayContext6Frame(frameIndex); egypt_1500::ReplayContext6Frame(frameIndex);
break; break;
...@@ -114,6 +121,9 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -114,6 +121,9 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::ResetContext2Replay(); candy_crush_500::ResetContext2Replay();
break; break;
case RestrictedTraceID::cod_mobile:
cod_mobile::ResetContext4Replay();
break;
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::ResetContext6Replay(); egypt_1500::ResetContext6Replay();
break; break;
...@@ -152,6 +162,9 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -152,6 +162,9 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetupContext2Replay(); candy_crush_500::SetupContext2Replay();
break; break;
case RestrictedTraceID::cod_mobile:
cod_mobile::SetupContext4Replay();
break;
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::SetupContext6Replay(); egypt_1500::SetupContext6Replay();
break; break;
...@@ -190,6 +203,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -190,6 +203,9 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetBinaryDataDir(dataDir); candy_crush_500::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::cod_mobile:
cod_mobile::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::SetBinaryDataDir(dataDir); egypt_1500::SetBinaryDataDir(dataDir);
break; break;
...@@ -228,6 +244,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -228,6 +244,9 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::candy_crush_500: case RestrictedTraceID::candy_crush_500:
candy_crush_500::SetBinaryDataDecompressCallback(callback); candy_crush_500::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::cod_mobile:
cod_mobile::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::SetBinaryDataDecompressCallback(callback); egypt_1500::SetBinaryDataDecompressCallback(callback);
break; break;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
angle_restricted_traces = [ angle_restricted_traces = [
"angry_birds_2_1500 2", "angry_birds_2_1500 2",
"candy_crush_500 2", "candy_crush_500 2",
"cod_mobile 4",
"egypt_1500 6", "egypt_1500 6",
"manhattan_10 6", "manhattan_10 6",
"mobile_legends 3", "mobile_legends 3",
......
...@@ -42,6 +42,7 @@ enum class RestrictedTraceID ...@@ -42,6 +42,7 @@ enum class RestrictedTraceID
{ {
angry_birds_2_1500, angry_birds_2_1500,
candy_crush_500, candy_crush_500,
cod_mobile,
egypt_1500, egypt_1500,
manhattan_10, manhattan_10,
mobile_legends, mobile_legends,
......
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