From bda335985b53163e69c0324f72596136d65f2c7c Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Sun, 8 Sep 2024 16:08:04 -0600 Subject: [PATCH] Test: Add Critical Ops trace Test: angle_trace_tests --gtest_filter="*critical_ops*" Bug: b/365417418 Bug: b/365524876 Change-Id: I3e6f3278a9c6ea819d61a0136986631b19170018 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5843583 Reviewed-by: Roman Lavrov Commit-Queue: Cody Northrop --- DEPS | 11 +++++++++++ scripts/code_generation_hashes/restricted_traces.json | 2 +- src/tests/perf_tests/TracePerfTest.cpp | 10 +++++++++- src/tests/restricted_traces/restricted_traces.json | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index 572357d8a28..30853236ea1 100644 --- a/DEPS +++ b/DEPS @@ -207,6 +207,7 @@ vars = { 'checkout_angle_restricted_trace_command_and_conquer_rivals': 'checkout_angle_restricted_traces', 'checkout_angle_restricted_trace_cookie_run_kingdom': 'checkout_angle_restricted_traces', 'checkout_angle_restricted_trace_cookie_run_oven_break': 'checkout_angle_restricted_traces', + 'checkout_angle_restricted_trace_critical_ops': 'checkout_angle_restricted_traces', 'checkout_angle_restricted_trace_csr2_drag_racing': 'checkout_angle_restricted_traces', 'checkout_angle_restricted_trace_cut_the_rope': 'checkout_angle_restricted_traces', 'checkout_angle_restricted_trace_darkness_rises': 'checkout_angle_restricted_traces', @@ -1693,6 +1694,16 @@ deps = { 'dep_type': 'cipd', 'condition': 'checkout_angle_restricted_trace_cookie_run_oven_break', }, + 'src/tests/restricted_traces/critical_ops': { + 'packages': [ + { + 'package': 'angle/traces/critical_ops', + 'version': 'version:1', + }, + ], + 'dep_type': 'cipd', + 'condition': 'checkout_angle_restricted_trace_critical_ops', + }, 'src/tests/restricted_traces/csr2_drag_racing': { 'packages': [ { diff --git a/scripts/code_generation_hashes/restricted_traces.json b/scripts/code_generation_hashes/restricted_traces.json index b74eca6e355..b91df93ceb7 100644 --- a/scripts/code_generation_hashes/restricted_traces.json +++ b/scripts/code_generation_hashes/restricted_traces.json @@ -4,5 +4,5 @@ "src/tests/restricted_traces/gen_restricted_traces.py": "79978de70c2597f249241ed864562149", "src/tests/restricted_traces/restricted_traces.json": - "2b522cc3aed242ba0d9fd4e11162290b" + "050b563c73f7d14af0b9a5e3bcf39804" } diff --git a/src/tests/perf_tests/TracePerfTest.cpp b/src/tests/perf_tests/TracePerfTest.cpp index bc234651c16..7c7576baadb 100644 --- a/src/tests/perf_tests/TracePerfTest.cpp +++ b/src/tests/perf_tests/TracePerfTest.cpp @@ -1181,7 +1181,7 @@ TracePerfTest::TracePerfTest(std::unique_ptr params) if (traceNameIs("hill_climb_racing") || traceNameIs("dead_trigger_2") || traceNameIs("disney_mirrorverse") || traceNameIs("cut_the_rope") || - traceNameIs("geometry_dash")) + traceNameIs("geometry_dash") || traceNameIs("critical_ops")) { if (IsAndroid() && (IsPixel4() || IsPixel4XL()) && !mParams->isANGLE()) { @@ -1826,6 +1826,14 @@ TracePerfTest::TracePerfTest(std::unique_ptr params) } } + if (traceNameIs("critical_ops")) + { + if (isNVIDIALinuxANGLE || isNVIDIAWinANGLE) + { + skipTest("https://anglebug.com/365524876 Renders incorrectly on Nvidia"); + } + } + if (IsGalaxyS22()) { if (traceNameIs("cod_mobile") || traceNameIs("dota_underlords") || diff --git a/src/tests/restricted_traces/restricted_traces.json b/src/tests/restricted_traces/restricted_traces.json index 3ec4c4d80c1..86f2b43d7e3 100644 --- a/src/tests/restricted_traces/restricted_traces.json +++ b/src/tests/restricted_traces/restricted_traces.json @@ -61,6 +61,7 @@ "command_and_conquer_rivals 5", "cookie_run_kingdom 5", "cookie_run_oven_break 1", + "critical_ops 1", "csr2_drag_racing 1", "cut_the_rope 1", "darkness_rises 1",