radeonsi/tests: handle flakes file for all test suite

And a generic flakes file that applies to all GPUs.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18865>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2022-09-29 15:20:00 +02:00 committed by Marge Bot
parent f319f039fb
commit ee9d7e5c62
2 changed files with 36 additions and 12 deletions

View file

@ -0,0 +1,14 @@
# piglit
glx@glx-visuals-depth -pixmap
glx@glx-visuals-stencil -pixmap
spec@egl_mesa_configless_context@basic
glx@glx-visuals-depth -pixmap
glx@glx-visuals-stencil -pixmap
spec@egl_mesa_configless_context@basic
spec@egl_chromium_sync_control@conformance
spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test
# glcts
KHR-GL46.sparse_texture2_tests.SparseTexture2Lookup
1 # piglit
2 glx@glx-visuals-depth -pixmap
3 glx@glx-visuals-stencil -pixmap
4 spec@egl_mesa_configless_context@basic
5 glx@glx-visuals-depth -pixmap
6 glx@glx-visuals-stencil -pixmap
7 spec@egl_mesa_configless_context@basic
8 spec@egl_chromium_sync_control@conformance
9 spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test
10 # glcts
11 KHR-GL46.sparse_texture2_tests.SparseTexture2Lookup

View file

@ -365,14 +365,25 @@ def select_baseline(basepath, gfx_level, gpu_name):
filters_args = parse_test_filters(args.include_tests)
baseline = select_baseline(base, gfx_level, gpu_name)
flakes = os.path.join(
base, "{}-{}-flakes.csv".format(gfx_level_to_str(gfx_level), gpu_name)
)
flakes = [
f
for f in (
os.path.join(base, g)
for g in [
"radeonsi-flakes.csv",
"{}-{}-flakes.csv".format(gfx_level_to_str(gfx_level), gpu_name),
]
)
if os.path.exists(f)
]
flakes_args = []
for f in flakes:
flakes_args += ["--flakes", f]
if os.path.exists(baseline):
print_yellow("Baseline: {}".format(baseline))
if os.path.exists(flakes):
print_yellow("[flakes {}]".format(flakes))
if flakes_args:
print_yellow("Flakes: {}".format(flakes_args))
# piglit test
if args.piglit:
@ -397,14 +408,11 @@ if args.piglit:
str(args.jobs),
"--skips",
skips,
] + filters_args
] + filters_args + flakes_args
if os.path.exists(baseline):
cmd += ["--baseline", baseline]
if os.path.exists(flakes):
cmd += ["--flakes", flakes]
run_cmd(cmd, args.verbose)
failures_path = os.path.join(out, "failures.csv")
if os.path.exists(failures_path):
@ -446,12 +454,13 @@ if args.glcts:
"--jobs",
str(args.jobs),
"--timeout",
"1000",
] + filters_args
"1000"
] + filters_args + flakes_args
if os.path.exists(baseline):
cmd += ["--baseline", baseline]
cmd += deqp_args
run_cmd(cmd, args.verbose)
failures_path = os.path.join(out, "failures.csv")
@ -513,7 +522,8 @@ if args.deqp:
os.path.join(output_folder, "deqp"),
"--suite",
suite_filename,
] + filters_args
] + filters_args + flakes_args
run_cmd(cmd, args.verbose)
failures_path = os.path.join(out, "failures.csv")