Skip to content

A
angle
Commit 9c8da026 by Cody Northrop Committed by Commit Bot
Options

Revert "Tests: Add FIFA Mobile trace"

This reverts commit 2e1091e0. Reason for revert: Potentially flaky results, http://anglebug.com/5215 Original change's description: > Tests: Add FIFA Mobile trace > > Test: angle_perftests --gtest_filter="*fifa_mobile*" > Bug: b/171421051 > Change-Id: If50c6387a1a49fb6946d20279caf6470544a2b11 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2490279 > Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> > Reviewed-by: Jamie Madill <jmadill@chromium.org> > Commit-Queue: Cody Northrop <cnorthrop@google.com> TBR=jmadill@chromium.org,syoussefi@chromium.org Bug: angleproject:5215 Change-Id: I6a332b126c6c54f189fd451725957d288ab6b76b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2491113Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>
parent 0f2542e1
Showing with 5 additions and 33 deletions
scripts/code_generation_hashes/restricted_traces.json
{ {
"src/tests/restricted_traces/.gitignore": "src/tests/restricted_traces/.gitignore":
"ed1e186b7880946aa6acbe4531900cdb", "975053b988efba09342bbc967b8cbb76",
"src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1": "src/tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
"44fc5437c4a84012e338b3da4b6fc28a", "44fc5437c4a84012e338b3da4b6fc28a",
"src/tests/restricted_traces/arena_of_valor.tar.gz.sha1": "src/tests/restricted_traces/arena_of_valor.tar.gz.sha1":
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
"dffd3bed0d0e53481f43b414309bf152", "dffd3bed0d0e53481f43b414309bf152",
"src/tests/restricted_traces/egypt_1500.tar.gz.sha1": "src/tests/restricted_traces/egypt_1500.tar.gz.sha1":
"1d80caa37b937f83c95cd053b1bdd4ac", "1d80caa37b937f83c95cd053b1bdd4ac",
"src/tests/restricted_traces/fifa_mobile.tar.gz.sha1":
"c1deaabd756b24677aa48aff56f2d331",
"src/tests/restricted_traces/free_fire.tar.gz.sha1": "src/tests/restricted_traces/free_fire.tar.gz.sha1":
"a95efee5e5c6d85bac2d8c2ab09dc34c", "a95efee5e5c6d85bac2d8c2ab09dc34c",
"src/tests/restricted_traces/gen_restricted_traces.py": "src/tests/restricted_traces/gen_restricted_traces.py":
...@@ -30,13 +28,13 @@ ...@@ -30,13 +28,13 @@
"src/tests/restricted_traces/nba2k20_800.tar.gz.sha1": "src/tests/restricted_traces/nba2k20_800.tar.gz.sha1":
"03df0dcf41c18bc59edfc0b088ca4a87", "03df0dcf41c18bc59edfc0b088ca4a87",
"src/tests/restricted_traces/restricted_traces.json": "src/tests/restricted_traces/restricted_traces.json":
"7b7520b827d68e198840d8ad1bee8a99", "964d9d30361aae731f495562ed373b79",
"src/tests/restricted_traces/restricted_traces_autogen.cpp": "src/tests/restricted_traces/restricted_traces_autogen.cpp":
"d3d51fd238bd31100c3a7600b20e362d", "8d82249c50da7d734fb71e11f2829d90",
"src/tests/restricted_traces/restricted_traces_autogen.gni": "src/tests/restricted_traces/restricted_traces_autogen.gni":
"2dd556cf9476dfddee3fdeaf7ea0eb18", "2367de2be057b3b3b7bbd3e89053b0f2",
"src/tests/restricted_traces/restricted_traces_autogen.h": "src/tests/restricted_traces/restricted_traces_autogen.h":
"8a1057120937bd5de15aaed70c6f0517", "7601e1f0c3806fa2ff203788906762b1",
"src/tests/restricted_traces/temple_run_300.tar.gz.sha1": "src/tests/restricted_traces/temple_run_300.tar.gz.sha1":
"77475b0186ee0380eeb9db47433d0457", "77475b0186ee0380eeb9db47433d0457",
"src/tests/restricted_traces/trex_200.tar.gz.sha1": "src/tests/restricted_traces/trex_200.tar.gz.sha1":
......
src/tests/restricted_traces/.gitignore
...@@ -10,8 +10,6 @@ cod_mobile.tar.gz ...@@ -10,8 +10,6 @@ cod_mobile.tar.gz
cod_mobile/ cod_mobile/
egypt_1500.tar.gz egypt_1500.tar.gz
egypt_1500/ egypt_1500/
fifa_mobile.tar.gz
fifa_mobile/
free_fire.tar.gz free_fire.tar.gz
free_fire/ free_fire/
kartrider_rush.tar.gz kartrider_rush.tar.gz
......
src/tests/restricted_traces/fifa_mobile.tar.gz.sha1 deleted 100644 → 0
02ba7ba24f0ecb5ca5effebfd63da2f704ae1f82
\ No newline at end of file
src/tests/restricted_traces/restricted_traces.json
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
"candy_crush_500", "candy_crush_500",
"cod_mobile", "cod_mobile",
"egypt_1500", "egypt_1500",
"fifa_mobile",
"free_fire", "free_fire",
"kartrider_rush", "kartrider_rush",
"manhattan_10", "manhattan_10",
......
src/tests/restricted_traces/restricted_traces_autogen.cpp
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "candy_crush_500/candy_crush_500_capture_context1.h" #include "candy_crush_500/candy_crush_500_capture_context1.h"
#include "cod_mobile/cod_mobile_capture_context4.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 "fifa_mobile/fifa_mobile_capture_context2.h"
#include "free_fire/free_fire_capture_context3.h" #include "free_fire/free_fire_capture_context3.h"
#include "kartrider_rush/kartrider_rush_capture_context3.h" #include "kartrider_rush/kartrider_rush_capture_context3.h"
#include "manhattan_10/manhattan_10_capture_context6.h" #include "manhattan_10/manhattan_10_capture_context6.h"
...@@ -53,9 +52,6 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = { ...@@ -53,9 +52,6 @@ constexpr angle::PackedEnumMap<RestrictedTraceID, TraceInfo> kTraceInfos = {
{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"}},
{RestrictedTraceID::fifa_mobile,
{fifa_mobile::kReplayFrameStart, fifa_mobile::kReplayFrameEnd,
fifa_mobile::kReplayDrawSurfaceWidth, fifa_mobile::kReplayDrawSurfaceHeight, "fifa_mobile"}},
{RestrictedTraceID::free_fire, {RestrictedTraceID::free_fire,
{free_fire::kReplayFrameStart, free_fire::kReplayFrameEnd, free_fire::kReplayDrawSurfaceWidth, {free_fire::kReplayFrameStart, free_fire::kReplayFrameEnd, free_fire::kReplayDrawSurfaceWidth,
free_fire::kReplayDrawSurfaceHeight, "free_fire"}}, free_fire::kReplayDrawSurfaceHeight, "free_fire"}},
...@@ -114,9 +110,6 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex) ...@@ -114,9 +110,6 @@ void ReplayFrame(RestrictedTraceID traceID, uint32_t frameIndex)
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::ReplayContext6Frame(frameIndex); egypt_1500::ReplayContext6Frame(frameIndex);
break; break;
case RestrictedTraceID::fifa_mobile:
fifa_mobile::ReplayContext2Frame(frameIndex);
break;
case RestrictedTraceID::free_fire: case RestrictedTraceID::free_fire:
free_fire::ReplayContext3Frame(frameIndex); free_fire::ReplayContext3Frame(frameIndex);
break; break;
...@@ -170,9 +163,6 @@ void ResetReplay(RestrictedTraceID traceID) ...@@ -170,9 +163,6 @@ void ResetReplay(RestrictedTraceID traceID)
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::ResetContext6Replay(); egypt_1500::ResetContext6Replay();
break; break;
case RestrictedTraceID::fifa_mobile:
fifa_mobile::ResetContext2Replay();
break;
case RestrictedTraceID::free_fire: case RestrictedTraceID::free_fire:
free_fire::ResetContext3Replay(); free_fire::ResetContext3Replay();
break; break;
...@@ -226,9 +216,6 @@ void SetupReplay(RestrictedTraceID traceID) ...@@ -226,9 +216,6 @@ void SetupReplay(RestrictedTraceID traceID)
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::SetupContext6Replay(); egypt_1500::SetupContext6Replay();
break; break;
case RestrictedTraceID::fifa_mobile:
fifa_mobile::SetupContext2Replay();
break;
case RestrictedTraceID::free_fire: case RestrictedTraceID::free_fire:
free_fire::SetupContext3Replay(); free_fire::SetupContext3Replay();
break; break;
...@@ -282,9 +269,6 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir) ...@@ -282,9 +269,6 @@ void SetBinaryDataDir(RestrictedTraceID traceID, const char *dataDir)
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::SetBinaryDataDir(dataDir); egypt_1500::SetBinaryDataDir(dataDir);
break; break;
case RestrictedTraceID::fifa_mobile:
fifa_mobile::SetBinaryDataDir(dataDir);
break;
case RestrictedTraceID::free_fire: case RestrictedTraceID::free_fire:
free_fire::SetBinaryDataDir(dataDir); free_fire::SetBinaryDataDir(dataDir);
break; break;
...@@ -338,9 +322,6 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba ...@@ -338,9 +322,6 @@ void SetBinaryDataDecompressCallback(RestrictedTraceID traceID, DecompressCallba
case RestrictedTraceID::egypt_1500: case RestrictedTraceID::egypt_1500:
egypt_1500::SetBinaryDataDecompressCallback(callback); egypt_1500::SetBinaryDataDecompressCallback(callback);
break; break;
case RestrictedTraceID::fifa_mobile:
fifa_mobile::SetBinaryDataDecompressCallback(callback);
break;
case RestrictedTraceID::free_fire: case RestrictedTraceID::free_fire:
free_fire::SetBinaryDataDecompressCallback(callback); free_fire::SetBinaryDataDecompressCallback(callback);
break; break;
......
src/tests/restricted_traces/restricted_traces_autogen.gni
...@@ -15,7 +15,6 @@ angle_restricted_traces = [ ...@@ -15,7 +15,6 @@ angle_restricted_traces = [
"candy_crush_500 1", "candy_crush_500 1",
"cod_mobile 4", "cod_mobile 4",
"egypt_1500 6", "egypt_1500 6",
"fifa_mobile 2",
"free_fire 3", "free_fire 3",
"kartrider_rush 3", "kartrider_rush 3",
"manhattan_10 6", "manhattan_10 6",
......
src/tests/restricted_traces/restricted_traces_autogen.h
...@@ -46,7 +46,6 @@ enum class RestrictedTraceID ...@@ -46,7 +46,6 @@ enum class RestrictedTraceID
candy_crush_500, candy_crush_500,
cod_mobile, cod_mobile,
egypt_1500, egypt_1500,
fifa_mobile,
free_fire, free_fire,
kartrider_rush, kartrider_rush,
manhattan_10, manhattan_10,
......
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