Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renderdiff: enable vulkan (#9108)

Browse Source 
RDIFF_BRANCH=pf/renderdiff-enable-vulkan
This commit is contained in:
Powei Feng
2025-08-19 23:10:01 -07:00
committed by GitHub
parent 96b26b85cc
commit 663a451031
12 changed files with 86 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/renderdiff/src/commit_msg.py
View File

@@ -41,7 +41,7 @@ def _parse_commit(commit_str):
)
if __name__ == "__main__":
RE_STR = rf"{RDIFF_UPDATE_GOLDEN_STR}(?:S)?=[\[]?([a-zA-Z0-9,\s\-\/]+)[\]]?"
RE_STR = rf"{RDIFF_UPDATE_GOLDEN_STR}(?:\s)?\=(?:\s)?([a-zA-Z0-9\s\-\/]+)"
parser = ArgParseImpl()
parser.add_argument('--file', help='A file containing the commit message')

63
test/renderdiff/src/compare.py
View File

@@ -6,13 +6,34 @@ import json
from utils import execute, ArgParseImpl, important_print, mkdir_p
from image_diff import same_image, output_image_diff
from results import RESULT_OK, RESULT_FAILED, RESULT_MISSING
from results import RESULT_OK, RESULT_FAILED, RESULT_MISSING, GOLDEN_MISSING
def _compare_goldens(base_dir, comparison_dir, out_dir=None):
all_files = glob.glob(os.path.join(base_dir, "./**/*.tif"), recursive=True)
test_dirs = set(os.path.abspath(os.path.dirname(f)).replace(os.path.abspath(base_dir) + '/', '') \
for f in all_files)
all_results = []
def single_test(src_dir, dest_dir, src_fname):
src_fname = os.path.abspath(src_fname)
test_case = src_fname.replace(f'{src_dir}/', '')
dest_fname = os.path.join(dest_dir, test_case)
result = {
'name': test_case,
}
if not os.path.exists(dest_fname):
result['result'] = RESULT_MISSING
elif not same_image(src_fname, dest_fname):
result['result'] = RESULT_FAILED
if output_test_dir:
# just the file name
diff_fname = f"{test_case.replace('.tif', '_diff.tif')}"
output_image_diff(src_fname, dest_fname, os.path.join(output_test_dir, diff_fname))
result['diff'] = diff_fname
else:
result['result'] = RESULT_OK
return result
for test_dir in test_dirs:
results = []
output_test_dir = None if not out_dir else os.path.abspath(os.path.join(out_dir, test_dir))
@@ -20,27 +41,23 @@ def _compare_goldens(base_dir, comparison_dir, out_dir=None):
mkdir_p(output_test_dir)
base_test_dir = os.path.abspath(os.path.join(base_dir, test_dir))
comp_test_dir = os.path.abspath(os.path.join(comparison_dir, test_dir))
for golden_file in \
glob.glob(os.path.join(base_test_dir, "*.tif")):
base_fname = os.path.abspath(golden_file)
test_case = base_fname.replace(f'{base_test_dir}/', '')
comp_fname = os.path.join(comp_test_dir, test_case)
result = {
'name': test_case,
}
if not os.path.exists(comp_fname):
print(f'file name not found: {comp_fname}')
result['result'] = RESULT_MISSING
elif not same_image(base_fname, comp_fname):
result['result'] = RESULT_FAILED
if output_test_dir:
# just the file name
diff_fname = f"{test_case.replace('.tif', '_diff.tif')}"
output_image_diff(base_fname, comp_fname, os.path.join(output_test_dir, diff_fname))
result['diff'] = diff_fname
else:
result['result'] = RESULT_OK
results.append(result)
results = [
single_test(base_test_dir, comp_test_dir, golden_file) \
for golden_file in glob.glob(os.path.join(base_test_dir, "*.tif"))
]
seen_test_cases = set([r['name'] for r in results])
# For files that are rendered but not in the golden directory
for base_file in \
glob.glob(os.path.join(comp_test_dir, "*.tif")):
src_fname = os.path.abspath(base_file)
test_case = base_file.replace(f'{comp_test_dir}/', '')
if test_case not in seen_test_cases:
results.append({
'name': test_case,
'result': GOLDEN_MISSING,
})
if output_test_dir:
output_fname = os.path.join(output_test_dir, "compare_results.json")
results_meta = {
@@ -70,7 +87,7 @@ if __name__ == '__main__':
results = _compare_goldens(args.src, dest, out_dir=args.out)
failed = [f" {k['name']}" for k in results if k['result'] != RESULT_OK]
failed = [f" {k['name']} ({k['result']})" for k in results if k['result'] != RESULT_OK]
success_count = len(results) - len(failed)
important_print(f'Successfully compared {success_count} / {len(results)} images' +
('\nFailed:\n' + ('\n'.join(failed)) if len(failed) > 0 else ''))

1
test/renderdiff/src/preamble.sh
View File

@@ -29,6 +29,7 @@ if [[ "$os_name" == "Linux" ]]; then
MESA_LIB_DIR="${MESA_DIR}lib/x86_64-linux-gnu"
elif [[ "$os_name" == "Darwin" ]]; then
MESA_LIB_DIR="${MESA_DIR}lib"
MESA_VK_ICD_PATH="${MESA_DIR}share/vulkan/icd.d/lvp_icd.aarch64.json"
else
echo "Unsupported platform for renderdiff tests"
exit 1

27
test/renderdiff/src/render.py
View File

@@ -26,15 +26,24 @@ from golden_manager import GoldenManager
from image_diff import same_image
from results import RESULT_OK, RESULT_FAILED
def _render_single_model(gltf_viewer, test_json_path, named_output_dir, test_name, backend, model, model_path, opengl_lib):
env = None
def _render_single_model(gltf_viewer, test_json_path, named_output_dir,
test_name, backend, model, model_path, opengl_lib, vk_icd):
# We need to pass along the old environment because it might include set up from vulkansdk.
env = os.environ.copy()
if backend == 'opengl' and opengl_lib and os.path.isdir(opengl_lib):
env = {
env |= {
'LD_LIBRARY_PATH': opengl_lib,
# for macOS
'DYLD_LIBRARY_PATH': opengl_lib,
}
if backend == 'vulkan' and os.path.exists(vk_icd):
env |= {
'VK_ICD_FILENAMES': vk_icd,
'VK_DRIVER_FILES': vk_icd,
'VK_LOADER_DEBUG': 'all',
}
out_name = f'{test_name}.{backend}.{model}'
test_desc = out_name
@@ -43,10 +52,10 @@ def _render_single_model(gltf_viewer, test_json_path, named_output_dir, test_nam
important_print(f'Rendering {test_desc}')
out_code, _ = execute(
out_code, output = execute(
f'{gltf_viewer} -a {backend} --batch={test_json_path} -e {model_path} --headless',
cwd=working_dir,
env=env, capture_output=False
env=env, capture_output=True
)
result = ''
@@ -56,9 +65,10 @@ def _render_single_model(gltf_viewer, test_json_path, named_output_dir, test_nam
out_tif_name = f'{named_output_dir}/{out_tif_basename}'
mv_f(f'{working_dir}/{test_name}0.tif', out_tif_name)
mv_f(f'{working_dir}/{test_name}0.json', f'{named_output_dir}/{test_name}.json')
important_print(f'{test_desc} rendering succeeded. output=\n{output}')
else:
result = RESULT_FAILED
important_print(f'{test_desc} rendering failed with error={out_code}')
important_print(f'{test_desc} rendering failed with error={out_code}output=\n{output}')
return {
'name': out_name,
@@ -91,17 +101,18 @@ def _render_test_config(gltf_viewer,
f.write(f'[{test.to_filament_format()}]')
for backend in test_config.backends:
if backend == 'vulkan':
assert vk_icd, "VK ICD must be specified when testing vulkan backend"
for model in test.models:
model_path = os.path.abspath(test_config.models[model])
futures.append(
executor.submit(_render_single_model, gltf_viewer_abs,
test_json_path, named_output_dir,
test.name, backend, model, model_path,
opengl_lib))
opengl_lib, vk_icd))
for future in concurrent.futures.as_completed(futures):
results.append(future.result())
print(results)
return named_output_dir, results

1
test/renderdiff/src/results.py
View File

@@ -1,3 +1,4 @@
RESULT_OK = 'ok'
RESULT_FAILED = 'failed'
RESULT_MISSING = 'missing'
GOLDEN_MISSING = 'golden missing'