Skip to content

A
angle
Commit c028fc73 by Cody Northrop Committed by Commit Bot
Options

Tests: Update traces to include draw surface width/height

The traces now contain the original resolution they ran with, so we can set that based on testID. This fixes correctness problems on Android, where only a fraction of the screen could be seen during replay. Bug: b/159238311 Test: angle_perftests --gtest_filter="*Trace*" Change-Id: I47b92ee31681998260bad059cde0856a25ae0fc6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2250863 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarManh Nguyen <nguyenmh@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent e474cc9e
Showing with 49 additions and 31 deletions
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/perf_tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"bdd8bc3482233c2c0f16a8831867e0c6", "f289d1836514a3ced7c166186df43204",
"src/tests/perf_tests/restricted_traces/candy_crush_500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/candy_crush_500.tar.gz.sha1":
"5ac71db1d8545c56aa1332ee0ba04113", "ef00d8872fe818250df07f761d440bfb",
"src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1":
"a6e28a00c09d75cdb6ab15171a7ee028", "e675648c5b16fc52077998621e6300ba",
"src/tests/perf_tests/restricted_traces/gen_restricted_traces.py": "src/tests/perf_tests/restricted_traces/gen_restricted_traces.py":
"f61ccd2c8ce98674527909d567083963", "aa5043eaa7ba7d620ff2a3b40d67bae2",
"src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1":
"b087dda1066c3097856f755f9a281617", "7f5e3e8b4d7ec07232c54d41964006ea",
"src/tests/perf_tests/restricted_traces/restricted_traces.json": "src/tests/perf_tests/restricted_traces/restricted_traces.json":
"de1d1c2086bd4f5249f5bdbdf0d2a854", "de1d1c2086bd4f5249f5bdbdf0d2a854",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni":
"25de059705d29d797e246aae027498ec", "25de059705d29d797e246aae027498ec",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h":
"8e936a5ca01c2374c627c8a494a3220a", "68a11667d674549018cf06e1a759c383",
"src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1":
"5511378fbb22b0991a85d63e011253bc", "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":
"0ddcf214dbcc9cac81449e4e5578e8c0", "e912c0a0e93efe73088211d63b4a30af",
"src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1":
"16a67f345ef9f0b38e0accfa7c08e90c" "b4357f6a2205ada41597437a4fa9bbab"
} }
\ No newline at end of file
src/tests/perf_tests/TracePerfTest.cpp
...@@ -36,8 +36,6 @@ struct TracePerfParams final : public RenderTestParams ...@@ -36,8 +36,6 @@ struct TracePerfParams final : public RenderTestParams
{ {
majorVersion = 3; majorVersion = 3;
minorVersion = 0; minorVersion = 0;
windowWidth = 1920;
windowHeight = 1080;
trackGpuTime = true; trackGpuTime = true;
// Display the frame after every drawBenchmark invocation // Display the frame after every drawBenchmark invocation
...@@ -361,6 +359,8 @@ TracePerfParams CombineTestID(const TracePerfParams &in, RestrictedTraceID id) ...@@ -361,6 +359,8 @@ TracePerfParams CombineTestID(const TracePerfParams &in, RestrictedTraceID id)
{ {
TracePerfParams out = in; TracePerfParams out = in;
out.testID = id; out.testID = id;
out.windowWidth = kTraceInfos[id].drawSurfaceWidth;
out.windowHeight = kTraceInfos[id].drawSurfaceHeight;
return out; return out;
} }
......
src/tests/perf_tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1
b8fbff5080e24c3a4ee03b8db9629529ed1e84a3 125ca1b8163d4a7335abc7368a32607ec73c7b6b
\ No newline at end of file \ No newline at end of file
src/tests/perf_tests/restricted_traces/candy_crush_500.tar.gz.sha1
8badacc007b8b2311004edb9a3086364b9ea8a61 be50ae17cbc2169d80eace51248c6ffca478981b
\ No newline at end of file \ No newline at end of file
src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1
cb6c1725f587af93b627620830d9b242a5324a02 1e5f339e28d600b9bd80a823b615a1f323106bb8
\ No newline at end of file \ No newline at end of file
src/tests/perf_tests/restricted_traces/gen_restricted_traces.py
...@@ -60,6 +60,8 @@ struct TraceInfo ...@@ -60,6 +60,8 @@ struct TraceInfo
{{ {{
uint32_t startFrame; uint32_t startFrame;
uint32_t endFrame; uint32_t endFrame;
uint32_t drawSurfaceWidth;
uint32_t drawSurfaceHeight;
char name[kTraceInfoMaxNameLen]; char name[kTraceInfoMaxNameLen];
}}; }};
...@@ -167,7 +169,10 @@ def gen_gni(traces, gni_file, format_args): ...@@ -167,7 +169,10 @@ def gen_gni(traces, gni_file, format_args):
def get_trace_info(trace): def get_trace_info(trace):
info = ["%s::kReplayFrameStart", "%s::kReplayFrameEnd", "\"%s\""] info = [
"%s::kReplayFrameStart", "%s::kReplayFrameEnd", "%s::kReplayDrawSurfaceWidth",
"%s::kReplayDrawSurfaceHeight", "\"%s\""
]
return ", ".join([element % trace for element in info]) return ", ".join([element % trace for element in info])
......
src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1
be2d5a291f51804dbf6b944c29591f2586751174 f0c3b74bfd9039242004199962c50409a71aae61
\ No newline at end of file \ No newline at end of file
src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h
...@@ -45,26 +45,38 @@ struct TraceInfo ...@@ -45,26 +45,38 @@ struct TraceInfo
{ {
uint32_t startFrame; uint32_t startFrame;
uint32_t endFrame; uint32_t endFrame;
uint32_t drawSurfaceWidth;
uint32_t drawSurfaceHeight;
char name[kTraceInfoMaxNameLen]; char name[kTraceInfoMaxNameLen];
}; };
constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{RestrictedTraceID::angry_birds_2_1500, {RestrictedTraceID::angry_birds_2_1500,
{angry_birds_2_1500::kReplayFrameStart, angry_birds_2_1500::kReplayFrameEnd, {angry_birds_2_1500::kReplayFrameStart, angry_birds_2_1500::kReplayFrameEnd,
angry_birds_2_1500::kReplayDrawSurfaceWidth, angry_birds_2_1500::kReplayDrawSurfaceHeight,
"angry_birds_2_1500"}}, "angry_birds_2_1500"}},
{RestrictedTraceID::candy_crush_500, {RestrictedTraceID::candy_crush_500,
{candy_crush_500::kReplayFrameStart, candy_crush_500::kReplayFrameEnd, "candy_crush_500"}}, {candy_crush_500::kReplayFrameStart, candy_crush_500::kReplayFrameEnd,
candy_crush_500::kReplayDrawSurfaceWidth, candy_crush_500::kReplayDrawSurfaceHeight,
"candy_crush_500"}},
{RestrictedTraceID::egypt_1500, {RestrictedTraceID::egypt_1500,
{egypt_1500::kReplayFrameStart, egypt_1500::kReplayFrameEnd, "egypt_1500"}}, {egypt_1500::kReplayFrameStart, egypt_1500::kReplayFrameEnd,
egypt_1500::kReplayDrawSurfaceWidth, egypt_1500::kReplayDrawSurfaceHeight, "egypt_1500"}},
{RestrictedTraceID::manhattan_10, {RestrictedTraceID::manhattan_10,
{manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd, "manhattan_10"}}, {manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd,
manhattan_10::kReplayDrawSurfaceWidth, manhattan_10::kReplayDrawSurfaceHeight,
"manhattan_10"}},
{RestrictedTraceID::subway_surfer_500, {RestrictedTraceID::subway_surfer_500,
{subway_surfer_500::kReplayFrameStart, subway_surfer_500::kReplayFrameEnd, {subway_surfer_500::kReplayFrameStart, subway_surfer_500::kReplayFrameEnd,
subway_surfer_500::kReplayDrawSurfaceWidth, subway_surfer_500::kReplayDrawSurfaceHeight,
"subway_surfer_500"}}, "subway_surfer_500"}},
{RestrictedTraceID::temple_run_300, {RestrictedTraceID::temple_run_300,
{temple_run_300::kReplayFrameStart, temple_run_300::kReplayFrameEnd, "temple_run_300"}}, {temple_run_300::kReplayFrameStart, temple_run_300::kReplayFrameEnd,
temple_run_300::kReplayDrawSurfaceWidth, temple_run_300::kReplayDrawSurfaceHeight,
"temple_run_300"}},
{RestrictedTraceID::trex_200, {RestrictedTraceID::trex_200,
{trex_200::kReplayFrameStart, trex_200::kReplayFrameEnd, "trex_200"}}}; {trex_200::kReplayFrameStart, trex_200::kReplayFrameEnd, trex_200::kReplayDrawSurfaceWidth,
trex_200::kReplayDrawSurfaceHeight, "trex_200"}}};
using DecompressCallback = uint8_t *(*)(const std::vector<uint8_t> &); using DecompressCallback = uint8_t *(*)(const std::vector<uint8_t> &);
using FramebufferChangeCallback = void (*)(void *userData, GLenum target, GLuint framebuffer); using FramebufferChangeCallback = void (*)(void *userData, GLenum target, GLuint framebuffer);
......
src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1
6a025eb1666a3a6355e0c1369bdccc91bf914228 7e001c7a67118c09d1ceb73f0f8add0e36564739
\ No newline at end of file \ No newline at end of file
src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1
5b92c54c1db6351901c78d053c608fcc23c78e43 e595223fa11e83e9995055a54bd8e62faa16f87e
\ No newline at end of file \ No newline at end of file
src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1
73a7c2b0b730b331bf6e3c0c061a0230d89b208f c422af1700f3945acdf71d60bb276f9ef7c0a684
\ No newline at end of file \ 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