Tests: Add trace of Egypt to TracePerfTest

scripts/code_generation_hashes/restricted_traces.json

 {
+  "src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1":
+    "bd3935d0237466e6c80b450900bba67d",
   "src/tests/perf_tests/restricted_traces/gen_restricted_traces.py":
     "f61ccd2c8ce98674527909d567083963",
   "src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1":
     "b4d333cd5cf3977c339350be0a819928",
   "src/tests/perf_tests/restricted_traces/restricted_traces.json":
-    "c0a96b33aa1b88197e956d1848aa36b3",
+    "ed50690d8fd713ad6ed7908af3e70b7e",
   "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni":
-    "c098dd718bab70e9f09ef955ddfb6d05",
+    "2e5d0ed5afca04a7a38eb5bec4259008",
   "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h":
-    "9caa6c37d60ca1d69a7d0d71749a88bb",
+    "2b831956463e2c30d6116c17b89743fa",
   "src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1":
     "934983876ac5f3d9bc9b43698bb94b9d",
   "src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1":

src/tests/perf_tests/restricted_traces/RestrictedTraceTests.md

@@ -37,7 +37,7 @@ out/Release/angle_perftests --gtest_filter=TracePerfTest*
 
 ## Updating traces
 
-The Manhattan and TRex traces were captured on Windows after building gfxbench from source. We run capture commands in git bash.
+The GFXBench traces were captured on Windows after building gfxbench from source. We run capture commands in git bash.
 
 ### Windows prep
 
@@ -73,6 +73,10 @@ ANGLE_CAPTURE_OUT_DIR=../../../../../angle/src/tests/perf_tests/restricted_trace
 # Manhattan
 mkdir -p ../../../../../angle/src/tests/perf_tests/restricted_traces/manhattan_10
 ANGLE_CAPTURE_OUT_DIR=../../../../../angle/src/tests/perf_tests/restricted_traces/manhattan_10 ANGLE_CAPTURE_FRAME_START=10 ANGLE_CAPTURE_FRAME_END=20 ANGLE_CAPTURE_LABEL=manhattan_10 ../bin/testfw_app -b $TFW_PACKAGE_DIR --gfx egl -w 1920 -h 1080 -t gl_manhattan --ei -frame_step_time=40
+
+# Egypt
+mkdir -p ../../../../../angle/src/tests/perf_tests/restricted_traces/egypt_1500
+ANGLE_CAPTURE_OUT_DIR=../../../../../angle/src/tests/perf_tests/restricted_traces/egypt_1500 ANGLE_CAPTURE_FRAME_START=1500 ANGLE_CAPTURE_FRAME_END=1510 ANGLE_CAPTURE_LABEL=egypt_1500 ../bin/testfw_app -b $TFW_PACKAGE_DIR --gfx egl -w 1920 -h 1080 -t gl_egypt --ei -frame_step_time=40
 ```
 
 ## Upload to the cloud
@@ -83,6 +87,7 @@ Starting from you ANGLE root directory:
 cd src/tests/perf_tests/restricted_traces
 upload_to_google_storage.py --bucket chrome-angle-capture-binaries --archive trex_200
 upload_to_google_storage.py --bucket chrome-angle-capture-binaries --archive manhattan_10
+upload_to_google_storage.py --bucket chrome-angle-capture-binaries --archive egypt_1500
 ```
 
 After uploading, add the sha1 files created by the upload and submit them with your changes.

src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1

+8dae5c920c8384d4f0c50e9da98a5414c61ba3e7
\ No newline at end of file

src/tests/perf_tests/restricted_traces/restricted_traces.json

@@ -7,6 +7,7 @@
         "restricted_traces.json: List of restricted trace tests in ANGLE."
     ],
     "traces": [
+        "egypt_1500",
         "manhattan_10",
         "temple_run_300",
         "trex_200"

src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni

@@ -9,6 +9,7 @@
 # Can be consumed by tests/BUILD.gn.
 
 angle_restricted_traces = [
+  "egypt_1500 1",
   "manhattan_10 1",
   "temple_run_300 3",
   "trex_200 1",

src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h

@@ -10,6 +10,7 @@
 #ifndef ANGLE_RESTRICTED_TRACES_H_
 #define ANGLE_RESTRICTED_TRACES_H_
 
+#include "egypt_1500/egypt_1500_capture_context1.h"
 #include "manhattan_10/manhattan_10_capture_context1.h"
 #include "temple_run_300/temple_run_300_capture_context3.h"
 #include "trex_200/trex_200_capture_context1.h"
@@ -18,6 +19,7 @@ namespace angle
 {
 enum class RestrictedTraceID
 {
+    egypt_1500,
     manhattan_10,
     temple_run_300,
     trex_200,
@@ -41,6 +43,8 @@ struct TraceInfo
 };
 
 constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
+    {RestrictedTraceID::egypt_1500,
+     {egypt_1500::kReplayFrameStart, egypt_1500::kReplayFrameEnd, "egypt_1500"}},
     {RestrictedTraceID::manhattan_10,
      {manhattan_10::kReplayFrameStart, manhattan_10::kReplayFrameEnd, "manhattan_10"}},
     {RestrictedTraceID::temple_run_300,
@@ -55,6 +59,9 @@ inline void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
 {
     switch (traceID)
     {
+        case RestrictedTraceID::egypt_1500:
+            egypt_1500::ReplayContext1Frame(frameIndex);
+            break;
         case RestrictedTraceID::manhattan_10:
             manhattan_10::ReplayContext1Frame(frameIndex);
             break;
@@ -75,6 +82,9 @@ inline void ResetReplay(RestrictedTraceID traceID)
 {
     switch (traceID)
     {
+        case RestrictedTraceID::egypt_1500:
+            egypt_1500::ResetContext1Replay();
+            break;
         case RestrictedTraceID::manhattan_10:
             manhattan_10::ResetContext1Replay();
             break;
@@ -95,6 +105,9 @@ inline void SetupReplay(RestrictedTraceID traceID)
 {
     switch (traceID)
     {
+        case RestrictedTraceID::egypt_1500:
+            egypt_1500::SetupContext1Replay();
+            break;
         case RestrictedTraceID::manhattan_10:
             manhattan_10::SetupContext1Replay();
             break;
@@ -115,6 +128,9 @@ inline void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
 {
     switch (traceID)
     {
+        case RestrictedTraceID::egypt_1500:
+            egypt_1500::SetBinaryDataDir(dataDir);
+            break;
         case RestrictedTraceID::manhattan_10:
             manhattan_10::SetBinaryDataDir(dataDir);
             break;
@@ -135,6 +151,9 @@ inline void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, Decompres
 {
     switch (traceID)
     {
+        case RestrictedTraceID::egypt_1500:
+            egypt_1500::SetBinaryDataDecompressCallback(callback);
+            break;
         case RestrictedTraceID::manhattan_10:
             manhattan_10::SetBinaryDataDecompressCallback(callback);
             break;
@@ -157,6 +176,9 @@ inline void SetFramebufferChangeCallback(RestrictedTraceID traceID,
 {
     switch (traceID)
     {
+        case RestrictedTraceID::egypt_1500:
+            egypt_1500::SetFramebufferChangeCallback(userData, callback);
+            break;
         case RestrictedTraceID::manhattan_10:
             manhattan_10::SetFramebufferChangeCallback(userData, callback);
             break;