network natively on HIP with Vulkan->HIP shared memory, extend K kernels to
gfx11 (RDNA3), and add dependency/packaging/test tooling around them.
Windows: FSR RR backend, native HIP K runner, gfx11 K kernels, tooling
FSR Ray Regeneration (experimental)
- Add fsr_rr_backend.{h,cpp}, fsr_rr_passes.h and the fsr_rr/ prepare and
compose compute shaders. They run AMD's FidelityFX denoiser
(amd_fidelityfx_denoiser_dx12.dll, SDK 2.3, not bundled) on a private
vkd3d-proton device.
- Add the amdxc64 shim (tools/windows/amdxc64_shim) and two vkd3d-proton
patches for libcxx includes. AMD's amdxc64.dll is never loaded.
- d4r_nvngx_windows: RrFeature now selects between the native DLSS RR
backend and the FSR backend (D4R_RR_BACKEND=fsr). After the denoiser it
runs an internal Super Sampling stage (feature 1) to upscale. If SR is
unavailable and output != render size, the frame fails; it is never
returned noisy.
- d4r.ini / player_config: new [RayReconstruction] FsrDenoiser,
FsrStabilityBias (auto or >= 0) and FsrDetail (0-1), with validation, and
matching D4R_FSR_* environment variables.
- Add the FSR RR fixture, output-check and ngx test scripts, and a shader
compile script.
Native HIP K runner (Windows)
- CMake: add d4r_engine_k_hip (d4r-k-hip) plus separate volk/engine copies,
because VK_USE_PLATFORM_WIN32_KHR changes volk's entry points.
- Share Vulkan memory with HIP via Win32 opaque handles on Windows
(VK_KHR_external_memory_win32) and via fds on Linux. Handle types are now
intptr_t, and the platform choice is in D4R_EXT_MEMORY_* macros.
- HipNetwork: add debugRepeatHashes and debugNodeMicros, exposed as
D4R_HIP_REPEAT_CHECK, D4R_HIP_REPEAT_ALL and D4R_HIP_NODE_PROFILE in
replay.cpp.
- replay.cpp: display-resolution-motion frames (FrameFlagDisplayMotion) no
longer require near2rnd == out2rnd. Both values must still be in (0, 1].
K kernels on gfx11
- Allow position-token and enc1 tiling on __GFX11__ as well as gfx12.
- Add an opt-in ds_bpermute cross-half exchange
(D4R_WINDOWS_GFX11_DS_EXCHANGE, enabled for K on Windows gfx11). M keeps
its LDS path.
- Fix a block-barrier race in the position layer. Without POS_VSHARE a fast
wave could overwrite its hb rows while a slower wave still read them for a
later head, giving rare wrong results on gfx1101 (enc0 outputs differing
between identical launches).
Packaging and install
- install.bat, d4r.ini, WINDOWS_README: FSR option, and
install_dependencies.py to install pinned NVIDIA dependencies with staged,
hash-verified replacement and rollback.
- Update the release package, local package refresh and test scripts.
- Add the InteropBatchInputCopies option (default false). Batching is faster
on some synthetic runs, but player temporal exactness is unresolved.
Tooling and tests
- K model: capture_k_weights, build_k_model, compare_k_outputs,
benchmark_k_hip, build_capture_runtime, test_k_model and the
zluda-k-output-capture patch. Captured weights and models are private
local assets and must not enter release archives.
- Synthetic probes: test_m_ngx, test_sr_dynamic,
prepare_rr_dynamic_fixture and the d3d12/rr_ngx probe updates.
- Add tests/windows/test_install_dependencies.py.
Docs
- Update the windows-fsr-rr, k-performance, local-package, rr-interop and
rr-model-cache docs. Add windows-parity-handoff.md and
windows-parity-continuation-prompt.md.
76 lines
4.4 KiB
Python
76 lines
4.4 KiB
Python
"""Compare rr_ngx_probe outputs of the synthetic noisy scene against its noise-free answer, frame by frame.
|
|
|
|
The fixture's frames.txt first line is `size RW RH OW OH`; dynamic-extents.txt (when present) gives each frame's render
|
|
size. Per frame the reference is clean-<frame>.bin (clean.bin for fixtures from the first generator version) at output
|
|
size. When a frame's render size differs from the output size the baselines are the noisy input nearest-resampled to
|
|
output size and, if clean-render-<frame>.bin exists, the noise-free render-size image resampled the same way (the best a
|
|
render-resolution result could be).
|
|
"""
|
|
import argparse
|
|
import json
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
repo = Path(__file__).resolve().parents[2]
|
|
sys.path.insert(0, str(repo / '.tools/python/vendor'))
|
|
import numpy as np
|
|
|
|
|
|
def resampler(render_shape, shape):
|
|
if render_shape == shape:
|
|
return lambda a: a
|
|
ys = np.minimum((np.arange(shape[0]) * render_shape[0] / shape[0]).astype(int), render_shape[0] - 1)
|
|
xs = np.minimum((np.arange(shape[1]) * render_shape[1] / shape[1]).astype(int), render_shape[1] - 1)
|
|
return lambda a: a[ys][:, xs]
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
parser.add_argument('--fixture', required=True, type=Path)
|
|
parser.add_argument('--output', required=True, type=Path)
|
|
parser.add_argument('--report', required=True, type=Path)
|
|
parser.add_argument('--ratio', type=float, default=0.5, help='tail RMSE must be below ratio * the input baseline')
|
|
parser.add_argument('--output-float32', action='store_true')
|
|
parser.add_argument('--switch-output', action='store_true')
|
|
args = parser.parse_args()
|
|
sizes = list(map(int, (args.fixture / 'frames.txt').read_text().split('\n')[0].split()[1:5]))
|
|
shape = (sizes[3], sizes[2], 4) # output size
|
|
n = len(list(args.fixture.glob('*-color.bin')))
|
|
extents_file = args.fixture / 'dynamic-extents.txt'
|
|
extents = [tuple(map(int, line.split())) for line in extents_file.read_text().split('\n') if line.strip()] if extents_file.exists() else None
|
|
sky = np.load(args.fixture / 'sky.npy')
|
|
body = ~sky
|
|
rows = []
|
|
for i in range(n):
|
|
fw, fh = extents[i] if extents else (sizes[0], sizes[1])
|
|
render_shape = (fh, fw, 4)
|
|
resample = resampler(render_shape, shape)
|
|
reference = args.fixture / f'clean-{i}.bin'
|
|
clean = np.fromfile(reference if reference.exists() else args.fixture / 'clean.bin', '<f2').astype('f8').reshape(shape)[..., :3]
|
|
float_output = args.output_float32 and (not args.switch_output or i % 2 == 1)
|
|
out = np.fromfile(args.output / f'{i}-out.bin', '<f4' if float_output else '<f2').astype('f8').reshape(shape)[..., :3]
|
|
noisy = resample(np.fromfile(args.fixture / f'{i}-color.bin', '<f2').astype('f8').reshape(render_shape)[..., :3])
|
|
rmse = lambda a: float(np.sqrt(np.mean((a[body] - clean[body]) ** 2)))
|
|
row = dict(frame=i, renderSize=[fw, fh], finite=bool(np.isfinite(out).all()), outputRmse=rmse(out), inputRmse=rmse(noisy),
|
|
skyMaxAbs=float(np.abs(out[sky] - clean[sky]).max()) if sky.any() else 0.0,
|
|
differsFromInput=bool(not np.array_equal(out, noisy)))
|
|
ideal = args.fixture / f'clean-render-{i}.bin'
|
|
if ideal.exists():
|
|
row['idealNearestRmse'] = rmse(resample(np.fromfile(ideal, '<f2').astype('f8').reshape(render_shape)[..., :3]))
|
|
rows.append(row)
|
|
tail = rows[-8:]
|
|
summary = dict(frames=n, creationRenderSize=sizes[:2], outputSize=sizes[2:], dynamicExtents=bool(extents),
|
|
allFinite=all(r['finite'] for r in rows), allDifferFromInput=all(r['differsFromInput'] for r in rows),
|
|
tailOutputRmse=float(np.mean([r['outputRmse'] for r in tail])), tailInputRmse=float(np.mean([r['inputRmse'] for r in tail])),
|
|
tailSkyMaxAbs=max(r['skyMaxAbs'] for r in tail), qualityReference=False, gameAccessed=False, synthetic=True)
|
|
if all('idealNearestRmse' in r for r in tail):
|
|
summary['idealNearestRmse'] = float(np.mean([r['idealNearestRmse'] for r in tail]))
|
|
summary['denoised'] = summary['tailOutputRmse'] < args.ratio * summary['tailInputRmse']
|
|
args.report.write_text(json.dumps(dict(summary=summary, frames=rows), indent=2) + '\n')
|
|
print(json.dumps(summary, indent=2))
|
|
sys.exit(0 if summary['allFinite'] and summary['allDifferFromInput'] and summary['denoised'] else 1)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main()
|