Skip to content

Commit

Permalink
Test: Add Critical Ops trace
Browse files Browse the repository at this point in the history
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 <[email protected]>
Commit-Queue: Cody Northrop <[email protected]>
  • Loading branch information
cnorthrop authored and Angle LUCI CQ committed Sep 9, 2024
1 parent 22c39d2 commit bda3359
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 2 deletions.
11 changes: 11 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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': [
{
Expand Down
2 changes: 1 addition & 1 deletion scripts/code_generation_hashes/restricted_traces.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"src/tests/restricted_traces/gen_restricted_traces.py":
"79978de70c2597f249241ed864562149",
"src/tests/restricted_traces/restricted_traces.json":
"2b522cc3aed242ba0d9fd4e11162290b"
"050b563c73f7d14af0b9a5e3bcf39804"
}
10 changes: 9 additions & 1 deletion src/tests/perf_tests/TracePerfTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ TracePerfTest::TracePerfTest(std::unique_ptr<const TracePerfParams> 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())
{
Expand Down Expand Up @@ -1826,6 +1826,14 @@ TracePerfTest::TracePerfTest(std::unique_ptr<const TracePerfParams> 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") ||
Expand Down
1 change: 1 addition & 0 deletions src/tests/restricted_traces/restricted_traces.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit bda3359

Please sign in to comment.