Add a native D3D12 FSR Ray Regeneration route for gfx1200/gfx1201, using the game's device and queue with embedded HLSL guide preparation and output composition. Preserve the vkd3d compatibility route for RDNA3 and expose explicit route overrides and diagnostics. Improve Windows runtime compatibility: - Retry rejected application-ID initialization with a project identity. - Defer expensive RR backend creation until feature creation. - Recover from transient submission failures without disabling later frames. - Add shared-buffer export fallbacks through explicit heaps and a private device on the same adapter. - Safely evict old RR descriptor sets when input views change. - Treat requested RR presets as hints when a configured model is available. - Expand SR/RR input formats and handle diffuse/specular hit distances, packed normals, depth-stencil resources, and unused FSR guides. Reduce SR overhead by batching output downloads and format conversion under one completion wait. Optimize strict M enc2/tube attention with bounded FP32 accumulation and the original FP64 fallback for ambiguous rounding cases. Extend RDNA4 tooling with gfx1200/gfx1201 native FP8 RR model builds, capability checks, architecture-aware deployment, and experimental K/M kernel paths. Require matching model and runtime arithmetic families. Add optional embedded FSR shader optimizations keyed by shader hash and exact original SPIR-V contents. Preserve reflected metadata and record optimizer provenance, artifact hashes, and cache identity. Simplify Windows installation with automatic backend dependency downloads, download progress and ETA, backed-up absolute OptiScaler library paths, and recovery from interrupted RR model builds. Add build-kernels.bat and a kernels-only build matrix for all eleven registered RDNA targets, with code-object target validation and SHA256 manifests. Expand conversion probes, numerical stress tests, temporal benchmark tooling, installer/deployment tests, and setup documentation. Document synthetic regression and timing results, experimental build options, and remaining RDNA4 hardware validation requirements.
211 lines
13 KiB
Python
211 lines
13 KiB
Python
"""Compare K/M interop and native candidates on identical alternating synthetic runs.
|
|
|
|
Uses an existing private runtime; never installs into a game. CPU interop timing
|
|
includes synchronization and NGX execution, and is not a GPU network-only time.
|
|
"""
|
|
import argparse
|
|
import hashlib
|
|
import json
|
|
import os
|
|
from pathlib import Path
|
|
import re
|
|
import statistics
|
|
import subprocess
|
|
import shutil
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
for key in ('probe', 'shim', 'runtime', 'core', 'dlss', 'output'):
|
|
parser.add_argument('--' + key, type=lambda s: Path(s).resolve(), required=True)
|
|
parser.add_argument('--resolution', default='1920x1080')
|
|
parser.add_argument('--model', choices=('K', 'M'), default='K')
|
|
parser.add_argument('--pixel-profile', choices=('baseline', 'packed', 'unorm', 'depth-stencil'), default='baseline')
|
|
parser.add_argument('--candidate-shim', type=lambda s: Path(s).resolve(), help='compare a rebuilt shim with the same native kernels')
|
|
parser.add_argument('--candidate-batch-inputs', action='store_true', help='also batch input copies in candidate shim/native runs')
|
|
parser.add_argument('--input-resolution', help='defaults to nominal Quality (two-thirds per axis)')
|
|
parser.add_argument('--frames', type=int, default=16)
|
|
parser.add_argument('--timeout', type=int, default=300, help='per-process limit, including cold shader compilation')
|
|
parser.add_argument('--profile-stages', action='store_true',
|
|
help='diagnostic CPU stage logging; adds overhead to timings')
|
|
parser.add_argument('--candidate-native', type=lambda s: Path(s).resolve(),
|
|
help='compare an experimental native directory instead of input batching')
|
|
parser.add_argument('--control-native', type=lambda s: Path(s).resolve(),
|
|
help='use an explicit verified control kernel directory while retaining runtime dependencies')
|
|
parser.add_argument('--player-config', action='store_true', help='select batching/native paths through staged player INI')
|
|
parser.add_argument('--sequence', choices=('abba', 'controls', 'batches'), default='abba',
|
|
help='paired comparison, or repeated identical settings to diagnose baseline determinism')
|
|
parser.add_argument('--reset-every-frame', action='store_true', help='diagnose history dependence; not representative temporal performance')
|
|
parser.add_argument('--profile-kernels', action='store_true',
|
|
help='diagnostic deferred GPU events, allowing legacy-stream dependencies; timings are instrumented')
|
|
args = parser.parse_args()
|
|
if args.player_config and (args.profile_stages or args.profile_kernels):
|
|
parser.error('player mode clears diagnostic profiling flags; use a separate instrumented run')
|
|
if args.frames < 8 or args.frames > 120:
|
|
parser.error('frames must be 8..120')
|
|
if not re.fullmatch(r'[1-9][0-9]*x[1-9][0-9]*', args.resolution):
|
|
parser.error('resolution must be WIDTHxHEIGHT')
|
|
ow, oh = map(int, args.resolution.split('x'))
|
|
preset = 11 if args.model == 'K' else 13
|
|
comparing = bool(args.candidate_native or args.candidate_shim)
|
|
if args.candidate_batch_inputs and not comparing:
|
|
parser.error('--candidate-batch-inputs requires a candidate shim or native directory')
|
|
if not args.input_resolution:
|
|
args.input_resolution = f'{ow * 2 // 3}x{oh * 2 // 3}' if args.model == 'K' else f'{ow // 2}x{oh // 2}'
|
|
if not re.fullmatch(r'[1-9][0-9]*x[1-9][0-9]*', args.input_resolution):
|
|
parser.error('input-resolution must be WIDTHxHEIGHT')
|
|
build_root = Path(__file__).resolve().parents[2] / 'build'
|
|
if not args.output.is_relative_to(build_root.resolve()):
|
|
parser.error('output must stay under the repository ignored build directory')
|
|
args.output.mkdir(parents=True, exist_ok=False)
|
|
report = {'passed': False, 'resolution': args.resolution, 'warmupFrames': 4,
|
|
'inputResolution': args.input_resolution,
|
|
'stageProfiling': args.profile_stages,
|
|
'kernelProfiling': args.profile_kernels,
|
|
'model': args.model, 'pixelProfile': args.pixel_profile,
|
|
'comparison': 'shim' if args.candidate_shim else 'native kernels' if args.candidate_native else 'input batching',
|
|
'timing': 'CPU interop including NGX and synchronization', 'runs': []}
|
|
runtime = args.runtime
|
|
native = runtime / 'native'
|
|
if (native / 'gfx1101').is_dir():
|
|
native = native / 'gfx1101'
|
|
if args.control_native:
|
|
native = args.control_native
|
|
report['playerConfig'] = args.player_config
|
|
report['sequence'] = args.sequence
|
|
report['resetEveryFrame'] = args.reset_every_frame
|
|
report['candidateBatchInputs'] = args.candidate_batch_inputs
|
|
module = args.shim
|
|
if args.player_config:
|
|
runtime = args.output / 'player'
|
|
shutil.copytree(args.runtime, runtime)
|
|
module = runtime / 'd4r_nvngx.dll'
|
|
shutil.copy2(args.shim, module)
|
|
for source, relative in ((args.core, 'ngx/_nvngx.dll'), (args.dlss, 'dlss/nvngx_dlss.dll')):
|
|
destination = runtime / relative
|
|
destination.parent.mkdir(parents=True, exist_ok=True)
|
|
shutil.copy2(source, destination)
|
|
nvapi = runtime / 'nvapi/nvapi64.dll'
|
|
if not nvapi.is_file():
|
|
nvapi = runtime / 'nvapi/gfx1101/nvapi64.dll'
|
|
report['artifacts'] = {str(p): hashlib.sha256(p.read_bytes()).hexdigest()
|
|
for p in (args.probe, args.shim, args.core, args.dlss)}
|
|
if args.candidate_shim:
|
|
report['candidateShimSha256'] = hashlib.sha256(args.candidate_shim.read_bytes()).hexdigest()
|
|
report['nativeArtifacts'] = {p.name: hashlib.sha256(p.read_bytes()).hexdigest()
|
|
for p in sorted(native.glob('*')) if p.is_file()}
|
|
if args.candidate_native:
|
|
report['candidateNativeArtifacts'] = {p.name: hashlib.sha256(p.read_bytes()).hexdigest()
|
|
for p in sorted(args.candidate_native.glob('*')) if p.is_file()}
|
|
env = os.environ.copy()
|
|
# Keep profiling and arithmetic settings independent of the caller's shell.
|
|
for key in list(env):
|
|
if key.startswith('D4R_') or key in ('ZLUDA_LOG_DIR', 'ZLUDA_CACHE_DIR', 'ZLUDA_CUDA_LIB'):
|
|
del env[key]
|
|
env.update(HIP_PATH=str(runtime / 'hip'),
|
|
ZLUDA_CUDA_LIB=str(runtime / 'zluda/nvcuda.dll'),
|
|
D4R_NVAPI_BACKEND=str(runtime / 'nvapi/backend/nvapi64.dll'),
|
|
D4R_FORMAT_MODULE=str(runtime / 'pixel_convert_gfx1101.hsaco'),
|
|
D4R_ZLUDA_NATIVE_DIR=str(native),
|
|
D4R_ZLUDA_WMMA='1', D4R_ZLUDA_WMMA_FP8='1',
|
|
D4R_ZLUDA_WMMA_F16_REFERENCE='1', D4R_QUIET_API='1',
|
|
ZLUDA_CACHE_DIR=str(Path(os.environ['LOCALAPPDATA']) / 'd4r/cache'),
|
|
D4R_NGX_DATA_DIR=str(args.output / 'ngx-data'))
|
|
env['PATH'] = str(runtime / 'hip/bin') + os.pathsep + str(runtime / 'zluda') + os.pathsep + env['PATH']
|
|
if args.profile_stages:
|
|
env['D4R_PROFILE_STAGES'] = '1'
|
|
if args.profile_kernels:
|
|
env.update(D4R_ZLUDA_PROFILE_DEFERRED='1', D4R_ZLUDA_PROFILE_ALLOW_LEGACY='1',
|
|
D4R_ZLUDA_PROFILE_EVERY='1')
|
|
try:
|
|
reference = None
|
|
variants = {'abba': (False, True, True, False), 'controls': (False,) * 4, 'batches': (True,) * 4}
|
|
for index, batched in enumerate(variants[args.sequence]):
|
|
use_batch = batched and (not comparing or args.candidate_batch_inputs)
|
|
label = ('candidate' if comparing else 'batch') if batched else 'control'
|
|
output = args.output / f'{index}-{label}'
|
|
output.mkdir()
|
|
env['D4R_DIAG_DIR'] = str(output)
|
|
if use_batch:
|
|
env['D4R_BATCH_INPUT_COPIES'] = '1'
|
|
else:
|
|
env.pop('D4R_BATCH_INPUT_COPIES', None)
|
|
env['D4R_ZLUDA_NATIVE_DIR'] = str(args.candidate_native if batched and args.candidate_native else native)
|
|
if args.player_config:
|
|
config = (Path(__file__).resolve().parents[2] / 'packaging/windows/d4r.ini').read_text()
|
|
config = re.sub(r'(?m)^Model\s*=\s*K\s*$', 'Model = ' + args.model, config)
|
|
config = re.sub(r'(?m)^BatchInputCopies\s*=\s*(?:true|false)\s*$',
|
|
'BatchInputCopies = ' + str(use_batch).lower(), config)
|
|
selected_native = args.candidate_native if batched and args.candidate_native else native
|
|
config = config.replace('NativeDir = auto', 'NativeDir = ' + str(selected_native))
|
|
(runtime / 'd4r.ini').write_text(config)
|
|
if args.candidate_shim:
|
|
shutil.copy2(args.candidate_shim if batched else args.shim, module)
|
|
selected_module = module if args.player_config else args.candidate_shim if batched and args.candidate_shim else module
|
|
command = [str(args.probe), '--module', str(selected_module), '--hip-root', str(runtime / 'hip'),
|
|
'--cuda-dll', str(runtime / 'zluda/nvcuda.dll'), '--ngx-core', str(args.core),
|
|
'--dlss-dll', str(args.dlss), '--nvapi-dll', str(nvapi),
|
|
'--ngx-abi', 'project', '--interop-mode', 'command-list', '--preset', str(preset),
|
|
'--ngx-quality', '2' if args.model == 'K' else '0',
|
|
'--ngx-create-flags', '0' if args.model == 'K' else '11',
|
|
'--pixel-profile', args.pixel_profile,
|
|
'--ngx-output-resolution', args.resolution,
|
|
'--ngx-input-resolution', args.input_resolution, '--iterations', str(args.frames)]
|
|
if args.player_config:
|
|
command += ['--player-mode', '1']
|
|
if args.reset_every_frame:
|
|
command += ['--reset-every-frame', '1']
|
|
with (output / 'stdout.log').open('wb') as out, (output / 'stderr.log').open('wb') as err:
|
|
result = subprocess.run(command, env=env, stdout=out, stderr=err, timeout=args.timeout)
|
|
if args.player_config and (runtime / 'd4r_nvngx.log').exists():
|
|
shutil.copy2(runtime / 'd4r_nvngx.log', output / 'player.log')
|
|
text = (output / 'stdout.log').read_text(errors='replace')
|
|
if result.returncode or 'PASS D3D12_DLSS' not in text:
|
|
raise RuntimeError(f'run {index} failed ({result.returncode}); inspect {output}')
|
|
if args.reset_every_frame and 'D3D12_RESET every_frame=1' not in text:
|
|
raise RuntimeError('Requested reset diagnostic was not applied')
|
|
if 'D3D12_PIXEL_PROFILE ' + args.pixel_profile not in text:
|
|
raise RuntimeError('Requested pixel formats were not applied')
|
|
iw, ih = map(int, args.input_resolution.split('x'))
|
|
expected_size = f'D3D12_NGX_DIMENSIONS input={iw}x{ih} output={ow}x{oh}'
|
|
if expected_size not in text or f'D4R_INTEROP async=0 batch_inputs={int(use_batch)}' not in text:
|
|
raise RuntimeError(f'run {index}: requested dimensions/interop mode not applied')
|
|
if len(re.findall(rf'D3D12_OUTPUT preset={preset} frame=\d+ finite=1 ', text)) != args.frames:
|
|
raise RuntimeError(f'run {index}: missing finite-output checks')
|
|
times = [float(x) for x in re.findall(r'D4R_FRAME .*?interop_ngx_ms=([0-9.]+)', text)]
|
|
if len(times) != args.frames:
|
|
raise RuntimeError(f'run {index}: incomplete frame timing')
|
|
hashes = {p.name: hashlib.sha256(p.read_bytes()).hexdigest() for p in output.glob('output-*')
|
|
if p.suffix in ('.rgba16f', '.r11g11b10f', '.bgra8')}
|
|
expected_products = args.frames * (2 if args.pixel_profile in ('packed', 'unorm') else 1)
|
|
if len(hashes) != expected_products:
|
|
raise RuntimeError(f'run {index}: incomplete output readback')
|
|
if reference is None:
|
|
reference = hashes
|
|
elif hashes != reference:
|
|
report['mismatchRun'] = index
|
|
report['differentFrames'] = [name for name, digest in hashes.items() if reference.get(name) != digest]
|
|
report['mismatchedOutputHashes'] = hashes
|
|
raise RuntimeError(f'run {index}: output differs from control')
|
|
report['runs'].append({'batch': use_batch,
|
|
'candidate': batched, 'allFrameMs': times,
|
|
'medianMs': statistics.median(times[4:]), 'outputHashes': hashes})
|
|
print(f'run={index} variant={label} warmed_cpu_interop_ms={statistics.median(times[4:]):.3f}', flush=True)
|
|
for mode in (False, True):
|
|
values = [t for row in report['runs'] if row['candidate'] == mode for t in row['allFrameMs'][4:]]
|
|
if not values:
|
|
continue
|
|
key = ('candidateMedianMs' if comparing else 'batchMedianMs') if mode else 'controlMedianMs'
|
|
report[key] = statistics.median(values)
|
|
report['passed'] = True
|
|
except Exception as error:
|
|
report['error'] = str(error)
|
|
print(str(error), flush=True)
|
|
finally:
|
|
(args.output / 'summary.json').write_text(json.dumps(report, indent=2) + '\n')
|
|
return 0 if report['passed'] else 1
|
|
|
|
|
|
if __name__ == '__main__':
|
|
raise SystemExit(main())
|