fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi/ci: run GLCTS, ESCTS, and dEQP from the glcts directory

Browse source 
GLCTS contains more recent dEQP, so we can remove the deqp clone.

Changes:
- glcts should use the main branch
- glcts/build contains gl-cts and deqp
- glcts/build_es contains gles-cts
- remove the escts and deqp directories and paths
- it saves about 27 GB of disk space

Updated build instructions:
    https://github.com/marekolsak/marek-build/

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28219>
This commit is contained in:
Marek Olšák 2024-03-15 16:42:22 -04:00
parent 8573e9bf47
commit b98bbb851c
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py
View file

@ -53,8 +53,6 @@ path_above_mesa = os.path.realpath(os.path.join(os.path.dirname(__file__), *['..
parser.add_argument("--piglit-path", type=str, help="Path to piglit source folder.")
parser.add_argument("--glcts-path", type=str, help="Path to GLCTS source folder.")
parser.add_argument("--escts-path", type=str, help="Path to GLES CTS source folder.")
parser.add_argument("--deqp-path", type=str, help="Path to dEQP source folder.")
parser.add_argument(
"--parent-path",
type=str,
@ -161,19 +159,15 @@ parser.add_argument(
args = parser.parse_args(sys.argv[1:])
piglit_path = args.piglit_path
glcts_path = args.glcts_path
escts_path = args.escts_path
deqp_path = args.deqp_path
if args.parent_path:
if args.piglit_path or args.glcts_path or args.deqp_path:
if args.piglit_path or args.glcts_path:
parser.print_help()
sys.exit(0)
piglit_path = os.path.join(args.parent_path, "piglit")
glcts_path = os.path.join(args.parent_path, "glcts")
escts_path = os.path.join(args.parent_path, "escts")
deqp_path = os.path.join(args.parent_path, "deqp")
else:
if not args.piglit_path or not args.glcts_path or not args.escts_path or not args.deqp_path:
if not args.piglit_path or not args.glcts_path:
parser.print_help()
sys.exit(0)
@ -466,22 +460,22 @@ if args.escts:
"--tests-per-group",
"100",
"--deqp",
"{}/build/external/openglcts/modules/glcts".format(escts_path),
"{}/build_es/external/openglcts/modules/glcts".format(glcts_path),
"--caselist",
"{}/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles2-khr-main.txt".format(
escts_path
glcts_path
),
"--caselist",
"{}/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles3-khr-main.txt".format(
escts_path
glcts_path
),
"--caselist",
"{}/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles31-khr-main.txt".format(
escts_path
glcts_path
),
"--caselist",
"{}/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.6.x/gles32-khr-main.txt".format(
escts_path
glcts_path
),
"--output",
out,
@ -525,12 +519,12 @@ if args.deqp:
suite.write("[[deqp]]\n")
suite.write(
'deqp = "{}"\n'.format(
"{}/build/modules/{subtest}/deqp-{subtest}".format(deqp_path, subtest=k)
"{}/build/modules/{subtest}/deqp-{subtest}".format(glcts_path, subtest=k)
)
)
suite.write(
'caselists = ["{}"]\n'.format(
"{}/android/cts/main/{}-main.txt".format(deqp_path, k)
"{}/external/openglcts/data/mustpass/{}/aosp_mustpass/3.2.6.x/{}-main.txt".format(glcts_path, "egl" if k == "egl" else "gles", k)
)
)
if os.path.exists(baseline):