Skip to content

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

Tests: Update gfxbench traces

Migrate from traces recorded on desktop to traces recorded on a Pixel 4 XL. This impacts the resolution and framebuffer config used for the tests. They now more accurately reflect the numbers seen from running the benchmark directly. Test: angle_perftests --gtest_filter=TracePerfTest.Run/* Bug: angleproject:4048 Change-Id: Ib013dfb35c32c6f97bcae76a74cc16d9a5d1a369 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2314896Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent ffb31229
Showing with 27 additions and 26 deletions
scripts/code_generation_hashes/restricted_traces.json
...@@ -4,17 +4,17 @@ ...@@ -4,17 +4,17 @@
"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/egypt_1500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1":
"e675648c5b16fc52077998621e6300ba", "1785a6043e7aa5d618609900df32a1cf",
"src/tests/perf_tests/restricted_traces/gen_restricted_traces.py": "src/tests/perf_tests/restricted_traces/gen_restricted_traces.py":
"8f72f02cfb21ad18c3558d38b77320cc", "8f72f02cfb21ad18c3558d38b77320cc",
"src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1":
"7f5e3e8b4d7ec07232c54d41964006ea", "be9db683aedcd2bac224c0abf3ab1e88",
"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.cpp": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp":
"dde7c3ba7d1028a1a684f9c01cd368a9", "0b4538715b26b64facf54896c61a8179",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni":
"25de059705d29d797e246aae027498ec", "255b551ced99cbd6fc4ceef99751d25e",
"src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h": "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h":
"d4a6af9481d496bd66f5b6144f4622ba", "d4a6af9481d496bd66f5b6144f4622ba",
"src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1":
...@@ -22,5 +22,5 @@ ...@@ -22,5 +22,5 @@
"src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1":
"e912c0a0e93efe73088211d63b4a30af", "e912c0a0e93efe73088211d63b4a30af",
"src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1": "src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1":
"b4357f6a2205ada41597437a4fa9bbab" "959db438978654acb2dfc4a0a8fcdf09"
} }
\ No newline at end of file
src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1
1e5f339e28d600b9bd80a823b615a1f323106bb8 1843ef83dade3031b7c0a2120d63b2dea22ff0bc
\ No newline at end of file \ No newline at end of file
src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1
f0c3b74bfd9039242004199962c50409a71aae61 bad90463144c9ec3b5fed53e0992a2122b4342d5
\ No newline at end of file \ No newline at end of file
src/tests/perf_tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
#include "angry_birds_2_1500/angry_birds_2_1500_capture_context3.h" #include "angry_birds_2_1500/angry_birds_2_1500_capture_context3.h"
#include "candy_crush_500/candy_crush_500_capture_context2.h" #include "candy_crush_500/candy_crush_500_capture_context2.h"
#include "egypt_1500/egypt_1500_capture_context1.h" #include "egypt_1500/egypt_1500_capture_context6.h"
#include "manhattan_10/manhattan_10_capture_context1.h" #include "manhattan_10/manhattan_10_capture_context6.h"
#include "subway_surfer_500/subway_surfer_500_capture_context4.h" #include "subway_surfer_500/subway_surfer_500_capture_context4.h"
#include "temple_run_300/temple_run_300_capture_context3.h" #include "temple_run_300/temple_run_300_capture_context3.h"
#include "trex_200/trex_200_capture_context1.h" #include "trex_200/trex_200_capture_context6.h"
namespace angle namespace angle
{ {
...@@ -68,10 +68,10 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -68,10 +68,10 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
candy_crush_500::ReplayContext2Frame(frameIndex); candy_crush_500::ReplayContext2Frame(frameIndex);
break; break;
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::ReplayContext1Frame(frameIndex); egypt_1500::ReplayContext6Frame(frameIndex);
break; break;
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ReplayContext1Frame(frameIndex); manhattan_10::ReplayContext6Frame(frameIndex);
break; break;
case RestrictedTraceID::subway_surfer_500: case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::ReplayContext4Frame(frameIndex); subway_surfer_500::ReplayContext4Frame(frameIndex);
...@@ -80,7 +80,7 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -80,7 +80,7 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
temple_run_300::ReplayContext3Frame(frameIndex); temple_run_300::ReplayContext3Frame(frameIndex);
break; break;
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::ReplayContext1Frame(frameIndex); trex_200::ReplayContext6Frame(frameIndex);
break; break;
default: default:
fprintf(stderr, "Error in switch.\n"); fprintf(stderr, "Error in switch.\n");
...@@ -100,10 +100,10 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -100,10 +100,10 @@ void ResetReplay(RestrictedTraceID traceID)
candy_crush_500::ResetContext2Replay(); candy_crush_500::ResetContext2Replay();
break; break;
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::ResetContext1Replay(); egypt_1500::ResetContext6Replay();
break; break;
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::ResetContext1Replay(); manhattan_10::ResetContext6Replay();
break; break;
case RestrictedTraceID::subway_surfer_500: case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::ResetContext4Replay(); subway_surfer_500::ResetContext4Replay();
...@@ -112,7 +112,7 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -112,7 +112,7 @@ void ResetReplay(RestrictedTraceID traceID)
temple_run_300::ResetContext3Replay(); temple_run_300::ResetContext3Replay();
break; break;
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::ResetContext1Replay(); trex_200::ResetContext6Replay();
break; break;
default: default:
fprintf(stderr, "Error in switch.\n"); fprintf(stderr, "Error in switch.\n");
...@@ -132,10 +132,10 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -132,10 +132,10 @@ void SetupReplay(RestrictedTraceID traceID)
candy_crush_500::SetupContext2Replay(); candy_crush_500::SetupContext2Replay();
break; break;
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::SetupContext1Replay(); egypt_1500::SetupContext6Replay();
break; break;
case RestrictedTraceID::manhattan_10: case RestrictedTraceID::manhattan_10:
manhattan_10::SetupContext1Replay(); manhattan_10::SetupContext6Replay();
break; break;
case RestrictedTraceID::subway_surfer_500: case RestrictedTraceID::subway_surfer_500:
subway_surfer_500::SetupContext4Replay(); subway_surfer_500::SetupContext4Replay();
...@@ -144,7 +144,7 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -144,7 +144,7 @@ void SetupReplay(RestrictedTraceID traceID)
temple_run_300::SetupContext3Replay(); temple_run_300::SetupContext3Replay();
break; break;
case RestrictedTraceID::trex_200: case RestrictedTraceID::trex_200:
trex_200::SetupContext1Replay(); trex_200::SetupContext6Replay();
break; break;
default: default:
fprintf(stderr, "Error in switch.\n"); fprintf(stderr, "Error in switch.\n");
......
src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
angle_restricted_traces = [ angle_restricted_traces = [
"angry_birds_2_1500 3", "angry_birds_2_1500 3",
"candy_crush_500 2", "candy_crush_500 2",
"egypt_1500 1", "egypt_1500 6",
"manhattan_10 1", "manhattan_10 6",
"subway_surfer_500 4", "subway_surfer_500 4",
"temple_run_300 3", "temple_run_300 3",
"trex_200 1", "trex_200 6",
] ]
src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1
c422af1700f3945acdf71d60bb276f9ef7c0a684 2500bb2bf18f85705f76064434fa0d500bc20471
\ 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