diff --git a/README.md b/README.md index b343cc38..e2238b44 100644 --- a/README.md +++ b/README.md @@ -61,12 +61,17 @@ on thin lines in reflections, blotches in Cyberpunk 2077 with path tracing); in can very occasionally come out far too bright or dark at a scene change. Full details: the release notes ([clean/installer/RELEASE-NOTES.md](clean/installer/RELEASE-NOTES.md)). -### Model L (under test) - -Model L is a larger model choice planned for 0.6.5, off by default and still under test; until then it is available -from source. Preliminary numbers, Cyberpunk 2077 at 1080p Quality on an RX 9070 XT: the network takes 2.25 ms with -Model L and 1.17 ms with Model M. Speed work is ongoing and the numbers will change. Details, test setup and records: -[clean/l/SPEED.md](clean/l/SPEED.md). +### Model L and Model K (new in 0.6.5, off by default) + +Model L and Model K are two more super-resolution models you can choose per game; Model M stays the default. Each is +converted once on your PC from a DLSS model file of one of your games (`WrongGPU.exe model convert --preset=L` or +`--preset=K`) and chosen per game with `WrongGPU.exe set "" model=L` (or `model=K`), or in +OptiScaler's menu. Both are still under test. Cyberpunk 2077 at 1080p Quality on an RX 9070 XT, standing still at the +same spot, measured one right after the other: the model's GPU time per frame (all of its kernels) is 1.03 ms with +Model K and 1.17 ms with Model M +([clean/k/records/cp2077-model-k-timing-2026-11-15.json](clean/k/records/cp2077-model-k-timing-2026-11-15.json)), +and 2.67 ms with Model L, measured the same way in a later sitting with Model M again at 1.17 ms +([clean/l/records/cp2077-model-l-timing-2026-11-16.json](clean/l/records/cp2077-model-l-timing-2026-11-16.json)). ### Something broken? @@ -129,7 +134,7 @@ implementation's own design and format notes (per-file provenance records are ke | `clean/runtime`, `clean/runner`, `clean/kernels` | Model M runtime library, build script, HIP kernels | | `clean/dx12` | Direct3D 12 kernels of Model M and their build (`build_dx12.py`) | | `clean/rr_f` | Ray Reconstruction: reference, kernels, runtime, plugin, tests | -| `clean/k` | Model K (preset K; built and tested, not offered in 0.6.0) | +| `clean/k` | Model K (a per-game choice since 0.6.5, off by default) | | `clean/fsr` | FSR front end (FidelityFX API provider) | | `clean/installer` | the WrongGPU launcher | | `clean/wgshared` | settings registry shared by the front end, the plugin and the launcher | diff --git a/clean/fsr/CMakeLists.txt b/clean/fsr/CMakeLists.txt index 5af83945..966dbff5 100644 --- a/clean/fsr/CMakeLists.txt +++ b/clean/fsr/CMakeLists.txt @@ -39,6 +39,26 @@ else() set(WG_MODEL_K_VALUE 0) set(WG_OTHER_K_VALUE 1) endif() +# The release script's one version (x.y.z) for the front end and WrongGPU.asi, their logs and version resources +# (src/version.h). Empty: version.h's own default. A release never edits a version string by hand. +set(WG_VERSION "" CACHE STRING "Release version x.y.z from the release script (empty: the default in src/version.h)") +if(WG_VERSION) + if(NOT WG_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$") + message(FATAL_ERROR "WG_VERSION must be x.y.z, got '${WG_VERSION}'") + endif() + set(_wg_ver_h "${CMAKE_CURRENT_BINARY_DIR}/wg_version/wg_version_override.h") + set(_wg_ver_text "#pragma once\n// generated by clean/fsr/CMakeLists.txt from WG_VERSION - do not edit\n#define WRONGGPU_FSR_VERSION \"${WG_VERSION}\"\n#define WRONGGPU_FSR_VERSION_RC ${CMAKE_MATCH_1}, ${CMAKE_MATCH_2}, ${CMAKE_MATCH_3}, 0\n") + set(_wg_ver_old "") + if(EXISTS "${_wg_ver_h}") + file(READ "${_wg_ver_h}" _wg_ver_old) + endif() + if(NOT _wg_ver_old STREQUAL _wg_ver_text) + file(WRITE "${_wg_ver_h}" "${_wg_ver_text}") + endif() + add_compile_definitions(WG_VERSION_OVERRIDE) + include_directories("${CMAKE_CURRENT_BINARY_DIR}/wg_version") + message(STATUS "WrongGPU version (WG_VERSION): ${WG_VERSION}") +endif() # Model L in the front end (#89; src/model_l.h): its entry "WrongGPU Model L" in the hosted version list, its id, # sr_model=L / model=L passed to the runtime (which needs WG_MODEL_L too), the model lookup's \L\model.wgcm, its # names in the overlay and the provider label. OFF (the default while Model L is not released): none of that; model=L diff --git a/clean/fsr/README.md b/clean/fsr/README.md index 3e541c4f..f0524a32 100644 --- a/clean/fsr/README.md +++ b/clean/fsr/README.md @@ -72,6 +72,10 @@ cmake --build build/fsr --config Release ctest --test-dir build/fsr -C Release --output-on-failure ``` +A release build adds `-DWG_VERSION=x.y.z` (since 0.6.5): the release script's one version for the front end and +`WrongGPU.asi` (their logs and version resources; `src/version.h`). Without it the default in `src/version.h` is used; +version strings are never edited by hand for a release. + Linux, MinGW-w64 cross build (`apt install g++-mingw-w64-x86-64-posix cmake`): ``` diff --git a/clean/fsr/src/version.h b/clean/fsr/src/version.h index 1192b622..6a1d1d4d 100644 --- a/clean/fsr/src/version.h +++ b/clean/fsr/src/version.h @@ -1,8 +1,15 @@ // SPDX-License-Identifier: MIT #pragma once // Version of the FSR front end, shown in the log and the DLL's version resource. -#define WRONGGPU_FSR_VERSION "0.6.0" -#define WRONGGPU_FSR_VERSION_RC 0, 6, 0, 0 +// Since 0.6.5: a release build takes the release script's one version (CMake WG_VERSION writes wg_version_override.h and +// defines WG_VERSION_OVERRIDE, for the C++ sources and the version resources alike); the values below are the default +// of a build without it. +#ifdef WG_VERSION_OVERRIDE +#include "wg_version_override.h" +#else +#define WRONGGPU_FSR_VERSION "0.6.5" +#define WRONGGPU_FSR_VERSION_RC 0, 6, 5, 0 +#endif #ifndef WRONGGPU_FSR_BUILD #define WRONGGPU_FSR_BUILD "local build" #endif diff --git a/clean/installer/CMakeLists.txt b/clean/installer/CMakeLists.txt index aae258d9..d22e7f10 100644 --- a/clean/installer/CMakeLists.txt +++ b/clean/installer/CMakeLists.txt @@ -25,7 +25,7 @@ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") # no ru set(WRONGGPU_PAYLOAD_DIR "" CACHE PATH "Folder with WrongGPU's amd_fidelityfx_dx12.dll, the runtime and its kernels (one release build)") set(WRONGGPU_MAP "${CMAKE_CURRENT_SOURCE_DIR}/../../data/preset-M.v1.map.json" CACHE FILEPATH "Converter map (spec 08)") -set(WRONGGPU_VERSION "0.6.0" CACHE STRING "Installer version") +set(WRONGGPU_VERSION "0.6.5" CACHE STRING "Installer version") set(WRONGGPU_BUILD_ID "" CACHE STRING "The build's own name, e.g. 0.5.5-launcher-dev (empty: the version)") set(WRONGGPU_PAYLOAD_NAME "" CACHE STRING "The release build the payload folder holds, e.g. 0.5.5-ea (empty: the version)") set(WRONGGPU_MAP_K "${CMAKE_CURRENT_SOURCE_DIR}/../../data/preset-K.v1.map.json" CACHE FILEPATH "Preset K converter map") diff --git a/clean/installer/RELEASE-NOTES.md b/clean/installer/RELEASE-NOTES.md index 09c567cc..95c3f7ac 100644 --- a/clean/installer/RELEASE-NOTES.md +++ b/clean/installer/RELEASE-NOTES.md @@ -1,25 +1,121 @@ -# WrongGPU 0.6.0 +# WrongGPU 0.6.5 -Download **WrongGPU-0.6.0.zip** from the release page and extract it, then run **WrongGPU-0.6.0.exe** (see Quick start). +Download **WrongGPU-0.6.5.zip** from the release page and extract it, then run **WrongGPU-0.6.5.exe** (see Quick start). -WrongGPU 0.6.0 is the first public release since 0.4.5, and it changes how you use WrongGPU: a **launcher** replaces -the setup wizard, the launcher gets **OptiScaler** for you, Model M **no longer needs an AMD HIP runtime**, and -WrongGPU now does **Ray Reconstruction** too. It includes everything from the 0.5.x early-access builds. +WrongGPU 0.6.5 adds **Model L** and **Model K**, two more super-resolution models you can choose per game, and brings +the fixes planned for 0.6.1 (0.6.1 was not released; everything in it is in 0.6.5). Model M stays the default. If you use 0.6.0, update +your games with the launcher (each game's page offers **Update**). -**Still a work in progress.** WrongGPU is still being worked on, and 0.6.0 is a pre-release. In some games or scenes +**Still a work in progress.** WrongGPU is still being worked on, and 0.6.5 is a pre-release. In some games or scenes you may still see visual bugs, such as artifacts or flicker. If you do, we'd like to hear about it: on the game's page in the launcher, click **Collect logs**, and send the zip it makes to us in the **#bug-reports** channel of the -**WrongGPU Discord server**, together with a short description of what you saw (the game, the scene, your settings) -and a screenshot. Every report helps us fix it. +**WrongGPU Discord server** or in an issue on GitHub, together with a short description of what you saw (the game, the +scene, your settings) and a screenshot. Every report helps us fix it. + +## What's new in 0.6.5 (since 0.6.0) + +### Model L (new) +- **A new model, off by default and still under test.** Model L is a larger super-resolution model than Model M: + it has a full-resolution encoder and decoder and its own reconstruction step. Model M stays the default for every + game; Model L is a choice you make per game. +- **Converted on your PC.** Like Model M, Model L's data is converted once on your PC from a DLSS model file + (`nvngx_dlss.dll`) of version 310.5 or newer from any game or app you have installed; WrongGPU never downloads or + ships it. Convert it once from a command prompt in WrongGPU's folder: `WrongGPU.exe model convert --preset=L`. +- **Choosing it.** For one game: `WrongGPU.exe set "" model=L` (`model=M` goes back). In OptiScaler's + menu it is the upscaler **WrongGPU Model L**, next to **WrongGPU Model M**. +- **Runs on Direct3D 12** inside the game's own command list, like Model M: no AMD HIP runtime needed. +- **GPU time.** In Cyberpunk 2077 at 1080p Quality (1280x720 upscaled to 1920x1080) on a Radeon RX 9070 XT, standing + still at the same spot, measured in the same sitting: the model's GPU time per frame (all of its kernels) is + 2.67 ms with Model L and 1.17 ms with Model M + ([clean/l/records/cp2077-model-l-timing-2026-11-16.json](https://github.com/phantoslayer21/wronggpu/blob/main/clean/l/records/cp2077-model-l-timing-2026-11-16.json) + has the record). + +### Model K (new) +- **Another model, off by default and still under test.** Model K is a different super-resolution network from + Model M, with its own implementation in WrongGPU. Model M stays the default for every game; Model K is a choice you + make per game. +- **Converted on your PC.** Like the other models, Model K's data is converted once on your PC from a DLSS model file + (`nvngx_dlss.dll`) of one of your games; WrongGPU never downloads or ships it. From a command prompt in WrongGPU's + folder: `WrongGPU.exe model convert --preset=K`. +- **Choosing it.** For one game: `WrongGPU.exe set "" model=K` (`model=M` goes back). In OptiScaler's + menu it is the upscaler **WrongGPU Model K**. +- **Runs on Direct3D 12** inside the game's own command list, like Model M: no AMD HIP runtime needed. Tested in + Cyberpunk 2077 at 1080p Quality. +- **GPU time.** In Cyberpunk 2077 at 1080p Quality (1280x720 upscaled to 1920x1080) on a Radeon RX 9070 XT, standing + still at the same spot, measured one right after the other: the model's GPU time per frame (all of its kernels) is + 1.03 ms with Model K and 1.17 ms with Model M + ([clean/k/records/cp2077-model-k-timing-2026-11-15.json](https://github.com/phantoslayer21/wronggpu/blob/main/clean/k/records/cp2077-model-k-timing-2026-11-15.json) + has the record). +- **Optional faster approximation (`k_approx`), off by default.** With nothing set, Model K runs its exact path. Adding + `k_approx=a1,a2` to the `runtime_options` line of the game's `wronggpu.ini` selects close approximations of two + stages: the input stage's logarithm, exponent and divisions (`a1`) and the output stage's divisions (`a2`). Model K, + 1440p Quality, WrongGPU's test harness (direct route) on a Radeon RX 9070 XT: the frame takes 1.37 ms with + `k_approx=a1,a2` and 1.58 ms on the exact path of the same build. The output differs slightly from the exact path; + compared with the exact path and with reference images it was rated very, very close on both test sets (a Cyberpunk + 2077 sequence and a thin-line scene), with no drift over time. Frames with a render size above 0.68x the output (for + example DLAA) or a jitter outside +-0.5 keep the exact input stage even with `a1` (one log line). It runs only on + WrongGPU's native Direct3D 12 route (the in-game route); where it can't be used, Model K is refused at start and the + game keeps its own upscaler. +- If you used Preset K with an older WrongGPU, the launcher no longer asks to switch that game to Model M when it + updates it: the game stays on Model K. + +### Faster kernels, same output +- **Model L:** its Swin stage takes 7.0 µs less per frame and its decoder stage 2.5 µs less at 1440p Quality (1707x960 + upscaled to 2560x1440); at 1080p Quality (1280x720 upscaled to 1920x1080) they take 2.5 µs and 1.0 µs less. The + output does not change. +- **Model M:** its final (post) stage takes 2.5 µs less per frame at 1440p Quality and 1.5 µs less at 1080p Quality. + The output does not change. +- Measured on a Radeon RX 9070 XT in our offline benchmark, which runs frames back to back (five rounds, the median + difference per stage); in a game the saving per frame can differ. + +### Fixed +- **Ray Reconstruction: video memory no longer grows while Ray Reconstruction is available but switched off.** In + 0.6.0, a game that sends its Ray Reconstruction inputs every frame (Cyberpunk 2077 does, from its main menu on) made + the plugin keep a copy of each frame's inputs that was never freed while no Ray Reconstruction was running, until the + PC ran out of video memory. The copies are now freed as soon as the GPU is done with them (#8). +- **Ray Reconstruction plugin: no more crash with an older Microsoft C++ runtime.** `WrongGPU-RR.asi` was the only part + of WrongGPU built against the shared C++ runtime, and with an older `msvcp140.dll` (an old Visual C++ redistributable, + or a Proton prefix) the game aborted at start or froze shortly after. The plugin now carries its own runtime, like the + rest of WrongGPU, and needs no `msvcp140.dll` (#9). +- **Model M under Proton:** one of WrongGPU's small helper shaders used a keyword that Wine's shader compiler rejects, + so Model M could not start under Proton. The keyword is gone (it was not needed). Model M under Proton also needs a fix + in vkd3d-proton's shader translator; see Discussion #10 for the state of that (#7). We have not tested Model M under + Proton ourselves. +- **Model M's driver check at start is stricter:** it now tells apart drivers or translation layers that lay out the + matrix data differently, instead of passing them (#14). +- **Collect logs from a game's uninstaller** (Apps & features, **Modify**) no longer reports valid model data as + invalid: it says the data is not verified there and points to Collect logs in the launcher (#24). +- **Uninstall, Update, Repair and the move out of a wrong folder never discard your files.** When a file can't go back + as it was, because you or another program changed it after the install, it stays where it is and WrongGPU's copy of + what was there before is kept in a `WrongGPU-originals` folder. The result says "partly restored" and where the copy + is. A `wronggpu.ini` you edited by hand stays after an uninstall (it used to be deleted while the message said it was + left in place) (#70, #73). +- **The launcher works next to your own OptiScaler setup:** it recognises another OptiScaler install and its plugins, + asks before it moves anything aside, and moves only the files you agreed to, checked by their contents (#23). +- **Ray Reconstruction: GPU memory is released safely when a game ends Ray Reconstruction.** The plugin now keeps an + instance's memory until the GPU has finished its last frame, instead of freeing it at once (#63). +- **Ray Reconstruction stays off when another Ray Reconstruction plugin is already active.** It switches itself off + only when the other plugin is positively identified, and says so in `wronggpu-rr.log`. A different plugin it cannot + identify keeps WrongGPU's on; `rr_other_plugin = yield` in the plugin's settings keeps WrongGPU's off (#22). +- **Ray Reconstruction under Proton:** the thread that prepares Ray Reconstruction's GPU code now has a large enough + stack for vkd3d-proton's shader translator, and a pipeline that fails to build is logged (#149). + +### Also changed +- The launcher reads the developer-only HIP runtime setting only in test builds, so a setting left on a PC can't + change what a release installs (#25). + +### Thanks +Thanks to **j0nsh1n** for the reports and the analysis behind #7, #8 and #9, for the Linux write-up in +Discussion #10, and for the Ray Reconstruction fix under Proton (#149, #196). ## Quick start -1. **Install.** Run **WrongGPU-0.6.0.exe** from the zip. Its first-run check looks at your PC, then offers **Install +1. **Install.** Run **WrongGPU-0.6.5.exe** from the zip. Its first-run check looks at your PC, then offers **Install for this user** (the default; afterwards it is **WrongGPU** in the Start menu) or **Run portable**, and then shows - your games. Open a game and click **Install** - (the launcher gets OptiScaler for it the first time). The game's page then shows a checklist, **Turn it on in the - game**, with the next two steps. **Borderlands 4** needs one Engine.ini setting for Ray Reconstruction (so did - Hogwarts Legacy before its November 2026 update): the launcher asks about it right after the install. + your games. Open a game and click **Install** (the launcher gets OptiScaler for it the first time). The game's page + then shows a checklist, **Turn it on in the game**, with the next two steps. **Borderlands 4** needs one Engine.ini + setting for Ray Reconstruction: the launcher asks about it right after the install. Already on 0.6.0? Start the new + launcher; your games show **Update**. 2. **Choose the upscaler in the game.** Start the game and choose **DLSS** as the upscaler in its graphics settings (FSR or XeSS also work). With TAA or upscaling off, the game never asks for an upscaler and WrongGPU stays idle. For a game WrongGPU runs in without OptiScaler, the game's page tells you which upscaler to pick. @@ -35,147 +131,51 @@ and a screenshot. Every report helps us fix it. upscaling. 4. **Undo.** On the game's page, **More → Uninstall WrongGPU** puts the game's own files back exactly as they were. -## What's new in 0.6.0 (since 0.4.5) +## What came in 0.6.0 (since 0.4.5) -### The WrongGPU launcher replaces the setup wizard -In 0.4.5 you closed the game, ran WrongGPU-Setup and picked your game. Now there is one window, the WrongGPU launcher, for -all your games: -- **Finds your games:** it reads your Steam, Epic and GOG libraries and shows every game it finds as a tile in its - Library, with the art from your own Steam cache (nothing is downloaded or shipped for it). **Add game** takes a game - from anywhere else, **Rescan** looks again. -- **Shows what each game can do:** can install, installed, update or repair, your own OptiScaler, another mod, an older - install, refused (for example games with anti-cheat, which are never supported), or running. -- **One click per game:** Install, Update, Repair, Roll back (to the version before the last update) and Uninstall, - and an optional **Play** button. -- **A settings page per game** with an Apply bar: WrongGPU on or off, what it runs on (Auto, Direct3D 12 or HIP), the - output filter, pre-exposure, sparkle guard, OptiScaler's FPS overlay and OptiScaler's own options, and for Ray - Reconstruction games its on/off switch and quality (see below). -- **Last run:** what the game used the last time it ran (Model M, Direct3D 12 or HIP, Ray Reconstruction and its - cost), and **Collect logs** in one click for a bug report. -- **A first-run check** of Windows, your graphics card, the Direct3D 12 path and the model data, then your choice: - **Install for this user** (a Start menu entry and one entry in Apps & features; the launcher uninstalls itself from - there) or **Run portable**. -- **Picks up your earlier installs:** games you set up with the 0.5.x setup are taken over, keep their settings, and - are updated by the launcher (we tested this). Games set up with 0.4.x use the same install record and should be - taken over the same way, but we haven't tested that yet. +For players coming from 0.4.5, in short (the 0.6.0 release page has the full list): +- **The WrongGPU launcher replaces the setup wizard:** it finds your Steam, Epic and GOG games, shows what each game can + do, installs, updates, repairs, rolls back and uninstalls with one click per game, has a settings page per game, shows + **Last run** and makes a **Collect logs** zip for bug reports. It works with the keyboard and with screen readers. +- **No more hunting for OptiScaler:** the launcher downloads the **WrongGPU edition of OptiScaler** itself (GPL, its own + release page: https://github.com/phantoslayer21/OptiScaler/releases/tag/wronggpu-edition-20261102.1), checks it + against the size and SHA-256 built into the launcher, and keeps it for every game. Nothing of OptiScaler is inside + WrongGPU's download. In OptiScaler's menu, WrongGPU is an upscaler of its own. +- **No AMD HIP runtime needed any more:** on the Radeon RX 9070 / RX 9060 series, Model M runs on **Direct3D 12 inside + the game's own command list**, in every mode up to native resolution (DLAA). HIP is only used for the optional sparkle + guard (and for frame capture in bug reports). Frames the network can't use go to AMD's FSR. +- **Ray Reconstruction:** in games that use DLSS Ray Reconstruction, WrongGPU denoises and upscales the ray-traced image + with its own network. The game page has a Ray Reconstruction section: **Use WrongGPU** (on by default) and + **Quality**: **Fast** (default, recommended), **Accurate** (higher quality, slower) and **Exact** (the most precise and + the slowest; Settings > Model and runtime > Exact mode). Exact follows the network's math as closely as we can, but it + can't match DLSS on an NVIDIA card pixel for pixel: different graphics cards round their arithmetic slightly + differently. You can also switch the mode in OptiScaler's menu. The Ray Reconstruction data is converted once on your + PC from your own DLSS Ray Reconstruction file; WrongGPU never downloads or ships it. +- **Prepared by the launcher:** the graphics driver compiles Ray Reconstruction's GPU code once per game; the launcher + does that after it installs, updates or repairs a game ("Preparing Ray Reconstruction", Esc cancels), and again in the + background after an AMD driver update or a WrongGPU update. +- **Borderlands 4: "Fix it for me"** for the one engine setting its Ray Reconstruction needs (see Tested games). - **Works next to other tools:** ReShade, Special K, ASI loaders, your own OptiScaler and similar mods are found and kept, or moved aside with a backup only when you agree. A game with another upscaler mod gets a clear message, and - WrongGPU leaves that game alone. Older WrongGPU files without an install record (for example from a 0.4.x direct - install in an Unreal Engine game's plugin folder) are found and can be cleaned up with your OK. -- **Borderlands 4 and Hogwarts Legacy: "Fix it for me".** Their Ray Reconstruction needs one engine setting, and - Borderlands 4 removes it on every start. After you install WrongGPU into either game, the launcher asks: **Fix it - for me** adds the setting (and makes Borderlands 4's file read-only so the game keeps it), **Show me how** opens the - game's page with the steps, the line to copy and a check that the file has it, **Not now** asks again next time. The - game's page (**Engine.ini setting**: WrongGPU or Myself) changes it at any time. Uninstalling WrongGPU undoes the fix. - The game's own Ray Reconstruction option may look greyed out or off; that's expected, the setting turns it on. - OptiScaler's overlay shows DLSS → WrongGPU RR and Last run shows Ray Reconstruction when it's working. - On Hogwarts Legacy since the game's November 2026 update, WrongGPU's Ray Reconstruction isn't available yet (see - Tested games), so the launcher doesn't ask there. - Chosen before the game's first start, the setting is added once the game has made its settings folder: start the game - once, then open the launcher (the game's page says "Will be added after you start the game once" until then). A game - installed in a protected folder (such as Program Files) never gets a permission prompt you didn't click for: its page - says "Waiting for the game's first start", then "Ready to add" (the Library lists the game under **Needs attention** - then, and the launcher says so once when it opens), and **Fix it now** adds the setting after Windows asks. -- The whole launcher works with the keyboard and with screen readers: every control has a name for them. (An update - check is coming in a later version.) - -### No more hunting for OptiScaler -In 0.4.5 you had to download OptiScaler yourself and point the setup at it. Now the launcher downloads the **WrongGPU -edition of OptiScaler** itself the first time it needs it (OptiScaler with the plugin interface WrongGPU's Ray -Reconstruction uses; GPL, its own release page: -https://github.com/phantoslayer21/OptiScaler/releases/tag/wronggpu-edition-20261102.1), checks it against the size and -SHA-256 built into the launcher, refuses a download that doesn't match, and keeps it for every game. Nothing of -OptiScaler is inside WrongGPU's download. Offline, you can choose an OptiScaler download yourself (Settings); games -whose Ray Reconstruction needs the WrongGPU edition then get Model M only until the download works. -- In OptiScaler's menu, WrongGPU is an upscaler of its own (**WrongGPU**, version **WrongGPU Model M**), and the - launcher selects it for you. OptiScaler's overlay shows "DLSS → WrongGPU Model M", or "DLSS → WrongGPU RR" and the - mode while Ray Reconstruction runs. AMD's FSR stays available under OptiScaler's own FSR entries. - -### No AMD HIP runtime needed any more -In 0.4.5 Model M ran on HIP and needed a working AMD HIP runtime. Now, on the Radeon RX 9070 / RX 9060 series, Model M -runs on **Direct3D 12 inside the game's own command list**: it reads the game's textures and writes its output -directly, with no HIP. That now covers every mode up to **native resolution (DLAA)**, including Ultra Quality and every -ratio between Quality and native. Measured on an RX 9070 XT with the 0.6.0 runtime (GPU time of WrongGPU's work per -frame, as its timing log reports it), on a synthetic benchmark: - -| Mode | 1080p output | 1440p output | -| --- | --- | --- | -| Quality | about 1.3 ms | about 2.2 ms | -| Ultra Quality | about 1.6 ms | about 2.8 ms | -| Native resolution (DLAA) | about 2.4 ms | about 4.3 ms | - - -HIP is only used for the optional sparkle guard (and for frame capture in bug reports). Frames the network can't use -(for example a render size larger than the output) go to AMD's FSR, which stays available next to WrongGPU. - -### Ray Reconstruction (new) -- In games that use DLSS Ray Reconstruction (path tracing or ray tracing), WrongGPU now denoises and upscales the - ray-traced image with its own network, on Radeon RX 9000 cards. Tested: Cyberpunk 2077, RESIDENT EVIL requiem - (experimental), Borderlands 4 (with the one setting above), Hogwarts Legacy (up to the game's November 2026 update; - see Tested games) and Marvel's Spider-Man 2 (experimental, see below). -- **How to turn it on:** install WrongGPU into the game with the launcher, then choose DLSS Ray Reconstruction in the - game's graphics settings. The Ray Reconstruction data is converted once on your PC from your own DLSS Ray - Reconstruction file (version 310.7 or newer, from any game); WrongGPU never downloads or ships it. -- The game page has a Ray Reconstruction section: **Use WrongGPU** (on by default; off gives the game back its own - denoiser) and **Quality**: - - **Fast** (default, recommended): the fastest. Fine detail can differ slightly from Accurate in motion. - - **Accurate**: higher quality, slower. To switch to it, choose Accurate under Quality on the game's page, or in - OptiScaler's menu. - - **Exact**: the most precise, and the slowest. Enable Settings > Model and runtime > Exact mode to select it. - Exact follows the network's math as closely as we can. It still can't match DLSS on an NVIDIA card pixel for - pixel: different graphics cards round their arithmetic slightly differently, so very small differences always - remain. -- You can also switch the mode in the game, in OptiScaler's menu. -- Games that create Ray Reconstruction themselves (for example Unreal Engine games with their own DLSS plugin) get it - through the WrongGPU edition of OptiScaler; with another OptiScaler the launcher installs WrongGPU without Ray - Reconstruction for such a game and says why. -- **Prepared by the launcher:** the graphics driver has to compile Ray Reconstruction's GPU code once per game. The launcher does that for you after it installs, updates or - repairs a game ("Preparing Ray Reconstruction", Esc cancels; the game page shows Prepared / Prepare), so the game's - first start has Ray Reconstruction ready at once. -- **After an AMD driver update** (the new driver starts with an empty shader cache) or a WrongGPU update, the launcher - prepares those games again in the background when you open it, the default quality first. The status line at the - top says "Preparing Ray Reconstruction after the driver update (n of m)", and the game page says the game is not - ready until it is done. Pressing Play or Prepare on a game does that game first. If the driver drops its cache on its - own, the game prepares it at its first start. - -### New games -- **RESIDENT EVIL requiem** (experimental): path tracing with WrongGPU's Ray Reconstruction, and Model M. It needs **REFramework**, installed by you first: the game blocks OptiScaler without - it. WrongGPU never installs, downloads or replaces REFramework; the launcher tells you when it is missing and waits - until it is there. The game keeps its graphics driver cache under its own name, so it prepares Ray Reconstruction at - its first start (up to about a minute with a fresh driver; OptiScaler's overlay says "WrongGPU RR (preparing...)" - meanwhile), and later starts have it ready at once. -- **Marvel's Spider-Man 2**: Model M; its Ray Reconstruction is experimental (see below). -- **LEGO Batman**: Model M. The game's menu has no Ray Reconstruction option (it would need a separate game mod), so WrongGPU's Ray Reconstruction isn't offered there. -- **Preset K** is not part of 0.6.0; it returns in **0.6.1**. If a game still starts on Preset K from an older WrongGPU, - the launcher asks before it updates the game: **Switch to Model M** updates it and moves it to Model M (its other - settings stay); **Not now** leaves the game as it is. - -### Also fixed since 0.5.x -- Frames the network can't use (textures too small for the frame, for example during an intro or while the window is - minimised) are passed through unchanged, and the network carries on with the next normal frame. -- When a game creates a new upscaler before destroying the old one, WrongGPU waits for the old one to release its video - memory first (a few seconds at most) instead of running out of memory. -- Video memory no longer grows when you switch upscalers several times in OptiScaler's menu. -- The Ray Reconstruction plugin's extra diagnostic checks (a background thread) are off by default; - `WG_RR_SLOT_CHECKS=on` turns them on for a bug report. -- Runtime options written on lines of their own in `wronggpu.ini` are no longer ignored. -- When an uninstall removes a linked WrongGPU data folder, it removes the link and keeps the linked folder's contents. -- One WrongGPU runtime per game, as before: `wronggpu_runtime.dll` holds Model M and Ray Reconstruction. + WrongGPU leaves that game alone. ## Known issues -- RESIDENT EVIL requiem needs your own REFramework (see above). +- A rare crash at game start can happen; restarting the game fixes it. +- RESIDENT EVIL requiem needs your own **REFramework**, installed by you first: the game blocks OptiScaler without it. + WrongGPU never installs, downloads or replaces REFramework; the launcher tells you when it is missing. - RESIDENT EVIL requiem: very occasionally a single frame comes out far too bright or too dark at a scene change (after - loading a save, or during flashes of lightning). It lasts one frame; we're investigating it for 0.6.1. + loading a save, or during flashes of lightning). It lasts one frame; we're investigating it (#17). - Hogwarts Legacy: since the game's November 2026 update, Ray Reconstruction isn't available with WrongGPU yet. Model M - works. A fix is planned for 0.6.1. -- Preset K returns in 0.6.1. -- Radeon RX 9060 XT / RX 9060: supported, not yet tested. Ray Reconstruction should take about twice as long as on an RX 9070 XT - (an estimate); 8 GB cards are untested. -- RESIDENT EVIL requiem prepares Ray Reconstruction at its own first start (see above), not in the launcher. + works. We're investigating it (#16). +- Model L: tested for super resolution in Cyberpunk 2077 and RESIDENT EVIL requiem, both of which hand the upscaler + HDR colour. Model L's path for games that hand the upscaler SDR colour is tested offline only: every game we tried + sends HDR colour. Ray Reconstruction always uses its own network; Model L is a super-resolution choice only. +- Radeon RX 9060 XT / RX 9060: supported, not yet tested; 8 GB cards are untested. +- RESIDENT EVIL requiem prepares Ray Reconstruction at its own first start (OptiScaler's overlay says "WrongGPU RR + (preparing...)" meanwhile), not in the launcher. - One Ray Reconstruction plugin serves games on game interface 2.7, 2.8 and 2.14 (it picks the route when the game starts). Games on other game interface versions (for example 2.6) can't use Ray Reconstruction through the game - interface, but it still works in those that create it directly, as Hogwarts Legacy did before its November 2026 - update. + interface, but it still works in those that create it directly. - Ray Reconstruction needs a DLSS Ray Reconstruction file of version 310.7 or newer somewhere on your PC (for example from another game). Without one, the game keeps its own denoiser and the launcher says so. - 007 First Light: not supported (crashes at start under OptiScaler). @@ -184,17 +184,17 @@ HIP is only used for the optional sparkle guard (and for frame capture in bug re ## Tested games Tested on a Radeon RX 9070 XT. "Ray Reconstruction" means WrongGPU's Ray Reconstruction ran in the game; Model M means -super resolution only. -- **Cyberpunk 2077**: Ray Reconstruction and Model M. -- **RESIDENT EVIL requiem** (experimental): Ray Reconstruction when the game's **Ray Tracing** setting is **Path - Tracing** and its upscaler is **DLSS**. Needs your own REFramework (see above). - Very occasionally one frame comes out far too bright or too dark at a scene change (see Known issues). +super resolution only. [COMPATIBILITY.md](https://github.com/phantoslayer21/wronggpu/blob/main/COMPATIBILITY.md) says +which WrongGPU version each result comes from. +- **Cyberpunk 2077**: Ray Reconstruction, Model M, Model L and Model K. +- **RESIDENT EVIL requiem** (experimental): Model M and Model L, and Ray Reconstruction when the game's **Ray + Tracing** setting is **Path Tracing** and its upscaler is **DLSS**. Needs your own REFramework (see Known issues). - **Borderlands 4**: Ray Reconstruction (the game creates it itself; this needs the WrongGPU edition of OptiScaler). - Known issue with this game: Ray Reconstruction needs one setting, and Borderlands 4 removes it on every start. After - you install WrongGPU into it, the launcher asks. **Fix it for me** adds the setting and makes the file read-only, so - the game keeps it (uninstalling WrongGPU undoes both). **Show me how** opens the game's page with the steps below, - an **Open folder** button, the line with **Copy**, and **Check again**, which tells you whether the file has it. **Not - now** asks again next time. The game's page changes the choice at any time. To do it yourself: + Ray Reconstruction needs one setting, and Borderlands 4 removes it on every start. After you install WrongGPU into it, + the launcher asks. **Fix it for me** adds the setting and makes the file read-only, so the game keeps it + (uninstalling WrongGPU undoes both). **Show me how** opens the game's page with the steps below, an **Open folder** + button, the line with **Copy**, and **Check again**, which tells you whether the file has it. **Not now** asks again + next time. The game's page changes the choice at any time. To do it yourself: 1. open the game's settings folder `Documents\My Games\Borderlands 4\Saved\Config\Windows` (the folder that holds `GameUserSettings.ini`; if your Documents folder is in OneDrive, it is there); 2. create or open the file `Engine.ini` there with Notepad; @@ -204,20 +204,12 @@ super resolution only. game removes the file at its next start. From a command prompt: `WrongGPU.exe set "\Borderlands4.exe" rr_config_fix=on` (`off` takes - the line out again). Measured at 1080p output (from 642x361): about 1.6 ms a frame. - The exact line is on the release page and behind the game page's **Copy** button. -- **Hogwarts Legacy**: Model M. Ray Reconstruction worked up to the game's November 2026 update. On the updated game - its Ray Reconstruction option is greyed out and WrongGPU's Ray Reconstruction isn't available yet, so the launcher - doesn't offer it there (a fix is planned for 0.6.1). Before that update: the game's menu didn't turn it on (the game - sets its own Ray Reconstruction option back to off), so it needs the same setting, and the launcher asks the same question after the install - (**Fix it for me** adds the line; the game keeps the file, so no read-only is needed). To do it yourself: open the - folder `%LOCALAPPDATA%\Hogwarts Legacy\Saved\Config\WindowsNoEditor` (the one that holds `GameUserSettings.ini`), - create or open `Engine.ini` there, add `[SystemSettings]` at the end if it isn't there and under it the line from the - game page's **Copy** button (or the release page), and save. That line turns Ray Reconstruction on whatever - the menu says. - The exact line (the same as Borderlands 4) is on the release page and behind the game page's **Copy** button. + the line out again). The exact line is on the release page and behind the game page's **Copy** button. +- **Hogwarts Legacy**: Model M. Ray Reconstruction worked up to the game's November 2026 update; on the updated game it + isn't available yet, so the launcher doesn't offer it there (#16). - **Marvel's Spider-Man 2**: Model M (see Known issues; Ray Reconstruction is experimental there, see below). -- **LEGO Batman**: Model M. The game's menu has no Ray Reconstruction option (it would need a separate game mod), so WrongGPU's Ray Reconstruction isn't offered there. +- **LEGO Batman**: Model M. The game's menu has no Ray Reconstruction option (it would need a separate game mod), so + WrongGPU's Ray Reconstruction isn't offered there. ## Experimental: Ray Reconstruction in Spider-Man 2 WrongGPU's Ray Reconstruction can be turned on in Marvel's Spider-Man 2, but the game is currently unstable with it: it @@ -234,31 +226,33 @@ ray-traced reflections off. We don't recommend it. To try it anyway: The exact launch option is on the release page. ## Requirements -- Windows 10 or 11, a Radeon RX 9000-series graphics card (RX 9070 series; RX 9060 XT supported, not yet tested), a - recent AMD driver. -- **No AMD HIP runtime needed any more** (0.4.5 needed one): Model M runs on Direct3D 12. HIP is only used for the - optional sparkle guard. +- Windows 10 or 11, a Radeon RX 9000-series graphics card (RX 9070 series; RX 9060 XT and RX 9060 supported, not yet + tested), a recent AMD driver. +- **No AMD HIP runtime needed:** Model M, Model L and Model K run on Direct3D 12. `executor=hip` and frame capture are + debugging options that use HIP; both are off by default. - An internet connection the first time, for the WrongGPU edition of OptiScaler, which the launcher downloads itself - (in 0.4.5 you supplied OptiScaler yourself; offline you still can, in Settings). -- For Model M, a DLSS file of version 310.5 or newer, and for Ray Reconstruction, a DLSS Ray Reconstruction file - of version 310.7 or newer, each from any game or app on your PC (not necessarily the game you play); WrongGPU + (offline you can choose an OptiScaler download yourself, in Settings). +- For Model M and Model L, a DLSS file of version 310.5 or newer, and for Ray Reconstruction, a DLSS Ray + Reconstruction file of version 310.7 or newer, each from any game or app on your PC (not necessarily the game you play); WrongGPU converts them on your PC and never ships them. ## Downloading and starting WrongGPU safely WrongGPU's download is not signed with a code-signing certificate (they cost money every year and this is a free project). That has three visible effects: -- **"Windows protected your PC"** (Microsoft Defender SmartScreen) can show when you start WrongGPU-0.6.0.exe the first - time. Click **More info**, check that the file name is WrongGPU-0.6.0.exe, then click **Run anyway**. SmartScreen +- **"Windows protected your PC"** (Microsoft Defender SmartScreen) can show when you start WrongGPU-0.6.5.exe the first + time. Click **More info**, check that the file name is WrongGPU-0.6.5.exe, then click **Run anyway**. SmartScreen may show this warning for an unsigned program. - **Check that your download is the real one** before you run it. The release page lists the SHA-256 of the zip, and SHA256SUMS.txt in the zip lists the SHA-256 of every file in it. In PowerShell (in the folder with the file): - `Get-FileHash .\WrongGPU-0.6.0.zip -Algorithm SHA256` (or `certutil -hashfile WrongGPU-0.6.0.zip SHA256` in a + `Get-FileHash .\WrongGPU-0.6.5.zip -Algorithm SHA256` (or `certutil -hashfile WrongGPU-0.6.5.zip SHA256` in a Command Prompt). The long number it prints must be exactly the one on the release page. For the launcher itself, use - `Get-FileHash .\WrongGPU-0.6.0.exe -Algorithm SHA256` and compare it with its line in SHA256SUMS.txt. If a number + `Get-FileHash .\WrongGPU-0.6.5.exe -Algorithm SHA256` and compare it with its line in SHA256SUMS.txt. If a number differs, delete the file and download it again from the release page only. -- **If Microsoft Defender flags or removes it**: first check the SHA-256 as above. If the numbers match, the file matches the published checksum, but that alone does not establish whether a detection is a false positive. You can restore it in Windows Security > Virus & threat protection > Protection - history (choose the item, Actions, Restore), and please report the detection to us with the name Defender showed and - to Microsoft at https://www.microsoft.com/en-us/wdsi/filesubmission so it gets cleared for everyone. If the numbers - do not match, do not restore it: delete it and download it again. +- **If Microsoft Defender flags or removes it**: first check the SHA-256 as above. If the numbers match, the file + matches the published checksum, but that alone does not establish whether a detection is a false positive. You can + restore it in Windows Security > Virus & threat protection > Protection history (choose the item, Actions, Restore), + and please report the detection to us with the name Defender showed and to Microsoft at + https://www.microsoft.com/en-us/wdsi/filesubmission so it gets cleared for everyone. If the numbers do not match, do + not restore it: delete it and download it again. DLSS is a trademark of NVIDIA Corporation; AMD, Radeon, FidelityFX and FSR are trademarks of Advanced Micro Devices, Inc. WrongGPU is an independent project and is not affiliated with or endorsed by either company. diff --git a/clean/k/records/cp2077-model-k-timing-2026-11-15.json b/clean/k/records/cp2077-model-k-timing-2026-11-15.json new file mode 100644 index 00000000..dae66c20 --- /dev/null +++ b/clean/k/records/cp2077-model-k-timing-2026-11-15.json @@ -0,0 +1,1470 @@ +{ + "timer": "the runtime's D3D12 timestamps in the game's command list (timing_log=1, timing_stages=1): each sample is one 'timing, last 300 dispatches' line = the mean over 300 frames; network_total = the model's GPU time per frame, from the start of its first kernel -> after its last kernel; frame_span_t3_t0 = the frame's full D3D12 span", + "statistics": "over the 300-frame windows of each run: median, p95, min, max of the window means; worst_frame_network_ms = the largest single frame in any window; spread_pct = (max - min) / median of the window means", + "what": "Model K and Model M (control) in Cyberpunk 2077, one right after the other: the same settings, save and spot, one game start each", + "game": "Cyberpunk 2077 (Steam), Quality mode (the game sends 1280x720), output 1920x1080, borderless, ray tracing as the save had it, path tracing off, frame generation off, Ray Reconstruction off", + "scene": "gameplay, standing still: the street spot under the overpass (the same save and spot as cp2077-model-l-timing-2026-11-14.json in clean/l/records)", + "render": [ + 1280, + 720 + ], + "output": [ + 1920, + 1080 + ], + "mode": "1080p Quality", + "executor": "dx12 (native D3D12, the game device); the AMD HIP runtime not loaded in the game process", + "options": "model=;executor=dx12;timing_log=1;timing_stages=1 (no other diagnostic option)", + "gpu": "AMD Radeon RX 9070 XT", + "build": "release candidate rc/065-k 32ab421 (Model K and Model M code as on main for these paths)", + "model_digests": { + "K": "a2236326b39d315d0e8e4cc78d6ef82a5071df5ce6dcab53ad13f5b682f05758 (converted on the PC by the launcher)", + "M": "bfbd9dad238721fb51ed60e85ceb9789ddb3468c3538efb651d09f8ca820c350 (this PC's converted Model M; the same file as in the 2026-11-14 record)" + }, + "failed_dispatches": 0, + "runs": { + "K": { + "model": "K", + "windows": 52, + "frames": 15600, + "network_total": { + "median_ms": 1.031, + "p95_ms": 1.034, + "min_ms": 1.018, + "max_ms": 1.035 + }, + "frame_span_t3_t0": { + "median_ms": 1.038, + "p95_ms": 1.04, + "min_ms": 1.024, + "max_ms": 1.041 + }, + "parts_median_ms": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "worst_frame_network_ms": 1.079, + "spread_pct": 1.65, + "window_list": [ + { + "end": "11:25:56", + "network_gpu": 1.03, + "worst_frame_network": 1.079, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.037, + "worst_frame_total": 1.084 + }, + { + "end": "11:25:58", + "network_gpu": 1.03, + "worst_frame_network": 1.048, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.037, + "worst_frame_total": 1.054 + }, + { + "end": "11:26:01", + "network_gpu": 1.032, + "worst_frame_network": 1.048, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.055 + }, + { + "end": "11:26:03", + "network_gpu": 1.032, + "worst_frame_network": 1.047, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.054 + }, + { + "end": "11:26:06", + "network_gpu": 1.031, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.056 + }, + { + "end": "11:26:08", + "network_gpu": 1.03, + "worst_frame_network": 1.056, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.442, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.036, + "worst_frame_total": 1.061 + }, + { + "end": "11:26:11", + "network_gpu": 1.019, + "worst_frame_network": 1.046, + "parts": { + "exposure": 0.009, + "input": 0.218, + "network": 0.437, + "output": 0.355 + }, + "frames": 300, + "total_t3_t0": 1.026, + "worst_frame_total": 1.052 + }, + { + "end": "11:26:14", + "network_gpu": 1.018, + "worst_frame_network": 1.041, + "parts": { + "exposure": 0.009, + "input": 0.218, + "network": 0.436, + "output": 0.355 + }, + "frames": 300, + "total_t3_t0": 1.024, + "worst_frame_total": 1.048 + }, + { + "end": "11:26:16", + "network_gpu": 1.027, + "worst_frame_network": 1.048, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.441, + "output": 0.357 + }, + "frames": 300, + "total_t3_t0": 1.033, + "worst_frame_total": 1.055 + }, + { + "end": "11:26:19", + "network_gpu": 1.025, + "worst_frame_network": 1.042, + "parts": { + "exposure": 0.009, + "input": 0.219, + "network": 0.44, + "output": 0.357 + }, + "frames": 300, + "total_t3_t0": 1.031, + "worst_frame_total": 1.048 + }, + { + "end": "11:26:21", + "network_gpu": 1.021, + "worst_frame_network": 1.056, + "parts": { + "exposure": 0.009, + "input": 0.219, + "network": 0.438, + "output": 0.356 + }, + "frames": 300, + "total_t3_t0": 1.027, + "worst_frame_total": 1.061 + }, + { + "end": "11:26:24", + "network_gpu": 1.027, + "worst_frame_network": 1.045, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.441, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.033, + "worst_frame_total": 1.052 + }, + { + "end": "11:26:27", + "network_gpu": 1.029, + "worst_frame_network": 1.041, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.442, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.035, + "worst_frame_total": 1.048 + }, + { + "end": "11:26:29", + "network_gpu": 1.029, + "worst_frame_network": 1.052, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.442, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.036, + "worst_frame_total": 1.059 + }, + { + "end": "11:26:32", + "network_gpu": 1.027, + "worst_frame_network": 1.045, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.441, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.034, + "worst_frame_total": 1.052 + }, + { + "end": "11:26:34", + "network_gpu": 1.029, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.442, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.036, + "worst_frame_total": 1.057 + }, + { + "end": "11:26:37", + "network_gpu": 1.031, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.057 + }, + { + "end": "11:26:39", + "network_gpu": 1.03, + "worst_frame_network": 1.051, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.037, + "worst_frame_total": 1.058 + }, + { + "end": "11:26:42", + "network_gpu": 1.03, + "worst_frame_network": 1.047, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.036, + "worst_frame_total": 1.053 + }, + { + "end": "11:26:44", + "network_gpu": 1.034, + "worst_frame_network": 1.055, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.445, + "output": 0.36 + }, + "frames": 300, + "total_t3_t0": 1.04, + "worst_frame_total": 1.062 + }, + { + "end": "11:26:47", + "network_gpu": 1.034, + "worst_frame_network": 1.054, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.445, + "output": 0.36 + }, + "frames": 300, + "total_t3_t0": 1.04, + "worst_frame_total": 1.061 + }, + { + "end": "11:26:50", + "network_gpu": 1.035, + "worst_frame_network": 1.049, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.445, + "output": 0.36 + }, + "frames": 300, + "total_t3_t0": 1.041, + "worst_frame_total": 1.055 + }, + { + "end": "11:26:52", + "network_gpu": 1.033, + "worst_frame_network": 1.054, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.04, + "worst_frame_total": 1.061 + }, + { + "end": "11:26:55", + "network_gpu": 1.033, + "worst_frame_network": 1.047, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.04, + "worst_frame_total": 1.053 + }, + { + "end": "11:26:58", + "network_gpu": 1.034, + "worst_frame_network": 1.049, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.445, + "output": 0.36 + }, + "frames": 300, + "total_t3_t0": 1.041, + "worst_frame_total": 1.056 + }, + { + "end": "11:27:00", + "network_gpu": 1.031, + "worst_frame_network": 1.048, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.055 + }, + { + "end": "11:27:03", + "network_gpu": 1.034, + "worst_frame_network": 1.051, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.36 + }, + "frames": 300, + "total_t3_t0": 1.04, + "worst_frame_total": 1.058 + }, + { + "end": "11:27:05", + "network_gpu": 1.034, + "worst_frame_network": 1.051, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.36 + }, + "frames": 300, + "total_t3_t0": 1.04, + "worst_frame_total": 1.057 + }, + { + "end": "11:27:08", + "network_gpu": 1.033, + "worst_frame_network": 1.049, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.039, + "worst_frame_total": 1.055 + }, + { + "end": "11:27:11", + "network_gpu": 1.034, + "worst_frame_network": 1.051, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.445, + "output": 0.36 + }, + "frames": 300, + "total_t3_t0": 1.041, + "worst_frame_total": 1.058 + }, + { + "end": "11:27:13", + "network_gpu": 1.031, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.443, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.055 + }, + { + "end": "11:27:16", + "network_gpu": 1.019, + "worst_frame_network": 1.045, + "parts": { + "exposure": 0.009, + "input": 0.219, + "network": 0.437, + "output": 0.354 + }, + "frames": 300, + "total_t3_t0": 1.025, + "worst_frame_total": 1.051 + }, + { + "end": "11:27:19", + "network_gpu": 1.028, + "worst_frame_network": 1.049, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.442, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.035, + "worst_frame_total": 1.055 + }, + { + "end": "11:27:21", + "network_gpu": 1.03, + "worst_frame_network": 1.049, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.037, + "worst_frame_total": 1.056 + }, + { + "end": "11:27:24", + "network_gpu": 1.031, + "worst_frame_network": 1.053, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.06 + }, + { + "end": "11:27:26", + "network_gpu": 1.03, + "worst_frame_network": 1.07, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.036, + "worst_frame_total": 1.076 + }, + { + "end": "11:27:29", + "network_gpu": 1.031, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.056 + }, + { + "end": "11:27:31", + "network_gpu": 1.032, + "worst_frame_network": 1.052, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.059 + }, + { + "end": "11:27:34", + "network_gpu": 1.031, + "worst_frame_network": 1.056, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.061 + }, + { + "end": "11:27:36", + "network_gpu": 1.032, + "worst_frame_network": 1.049, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.056 + }, + { + "end": "11:27:39", + "network_gpu": 1.032, + "worst_frame_network": 1.053, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.039, + "worst_frame_total": 1.06 + }, + { + "end": "11:27:41", + "network_gpu": 1.033, + "worst_frame_network": 1.054, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.04, + "worst_frame_total": 1.061 + }, + { + "end": "11:27:44", + "network_gpu": 1.031, + "worst_frame_network": 1.048, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.055 + }, + { + "end": "11:27:46", + "network_gpu": 1.03, + "worst_frame_network": 1.053, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.036, + "worst_frame_total": 1.06 + }, + { + "end": "11:27:49", + "network_gpu": 1.029, + "worst_frame_network": 1.047, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.442, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.036, + "worst_frame_total": 1.053 + }, + { + "end": "11:27:51", + "network_gpu": 1.029, + "worst_frame_network": 1.046, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.036, + "worst_frame_total": 1.053 + }, + { + "end": "11:27:54", + "network_gpu": 1.032, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.039, + "worst_frame_total": 1.057 + }, + { + "end": "11:27:56", + "network_gpu": 1.033, + "worst_frame_network": 1.053, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.36 + }, + "frames": 300, + "total_t3_t0": 1.04, + "worst_frame_total": 1.06 + }, + { + "end": "11:27:59", + "network_gpu": 1.032, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.221, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.039, + "worst_frame_total": 1.056 + }, + { + "end": "11:28:01", + "network_gpu": 1.029, + "worst_frame_network": 1.054, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.442, + "output": 0.358 + }, + "frames": 300, + "total_t3_t0": 1.035, + "worst_frame_total": 1.061 + }, + { + "end": "11:28:04", + "network_gpu": 1.031, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.443, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.037, + "worst_frame_total": 1.057 + }, + { + "end": "11:28:06", + "network_gpu": 1.032, + "worst_frame_network": 1.05, + "parts": { + "exposure": 0.009, + "input": 0.22, + "network": 0.444, + "output": 0.359 + }, + "frames": 300, + "total_t3_t0": 1.038, + "worst_frame_total": 1.057 + } + ], + "proof": "runtime options model=K; network kernels model=K" + }, + "M": { + "model": "M", + "windows": 47, + "frames": 14100, + "network_total": { + "median_ms": 1.174, + "p95_ms": 1.177, + "min_ms": 1.167, + "max_ms": 1.177 + }, + "frame_span_t3_t0": { + "median_ms": 1.181, + "p95_ms": 1.183, + "min_ms": 1.173, + "max_ms": 1.183 + }, + "parts_median_ms": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "worst_frame_network_ms": 1.212, + "spread_pct": 0.85, + "window_list": [ + { + "end": "11:31:22", + "network_gpu": 1.173, + "worst_frame_network": 1.197, + "parts": { + "enc0": 0.111, + "Swin": 0.584, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.179, + "worst_frame_total": 1.204 + }, + { + "end": "11:31:24", + "network_gpu": 1.174, + "worst_frame_network": 1.199, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.205 + }, + { + "end": "11:31:27", + "network_gpu": 1.176, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.182, + "worst_frame_total": 1.207 + }, + { + "end": "11:31:30", + "network_gpu": 1.175, + "worst_frame_network": 1.204, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.21 + }, + { + "end": "11:31:32", + "network_gpu": 1.175, + "worst_frame_network": 1.201, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.207 + }, + { + "end": "11:31:35", + "network_gpu": 1.174, + "worst_frame_network": 1.203, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.209 + }, + { + "end": "11:31:37", + "network_gpu": 1.175, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.182, + "worst_frame_total": 1.207 + }, + { + "end": "11:31:40", + "network_gpu": 1.174, + "worst_frame_network": 1.212, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.217 + }, + { + "end": "11:31:42", + "network_gpu": 1.167, + "worst_frame_network": 1.191, + "parts": { + "enc0": 0.11, + "Swin": 0.581, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.173, + "worst_frame_total": 1.198 + }, + { + "end": "11:31:45", + "network_gpu": 1.169, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.11, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.201 + }, + { + "end": "11:31:48", + "network_gpu": 1.172, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.11, + "Swin": 0.584, + "dec0": 0.189, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.178, + "worst_frame_total": 1.206 + }, + { + "end": "11:31:50", + "network_gpu": 1.173, + "worst_frame_network": 1.202, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.209 + }, + { + "end": "11:31:53", + "network_gpu": 1.173, + "worst_frame_network": 1.201, + "parts": { + "enc0": 0.111, + "Swin": 0.584, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.179, + "worst_frame_total": 1.207 + }, + { + "end": "11:31:55", + "network_gpu": 1.172, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.11, + "Swin": 0.584, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.178, + "worst_frame_total": 1.206 + }, + { + "end": "11:31:58", + "network_gpu": 1.173, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.11, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.179, + "worst_frame_total": 1.202 + }, + { + "end": "11:32:01", + "network_gpu": 1.171, + "worst_frame_network": 1.198, + "parts": { + "enc0": 0.11, + "Swin": 0.585, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.178, + "worst_frame_total": 1.205 + }, + { + "end": "11:32:03", + "network_gpu": 1.174, + "worst_frame_network": 1.194, + "parts": { + "enc0": 0.11, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.201 + }, + { + "end": "11:32:06", + "network_gpu": 1.174, + "worst_frame_network": 1.199, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.206 + }, + { + "end": "11:32:08", + "network_gpu": 1.174, + "worst_frame_network": 1.203, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.209 + }, + { + "end": "11:32:11", + "network_gpu": 1.175, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.11, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.207 + }, + { + "end": "11:32:14", + "network_gpu": 1.175, + "worst_frame_network": 1.205, + "parts": { + "enc0": 0.11, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.209 + }, + { + "end": "11:32:16", + "network_gpu": 1.174, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.207 + }, + { + "end": "11:32:19", + "network_gpu": 1.175, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.207 + }, + { + "end": "11:32:21", + "network_gpu": 1.175, + "worst_frame_network": 1.204, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.209 + }, + { + "end": "11:32:24", + "network_gpu": 1.174, + "worst_frame_network": 1.207, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.214 + }, + { + "end": "11:32:27", + "network_gpu": 1.176, + "worst_frame_network": 1.21, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.182, + "worst_frame_total": 1.217 + }, + { + "end": "11:32:29", + "network_gpu": 1.176, + "worst_frame_network": 1.204, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.182, + "worst_frame_total": 1.21 + }, + { + "end": "11:32:32", + "network_gpu": 1.176, + "worst_frame_network": 1.198, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.182, + "worst_frame_total": 1.204 + }, + { + "end": "11:32:34", + "network_gpu": 1.176, + "worst_frame_network": 1.201, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.183, + "worst_frame_total": 1.207 + }, + { + "end": "11:32:37", + "network_gpu": 1.176, + "worst_frame_network": 1.206, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.183, + "worst_frame_total": 1.212 + }, + { + "end": "11:32:39", + "network_gpu": 1.177, + "worst_frame_network": 1.202, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.183, + "worst_frame_total": 1.208 + }, + { + "end": "11:32:42", + "network_gpu": 1.177, + "worst_frame_network": 1.201, + "parts": { + "enc0": 0.111, + "Swin": 0.587, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.183, + "worst_frame_total": 1.208 + }, + { + "end": "11:32:45", + "network_gpu": 1.17, + "worst_frame_network": 1.203, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.209 + }, + { + "end": "11:32:47", + "network_gpu": 1.17, + "worst_frame_network": 1.197, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.204 + }, + { + "end": "11:32:50", + "network_gpu": 1.173, + "worst_frame_network": 1.205, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.179, + "worst_frame_total": 1.212 + }, + { + "end": "11:32:53", + "network_gpu": 1.174, + "worst_frame_network": 1.203, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.21 + }, + { + "end": "11:32:55", + "network_gpu": 1.173, + "worst_frame_network": 1.201, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.214 + }, + { + "end": "11:32:58", + "network_gpu": 1.174, + "worst_frame_network": 1.205, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.212 + }, + { + "end": "11:33:00", + "network_gpu": 1.175, + "worst_frame_network": 1.199, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.205 + }, + { + "end": "11:33:03", + "network_gpu": 1.174, + "worst_frame_network": 1.198, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.204 + }, + { + "end": "11:33:05", + "network_gpu": 1.175, + "worst_frame_network": 1.207, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.182, + "worst_frame_total": 1.212 + }, + { + "end": "11:33:08", + "network_gpu": 1.175, + "worst_frame_network": 1.201, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.181, + "worst_frame_total": 1.208 + }, + { + "end": "11:33:11", + "network_gpu": 1.174, + "worst_frame_network": 1.202, + "parts": { + "enc0": 0.111, + "Swin": 0.585, + "dec0": 0.189, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.18, + "worst_frame_total": 1.208 + }, + { + "end": "11:33:13", + "network_gpu": 1.177, + "worst_frame_network": 1.201, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.183, + "worst_frame_total": 1.208 + }, + { + "end": "11:33:16", + "network_gpu": 1.176, + "worst_frame_network": 1.205, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.183, + "worst_frame_total": 1.212 + }, + { + "end": "11:33:18", + "network_gpu": 1.175, + "worst_frame_network": 1.209, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.29 + }, + "frames": 300, + "total_t3_t0": 1.182, + "worst_frame_total": 1.216 + }, + { + "end": "11:33:21", + "network_gpu": 1.177, + "worst_frame_network": 1.201, + "parts": { + "enc0": 0.111, + "Swin": 0.586, + "dec0": 0.189, + "post": 0.291 + }, + "frames": 300, + "total_t3_t0": 1.183, + "worst_frame_total": 1.208 + } + ], + "proof": "post_last=post_tf_f32_p12_diet_vsit_direct (Model M's post)" + } + }, + "note": "Model M here (1.174 ms) equals the Model M figure of the 2026-11-14 record (1.174 ms) in the same scene." +} diff --git a/clean/l/SPEED.md b/clean/l/SPEED.md index f97900ad..1b6c809e 100644 --- a/clean/l/SPEED.md +++ b/clean/l/SPEED.md @@ -1,15 +1,15 @@ -# Model L speed (preliminary) +# Model L speed -**Status: preliminary.** Model L is in development for 0.7.0. It is available from source with its build option -(`--model-l`, described under "Building Model L" below). Speed work is ongoing (the encoder is next), and these -numbers will change. +**Status: under test.** Model L ships with 0.6.5 as a choice per game, off by default; Model M stays the default. +In a build from source it needs its build option (`--model-l`, described under "Building Model L" below). Speed +work is ongoing, and these numbers will change. Model L costs more than Model M because it has a full-resolution encoder and decoder, and its own reconstruction. All figures are milliseconds per frame of the network (the work WrongGPU does for one upscaled frame), measured on -the GPU. Every figure comes from one of two records in [`records/`](records/): the first table from the in-game -record, the other tables from the harness record. The two records time slightly different things, so read each -table on its own and do not mix them. +the GPU. Every figure comes from a record in [`records/`](records/), named under its table. The records time +slightly different things (in game, harness, and an earlier harness record for Model M), so read each table on its +own and do not mix them. ## In game: Cyberpunk 2077, 1080p Quality @@ -19,60 +19,60 @@ table on its own and do not mix them. | Resolution and mode | 1080p Quality: 1280x720 upscaled to 1920x1080 | | GPU and driver | AMD Radeon RX 9070 XT, driver 32.0.32015.7029 | | Timer | the runtime's D3D12 timestamps in the game's command list; each sample is the mean of 300 frames, and each figure is the median over the scene's windows | -| Build | main 8ed26e8 plus pull requests #155 and #156 | -| Model L | its own reconstruction (the default): 36 windows, 10800 frames | -| Model M | same session, same settings: 43 windows, 12900 frames | +| Build | main 25429c5, release configuration | +| Model L | the release form (hybrid, the default on Direct3D 12), chosen with `set model=L`: 43 windows, 12900 frames | +| Model M | the control, timed in the same sitting just before Model L, same settings, save and spot: 49 windows, 14700 frames | | Step | Model L (ms) | Model M (ms) | |---|---|---| -| enc0 (input encoder) | 0.503 | 0.111 | -| Swin | 0.751 | 0.585 | -| dec0 | 0.345 | 0.189 | -| post | 0.651 | 0.289 | -| **Network total** | **2.250** | **1.174** | -| Frame's full D3D12 span | 2.256 | 1.180 | +| enc0 (input encoder) | 0.528 | 0.111 | +| Swin | 1.097 | 0.582 | +| dec0 | 0.476 | 0.188 | +| post | 0.565 | 0.287 | +| **Network total** | **2.666** | **1.168** | +| Frame's full D3D12 span | 2.677 | 1.174 | -So in this scene the network takes 2.25 ms with Model L and 1.17 ms with Model M, on the same PC in the same -session. "Network total" runs from the start of the network to the end of its last kernel. Record: -[`cp2077-model-l-timing-2026-11-14.json`](records/cp2077-model-l-timing-2026-11-14.json). The record also holds -title-screen scenes and a development variant that is not a supported output; this page does not use them. +So in this scene the network takes 2.67 ms with Model L and 1.17 ms with Model M, on the same PC in the same +sitting. "Network total" runs from the start of the network to the end of its last kernel. Record: +[`cp2077-model-l-timing-2026-11-16.json`](records/cp2077-model-l-timing-2026-11-16.json). The earlier record +[`cp2077-model-l-timing-2026-11-14.json`](records/cp2077-model-l-timing-2026-11-14.json) timed an earlier form of +Model L that this release does not ship. -## Harness: synthetic model and frames +## Harness: Model L, 1440p Quality, Direct3D 12 | Setting | Value | |---|---| -| Model and frames | synthetic model and synthetic frames (no game, no real weights) | -| Shapes | 1080p Quality, 1440p Quality, 1440p Performance (the record's shape names) | -| GPU and driver | not stored in the harness record | -| Timer | per-kernel GPU timestamps, which add overhead, so the harness reads higher than the game does | -| Runs | 5 runs per shape, models interleaved per round, one GPU slot per run | -| Build | main 6622148 | -| Tool | `clean/l/runner/l_d3d12_profile.py` (and `tools/prof_shapes.py` for 1440p Performance) | +| Harness | WrongGPU's Direct3D 12 test harness (no game), the direct route, executor dx12 | +| Shape | 1440p Quality: 1707x960 upscaled to 2560x1440 | +| Model L | the release form with no form option set (the default), as built by the change that made it the default | +| Runs | 5 rounds of 1500 frames, interleaved with the other configurations of the record; each figure is the median of the rounds | +| GPU and driver | not stored in the record | -Frame span, Model L / Model M: +| Step | Model L (ms) | +|---|---| +| enc0 (input encoder) | 1.032 | +| Swin | 1.825 | +| dec0 | 0.903 | +| post | 1.081 | +| **Frame** | **4.85** | -| Shape | Model L (ms) | Model M (ms) | -|---|---|---| -| 1080p Quality | 2.36 | 1.32 | -| 1440p Quality | 4.00 | 2.17 | -| 1440p Performance | 2.86 | 1.59 | +So in the harness at 1440p Quality a Model L frame takes 4.85 ms. Record: +[`l_time_1440q_hybrid_d3d12.json`](records/l_time_1440q_hybrid_d3d12.json) (configuration `hybdef`). Model L's +other shapes will be re-measured with this form; until then this page shows no harness figures for them. -Per-step split (ms, rounded to three decimals; "other" is the exposure step): +## Harness: Model M, from an earlier harness record -| Shape | Model | enc0 | Swin | dec0 | post | other | +These come from a different record (synthetic models, per-kernel times, build main 6622148 of 2026-11-14, 5 runs per +shape), so do not compare them with the Model L harness table above. + +| Shape | Frame span (ms) | enc0 | Swin | dec0 | post | other (exposure) | |---|---|---|---|---|---|---| -| 1080p Quality | L | 0.545 | 0.783 | 0.349 | 0.733 | 0.012 | -| 1080p Quality | M | 0.114 | 0.589 | 0.169 | 0.424 | 0.010 | -| 1440p Quality | L | 0.991 | 1.216 | 0.638 | 1.370 | 0.020 | -| 1440p Quality | M | 0.202 | 0.942 | 0.335 | 0.767 | 0.020 | -| 1440p Performance | L | 0.551 | 0.782 | 0.351 | 1.301 | 0.013 | -| 1440p Performance | M | 0.122 | 0.596 | 0.171 | 0.697 | 0.012 | - -What the steps cover in the harness (from the record): enc0 is Model L's input encoder, linears, encoder block and -gather, or Model M's input encoder; dec0 is Model L's decoder projection and decoder block, or Model M's `d1p12` -block with the decoder fused in; post is post, filter, `scale_rgb` and `color_divide`; Swin is the rest (for Model L -it includes its own dec1 block). The in-game timer cuts the network at its own points, so the step values in the two -tables are not directly comparable. Record: [`l-vs-m-shapes-main.json`](records/l-vs-m-shapes-main.json). +| 1080p Quality | 1.32 | 0.114 | 0.589 | 0.169 | 0.424 | 0.010 | +| 1440p Quality | 2.17 | 0.202 | 0.942 | 0.335 | 0.767 | 0.020 | +| 1440p Performance | 1.59 | 0.122 | 0.596 | 0.171 | 0.697 | 0.012 | + +Record: [`l-vs-m-shapes-main.json`](records/l-vs-m-shapes-main.json) (its Model L rows timed an earlier form of +Model L and are not shown). ## Building Model L diff --git a/clean/l/records/cp2077-model-l-timing-2026-11-16.json b/clean/l/records/cp2077-model-l-timing-2026-11-16.json new file mode 100644 index 00000000..6332def7 --- /dev/null +++ b/clean/l/records/cp2077-model-l-timing-2026-11-16.json @@ -0,0 +1,1374 @@ +{ + "timer": "the runtime's D3D12 timestamps in the game's command list (timing_log=1, timing_stages=1): each sample is one 'timing, last 300 dispatches' line = the mean over 300 frames; network_total = the model's GPU time per frame, from the start of its first kernel -> after its last kernel; frame_span_t3_t0 = the frame's full D3D12 span", + "statistics": "over the 300-frame windows of each run: median, p95, min, max of the window means; worst_frame_network_ms = the largest single frame in any window; spread_pct = (max - min) / median of the window means", + "what": "Model L in its release form (hybrid_full, the default on Direct3D 12 since 0.6.5) and Model M (control) in Cyberpunk 2077 in one sitting (Model M first, Model L about 15 minutes later): the same settings, save and spot, one game start each", + "game": "Cyberpunk 2077 (Steam), Quality mode (the game sends 1280x720), output 1920x1080, borderless, ray tracing as the save had it, path tracing off, frame generation off, Ray Reconstruction off", + "scene": "gameplay, standing still: the street spot under the overpass (the same save and spot as cp2077-model-l-timing-2026-11-14.json and clean/k/records/cp2077-model-k-timing-2026-11-15.json)", + "render": [ + 1280, + 720 + ], + "output": [ + 1920, + 1080 + ], + "mode": "1080p Quality", + "executor": "dx12 (native D3D12, the game device); the AMD HIP runtime not loaded in the game process", + "options": "executor=dx12;timing_log=1;timing_stages=1 (no other diagnostic option; no form option: Model L runs its default form). The model that runs is the game's model choice record: Model L set with the launcher's `set model=L` (the launcher run for that one command with its data folder pointed at a copy of the same converted Model L file); Model M from the record the launcher's update created. wronggpu.ini's model item (model=L in both sessions) is only the install default and was overridden by the record, as designed", + "gpu": "AMD Radeon RX 9070 XT", + "gpu_driver": "32.0.32015.7029", + "build": "main 25429c5b, built in the release configuration (Model M, Model L and Model K in the runtime, front end and launcher)", + "model_digests": { + "L": "d3c040191ec7ab0164efc03ee76413277e7fb54e6e6d2b168f2c0202aa1ad806 (converted on the PC by the launcher; the same file as in the 2026-11-14 record)", + "M": "bfbd9dad238721fb51ed60e85ceb9789ddb3468c3538efb651d09f8ca820c350 (this PC's converted Model M; the same file as in the 2026-11-15 record)" + }, + "failed_dispatches": 0, + "stand_in_frames": "Model L session: 1 (frame 1 of the context, before the front end tracked the game's command list; about 2 minutes before the timed interval). Model M session: 0. None inside the timed intervals.", + "runs": { + "L": { + "model": "L", + "windows": 43, + "frames": 12900, + "network_total": { + "median_ms": 2.666, + "p95_ms": 2.673, + "min_ms": 2.656, + "max_ms": 2.677 + }, + "frame_span_t3_t0": { + "median_ms": 2.677, + "p95_ms": 2.684, + "min_ms": 2.667, + "max_ms": 2.688 + }, + "parts_median_ms": { + "enc0": 0.528, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.565 + }, + "worst_frame_network_ms": 2.745, + "spread_pct": 0.79, + "window_list": [ + { + "end": "07:47:50", + "network_gpu": 2.661, + "worst_frame_network": 2.738, + "parts": { + "enc0": 0.527, + "Swin": 1.095, + "dec0": 0.475, + "post": 0.564 + }, + "frames": 300, + "total_t3_t0": 2.672, + "worst_frame_total": 2.749 + }, + { + "end": "07:47:53", + "network_gpu": 2.664, + "worst_frame_network": 2.726, + "parts": { + "enc0": 0.528, + "Swin": 1.095, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.675, + "worst_frame_total": 2.738 + }, + { + "end": "07:47:56", + "network_gpu": 2.663, + "worst_frame_network": 2.723, + "parts": { + "enc0": 0.528, + "Swin": 1.095, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.674, + "worst_frame_total": 2.735 + }, + { + "end": "07:47:59", + "network_gpu": 2.665, + "worst_frame_network": 2.736, + "parts": { + "enc0": 0.528, + "Swin": 1.096, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.676, + "worst_frame_total": 2.747 + }, + { + "end": "07:48:02", + "network_gpu": 2.667, + "worst_frame_network": 2.733, + "parts": { + "enc0": 0.528, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.678, + "worst_frame_total": 2.744 + }, + { + "end": "07:48:05", + "network_gpu": 2.666, + "worst_frame_network": 2.736, + "parts": { + "enc0": 0.528, + "Swin": 1.096, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.677, + "worst_frame_total": 2.747 + }, + { + "end": "07:48:08", + "network_gpu": 2.666, + "worst_frame_network": 2.726, + "parts": { + "enc0": 0.528, + "Swin": 1.096, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.677, + "worst_frame_total": 2.737 + }, + { + "end": "07:48:11", + "network_gpu": 2.665, + "worst_frame_network": 2.721, + "parts": { + "enc0": 0.529, + "Swin": 1.095, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.676, + "worst_frame_total": 2.732 + }, + { + "end": "07:48:15", + "network_gpu": 2.656, + "worst_frame_network": 2.703, + "parts": { + "enc0": 0.528, + "Swin": 1.092, + "dec0": 0.474, + "post": 0.562 + }, + "frames": 300, + "total_t3_t0": 2.667, + "worst_frame_total": 2.715 + }, + { + "end": "07:48:18", + "network_gpu": 2.657, + "worst_frame_network": 2.71, + "parts": { + "enc0": 0.527, + "Swin": 1.092, + "dec0": 0.474, + "post": 0.563 + }, + "frames": 300, + "total_t3_t0": 2.668, + "worst_frame_total": 2.721 + }, + { + "end": "07:48:21", + "network_gpu": 2.659, + "worst_frame_network": 2.729, + "parts": { + "enc0": 0.527, + "Swin": 1.094, + "dec0": 0.474, + "post": 0.563 + }, + "frames": 300, + "total_t3_t0": 2.669, + "worst_frame_total": 2.74 + }, + { + "end": "07:48:24", + "network_gpu": 2.661, + "worst_frame_network": 2.717, + "parts": { + "enc0": 0.527, + "Swin": 1.096, + "dec0": 0.475, + "post": 0.563 + }, + "frames": 300, + "total_t3_t0": 2.672, + "worst_frame_total": 2.728 + }, + { + "end": "07:48:27", + "network_gpu": 2.664, + "worst_frame_network": 2.727, + "parts": { + "enc0": 0.528, + "Swin": 1.096, + "dec0": 0.475, + "post": 0.564 + }, + "frames": 300, + "total_t3_t0": 2.675, + "worst_frame_total": 2.738 + }, + { + "end": "07:48:30", + "network_gpu": 2.663, + "worst_frame_network": 2.732, + "parts": { + "enc0": 0.527, + "Swin": 1.096, + "dec0": 0.475, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.674, + "worst_frame_total": 2.744 + }, + { + "end": "07:48:33", + "network_gpu": 2.667, + "worst_frame_network": 2.745, + "parts": { + "enc0": 0.528, + "Swin": 1.098, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.678, + "worst_frame_total": 2.756 + }, + { + "end": "07:48:36", + "network_gpu": 2.665, + "worst_frame_network": 2.723, + "parts": { + "enc0": 0.528, + "Swin": 1.096, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.676, + "worst_frame_total": 2.734 + }, + { + "end": "07:48:39", + "network_gpu": 2.667, + "worst_frame_network": 2.73, + "parts": { + "enc0": 0.528, + "Swin": 1.098, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.678, + "worst_frame_total": 2.741 + }, + { + "end": "07:48:42", + "network_gpu": 2.668, + "worst_frame_network": 2.715, + "parts": { + "enc0": 0.528, + "Swin": 1.099, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.679, + "worst_frame_total": 2.726 + }, + { + "end": "07:48:45", + "network_gpu": 2.673, + "worst_frame_network": 2.732, + "parts": { + "enc0": 0.528, + "Swin": 1.102, + "dec0": 0.477, + "post": 0.567 + }, + "frames": 300, + "total_t3_t0": 2.684, + "worst_frame_total": 2.743 + }, + { + "end": "07:48:48", + "network_gpu": 2.67, + "worst_frame_network": 2.714, + "parts": { + "enc0": 0.528, + "Swin": 1.1, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.681, + "worst_frame_total": 2.725 + }, + { + "end": "07:48:51", + "network_gpu": 2.669, + "worst_frame_network": 2.723, + "parts": { + "enc0": 0.528, + "Swin": 1.099, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.68, + "worst_frame_total": 2.735 + }, + { + "end": "07:48:54", + "network_gpu": 2.667, + "worst_frame_network": 2.729, + "parts": { + "enc0": 0.528, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.678, + "worst_frame_total": 2.739 + }, + { + "end": "07:48:57", + "network_gpu": 2.666, + "worst_frame_network": 2.709, + "parts": { + "enc0": 0.528, + "Swin": 1.096, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.677, + "worst_frame_total": 2.72 + }, + { + "end": "07:49:00", + "network_gpu": 2.667, + "worst_frame_network": 2.726, + "parts": { + "enc0": 0.529, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.678, + "worst_frame_total": 2.736 + }, + { + "end": "07:49:03", + "network_gpu": 2.669, + "worst_frame_network": 2.713, + "parts": { + "enc0": 0.529, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.567 + }, + "frames": 300, + "total_t3_t0": 2.68, + "worst_frame_total": 2.723 + }, + { + "end": "07:49:07", + "network_gpu": 2.668, + "worst_frame_network": 2.717, + "parts": { + "enc0": 0.529, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.679, + "worst_frame_total": 2.728 + }, + { + "end": "07:49:10", + "network_gpu": 2.667, + "worst_frame_network": 2.723, + "parts": { + "enc0": 0.529, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.678, + "worst_frame_total": 2.734 + }, + { + "end": "07:49:13", + "network_gpu": 2.669, + "worst_frame_network": 2.728, + "parts": { + "enc0": 0.529, + "Swin": 1.098, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.68, + "worst_frame_total": 2.739 + }, + { + "end": "07:49:16", + "network_gpu": 2.667, + "worst_frame_network": 2.723, + "parts": { + "enc0": 0.529, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.678, + "worst_frame_total": 2.734 + }, + { + "end": "07:49:19", + "network_gpu": 2.663, + "worst_frame_network": 2.724, + "parts": { + "enc0": 0.528, + "Swin": 1.096, + "dec0": 0.475, + "post": 0.564 + }, + "frames": 300, + "total_t3_t0": 2.674, + "worst_frame_total": 2.733 + }, + { + "end": "07:49:22", + "network_gpu": 2.662, + "worst_frame_network": 2.707, + "parts": { + "enc0": 0.529, + "Swin": 1.094, + "dec0": 0.475, + "post": 0.564 + }, + "frames": 300, + "total_t3_t0": 2.673, + "worst_frame_total": 2.718 + }, + { + "end": "07:49:25", + "network_gpu": 2.659, + "worst_frame_network": 2.717, + "parts": { + "enc0": 0.528, + "Swin": 1.093, + "dec0": 0.475, + "post": 0.563 + }, + "frames": 300, + "total_t3_t0": 2.669, + "worst_frame_total": 2.728 + }, + { + "end": "07:49:28", + "network_gpu": 2.664, + "worst_frame_network": 2.717, + "parts": { + "enc0": 0.529, + "Swin": 1.096, + "dec0": 0.475, + "post": 0.564 + }, + "frames": 300, + "total_t3_t0": 2.675, + "worst_frame_total": 2.728 + }, + { + "end": "07:49:31", + "network_gpu": 2.665, + "worst_frame_network": 2.73, + "parts": { + "enc0": 0.529, + "Swin": 1.095, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.676, + "worst_frame_total": 2.741 + }, + { + "end": "07:49:34", + "network_gpu": 2.669, + "worst_frame_network": 2.726, + "parts": { + "enc0": 0.529, + "Swin": 1.098, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.68, + "worst_frame_total": 2.737 + }, + { + "end": "07:49:37", + "network_gpu": 2.666, + "worst_frame_network": 2.721, + "parts": { + "enc0": 0.528, + "Swin": 1.097, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.677, + "worst_frame_total": 2.732 + }, + { + "end": "07:49:41", + "network_gpu": 2.665, + "worst_frame_network": 2.727, + "parts": { + "enc0": 0.529, + "Swin": 1.096, + "dec0": 0.475, + "post": 0.564 + }, + "frames": 300, + "total_t3_t0": 2.676, + "worst_frame_total": 2.738 + }, + { + "end": "07:49:44", + "network_gpu": 2.669, + "worst_frame_network": 2.72, + "parts": { + "enc0": 0.529, + "Swin": 1.099, + "dec0": 0.476, + "post": 0.565 + }, + "frames": 300, + "total_t3_t0": 2.68, + "worst_frame_total": 2.732 + }, + { + "end": "07:49:47", + "network_gpu": 2.673, + "worst_frame_network": 2.727, + "parts": { + "enc0": 0.529, + "Swin": 1.101, + "dec0": 0.477, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.684, + "worst_frame_total": 2.738 + }, + { + "end": "07:49:50", + "network_gpu": 2.671, + "worst_frame_network": 2.723, + "parts": { + "enc0": 0.529, + "Swin": 1.1, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.682, + "worst_frame_total": 2.734 + }, + { + "end": "07:49:53", + "network_gpu": 2.671, + "worst_frame_network": 2.729, + "parts": { + "enc0": 0.529, + "Swin": 1.1, + "dec0": 0.476, + "post": 0.566 + }, + "frames": 300, + "total_t3_t0": 2.682, + "worst_frame_total": 2.74 + }, + { + "end": "07:49:56", + "network_gpu": 2.675, + "worst_frame_network": 2.728, + "parts": { + "enc0": 0.53, + "Swin": 1.101, + "dec0": 0.477, + "post": 0.567 + }, + "frames": 300, + "total_t3_t0": 2.686, + "worst_frame_total": 2.74 + }, + { + "end": "07:49:59", + "network_gpu": 2.677, + "worst_frame_network": 2.731, + "parts": { + "enc0": 0.531, + "Swin": 1.102, + "dec0": 0.477, + "post": 0.568 + }, + "frames": 300, + "total_t3_t0": 2.688, + "worst_frame_total": 2.742 + } + ], + "proof": "model choice record: Model L (the launcher); model data Model L; network kernels: Swin bottleneck hyb6 (the hybrid form), post_last=lc12/l_post_recon_p12, filter_last=l_post_filter_direct (Model L's own reconstruction)" + }, + "M": { + "model": "M", + "windows": 49, + "frames": 14700, + "network_total": { + "median_ms": 1.168, + "p95_ms": 1.171, + "min_ms": 1.161, + "max_ms": 1.18 + }, + "frame_span_t3_t0": { + "median_ms": 1.174, + "p95_ms": 1.177, + "min_ms": 1.167, + "max_ms": 1.186 + }, + "parts_median_ms": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "worst_frame_network_ms": 6.371, + "spread_pct": 1.63, + "window_list": [ + { + "end": "07:29:30", + "network_gpu": 1.169, + "worst_frame_network": 1.199, + "parts": { + "enc0": 0.11, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.205 + }, + { + "end": "07:29:32", + "network_gpu": 1.171, + "worst_frame_network": 1.216, + "parts": { + "enc0": 0.111, + "Swin": 0.584, + "dec0": 0.189, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.177, + "worst_frame_total": 1.221 + }, + { + "end": "07:29:35", + "network_gpu": 1.17, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.202 + }, + { + "end": "07:29:38", + "network_gpu": 1.167, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.11, + "Swin": 0.581, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.202 + }, + { + "end": "07:29:40", + "network_gpu": 1.166, + "worst_frame_network": 1.196, + "parts": { + "enc0": 0.11, + "Swin": 0.581, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.172, + "worst_frame_total": 1.202 + }, + { + "end": "07:29:43", + "network_gpu": 1.165, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.11, + "Swin": 0.58, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.171, + "worst_frame_total": 1.202 + }, + { + "end": "07:29:45", + "network_gpu": 1.169, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.289 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.202 + }, + { + "end": "07:29:48", + "network_gpu": 1.169, + "worst_frame_network": 1.197, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.203 + }, + { + "end": "07:29:51", + "network_gpu": 1.169, + "worst_frame_network": 1.197, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.204 + }, + { + "end": "07:29:53", + "network_gpu": 1.17, + "worst_frame_network": 1.203, + "parts": { + "enc0": 0.111, + "Swin": 0.584, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.177, + "worst_frame_total": 1.209 + }, + { + "end": "07:29:56", + "network_gpu": 1.169, + "worst_frame_network": 1.202, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.208 + }, + { + "end": "07:29:58", + "network_gpu": 1.17, + "worst_frame_network": 1.203, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.208 + }, + { + "end": "07:30:01", + "network_gpu": 1.166, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.111, + "Swin": 0.58, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.172, + "worst_frame_total": 1.201 + }, + { + "end": "07:30:04", + "network_gpu": 1.161, + "worst_frame_network": 1.188, + "parts": { + "enc0": 0.11, + "Swin": 0.578, + "dec0": 0.187, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.167, + "worst_frame_total": 1.194 + }, + { + "end": "07:30:07", + "network_gpu": 1.18, + "worst_frame_network": 6.371, + "parts": { + "enc0": 0.11, + "Swin": 0.596, + "dec0": 0.187, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.186, + "worst_frame_total": 6.378 + }, + { + "end": "07:30:09", + "network_gpu": 1.164, + "worst_frame_network": 1.189, + "parts": { + "enc0": 0.11, + "Swin": 0.58, + "dec0": 0.188, + "post": 0.286 + }, + "frames": 300, + "total_t3_t0": 1.17, + "worst_frame_total": 1.195 + }, + { + "end": "07:30:12", + "network_gpu": 1.165, + "worst_frame_network": 1.193, + "parts": { + "enc0": 0.111, + "Swin": 0.58, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.171, + "worst_frame_total": 1.199 + }, + { + "end": "07:30:14", + "network_gpu": 1.168, + "worst_frame_network": 1.191, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.198 + }, + { + "end": "07:30:17", + "network_gpu": 1.167, + "worst_frame_network": 1.192, + "parts": { + "enc0": 0.111, + "Swin": 0.581, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.173, + "worst_frame_total": 1.198 + }, + { + "end": "07:30:20", + "network_gpu": 1.168, + "worst_frame_network": 1.206, + "parts": { + "enc0": 0.111, + "Swin": 0.581, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.213 + }, + { + "end": "07:30:22", + "network_gpu": 1.168, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.201 + }, + { + "end": "07:30:25", + "network_gpu": 1.167, + "worst_frame_network": 1.191, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.173, + "worst_frame_total": 1.198 + }, + { + "end": "07:30:27", + "network_gpu": 1.168, + "worst_frame_network": 1.196, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.202 + }, + { + "end": "07:30:30", + "network_gpu": 1.168, + "worst_frame_network": 1.194, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.2 + }, + { + "end": "07:30:32", + "network_gpu": 1.17, + "worst_frame_network": 1.194, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.201 + }, + { + "end": "07:30:35", + "network_gpu": 1.169, + "worst_frame_network": 1.198, + "parts": { + "enc0": 0.11, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.204 + }, + { + "end": "07:30:38", + "network_gpu": 1.168, + "worst_frame_network": 1.193, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.199 + }, + { + "end": "07:30:40", + "network_gpu": 1.168, + "worst_frame_network": 1.193, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.2 + }, + { + "end": "07:30:43", + "network_gpu": 1.167, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.111, + "Swin": 0.581, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.173, + "worst_frame_total": 1.201 + }, + { + "end": "07:30:45", + "network_gpu": 1.168, + "worst_frame_network": 1.193, + "parts": { + "enc0": 0.111, + "Swin": 0.581, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.2 + }, + { + "end": "07:30:48", + "network_gpu": 1.168, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.201 + }, + { + "end": "07:30:51", + "network_gpu": 1.167, + "worst_frame_network": 1.191, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.286 + }, + "frames": 300, + "total_t3_t0": 1.173, + "worst_frame_total": 1.198 + }, + { + "end": "07:30:53", + "network_gpu": 1.168, + "worst_frame_network": 1.189, + "parts": { + "enc0": 0.11, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.196 + }, + { + "end": "07:30:56", + "network_gpu": 1.168, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.111, + "Swin": 0.581, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.202 + }, + { + "end": "07:30:59", + "network_gpu": 1.168, + "worst_frame_network": 1.191, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.197 + }, + { + "end": "07:31:01", + "network_gpu": 1.168, + "worst_frame_network": 1.195, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.201 + }, + { + "end": "07:31:04", + "network_gpu": 1.165, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.111, + "Swin": 0.58, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.172, + "worst_frame_total": 1.206 + }, + { + "end": "07:31:07", + "network_gpu": 1.164, + "worst_frame_network": 1.194, + "parts": { + "enc0": 0.111, + "Swin": 0.579, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.17, + "worst_frame_total": 1.201 + }, + { + "end": "07:31:09", + "network_gpu": 1.166, + "worst_frame_network": 1.194, + "parts": { + "enc0": 0.111, + "Swin": 0.58, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.172, + "worst_frame_total": 1.201 + }, + { + "end": "07:31:12", + "network_gpu": 1.169, + "worst_frame_network": 1.197, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.203 + }, + { + "end": "07:31:14", + "network_gpu": 1.17, + "worst_frame_network": 1.196, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.202 + }, + { + "end": "07:31:17", + "network_gpu": 1.17, + "worst_frame_network": 1.2, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.206 + }, + { + "end": "07:31:20", + "network_gpu": 1.169, + "worst_frame_network": 1.206, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.212 + }, + { + "end": "07:31:22", + "network_gpu": 1.17, + "worst_frame_network": 1.196, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.203 + }, + { + "end": "07:31:25", + "network_gpu": 1.171, + "worst_frame_network": 1.199, + "parts": { + "enc0": 0.111, + "Swin": 0.584, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.177, + "worst_frame_total": 1.206 + }, + { + "end": "07:31:27", + "network_gpu": 1.169, + "worst_frame_network": 1.199, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.175, + "worst_frame_total": 1.205 + }, + { + "end": "07:31:30", + "network_gpu": 1.168, + "worst_frame_network": 1.19, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.197 + }, + { + "end": "07:31:32", + "network_gpu": 1.169, + "worst_frame_network": 1.192, + "parts": { + "enc0": 0.111, + "Swin": 0.583, + "dec0": 0.188, + "post": 0.288 + }, + "frames": 300, + "total_t3_t0": 1.176, + "worst_frame_total": 1.198 + }, + { + "end": "07:31:35", + "network_gpu": 1.168, + "worst_frame_network": 1.196, + "parts": { + "enc0": 0.111, + "Swin": 0.582, + "dec0": 0.188, + "post": 0.287 + }, + "frames": 300, + "total_t3_t0": 1.174, + "worst_frame_total": 1.203 + } + ], + "proof": "model choice record: Model M; network kernels post_last=post_tf_f32_p12_diet_vsit_direct (Model M's fused post)" + } + }, + "note": "Model M here (1.168 ms) is 0.5 % below the Model M figure of the 2026-11-14 and 2026-11-15 records (1.174 ms) in the same scene. Model L's release form (hybrid_full) replaces the form timed on 2026-11-14 (2.250 ms)." +} diff --git a/clean/rr_f/proxy/binding/rr-f-2.14.json b/clean/rr_f/proxy/binding/rr-f-2.14.json index 0ba54371..99dac090 100644 --- a/clean/rr_f/proxy/binding/rr-f-2.14.json +++ b/clean/rr_f/proxy/binding/rr-f-2.14.json @@ -18,7 +18,7 @@ "release_version": [ 0, 6, - 0 + 5 ], "roles": { "init": "slInit", diff --git a/clean/rr_f/proxy/binding/rr-f-2.7.json b/clean/rr_f/proxy/binding/rr-f-2.7.json index dce8d63f..20081fd6 100644 --- a/clean/rr_f/proxy/binding/rr-f-2.7.json +++ b/clean/rr_f/proxy/binding/rr-f-2.7.json @@ -18,7 +18,7 @@ "release_version": [ 0, 6, - 0 + 5 ], "roles": { "init": "slInit", diff --git a/clean/rr_f/proxy/binding/rr-f-2.8.json b/clean/rr_f/proxy/binding/rr-f-2.8.json index 4b198318..10209f7c 100644 --- a/clean/rr_f/proxy/binding/rr-f-2.8.json +++ b/clean/rr_f/proxy/binding/rr-f-2.8.json @@ -23,7 +23,7 @@ "release_version": [ 0, 6, - 0 + 5 ], "roles": { "init": "slInit", diff --git a/clean/rr_f/proxy/tests/test_gen_forwarding.py b/clean/rr_f/proxy/tests/test_gen_forwarding.py index 688ef069..b8813d08 100644 --- a/clean/rr_f/proxy/tests/test_gen_forwarding.py +++ b/clean/rr_f/proxy/tests/test_gen_forwarding.py @@ -400,8 +400,8 @@ def test_probe_generation(self): str(nr["own_ordinal"])) def test_hook_generation(self): - for b, minor, release_rc, iface_fv in ((self.b7, 7, "0.6.0.0", "2.7.1.0"), - (self.b14, 14, "0.6.0.0", "2.14.1.0")): + for b, minor, release_rc, iface_fv in ((self.b7, 7, "0.6.5.0", "2.7.1.0"), + (self.b14, 14, "0.6.5.0", "2.14.1.0")): for probe in (False, True): with tempfile.TemporaryDirectory() as d: nn = gf.generate_from(b, os.path.join(d, "out"), probe=probe, hook=True) diff --git a/clean/rr_f/proxy/tools/build.py b/clean/rr_f/proxy/tools/build.py index c0ddf16d..34899fac 100644 --- a/clean/rr_f/proxy/tools/build.py +++ b/clean/rr_f/proxy/tools/build.py @@ -3,6 +3,9 @@ python clean/rr_f/proxy/tools/build.py [--out DIR] [--binding FILE [--probe] [--hook]] [--no-tests] [--proxy-name NAME|interposer] [--probe-name NAME|interposer] + [--release-version x.y.z] +--release-version (since 0.6.5): the release script's one version for the hook plugin (its VERSIONINFO and the version its +core reports) in place of the tables' release_version. Default: builds, per Streamline version, the file-replacement proxy (release + probe), and ONE hook-mode ASI plugin (release + probe, HOOK-MODE.md; release 0.6.0: built from the 2.14.1 table, it picks its route from the game @@ -43,6 +46,7 @@ VSDEVCMD = os.environ.get("VSDEVCMD", r"C:\Program Files\Microsoft Visual Studio\18\Community\Common7\Tools\VsDevCmd.bat") DEFAULT_OUT = os.environ.get("WG_RR_PROXY_BUILD", os.path.join(os.environ.get("WG_BUILD_ROOT", os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))), "build")), "rr-f-proxy", "out")) +RELEASE_VERSION = None # since 0.6.5: --release-version x.y.z (the release script's one version) for the hook plugin CORE = ["proxy_core.cpp", "settings.cpp", "formats.cpp", "optimal.cpp", "answers.cpp"] PROBE = ["probe.cpp", "probe_log.cpp", "probe_gpu_d3d12.cpp"] # probe build only SHADERS = (("WG_PROBE_UPSCALE", "kProbeUpscaleCs", "probe_upscale_cs.h"), @@ -225,7 +229,7 @@ def build_hook(binding, out, probe, name): """Build the hook-mode ASI plugin (src/hook_dll.cpp; HOOK-MODE.md): the proxy core, settings and (probe) the probe, with the transport that patches the game interface's import tables. No forwarding stubs.""" gen = os.path.join(out, "gen") - n = gf.generate(binding, gen, probe, name, hook=True) + n = gf.generate(binding, gen, probe, name, hook=True, release_version=RELEASE_VERSION) obj = os.path.join(out, "obj") os.makedirs(obj, exist_ok=True) if probe: @@ -494,8 +498,16 @@ def main(): ap.add_argument("--no-tests", action="store_true") ap.add_argument("--proxy-name", help="file name of the built release proxy, or 'interposer'") ap.add_argument("--probe-name", help="file name of the built probe proxy, or 'interposer'") + ap.add_argument("--release-version", help="x.y.z: the release script's one version for the hook plugin (its VERSIONINFO " + "and the version its core reports) in place of the tables' release_version") a = ap.parse_args() a.out = os.path.abspath(a.out) # the compiles run inside the output folder + global RELEASE_VERSION + if a.release_version: + parts = a.release_version.split(".") + if len(parts) != 3 or not all(p.isdigit() for p in parts): + raise SystemExit(f"--release-version must be x.y.z, got {a.release_version!r}") + RELEASE_VERSION = [int(p) for p in parts] os.makedirs(a.out, exist_ok=True) if a.binding: try: diff --git a/clean/rr_f/proxy/tools/gen_forwarding.py b/clean/rr_f/proxy/tools/gen_forwarding.py index b7c846e7..29f62812 100644 --- a/clean/rr_f/proxy/tools/gen_forwarding.py +++ b/clean/rr_f/proxy/tools/gen_forwarding.py @@ -512,8 +512,12 @@ def generate_from(b, out_dir, digests=None, source="(in memory)", probe=False, o return n -def generate(binding_path, out_dir, probe=False, output_name=None, hook=False): +def generate(binding_path, out_dir, probe=False, output_name=None, hook=False, release_version=None): + """release_version (since 0.6.5): [x, y, z] from the release script's one version, in place of the table's + release_version (the hook plugin's VERSIONINFO and the version its core reports); None: the table's.""" b, digests = load(binding_path) + if release_version is not None: + b = dict(b, release_version=[int(x) for x in release_version]) return generate_from(b, out_dir, digests, os.path.basename(binding_path), probe, output_name, hook) diff --git a/clean/rr_f/runtime/src/rr_runtime.cpp b/clean/rr_f/runtime/src/rr_runtime.cpp index 497bcc7f..12b6fcd9 100644 --- a/clean/rr_f/runtime/src/rr_runtime.cpp +++ b/clean/rr_f/runtime/src/rr_runtime.cpp @@ -66,7 +66,7 @@ #ifndef WG_RR_RUNTIME_VERSION0 #define WG_RR_RUNTIME_VERSION0 0 #define WG_RR_RUNTIME_VERSION1 6 -#define WG_RR_RUNTIME_VERSION2 0 +#define WG_RR_RUNTIME_VERSION2 5 #endif namespace wgrr_rt {