mirror of
https://git.triforceproject.com/triforce/source
synced 2026-11-19 16:20:01 -04:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb26495475 | ||
|
|
a750a21025 | ||
|
|
72793f2231 | ||
|
|
6f338c8f56 | ||
|
|
93eeb714c2 | ||
|
|
183b05d8c4 | ||
|
|
b2ca6a6bb6 | ||
|
|
23a743a977 | ||
|
|
40aa5f5595 | ||
|
|
aff80bd56f | ||
|
|
a02bcb21a9 | ||
|
|
2f1e350320 | ||
|
|
20c9e9f141 | ||
|
|
e33a732651 | ||
|
|
83b5be58d6 |
19
.github/workflows/linux-appimage.yml
vendored
19
.github/workflows/linux-appimage.yml
vendored
@@ -9,6 +9,13 @@ on:
|
||||
tags: ['*']
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
# (a build that replaces a release's Linux file names that release: a game built from it compares its version with
|
||||
# the latest release's tag by name (host/hos_update.c), and git describe's v0.3.6-1-g... would be told of v0.3.6)
|
||||
version:
|
||||
description: "The version the AppImage names itself (empty: git describe's)"
|
||||
required: false
|
||||
default: ''
|
||||
permissions:
|
||||
contents: read
|
||||
concurrency:
|
||||
@@ -95,23 +102,25 @@ jobs:
|
||||
ls -la work work/image
|
||||
|
||||
- name: AppImage
|
||||
env:
|
||||
HOOKSHOT_VERSION: ${{ inputs.version }} # (empty but for a started run that names one: appimage.sh asks git then)
|
||||
run: scripts/linux/appimage.sh
|
||||
|
||||
# (AMD FSR 4's Linux side, a build option the AppImage leaves off (gpu/vk/vk_fsr4.cpp: dlopen, the older backend
|
||||
# description, the unit exposure; the descriptor buffers in vk_main.cpp): built once more in a copy of the back end's
|
||||
# work folder, where only vk_fsr4.cpp compiles again. The AppImage above is not changed)
|
||||
- name: hookshot_vk.so with AMD FSR 4 (build check)
|
||||
- name: triforce_vk.so with AMD FSR 4 (build check)
|
||||
shell: bash # (this container's default is sh, which has no PIPESTATUS)
|
||||
run: |
|
||||
cp -r build-linux/vk-work "$RUNNER_TEMP/vk-fsr"
|
||||
rm -f "$RUNNER_TEMP/vk-fsr/sa/build/hookshot_vk.so" # (the AppImage's own, without FSR: the test below is this build's)
|
||||
rm -f "$RUNNER_TEMP/vk-fsr/sa/build/triforce_vk.so" # (the AppImage's own, without FSR: the test below is this build's)
|
||||
D="$PWD/build-linux/deps"
|
||||
OOT_WORK="$RUNNER_TEMP/vk-fsr" EMSDK="$D/emsdk" RX_CPM="$D/cpm" RX_MARCH=x86-64-v3 RX_VK_ONLY=1 RX_RELEASE=1 HOOKSHOT_FSR=1 \
|
||||
"$D/python/bin/python3" -I nx2/build.py --standalone --jobs "$(nproc)" |
|
||||
tee "$RUNNER_TEMP/vk-fsr.log"
|
||||
test "${PIPESTATUS[0]}" -eq 0
|
||||
grep -q "with AMD FSR 4" "$RUNNER_TEMP/vk-fsr.log"
|
||||
test -f "$RUNNER_TEMP/vk-fsr/sa/build/hookshot_vk.so"
|
||||
test -f "$RUNNER_TEMP/vk-fsr/sa/build/triforce_vk.so"
|
||||
|
||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||
with:
|
||||
@@ -135,7 +144,7 @@ jobs:
|
||||
|
||||
release:
|
||||
name: Release asset
|
||||
if: startsWith(github.ref, 'refs/tags/') && github.ref_name != 'builder-parts' && github.ref_name != 'linux-parts'
|
||||
if: startsWith(github.ref, 'refs/tags/') && github.ref_name != 'builder-parts' && github.ref_name != 'linux-parts' && vars.CI_RELEASE_LINUX == 'true'
|
||||
needs: appimage
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 15
|
||||
@@ -163,4 +172,4 @@ jobs:
|
||||
# (the release made here or by the Windows builder workflow, whichever is first; a -rc tag is a prerelease and
|
||||
# never "latest")
|
||||
- name: AppImage to the release
|
||||
run: scripts/release_upload.sh "$GITHUB_REF_NAME" dist/*.AppImage dist/parts/hookshot-linux.txt
|
||||
run: scripts/release_upload.sh "$GITHUB_REF_NAME" dist/*.AppImage dist/parts/triforce-linux.txt
|
||||
|
||||
8
.github/workflows/vulkan-dlss.yml
vendored
8
.github/workflows/vulkan-dlss.yml
vendored
@@ -1,5 +1,5 @@
|
||||
# NVIDIA DLSS is a local build's option: NVIDIA's SDK is never part of Hookshot or its downloads. This only checks that
|
||||
# hookshot_vk.dll still compiles and links with it, through llvm-mingw as players build it. It runs by hand, and on a push or
|
||||
# triforce_vk.dll still compiles and links with it, through llvm-mingw as players build it. It runs by hand, and on a push or
|
||||
# pull request only when a file DLSS's build depends on changed (the paths below), not on every push. scripts/ngx_sdk.py
|
||||
# fetches the SDK at its pinned release, SHA-256 checked, without DLSS's runtime: NVIDIA's license is accepted for that run
|
||||
# alone (--accept-nvidia-license), and nothing of it is uploaded or cached.
|
||||
@@ -104,7 +104,7 @@ jobs:
|
||||
run: echo "HOOKSHOT_MINGW=$(python -I scripts/release_parts.py llvm-mingw "$RUNNER_TEMP/llvm")" >> "$GITHUB_ENV"
|
||||
- name: NVIDIA's DLSS SDK (headers and nvsdk_ngx_s.lib)
|
||||
run: python -I scripts/ngx_sdk.py --platform windows --build-only --accept-nvidia-license "$RUNNER_TEMP/ngx-sdk"
|
||||
- name: hookshot_vk.dll with NVIDIA DLSS and AMD FSR 4
|
||||
- name: triforce_vk.dll with NVIDIA DLSS and AMD FSR 4
|
||||
env:
|
||||
RX_VK_ONLY: '1'
|
||||
RX_RELEASE: '1'
|
||||
@@ -119,9 +119,9 @@ jobs:
|
||||
# is loaded by NGX at run time from the game folder's ngx folder, and its core, _nvngx.dll, from the driver's)
|
||||
- name: Imports
|
||||
run: |
|
||||
dll="$RUNNER_TEMP/vk-work/sa/build/hookshot_vk.dll"
|
||||
dll="$RUNNER_TEMP/vk-work/sa/build/triforce_vk.dll"
|
||||
"$HOOKSHOT_MINGW/bin/llvm-objdump" -p "$dll" | sed -n 's/^ *DLL Name: //p' | tr -d '\r' | sort -u | tee "$RUNNER_TEMP/imports.txt"
|
||||
if grep -viE '^(kernel32|user32|gdi32|advapi32)\.dll$|^api-ms-win-crt-[a-z0-9-]+\.dll$' "$RUNNER_TEMP/imports.txt"; then
|
||||
echo "::error::hookshot_vk.dll with NVIDIA DLSS imports a DLL that is not Windows' own (above)"
|
||||
echo "::error::triforce_vk.dll with NVIDIA DLSS imports a DLL that is not Windows' own (above)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
8
.github/workflows/windows-builder.yml
vendored
8
.github/workflows/windows-builder.yml
vendored
@@ -185,18 +185,18 @@ jobs:
|
||||
- name: llvm-mingw
|
||||
run: echo "HOOKSHOT_MINGW=$(python -I scripts/release_parts.py llvm-mingw "$RUNNER_TEMP/llvm")" >> "$GITHUB_ENV"
|
||||
# (as scripts/linux/appimage.sh builds Linux's: the back end alone, no lift, no game)
|
||||
- name: hookshot_vk.dll
|
||||
- name: triforce_vk.dll
|
||||
env:
|
||||
RX_VK_ONLY: '1'
|
||||
RX_RELEASE: '1'
|
||||
run: |
|
||||
OOT_WORK="$RUNNER_TEMP/vk-work" RX_CPM="$GITHUB_WORKSPACE/_deps/cpm" \
|
||||
python -I nx2/build.py --standalone --jobs "$NUMBER_OF_PROCESSORS"
|
||||
ls -l "$RUNNER_TEMP/vk-work/sa/build/hookshot_vk.dll"
|
||||
ls -l "$RUNNER_TEMP/vk-work/sa/build/triforce_vk.dll"
|
||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||
with:
|
||||
name: hookshot_vk-windows
|
||||
path: ${{ runner.temp }}/vk-work/sa/build/hookshot_vk.dll
|
||||
name: triforce_vk-windows
|
||||
path: ${{ runner.temp }}/vk-work/sa/build/triforce_vk.dll
|
||||
if-no-files-found: error
|
||||
|
||||
release:
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -38,6 +38,9 @@ build-linux/
|
||||
# ---- NVIDIA's DLSS SDK (scripts/ngx_sdk.py): NVIDIA's files, never committed ----
|
||||
ngx-sdk/
|
||||
|
||||
# ---- RenoDX's shaders compiled (scripts/renodx_shaders.py): worked from the game's own shaders, never committed ----
|
||||
renodx_spv.h
|
||||
|
||||
# Triforce Setup's build output (setup\build.ps1, setup\pack_tools.ps1)
|
||||
setup/out/
|
||||
build1.done
|
||||
|
||||
103
CONTRIBUTING.md
103
CONTRIBUTING.md
@@ -37,18 +37,25 @@ Open an [issue](https://github.com/ruckus7382sfgsgdf/CBeta0.2/issues) and includ
|
||||
- **a game problem:** `triforce_log.txt` from your game folder (the folder with `Triforce.exe`). If you started the
|
||||
game again after the problem, send `triforce_log.1.txt` too: each start keeps the four runs before it as
|
||||
`triforce_log.1.txt` (the last) to `triforce_log.4.txt`.
|
||||
- **a Setup or build problem:** `setup.log` from `%LOCALAPPDATA%\Programs\Triforce`, and for a failed build the text
|
||||
from **Show details** on the build page.
|
||||
- **a freeze:** `triforce_hang.txt` from the game folder as well, when it is there. After 20 seconds without a frame
|
||||
the game writes down where each of its threads was (addresses in the program, no game data).
|
||||
- **something seen in play:** press **F8** when you see it, and send the folder it names (`captures\<date>-<time>`
|
||||
in the game folder): a picture of the frame, the end of the log, your settings and your save, with no game file
|
||||
among them. The System tab's **Export save for a bug report** makes one zip of the save and the logs instead.
|
||||
- **a Setup or build problem:** `setup.log` from `%LOCALAPPDATA%\Programs\Triforce`. For a build that stopped, press
|
||||
**Copy report** on the build page and paste it: the Setup and tools versions, what the build was started with,
|
||||
the last 200 lines of **Show details** and of `setup.log`, with your user folder written as `%USERPROFILE%` so
|
||||
your name is not in it.
|
||||
|
||||
Before you report:
|
||||
|
||||
- Try the [newest release](https://github.com/ruckus7382sfgsgdf/CBeta0.2/releases) first.
|
||||
- Try the [newest release](https://triforceproject.com) first.
|
||||
- Search the open issues; if yours is there, add your details to it.
|
||||
- For graphics or performance problems, test without ReShade, overlays, shader-cache tools and frame-generation
|
||||
injectors: they change what Triforce does.
|
||||
- If graphics look wrong after an update, clearing the shader caches often helps: close the game and delete
|
||||
`triforce_programs.bin`, `triforce_programs.idx`, `triforce_pipelines.bin`, `triforce_pipeline_states.bin`,
|
||||
`triforce_computes.bin`, `mkw_vk_pipelines.bin` and `triforce_prepared.bin` from the game folder (never
|
||||
`triforce_computes.bin`, `mkw_vk_pipelines.bin`, `mkw_vk_pipelines_play.bin` and `triforce_prepared.bin` from the game folder (never
|
||||
`triforce_shaders.bin`). The next start prepares them again.
|
||||
|
||||
One topic per issue or pull request, in English, please.
|
||||
@@ -70,7 +77,7 @@ versions do not work, and the build reads your files where they are without chan
|
||||
free and takes around 40 minutes; a run uses about 10 GB of RAM. Build on an SSD if you can.
|
||||
|
||||
The easy way to get every tool a build needs is **Triforce Setup** from the
|
||||
[releases](https://github.com/ruckus7382sfgsgdf/CBeta0.2/releases): it installs the tools (Python with its packages,
|
||||
[releases](https://triforceproject.com): it installs the tools (Python with its packages,
|
||||
llvm-mingw, the Vulkan headers, FFmpeg, SDL2) into `%LOCALAPPDATA%\Programs\Triforce\tools`.
|
||||
|
||||
To build from a clone instead:
|
||||
@@ -90,7 +97,70 @@ To build from a clone instead:
|
||||
The launcher lives in `setup/`: a .NET Framework 4.8 WPF app, built with `powershell -File setup\build.ps1` (needs the
|
||||
C# compiler from Visual Studio Build Tools). `setup\pack_tools.ps1` packs the tools zip a release carries. Never run a
|
||||
development build's install, update or uninstall without `TRIFORCE_TEST_ROOT` set to a scratch folder: it would act
|
||||
on your real install.
|
||||
on your real install. With it the install, the settings (a text file in place of the registry), the shortcuts, the
|
||||
game folders and the build's work folder (`<root>\build`) all stay inside that folder. The network is not part of
|
||||
that: such a run still asks the release site and downloads, unless `TRIFORCE_RELEASE_API` names another address.
|
||||
|
||||
What keeps a run of Setup from damaging an install is in `setup/Guard.cs`, written without the window so that
|
||||
`tests/test_setup_*.py` compile it alone (with the same C# compiler) and run it, no Setup started:
|
||||
|
||||
- **One Setup at a time for an install.** The first one holds a lock named after the folder it works in (and, in a
|
||||
test run, after `TRIFORCE_TEST_ROOT`, so a test never meets the real install's Setup). A second start brings the
|
||||
first one's window to the front and ends; an uninstall is refused while Setup is open.
|
||||
- **Room on the disk, asked first.** Before the tools are downloaded Setup asks the disk for room for the zip and for
|
||||
what it unpacks to (five times the zip's size, until the zip is there and says it exactly before its first file is
|
||||
unpacked), and stops with both numbers, what it takes and what is free, when there is none. With less than 60 GB on
|
||||
the game folder's disk the Build button says so in the same way and still lets the player go on. An update of a game
|
||||
folder is not asked about: what it takes depends on what changed.
|
||||
- **Downloads that go on, and are checked.** A file is fetched into `<file>.part`. One that was cut off (the
|
||||
connection, Cancel, Setup closed) is gone on from at the next try with a Range request, but only as a part of the
|
||||
same file: `<file>.part.of` names the address and size it was begun for and the server's ETag (else its date) for
|
||||
it, which goes back as If-Range; anything else is fetched anew. A server that sends nothing for 60 seconds is given
|
||||
up. The file gets its name only once it has the size the release lists, which the server must not contradict. A
|
||||
tools zip that is there whole is not fetched again; one that does not unpack is.
|
||||
- **Copy report**, beside Show details after a build that stopped (not one the player cancelled): what Setup knows of
|
||||
the build and the last 200 lines of its details and of `setup.log` go to the clipboard, with the account's folder
|
||||
(in either slash, doubled backslashes, any case, and its short name) replaced by `%USERPROFILE%`. A name in a path
|
||||
outside that folder stays.
|
||||
- **Its own update, undone when the new Setup does not start.** The new exe takes the running one's name, the running
|
||||
one goes on as `TriforceSetup.old.exe` and starts the new one with `--relaunched`. No second program watches: the
|
||||
old Setup itself stays, out of sight, until the new one's window is up (a named event), 30 seconds at most. A new
|
||||
Setup that cannot be started, or that ends with an error's exit code before that, is replaced by the old exe again in
|
||||
one rename; the old window comes back and says so, and that release's Setup is not fetched again on this PC
|
||||
(`SetupSkip` in `HKCU\Software\Triforce`; the tools still are). One that runs on without the sign, or ends without
|
||||
an error, is left alone.
|
||||
|
||||
Three more parts are written the same way, each a file without the window and a test that runs it on folders of
|
||||
its own:
|
||||
|
||||
- **The Mods page** (`setup/Mods.cs`, `tests/test_setup_mods.py`; the page is `Shell.Mods.cs`). It keeps no list:
|
||||
the mods folder is read as `host/mods.c` reads it, and every change is one a player could make by hand. On and off
|
||||
is the `-` in front of a folder's name; the order is a number in front (`01-`, two or three digits and a hyphen),
|
||||
kept apart from the mod's own name, and moving a mod numbers the folders of the mods folder anew, all of them or
|
||||
none; a removed mod moves into `mods\.removed`; an archive is unpacked into `mods\.adding-<id>` (a name with a
|
||||
dot in front is not looked at by the game), checked as it lies there (no path out of the folder, no link, no
|
||||
device's name, a bound on size and count), and only its mod folder moves into place. `.zip` is read with .NET,
|
||||
`.7z` and `.rar` with the `tar.exe` in System32 and nothing else: do not add an unpacker to the repository. Every
|
||||
write goes through one question, "is this inside the mods folder?", and no change is made while the game of that
|
||||
folder runs. Code patches (`exefs`) are built in: Setup keeps a mark of them at each build (`ModsBuilt` in
|
||||
`HKCU\Software\Triforce`) and says "Build again to apply" while the mods' mark is another one. Cheats are not in
|
||||
that mark: the game reads them when it starts.
|
||||
- **Add to Steam** (`setup/Steam.cs`, `tests/test_setup_steam.py`; the pictures are drawn in `SteamArt.cs`, the
|
||||
link is `Shell.Steam.cs`). Steam's `shortcuts.vdf` is another program's file: it is read whole, other shortcuts are
|
||||
copied through as bytes and never rebuilt, a file that does not read to its end is refused, the new file takes the
|
||||
old one's name in one rename, and the old one is kept (`.triforce-backup`, `.before-triforce`). Nothing is
|
||||
written while Steam runs, and only from the question the player answers. **No test and no test run may touch a
|
||||
real Steam folder:** Steam's folder is always handed in, tests author their own in a temporary folder, and with
|
||||
`TRIFORCE_TEST_ROOT` Setup looks only at `<root>\Steam` and never asks the registry.
|
||||
- **Sounds** (`setup/Sound.cs`, `tests/test_setup_sound.py`; where they play is `Shell.Sounds.cs`). Setup plays the
|
||||
game's own decide and cancel sounds, `Sound/Resource/Stream/SE_Sys_Do00.bwav` and `SE_Sys_Cancel00.bwav`, read from
|
||||
the player's game folder (or from the mod the game itself would read them from) and decoded in memory. **No sound
|
||||
is in the repository, in a release or in Setup, and none may be added:** before a game is built, and for a file that
|
||||
is missing or does not decode, Setup is silent. Nothing decoded is written to the disk. The tests author their own
|
||||
BWAV files and never read a game's. Sounds play only for what the player does (a click, a row chosen, a choice
|
||||
changed; not a page the programme turns), not while the game runs, and never in a run without a player
|
||||
(`--snapshot`, `TRIFORCE_UI_SCRIPT`, `TRIFORCE_TEST_ROOT`): such a run gets, with `TRIFORCE_SOUND_LOG=<file>`, a
|
||||
line in that file for each sound that would have played, and still makes none.
|
||||
|
||||
## Building
|
||||
|
||||
@@ -102,6 +172,25 @@ on your real install.
|
||||
|
||||
The translated C and every build are local files; they are never committed.
|
||||
|
||||
### RenoDX HDR (optional)
|
||||
|
||||
RenoDX's tone mapping and HDR output for OoT (`gpu/vk/vk_renodx.cpp`) are built in only with RenoDX's Zelda OoT shaders
|
||||
(github.com/clshortfuse/renodx, MIT). They are worked from the game's own shaders, so neither they nor what is compiled
|
||||
from them (`renodx_spv.h`) is ever committed, bundled or uploaded. `--renodx` (the builder's RenoDX HDR tick) runs
|
||||
`scripts/renodx_shaders.py`, which fetches the sources at one pinned commit and the Slang compiler at one pinned
|
||||
release, each file checked against its SHA-256, and compiles them on the PC into a `renodx` folder beside the work
|
||||
folder (or `HOOKSHOT_RENODX=<folder>`). An `--update` of that game folder keeps it; `--no-renodx` drops it. In the game
|
||||
it works with the Insert menu's HDR set to Native, where its rows appear.
|
||||
|
||||
Each replacement is named by the CRC-32 of the module the renderer's own emitter makes for that shader (the table in
|
||||
`scripts/renodx_shaders.py`). A change to the emitter changes those, and RenoDX then replaces nothing, with only its
|
||||
coverage line in the log to say so: dump the modules again (`RX_VK_DUMP_ALL_SPV=<folder>`) and match them by what they
|
||||
read. Never share a game folder built with it.
|
||||
|
||||
What RenoDX's mod does not have (RenoDRT as a tone mapper, the gamma correction) is in `gpu/vk/shaders/renodx_glue`:
|
||||
files of Triforce's own that are compiled together with the fetched shaders and call RenoDX's library there. Keep it
|
||||
that way: nothing of RenoDX's source goes into them or anywhere else in the repository.
|
||||
|
||||
## Testing
|
||||
|
||||
The game-free checks need no game files:
|
||||
@@ -143,7 +232,7 @@ it builds on. By submitting a change you agree to license it under those terms.
|
||||
an incompatible license, and never paste decompiled game code or anything generated from the game files.
|
||||
|
||||
The third-party parts (Eden, suyu, Sirit, the Vulkan Memory Allocator, SDL, Opus, Dear ImGui, zstd, the Libertinus
|
||||
fonts, zbic and the a64-kit tools) keep their own notices. Preserve them.
|
||||
fonts, SMAA, zbic and the a64-kit tools) keep their own notices. Preserve them.
|
||||
|
||||
Thanks for testing, reporting and sending fixes. Every report from a different GPU and every area played further
|
||||
moves the port forward.
|
||||
|
||||
6
assets/triforce_assets/CREDITS.txt
Normal file
6
assets/triforce_assets/CREDITS.txt
Normal file
@@ -0,0 +1,6 @@
|
||||
Majora's Mask (majora_mask.bin, majora_alb.png, majora_emc.png)
|
||||
3D model "Majora's Mask" by PigeonMage, https://sketchfab.com/3d-models/majoras-mask-e9cfcdf9875846f6b6137f0156cd4eb2
|
||||
Licence: Creative Commons Attribution 4.0 (CC BY 4.0), https://creativecommons.org/licenses/by/4.0/
|
||||
Changes: the mesh placed on the Happy Mask Salesman's head bone, scaled, and its textures resized to 1024 x 1024.
|
||||
|
||||
The Happy Mask Salesman himself is not in these files: Triforce reads his model and animations from your own game files.
|
||||
BIN
assets/triforce_assets/majora_alb.png
Normal file
BIN
assets/triforce_assets/majora_alb.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 MiB |
BIN
assets/triforce_assets/majora_emc.png
Normal file
BIN
assets/triforce_assets/majora_emc.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 129 KiB |
BIN
assets/triforce_assets/majora_mask.bin
Normal file
BIN
assets/triforce_assets/majora_mask.bin
Normal file
Binary file not shown.
@@ -10,7 +10,21 @@ public partial class App : Application
|
||||
// Why it stopped is one "error <text>" line on stdout (the stream a launcher reads) and again on stderr
|
||||
protected override void OnStartup(StartupEventArgs e)
|
||||
{
|
||||
if (e.Args.Length > 0 && e.Args[0] == "--cli")
|
||||
var cli = e.Args.Length > 0 && e.Args[0] == "--cli";
|
||||
// ((Triforce) one builder at a time for its tools, Instance.cs: asked before any build or window)
|
||||
if (Tools.Find() is { } tools && !Instance.Take(tools.Root))
|
||||
{
|
||||
if (cli)
|
||||
{
|
||||
var said = "error " + Instance.Refusal(tools.Root).Replace("\n\n", " ");
|
||||
Console.Out.WriteLine(said);
|
||||
Console.Error.WriteLine(said);
|
||||
}
|
||||
else MessageBox.Show(Instance.Refusal(tools.Root), "Hookshot Builder", MessageBoxButton.OK, MessageBoxImage.Information);
|
||||
Environment.Exit(1);
|
||||
return;
|
||||
}
|
||||
if (cli)
|
||||
{
|
||||
Environment.Exit(Cli(e.Args.Skip(1).ToList()));
|
||||
return;
|
||||
|
||||
@@ -9,6 +9,7 @@ sealed class BuilderSettings
|
||||
public string? Exefs { get; set; }
|
||||
public bool Dlss { get; set; } // (NVIDIA DLSS ticked: NVIDIA's license was accepted)
|
||||
public bool Fsr { get; set; } // (AMD FSR 4 ticked)
|
||||
public bool Renodx { get; set; } // (RenoDX HDR ticked)
|
||||
public bool PrepareLater { get; set; } // ("Prepare shaders now" unticked)
|
||||
|
||||
public static BuilderSettings? Load(string path)
|
||||
|
||||
53
builder/HookshotBuilder/Instance.cs
Normal file
53
builder/HookshotBuilder/Instance.cs
Normal file
@@ -0,0 +1,53 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Threading;
|
||||
|
||||
namespace HookshotBuilder;
|
||||
|
||||
/// (Triforce, handoff §5) One Hookshot Builder at a time for its build tools. Two of them on one tools folder ran make_game.py on
|
||||
/// the same work folder, and make_game.py stops a build it finds running there: the first one's build ended without a reason.
|
||||
/// The first builder holds a named mutex for as long as it runs (Windows lets go of it when the process ends, however it ends);
|
||||
/// a second one for the same tools says so and ends. The name comes from the tools folder (Tools.Root), so builders of other
|
||||
/// folders, Triforce Setup (its lock is named after its own folder) and the game (after its game folder) never meet it.
|
||||
/// HOOKSHOT_SINGLE_INSTANCE=0: no lock (as before). Plain logic: tests/test_builder_instance.py compiles this file alone
|
||||
static class Instance
|
||||
{
|
||||
static Mutex? held;
|
||||
|
||||
/// The lock's name for a tools folder: one for each spelling of it (case, '/' or '\', a separator at its end), a 64-bit FNV-1a
|
||||
/// of that spelling. Local\: this user's session
|
||||
public static string Name(string root)
|
||||
{
|
||||
try { root = Path.GetFullPath(root); } catch (Exception) { }
|
||||
var text = root.Replace('/', '\\').TrimEnd('\\').ToUpperInvariant();
|
||||
var h = 14695981039346656037UL; // (a name, not a secret)
|
||||
foreach (var c in text) { h ^= c; h *= 1099511628211UL; }
|
||||
return @"Local\HookshotBuilder-" + h.ToString("x16");
|
||||
}
|
||||
|
||||
/// True when this process now holds the tools folder (or did already; it waited up to waitMs for a builder that was ending),
|
||||
/// false when another builder does. Where no lock can be made at all nobody is refused
|
||||
public static bool Take(string root, int waitMs = 5000)
|
||||
{
|
||||
if (held != null) return true;
|
||||
if (Environment.GetEnvironmentVariable("HOOKSHOT_SINGLE_INSTANCE") == "0") return true;
|
||||
Mutex m;
|
||||
try { m = new Mutex(false, Name(root)); }
|
||||
catch (UnauthorizedAccessException) { return false; } // (it is there, and belongs to a builder run as administrator)
|
||||
catch (Exception) { return true; }
|
||||
try
|
||||
{
|
||||
if (!m.WaitOne(waitMs)) { m.Dispose(); return false; }
|
||||
}
|
||||
catch (AbandonedMutexException) { } // (its holder ended without letting go: Windows hands it on, and it is ours)
|
||||
catch (Exception) { m.Dispose(); return true; }
|
||||
held = m;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// What a second builder says
|
||||
public static string Refusal(string root) =>
|
||||
"Hookshot Builder is already running for these build tools:\n\n" + root +
|
||||
"\n\nUse the window that is open, or close it and start the builder again. (Two builders on one tools folder would build " +
|
||||
"into the same work folder and stop each other's build.)";
|
||||
}
|
||||
@@ -189,6 +189,12 @@
|
||||
Content="AMD FSR 4 (AMD's files are not included: see the readme)"/>
|
||||
<TextBlock Style="{StaticResource Note}" FontSize="12" Margin="26,4,0,0" TextWrapping="Wrap"
|
||||
Text="For AMD Radeon graphics cards. It is chosen in the game's Insert menu, as the Upscaler."/>
|
||||
<!-- RenoDX's HDR: off unless ticked. Its shaders and the Slang compiler are downloaded and compiled by the build
|
||||
(make_game.py's renodx switch, scripts/renodx_shaders.py): never part of the builder or its downloads -->
|
||||
<CheckBox x:Name="RenodxTick" Style="{StaticResource Tick}" IsChecked="False" Margin="0,10,0,0"
|
||||
Content="RenoDX HDR (downloads RenoDX's shaders and the Slang compiler, about 60 MB)"/>
|
||||
<TextBlock Style="{StaticResource Note}" FontSize="12" Margin="26,4,0,0" TextWrapping="Wrap"
|
||||
Text="For HDR displays: RenoDX's tone mapping with the Insert menu's HDR set to Native. Its shaders stay on this PC: never share a game folder built with them."/>
|
||||
</StackPanel>
|
||||
|
||||
</Grid>
|
||||
|
||||
@@ -264,6 +264,7 @@ public partial class MainWindow : Window
|
||||
if (!string.IsNullOrEmpty(s.Out)) OutPath.Text = s.Out;
|
||||
DlssTick.IsChecked = s.Dlss;
|
||||
FsrTick.IsChecked = s.Fsr;
|
||||
RenodxTick.IsChecked = s.Renodx;
|
||||
if (s.Romfs != null && s.Exefs != null && Directory.Exists(s.Romfs) && File.Exists(System.IO.Path.Combine(s.Exefs, "main")))
|
||||
{
|
||||
romfs = s.Romfs;
|
||||
@@ -287,6 +288,7 @@ public partial class MainWindow : Window
|
||||
{
|
||||
var s = new BuilderSettings { Out = OutPath.Text, Nup = romfs == null ? chosenNup : null, Romfs = romfs, Exefs = exefs,
|
||||
Dlss = DlssTick.IsChecked == true, Fsr = FsrTick.IsChecked == true,
|
||||
Renodx = RenodxTick.IsChecked == true,
|
||||
PrepareLater = PrepareTick.IsChecked != true };
|
||||
Directory.CreateDirectory(System.IO.Path.GetDirectoryName(SettingsPath)!);
|
||||
File.WriteAllText(SettingsPath, System.Text.Json.JsonSerializer.Serialize(s));
|
||||
@@ -703,6 +705,7 @@ public partial class MainWindow : Window
|
||||
else return;
|
||||
args.AddRange(new[] { "--out", OutPath.Text, "--language", lang.Code });
|
||||
if (FsrTick.IsChecked == true) args.Add("--fsr"); // (an --update of the folder keeps it: make_game.py's mark)
|
||||
if (RenodxTick.IsChecked == true) args.Add("--renodx"); // (the same: its shaders are fetched and compiled by the build)
|
||||
prepareNow = PrepareTick.IsChecked == true;
|
||||
Run(tools, ShaderStep.Args(args, prepareNow), dlss: DlssTick.IsChecked == true);
|
||||
}
|
||||
|
||||
123
builder/HookshotBuilder/Reuse.cs
Normal file
123
builder/HookshotBuilder/Reuse.cs
Normal file
@@ -0,0 +1,123 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
|
||||
namespace HookshotBuilder;
|
||||
|
||||
/// (Triforce) What the setup (builder/setup/setup.c) lends from the installed version to the one it puts together, and the lock
|
||||
/// every setup holds while it does. An update moves the folders of parts that did not change (Python, the compiler...) from
|
||||
/// versions\<installed> into versions\<tag>.part and writes each down first in its reused.txt (the installed version's tag,
|
||||
/// then a folder a line); a cut-off setup leaves them there. Free gives them back (UndoEveryReuse, setup.c undo_every_reuse,
|
||||
/// the same rules) and never deletes a <tag>.part that still holds them (Lent): deleted, the installed version lost them for
|
||||
/// good. Plain logic: tests/test_builder_setup_lock.py compiles this file alone
|
||||
static class Reuse
|
||||
{
|
||||
public const string Note = "reused.txt";
|
||||
|
||||
/// True when folder is an unfinished version (a versions\*.part) that still holds folders of another version
|
||||
public static bool Lent(string folder) =>
|
||||
Path.GetFileName(folder.TrimEnd('\\', '/')).EndsWith(".part", StringComparison.OrdinalIgnoreCase) &&
|
||||
File.Exists(Path.Combine(folder, Note));
|
||||
|
||||
/// The setup's lock for a setup folder (setup.c setup_lock_name and setup_parts.lock_name, the same): a 64-bit FNV-1a of the
|
||||
/// folder's full path with '\' between its parts, none at its end, a to z in upper case. Local\: this user's session
|
||||
public static string LockName(string setupBase)
|
||||
{
|
||||
try { setupBase = Path.GetFullPath(setupBase); } catch (Exception) { }
|
||||
var text = setupBase.Replace('/', '\\').TrimEnd('\\');
|
||||
var h = 14695981039346656037UL; // (a name, not a secret)
|
||||
foreach (var c in text) { h ^= c >= 'a' && c <= 'z' ? (uint)(c - 32) : c; h *= 1099511628211UL; }
|
||||
return @"Local\HookshotBuilder-Setup-" + h.ToString("x16");
|
||||
}
|
||||
|
||||
/// The setup folder held by this thread until Dispose (one that holds nothing where no lock can be made at all), or null
|
||||
/// when a setup held it for waitMs: one is installing now
|
||||
public static Held? TakeLock(string setupBase, int waitMs = 0)
|
||||
{
|
||||
Mutex m;
|
||||
try { m = new Mutex(false, LockName(setupBase)); }
|
||||
catch (UnauthorizedAccessException) { return null; } // (it is there, and belongs to a setup run as administrator)
|
||||
catch (Exception) { return new Held(null); }
|
||||
try
|
||||
{
|
||||
if (!m.WaitOne(waitMs)) { m.Dispose(); return null; }
|
||||
}
|
||||
catch (AbandonedMutexException) { } // (its holder ended without letting go: Windows hands it on, and it is ours)
|
||||
catch (Exception) { m.Dispose(); return new Held(null); }
|
||||
return new Held(m);
|
||||
}
|
||||
|
||||
public sealed class Held : IDisposable
|
||||
{
|
||||
Mutex? m;
|
||||
internal Held(Mutex? m) => this.m = m;
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (m == null) return;
|
||||
try { m.ReleaseMutex(); } catch (Exception) { }
|
||||
m.Dispose();
|
||||
m = null;
|
||||
}
|
||||
}
|
||||
|
||||
/// The folders a setup moved from the installed version into install (a <tag>.part), moved back: each only where that version
|
||||
/// has none; the note goes once all went back. True: nothing is left to move back
|
||||
public static bool Undo(string versions, string install)
|
||||
{
|
||||
var note = Path.Combine(install, Note);
|
||||
string[] lines;
|
||||
try { lines = File.ReadAllLines(note).Where(l => l.Trim().Length > 0).ToArray(); }
|
||||
catch (Exception e) when (e is IOException or UnauthorizedAccessException) { return !File.Exists(note); }
|
||||
if (lines.Length == 0 || !NameOk(lines[0], false)) // (no version named: nothing was moved yet)
|
||||
{
|
||||
try { File.Delete(note); } catch (Exception e) when (e is IOException or UnauthorizedAccessException) { }
|
||||
return true;
|
||||
}
|
||||
var ok = true;
|
||||
foreach (var rel in lines.Skip(1))
|
||||
{
|
||||
if (!NameOk(rel, true)) continue;
|
||||
var from = Path.Combine(install, rel.Replace('/', '\\'));
|
||||
var back = Path.Combine(versions, lines[0], rel.Replace('/', '\\'));
|
||||
if (!(Directory.Exists(from) || File.Exists(from)) || Directory.Exists(back) || File.Exists(back)) continue;
|
||||
try
|
||||
{
|
||||
Directory.CreateDirectory(Path.GetDirectoryName(back)!);
|
||||
if (Directory.Exists(from)) Directory.Move(from, back);
|
||||
else File.Move(from, back);
|
||||
}
|
||||
catch (Exception e) when (e is IOException or UnauthorizedAccessException) { ok = false; }
|
||||
}
|
||||
if (ok)
|
||||
try { File.Delete(note); } catch (Exception e) when (e is IOException or UnauthorizedAccessException) { }
|
||||
return ok;
|
||||
}
|
||||
|
||||
/// Undo for every versions\*.part with a note; the first whose folders could not all go back (each is tried), null when none
|
||||
public static string? UndoEveryReuse(string versions)
|
||||
{
|
||||
string? left = null;
|
||||
string[] dirs;
|
||||
try { dirs = Directory.GetDirectories(versions); }
|
||||
catch (Exception e) when (e is IOException or UnauthorizedAccessException) { return null; }
|
||||
foreach (var d in dirs.OrderBy(d => d, StringComparer.Ordinal))
|
||||
if (Lent(d) && !Undo(versions, d)) left ??= d;
|
||||
return left;
|
||||
}
|
||||
|
||||
/// A name from the note (setup.c list_name_ok, the same): letters, digits and . _ + - only (with path, '/' or '\' between
|
||||
/// its parts), no "." or ".." part, no drive, no root
|
||||
static bool NameOk(string s, bool path)
|
||||
{
|
||||
if (s.Length == 0 || s[0] == '/' || s[0] == '\\') return false;
|
||||
foreach (var c in s)
|
||||
if (!(c is >= 'a' and <= 'z' or >= 'A' and <= 'Z' or >= '0' and <= '9' or '.' or '_' or '+' or '-' ||
|
||||
(path && (c == '/' || c == '\\'))))
|
||||
return false;
|
||||
foreach (var part in path ? s.Split('/', '\\') : new[] { s })
|
||||
if (part.Length == 0 || part == "." || part == "..") return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -75,17 +75,20 @@ static class Storage
|
||||
|
||||
/// What Free lets go. afterBuild: what goes once the game is ready, the compiled objects of the build (objcache, which make_game.py
|
||||
/// prunes to them) and their system headers' stamp kept, so that the next update compiles only what changed (issue 1287: every
|
||||
/// update compiled all ~600 files again, an hour and more). The Free up space button lets those go too
|
||||
static IEnumerable<string> Freeable(bool afterBuild = false)
|
||||
/// update compiled all ~600 files again, an hour and more). The Free up space button lets those go too. (Triforce) Never an
|
||||
/// unfinished version that still holds folders of the installed one (Reuse.Lent): deleted, the installed version lost its
|
||||
/// Python or its compiler for good. installing: a setup holds the folder now, and what it is putting together (downloads\,
|
||||
/// versions\) stays. Nothing is changed here: Measure counts it
|
||||
static IEnumerable<string> Freeable(bool afterBuild = false, bool installing = false)
|
||||
{
|
||||
foreach (var d in afterBuild ? new[] { "sa", "exefs", "probe" } : new[] { "objcache", "sa", "exefs", "probe" })
|
||||
yield return Path.Combine(Work, d);
|
||||
foreach (var d in new[] { "downloads", "update" })
|
||||
foreach (var d in installing ? new[] { "update" } : new[] { "downloads", "update" })
|
||||
yield return Path.Combine(Base, d);
|
||||
var versions = Path.Combine(Base, "versions");
|
||||
if (Directory.Exists(versions))
|
||||
if (Directory.Exists(versions) && !installing)
|
||||
foreach (var v in Directory.EnumerateDirectories(versions))
|
||||
if (!Kept(v)) yield return v;
|
||||
if (!Kept(v) && !Reuse.Lent(v)) yield return v;
|
||||
}
|
||||
|
||||
/// Bytes in the builder's folder and the build files folder, and in what Free lets go (an object hard-linked in both sa\build and
|
||||
@@ -103,12 +106,18 @@ static class Storage
|
||||
/// Lets go of what Measure counts as freeable; returns the bytes it could not delete (a file in use)
|
||||
public static long Free(bool afterBuild = false)
|
||||
{
|
||||
foreach (var d in Freeable(afterBuild)) Delete(d);
|
||||
// ((Triforce) what a cut-off setup moved from the installed version goes back first (Reuse.UndoEveryReuse), and then its
|
||||
// <tag>.part is freeable; one whose folders could not all go back stays. With the setup's folder held: a setup running now
|
||||
// is not undone under it, and its folders are left alone)
|
||||
using var setup = Reuse.TakeLock(Base);
|
||||
var installing = setup == null;
|
||||
if (!installing) Reuse.UndoEveryReuse(Path.Combine(Base, "versions"));
|
||||
foreach (var d in Freeable(afterBuild, installing)) Delete(d);
|
||||
if (!afterBuild) Delete(Path.Combine(Work, "system_headers.txt")); // (the stamp of the compiled objects' system headers goes with them)
|
||||
if (!afterBuild) return Measure().freeable;
|
||||
var seen = new HashSet<(uint, ulong)>(); // (what of the after-build set is still there: a file in use)
|
||||
long left = 0;
|
||||
foreach (var d in Freeable(afterBuild: true)) left += Size(d, seen);
|
||||
foreach (var d in Freeable(afterBuild: true, installing)) left += Size(d, seen);
|
||||
return left;
|
||||
}
|
||||
|
||||
|
||||
@@ -302,27 +302,85 @@ static class Updater
|
||||
using var response = await http.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token);
|
||||
if (!response.IsSuccessStatusCode) throw HttpFailure(response);
|
||||
|
||||
var total = response.Content.Headers.ContentLength ?? size;
|
||||
await using var from = await response.Content.ReadAsStreamAsync(token);
|
||||
await using var to = File.Create(path);
|
||||
var buffer = new byte[1 << 20];
|
||||
long have = 0;
|
||||
var shown = DateTime.MinValue;
|
||||
int n;
|
||||
while (true)
|
||||
// ((Triforce) the size the release lists, which the server must not contradict; the server's only where none is listed (the
|
||||
// server's went first, and a short or other file passed as whole). Room for it asked before the first byte, and the bytes
|
||||
// written to <file>.part, which becomes the file only once complete: a failure removes it)
|
||||
var told = response.Content.Headers.ContentLength;
|
||||
if (size > 0 && told is { } other && other != size)
|
||||
throw new IOException($"The server offers {other} bytes as {Path.GetFileName(path)}, and the release lists {size}. Nothing was downloaded.");
|
||||
var total = size > 0 ? size : told ?? 0;
|
||||
if (total > 0 && NoRoom(path, total) is { } none) throw new IOException(none);
|
||||
var part = path + ".part";
|
||||
try
|
||||
{
|
||||
try { n = await from.ReadAsync(buffer, token); }
|
||||
catch (IOException e) { throw new HttpRequestException("The download connection ended unexpectedly.", e); }
|
||||
if (n == 0) break;
|
||||
await to.WriteAsync(buffer.AsMemory(0, n), token);
|
||||
have += n;
|
||||
if (progress != null && total > 0 && DateTime.UtcNow - shown > TimeSpan.FromMilliseconds(200))
|
||||
await using (var from = await response.Content.ReadAsStreamAsync(token))
|
||||
await using (var to = File.Create(part))
|
||||
{
|
||||
shown = DateTime.UtcNow;
|
||||
progress(Math.Min(1.0, (double)have / total));
|
||||
var buffer = new byte[1 << 20];
|
||||
long have = 0;
|
||||
var shown = DateTime.MinValue;
|
||||
int n;
|
||||
while (true)
|
||||
{
|
||||
try { n = await from.ReadAsync(buffer, token); }
|
||||
catch (IOException e) { throw new HttpRequestException("The download connection ended unexpectedly.", e); }
|
||||
if (n == 0) break;
|
||||
await to.WriteAsync(buffer.AsMemory(0, n), token);
|
||||
have += n;
|
||||
if (total > 0 && have > total) throw new IOException($"The server sent more than the {total} bytes of {Path.GetFileName(path)}.");
|
||||
if (progress != null && total > 0 && DateTime.UtcNow - shown > TimeSpan.FromMilliseconds(200))
|
||||
{
|
||||
shown = DateTime.UtcNow;
|
||||
progress(Math.Min(1.0, (double)have / total));
|
||||
}
|
||||
}
|
||||
if (total > 0 && have != total) throw new HttpRequestException($"The download ended early ({have >> 20} of {total >> 20} MB).");
|
||||
}
|
||||
File.Move(part, path, true);
|
||||
}
|
||||
if (total > 0 && have != total) throw new HttpRequestException($"The download ended early ({have >> 20} of {total >> 20} MB).");
|
||||
catch (Exception)
|
||||
{
|
||||
try { File.Delete(part); } catch (Exception) { }
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
/// ((Triforce) setup/Guard.cs Space, the same rule) Null when the disk of path has room for need bytes and 32 MB more (or
|
||||
/// cannot be asked); else the sentence that says how much it takes and how much is free
|
||||
static string? NoRoom(string path, long need)
|
||||
{
|
||||
long free;
|
||||
try { free = new DriveInfo(Path.GetPathRoot(Path.GetFullPath(path))!).AvailableFreeSpace; }
|
||||
catch (Exception) { return null; }
|
||||
need += 32L << 20;
|
||||
return free >= need ? null
|
||||
: $"There is no room for {Path.GetFileName(path)} on {Path.GetPathRoot(Path.GetFullPath(path))}: it takes {(need + (1 << 20) - 1) >> 20} MB there, and {free >> 20} MB are free. Make room and try again.";
|
||||
}
|
||||
|
||||
static readonly HashSet<string> Devices = new(StringComparer.OrdinalIgnoreCase) { "CON", "PRN", "AUX", "NUL", "CONIN$", "CONOUT$" };
|
||||
|
||||
/// ((Triforce) setup/Mods.cs Unsafe, the same rules) Why a zip's member must not be unpacked under its name, null when it may:
|
||||
/// a path from the disk's root or through "..", a colon (a drive's letter, a hidden stream), a name Windows keeps for a device
|
||||
/// (with or without an extension), a name that ends in a dot or a space (Windows drops them), a character Windows refuses
|
||||
internal static string? UnsafeName(string name)
|
||||
{
|
||||
var n = name.Replace('\\', '/');
|
||||
if (n.Trim().Length == 0) return "a file without a name";
|
||||
if (n[0] == '/') return "a path that starts at the disk's root";
|
||||
if (n.IndexOf(':') >= 0) return "a name with a colon or a drive's letter";
|
||||
foreach (var p in n.Split('/'))
|
||||
{
|
||||
if (p.Length == 0 || p == ".") continue;
|
||||
if (p == "..") return "a path that leaves its own folder (..)";
|
||||
if (p[p.Length - 1] == '.' || p[p.Length - 1] == ' ') return "a name that ends in a dot or a space, which Windows drops";
|
||||
var dot = p.IndexOf('.');
|
||||
var stem = (dot >= 0 ? p.Substring(0, dot) : p).TrimEnd(' ');
|
||||
if (Devices.Contains(stem) || stem.Length == 4 && (stem.StartsWith("COM", StringComparison.OrdinalIgnoreCase) || stem.StartsWith("LPT", StringComparison.OrdinalIgnoreCase)) &&
|
||||
(stem[3] is >= '1' and <= '9' || stem[3] == (char)0xB9 || stem[3] == (char)0xB2 || stem[3] == (char)0xB3))
|
||||
return "a name Windows keeps for a device (" + p + ")";
|
||||
if (p.Any(c => c < 32 || "<>\"|?*".IndexOf(c) >= 0)) return "a name with a character Windows does not allow";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
static HttpRequestException HttpFailure(HttpResponseMessage response) =>
|
||||
@@ -335,14 +393,41 @@ static class Updater
|
||||
error is HttpRequestException { StatusCode: { } status } ? $" (HTTP {(int)status})" : "";
|
||||
|
||||
/// The zip's HookshotBuilder folder, as target (an older one there replaced)
|
||||
/// ((Triforce) every name checked first (UnsafeName: such a zip is refused whole), a failure removes the part, and an older
|
||||
/// target is moved aside and back when the new one cannot take its place: before, it was deleted first, and a move that
|
||||
/// failed then left neither)
|
||||
static async Task<string> Unpack(string zip, string target)
|
||||
{
|
||||
var part = target + ".part";
|
||||
if (Directory.Exists(part)) Directory.Delete(part, true);
|
||||
await Task.Run(() => ZipFile.ExtractToDirectory(zip, part));
|
||||
try
|
||||
{
|
||||
await Task.Run(() =>
|
||||
{
|
||||
using (var z = ZipFile.OpenRead(zip))
|
||||
foreach (var e in z.Entries)
|
||||
if (UnsafeName(e.FullName) is { } why)
|
||||
throw new InvalidDataException($"The download holds {why} (\"{e.FullName}\"): it was not unpacked.");
|
||||
ZipFile.ExtractToDirectory(zip, part);
|
||||
});
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
try { if (Directory.Exists(part)) Directory.Delete(part, true); } catch (Exception) { }
|
||||
throw;
|
||||
}
|
||||
var inner = Path.Combine(part, "HookshotBuilder");
|
||||
if (Directory.Exists(target)) Directory.Delete(target, true);
|
||||
Directory.Move(Directory.Exists(inner) ? inner : part, target);
|
||||
var old = target + ".old";
|
||||
if (Directory.Exists(old)) Directory.Delete(old, true);
|
||||
if (Directory.Exists(target)) Directory.Move(target, old);
|
||||
try { Directory.Move(Directory.Exists(inner) ? inner : part, target); }
|
||||
catch (Exception)
|
||||
{
|
||||
try { if (!Directory.Exists(target) && Directory.Exists(old)) Directory.Move(old, target); } catch (Exception) { }
|
||||
try { if (Directory.Exists(part)) Directory.Delete(part, true); } catch (Exception) { }
|
||||
throw;
|
||||
}
|
||||
try { if (Directory.Exists(old)) Directory.Delete(old, true); } catch (Exception) { }
|
||||
if (Directory.Exists(part)) Directory.Delete(part, true);
|
||||
return target;
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<windowsSettings>
|
||||
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
|
||||
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
</assembly>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
#!/bin/sh
|
||||
# The Hookshot AppImage: the builder window (builder/linux/hookshot_builder.py) with everything it builds the game with -
|
||||
# Python and the tools, clang and lld, a glibc 2.35 sysroot, FFmpeg, SDL2 and the Vulkan back end, built already.
|
||||
# Hookshot.AppImage the builder window (Play is in the window, once a game is built)
|
||||
# Hookshot.AppImage the launcher window (Play is in the window, once a game is built)
|
||||
# Hookshot.AppImage --classic the classic builder window instead
|
||||
# Hookshot.AppImage --play start the game the builder saved, without opening the window
|
||||
# Hookshot.AppImage --play <folder> start the game in that folder
|
||||
# Hookshot.AppImage <folder> the same
|
||||
@@ -35,4 +36,20 @@ fi
|
||||
if [ -n "${1:-}" ] && [ -d "$1" ]; then
|
||||
exec "$HOOKSHOT_TOOLS/builder/linux/hookshot-launch" "$1"
|
||||
fi
|
||||
# The window: the Triforce launcher (usr/bin/triforce-launcher, a WebKitGTK window). It exits 4 when this system has no
|
||||
# WebKitGTK 4.1 (e.g. some Steam Deck images), and the classic builder window opens instead; --classic or
|
||||
# TRIFORCE_CLASSIC=1 always opens the classic one.
|
||||
LAUNCHER="$HERE/usr/bin/triforce-launcher"
|
||||
if [ "${1:-}" = "--classic" ]; then
|
||||
shift
|
||||
TRIFORCE_CLASSIC=1
|
||||
fi
|
||||
if [ "${TRIFORCE_CLASSIC:-0}" != "1" ] && [ -x "$LAUNCHER" ]; then
|
||||
# (WebKitGTK's GPU path breaks on NVIDIA's driver and under gamescope; its plain path is fine for a launcher)
|
||||
export WEBKIT_DISABLE_DMABUF_RENDERER="${WEBKIT_DISABLE_DMABUF_RENDERER:-1}"
|
||||
export TRIFORCE_APPRUN="$HERE/AppRun"
|
||||
"$LAUNCHER" "$@"
|
||||
code=$?
|
||||
[ "$code" -ne 4 ] && exit "$code"
|
||||
fi
|
||||
exec "$PY" -I "$HOOKSHOT_TOOLS/builder/linux/hookshot_builder.py" "$@"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Hookshot Builder
|
||||
Name=Triforce Builder
|
||||
Comment=Builds Ocarina of Time for PC from your own copy of the game
|
||||
Exec=AppRun
|
||||
Icon=hookshot
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
#!/bin/sh
|
||||
# The game folder's launcher, what hookshot.exe is on Windows: Play, and Update when a newer release is out.
|
||||
# The game itself is bin/hookshot. This file is copied to hookshot in the folder (nx2/make_game.py).
|
||||
# The game folder's launcher, what Triforce.exe is on Windows: Play, and Update when a newer release is out.
|
||||
# The game itself is bin/triforce. This file is copied to triforce in the folder (nx2/make_game.py).
|
||||
#
|
||||
# It starts the builder installed by an update ($XDG_DATA_HOME/hookshot/builder), or the builder= line in
|
||||
# hookshot_version.txt (the AppImage that built the folder). With neither, it starts the game.
|
||||
# It starts the builder installed by an update ($XDG_DATA_HOME/triforce/builder), or the builder= line in
|
||||
# triforce_version.txt (the AppImage that built the folder; hookshot_version.txt in a folder that still has that). With neither, it starts the game.
|
||||
set -eu
|
||||
HERE=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||
|
||||
installed() {
|
||||
root=${HOOKSHOT_BUILDER_HOME:-${XDG_DATA_HOME:-$HOME/.local/share}}/hookshot/builder
|
||||
root=${HOOKSHOT_BUILDER_HOME:-${XDG_DATA_HOME:-$HOME/.local/share}}/triforce/builder
|
||||
[ -f "$root/current" ] || return 1
|
||||
tag=$(tr -d ' \r\n' < "$root/current")
|
||||
[ -n "$tag" ] && [ -x "$root/versions/$tag/AppRun" ] || return 1
|
||||
@@ -16,13 +16,15 @@ installed() {
|
||||
}
|
||||
|
||||
builder_line() {
|
||||
[ -f "$HERE/hookshot_version.txt" ] || return 1
|
||||
file=$HERE/triforce_version.txt
|
||||
[ -f "$file" ] || file=$HERE/hookshot_version.txt
|
||||
[ -f "$file" ] || return 1
|
||||
path=
|
||||
while IFS= read -r line || [ -n "$line" ]; do
|
||||
case $line in
|
||||
builder=*) path=${line#builder=} ;;
|
||||
esac
|
||||
done < "$HERE/hookshot_version.txt"
|
||||
done < "$file"
|
||||
[ -n "$path" ] && [ -x "$path" ] || return 1
|
||||
printf '%s\n' "$path"
|
||||
}
|
||||
@@ -34,9 +36,11 @@ fi
|
||||
if [ -n "$run" ]; then
|
||||
exec "$run" --launch "$HERE"
|
||||
fi
|
||||
if [ -x "$HERE/bin/hookshot" ]; then
|
||||
cd "$HERE"
|
||||
exec ./bin/hookshot
|
||||
fi
|
||||
echo "Hookshot: the game (bin/hookshot) is missing from this folder. Build it again with Hookshot Builder." >&2
|
||||
for game in bin/triforce bin/hookshot; do
|
||||
if [ -x "$HERE/$game" ]; then
|
||||
cd "$HERE"
|
||||
exec "./$game"
|
||||
fi
|
||||
done
|
||||
echo "Triforce: the game (bin/triforce) is missing from this folder. Build it again with Triforce Builder." >&2
|
||||
exit 1
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/bin/sh
|
||||
# Start the game Hookshot Builder wrote, from that folder, without the AppImage's libraries.
|
||||
# Start the game Triforce Builder wrote, from that folder, without the AppImage's libraries.
|
||||
# The builder AppImage calls this for --play. The window's Play button does the same thing.
|
||||
#
|
||||
# hookshot-launch the out= folder in ~/.config/hookshot/builder.ini
|
||||
# hookshot-launch the out= folder in ~/.config/triforce/builder.ini
|
||||
# hookshot-launch /path/to/the/game that folder
|
||||
# HOOKSHOT_LAUNCH_CONFIG=<file> read that ini instead (a test)
|
||||
set -eu
|
||||
@@ -11,7 +11,7 @@ ini_path() {
|
||||
if [ -n "${HOOKSHOT_LAUNCH_CONFIG:-}" ]; then
|
||||
printf '%s\n' "$HOOKSHOT_LAUNCH_CONFIG"
|
||||
else
|
||||
printf '%s\n' "${XDG_CONFIG_HOME:-$HOME/.config}/hookshot/builder.ini"
|
||||
printf '%s\n' "${XDG_CONFIG_HOME:-$HOME/.config}/triforce/builder.ini"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -28,7 +28,9 @@ out_of() {
|
||||
}
|
||||
|
||||
ready() {
|
||||
[ -n "${1:-}" ] && [ -f "$1/image.bin" ] && { [ -x "$1/bin/hookshot" ] || [ -f "$1/hookshot" ]; }
|
||||
# (bin/triforce under the launcher, or triforce in a folder built without one; Hookshot's names after them)
|
||||
[ -n "${1:-}" ] && [ -f "$1/image.bin" ] &&
|
||||
{ [ -x "$1/bin/triforce" ] || [ -x "$1/bin/hookshot" ] || [ -f "$1/triforce" ] || [ -f "$1/hookshot" ]; }
|
||||
}
|
||||
|
||||
folder=${1:-}
|
||||
@@ -40,13 +42,13 @@ if [ -z "$folder" ]; then
|
||||
fi
|
||||
|
||||
if ! ready "$folder"; then
|
||||
echo "Hookshot: no built game to start. Build one with Hookshot Builder, or pass its folder." >&2
|
||||
echo "Triforce: no built game to start. Build one with Triforce Builder, or pass its folder." >&2
|
||||
# (HOOKSHOT_LAUNCH_CONFIG is a test: it must not open a dialog)
|
||||
if [ -z "${HOOKSHOT_LAUNCH_CONFIG:-}" ]; then
|
||||
if command -v zenity >/dev/null 2>&1; then
|
||||
zenity --error --title=Hookshot --text="No built game to start. Build one with Hookshot Builder first." || true
|
||||
zenity --error --title=Triforce --text="No built game to start. Build one with Triforce Builder first." || true
|
||||
elif command -v kdialog >/dev/null 2>&1; then
|
||||
kdialog --error "No built game to start. Build one with Hookshot Builder first." || true
|
||||
kdialog --error "No built game to start. Build one with Triforce Builder first." || true
|
||||
fi
|
||||
fi
|
||||
exit 1
|
||||
@@ -60,9 +62,14 @@ for name in $names; do
|
||||
done
|
||||
|
||||
cd "$folder"
|
||||
# (--play already chose Play. The game's own update question stays for a bin/hookshot the player started themselves)
|
||||
# (--play already chose Play. The game's own update question stays for a bin/triforce the player started themselves)
|
||||
export HOOKSHOT_NO_UPDATE_CHECK=1
|
||||
if [ -x ./bin/hookshot ]; then
|
||||
exec ./bin/hookshot
|
||||
for game in ./bin/triforce ./bin/hookshot; do
|
||||
if [ -x "$game" ]; then
|
||||
exec "$game"
|
||||
fi
|
||||
done
|
||||
if [ -f ./triforce ]; then
|
||||
exec ./triforce
|
||||
fi
|
||||
exec ./hookshot
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"""Hookshot Builder for Linux: what builder/HookshotBuilder (WPF) is on Windows, in Tk. It runs nx2/make_game.py and
|
||||
"""Triforce Builder for Linux: what builder/HookshotBuilder (WPF) is on Windows, in Tk. It runs nx2/make_game.py and
|
||||
follows its @@ lines (make_game.py's docstring), then offers to start the game. The AppImage starts it (builder/linux/AppRun),
|
||||
with the compiler, sysroot and libraries it brings in the environment.
|
||||
|
||||
@@ -29,15 +29,15 @@ import linux_update # noqa: E402 (the release check and the part download)
|
||||
import make_game # noqa: E402 (LANGUAGES, BUILD_ID)
|
||||
import toolchain # noqa: E402 (default_jobs: RX_JOBS)
|
||||
|
||||
CONFIG = os.path.join(os.environ.get("XDG_CONFIG_HOME") or os.path.expanduser("~/.config"), "hookshot", "builder.ini")
|
||||
CONFIG = os.path.join(os.environ.get("XDG_CONFIG_HOME") or os.path.expanduser("~/.config"), "triforce", "builder.ini")
|
||||
STAGES = {"read": "Reading your game files", "lift": "Translating the game to PC code", "compile": "Compiling",
|
||||
"finish": "Putting the game folder together", "shaders": "Preparing shaders"}
|
||||
DLSS_LICENSE = (
|
||||
"NVIDIA DLSS is NVIDIA's, not Hookshot's. With it ticked, the build downloads NVIDIA's DLSS SDK (release v310.9.16) from "
|
||||
"NVIDIA DLSS is NVIDIA's, not Triforce's. With it ticked, the build downloads NVIDIA's DLSS SDK (release v310.9.16) from "
|
||||
"github.com/NVIDIA/DLSS, under NVIDIA's own license, the NVIDIA RTX SDKs license:\n\n"
|
||||
"https://github.com/NVIDIA/DLSS/blob/9981c6350dc58c0ce21f024fd65e31e851c31689/LICENSE.txt\n\n"
|
||||
"Its files stay on this PC (in the builder's ngx-sdk folder, and libnvidia-ngx-dlss.so in the game folder's ngx folder). "
|
||||
"Hookshot never includes or shares them: never share a game folder built with them.\n\n"
|
||||
"Triforce never includes or shares them: never share a game folder built with them.\n\n"
|
||||
"Do you accept NVIDIA's license?"
|
||||
)
|
||||
|
||||
@@ -137,19 +137,19 @@ def add_to_menu(folder):
|
||||
if any(ch in folder for ch in "\r\n\0"): # (a line break would start another key of the entry)
|
||||
raise ValueError("the game folder's name has a line break")
|
||||
icon = os.path.join(folder, "hookshot.png")
|
||||
src = os.path.join(ROOT, "assets", "hookshot.png")
|
||||
src = os.path.join(ROOT, "assets", "triforce.png")
|
||||
if os.path.exists(src):
|
||||
shutil.copyfile(src, icon)
|
||||
apps = os.path.join(os.environ.get("XDG_DATA_HOME") or os.path.expanduser("~/.local/share"), "applications")
|
||||
os.makedirs(apps, exist_ok=True)
|
||||
with open(os.path.join(apps, "hookshot.desktop"), "w", encoding="utf-8") as f:
|
||||
f.write("[Desktop Entry]\nType=Application\nName=Hookshot\nComment=The Legend of Zelda: Ocarina of Time, built from your copy\n"
|
||||
with open(os.path.join(apps, "triforce.desktop"), "w", encoding="utf-8") as f:
|
||||
f.write("[Desktop Entry]\nType=Application\nName=Triforce\nComment=The Legend of Zelda: Ocarina of Time, built from your copy\n"
|
||||
"Exec=%s\nPath=%s\nIcon=%s\nCategories=Game;\nTerminal=false\nStartupWMClass=%s\n"
|
||||
% (desktop_exec(os.path.join(folder, "hookshot")), folder, icon, APP_ID))
|
||||
% (desktop_exec(os.path.join(folder, "triforce")), folder, icon, APP_ID))
|
||||
|
||||
|
||||
def free_gb(path):
|
||||
path = os.path.expanduser(path or "") # (the field takes ~/Games/Hookshot, as build() and apply_mode() read it)
|
||||
path = os.path.expanduser(path or "") # (the field takes ~/Games/Triforce, as build() and apply_mode() read it)
|
||||
while path and not os.path.exists(path):
|
||||
path = os.path.dirname(path)
|
||||
try:
|
||||
@@ -308,7 +308,7 @@ def _arg(name):
|
||||
class Builder(tk.Tk):
|
||||
def __init__(self, launch=None, update=None, fetched=False, tag=None):
|
||||
super().__init__()
|
||||
self.title("Hookshot Builder")
|
||||
self.title("Triforce Builder")
|
||||
self.apply_scale()
|
||||
self.apply_theme()
|
||||
self.minsize(self.px(760), self.px(520))
|
||||
@@ -330,7 +330,7 @@ class Builder(tk.Tk):
|
||||
self.nup = tk.StringVar(value=self.cfg.get("nup", ""))
|
||||
self.romfs = tk.StringVar(value=self.cfg.get("romfs", ""))
|
||||
self.exefs = tk.StringVar(value=self.cfg.get("exefs", ""))
|
||||
self.out = tk.StringVar(value=self.cfg.get("out", os.path.expanduser("~/Games/Hookshot")))
|
||||
self.out = tk.StringVar(value=self.cfg.get("out", os.path.expanduser("~/Games/Triforce")))
|
||||
names = [n for _, n in make_game.LANGUAGES]
|
||||
code = self.cfg.get("language", "en-US")
|
||||
self.language = tk.StringVar(value=dict(make_game.LANGUAGES).get(code, names[0]))
|
||||
@@ -531,7 +531,7 @@ class Builder(tk.Tk):
|
||||
"""assets/hookshot.png (the Windows head's and the game's icon), size pixels wide over the page: averaged down with its
|
||||
alpha on Tk 9, every nth pixel on an older Tk"""
|
||||
self.images["logo"] = None
|
||||
path = os.path.join(ROOT, "assets", "hookshot.png")
|
||||
path = os.path.join(ROOT, "assets", "triforce.png")
|
||||
try:
|
||||
full = tk.PhotoImage(master=self, file=path)
|
||||
except (tk.TclError, OSError):
|
||||
@@ -578,8 +578,8 @@ class Builder(tk.Tk):
|
||||
if self.images.get("logo") is not None:
|
||||
canvas.create_image(x, px(32), image=self.images["logo"], anchor="w")
|
||||
x += self.images["logo"].width() + px(10)
|
||||
canvas.create_text(x, px(32), text="Hookshot", font="HsBrand", fill=INK, anchor="w")
|
||||
x += int(self.tk.call("font", "measure", "HsBrand", "Hookshot"))
|
||||
canvas.create_text(x, px(32), text="Triforce", font="HsBrand", fill=INK, anchor="w")
|
||||
x += int(self.tk.call("font", "measure", "HsBrand", "Triforce"))
|
||||
if chip:
|
||||
canvas.create_text(x + px(12), px(32), text=chip, font="HsSmall", fill=INK_SOFT, anchor="w")
|
||||
self.header_canvas = canvas
|
||||
@@ -644,7 +644,7 @@ class Builder(tk.Tk):
|
||||
|
||||
# ---- the form ----
|
||||
def show_form(self):
|
||||
self.title("Hookshot Builder")
|
||||
self.title("Triforce Builder")
|
||||
if self.page:
|
||||
self.page.destroy()
|
||||
px = self.px
|
||||
@@ -657,7 +657,7 @@ class Builder(tk.Tk):
|
||||
f.columnconfigure(1, minsize=px(20))
|
||||
f.columnconfigure(2, minsize=px(200))
|
||||
ttk.Label(f, text="Build your game", style="Title.TLabel").grid(row=0, column=0, columnspan=3, sticky="w")
|
||||
ttk.Label(f, text="Pick your game files and where the game goes. Hookshot does the rest, once.", style="Sub.TLabel",
|
||||
ttk.Label(f, text="Pick your game files and where the game goes. Triforce does the rest, once.", style="Sub.TLabel",
|
||||
wraplength=px(800)).grid(row=1, column=0, columnspan=3, sticky="w", pady=(px(6), 0))
|
||||
if game_ready(self.cfg.get("out")):
|
||||
ttk.Button(f, text="Play the game built in %s" % self.cfg["out"], command=lambda: self.play_and_close(self.cfg["out"])).grid(
|
||||
@@ -819,14 +819,14 @@ class Builder(tk.Tk):
|
||||
self.status.set("Update builds your game again %s NVIDIA DLSS."
|
||||
% ("with" if self.dlss.get() else "without"))
|
||||
elif self.mode == "update-game":
|
||||
self.status.set("Hookshot %s is available. Your game is %s. Update downloads only what changed, then compiles what changed."
|
||||
self.status.set("Triforce %s is available. Your game is %s. Update downloads only what changed, then compiles what changed."
|
||||
% (target, game))
|
||||
elif self.mode == "up-to-date" and self.latest is None:
|
||||
self.status.set("Your game is %s, as this builder. GitHub did not answer, so newer versions could not be checked." % game)
|
||||
elif self.mode == "up-to-date":
|
||||
self.status.set("%s is the latest version." % game)
|
||||
elif self.mode == "update-builder":
|
||||
self.status.set("Hookshot Builder %s is available (this one is %s). Update it first, then build." % (self.latest, self.tools or "this one"))
|
||||
self.status.set("Triforce Builder %s is available (this one is %s). Update it first, then build." % (self.latest, self.tools or "this one"))
|
||||
else:
|
||||
self.status.set("")
|
||||
|
||||
@@ -840,20 +840,20 @@ class Builder(tk.Tk):
|
||||
self.launch_status.set("Update available: %s" % target)
|
||||
show = True
|
||||
elif target and game and game != target:
|
||||
self.launch_status.set("%s is out. Build this folder again with Hookshot Builder to get it." % target)
|
||||
self.launch_status.set("%s is out. Build this folder again with Triforce Builder to get it." % target)
|
||||
elif game and self.latest is None:
|
||||
self.launch_status.set("Up to date with this builder (GitHub did not answer)")
|
||||
elif game:
|
||||
self.launch_status.set("Up to date")
|
||||
else:
|
||||
self.launch_status.set("Could not check for updates (GitHub did not answer)" if self.latest is None else "Hookshot")
|
||||
self.launch_status.set("Could not check for updates (GitHub did not answer)" if self.latest is None else "Triforce")
|
||||
if hasattr(self, "launch_update"):
|
||||
self.launch_update.pack(side="right", padx=self.px(4)) if show else self.launch_update.pack_forget()
|
||||
|
||||
def show_launch(self, folder):
|
||||
if self.page:
|
||||
self.page.destroy()
|
||||
self.title("Hookshot")
|
||||
self.title("Triforce")
|
||||
px = self.px
|
||||
page = self.page = ttk.Frame(self)
|
||||
page.pack(fill="both", expand=True)
|
||||
@@ -881,7 +881,7 @@ class Builder(tk.Tk):
|
||||
def begin_update(self, folder=None):
|
||||
if folder is not None:
|
||||
self.update_folder = folder
|
||||
self.show_progress("Updating your game" if self.update_folder else "Updating Hookshot Builder")
|
||||
self.show_progress("Updating your game" if self.update_folder else "Updating Triforce Builder")
|
||||
folder = self.update_folder
|
||||
# (a game older than this builder is built again with it: nothing to download, and GitHub need not answer. So is one
|
||||
# from a builder that is not an older release, e.g. from the Actions tab: issue 902)
|
||||
@@ -952,20 +952,20 @@ class Builder(tk.Tk):
|
||||
out = os.path.expanduser(self.out.get().strip())
|
||||
if self.kind.get() == "nup":
|
||||
if not os.path.isfile(self.nup.get()):
|
||||
return messagebox.showerror("Hookshot", "Choose your game's .nup file.")
|
||||
return messagebox.showerror("Triforce", "Choose your game's .nup file.")
|
||||
src = ["--nup", self.nup.get()]
|
||||
else:
|
||||
if not (os.path.isdir(self.romfs.get()) and os.path.isdir(self.exefs.get())):
|
||||
return messagebox.showerror("Hookshot", "Choose your game's romfs and exefs folders.")
|
||||
return messagebox.showerror("Triforce", "Choose your game's romfs and exefs folders.")
|
||||
src = ["--romfs", self.romfs.get(), "--exefs", self.exefs.get()]
|
||||
if not out:
|
||||
return messagebox.showerror("Hookshot", "Choose where to save the game.")
|
||||
return messagebox.showerror("Triforce", "Choose where to save the game.")
|
||||
try:
|
||||
jobs = make_game.requested_jobs(os.environ.get("HOOKSHOT_JOBS"))
|
||||
if jobs is None and os.environ.get("RX_JOBS"): # (the older setting, still honoured)
|
||||
jobs = toolchain.default_jobs()
|
||||
except ValueError as error:
|
||||
return messagebox.showerror("Hookshot", str(error))
|
||||
return messagebox.showerror("Triforce", str(error))
|
||||
code = next((c for c, n in make_game.LANGUAGES if n == self.language.get()), "en-US")
|
||||
dlss = bool(self.dlss.get()) if hasattr(self, "dlss") else False
|
||||
self.cfg.update(kind=self.kind.get(), nup=self.nup.get(), romfs=self.romfs.get(), exefs=self.exefs.get(), out=out, language=code,
|
||||
@@ -977,7 +977,7 @@ class Builder(tk.Tk):
|
||||
([] if jobs is None else ["--jobs", str(jobs)]) + ([] if self.prepare.get() else ["--no-prepare-shaders"]) + \
|
||||
(dlss_args(True) if dlss else [])
|
||||
slow = slow_disk_warning(out) # (a warning, not a stop: a hard drive still builds, only much slower)
|
||||
if slow is not None and not messagebox.askokcancel("Hookshot", slow):
|
||||
if slow is not None and not messagebox.askokcancel("Triforce", slow):
|
||||
return
|
||||
self.show_progress()
|
||||
self.started = time.time()
|
||||
@@ -1182,7 +1182,7 @@ class Builder(tk.Tk):
|
||||
|
||||
def close(self):
|
||||
if self.proc and self.proc.poll() is None:
|
||||
if not messagebox.askyesno("Hookshot", "Stop the build and close?"):
|
||||
if not messagebox.askyesno("Triforce", "Stop the build and close?"):
|
||||
return
|
||||
os.killpg(self.proc.pid, signal.SIGTERM)
|
||||
self.destroy()
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
"""Linux builder updates, the same way Windows installs (builder/setup/setup.c, scripts/make_setup_parts.py).
|
||||
|
||||
A release publishes hookshot-linux.txt. Each part is a zip named by its SHA-256 and kept on the linux-parts release, so a
|
||||
A release publishes triforce-linux.txt. Each part is a zip named by its SHA-256 and kept on the linux-parts release, so a
|
||||
part whose files did not change is not downloaded again. The player's copy lives at
|
||||
$XDG_DATA_HOME/hookshot/builder/versions/<tag> (AppRun at its root, the same layout as the AppImage). An unchanged part
|
||||
$XDG_DATA_HOME/triforce/builder/versions/<tag> (AppRun at its root, the same layout as the AppImage). An unchanged part
|
||||
is copied from the builder that is running now (the mounted AppImage, or the version installed last time).
|
||||
|
||||
tag <tag>
|
||||
@@ -22,9 +22,19 @@ import zipfile
|
||||
|
||||
from part_links import SYSROOT_PART, is_absolute_link, relative_sysroot_link
|
||||
|
||||
LIST_NAME = "hookshot-linux.txt"
|
||||
LATEST_LIST = "https://github.com/NotRexed/Hookshot/releases/latest/download/" + LIST_NAME
|
||||
LATEST_API = "https://api.github.com/repos/NotRexed/Hookshot/releases/latest"
|
||||
LIST_NAME = "triforce-linux.txt"
|
||||
# (11-13: Triforce's own home. Releases are in triforce/downloads on its Forgejo: the list is asked on the main domain,
|
||||
# which passes /api/v1 on; a release's files are the Forgejo's own links. Up to v0.3.5: github.com/ruckus7382sfgsgdf/CBeta0.2)
|
||||
HOME_API = "https://triforceproject.com/api/v1/repos/triforce/downloads"
|
||||
DOWNLOADS = "https://git.triforceproject.com/triforce/downloads"
|
||||
LATEST_LIST = "%s/releases/latest/download/%s" % (DOWNLOADS, LIST_NAME)
|
||||
# (Triforce: the newest release, pre-releases too, as the Windows side asks: /releases/latest skips pre-releases, and
|
||||
# every Triforce release so far is one. The answer is a list of one release)
|
||||
LATEST_API = HOME_API + "/releases?limit=1"
|
||||
# (the game folder's names, nx2/make_game.py's; Hookshot's after them, for a folder that still has those)
|
||||
GAME_NAMES = ("triforce", "hookshot")
|
||||
VERSION_FILES = ("triforce_version.txt", "hookshot_version.txt")
|
||||
KEPT_EXEFS = (".triforce_exefs", ".hookshot_exefs")
|
||||
|
||||
|
||||
class Part(object):
|
||||
@@ -48,7 +58,7 @@ class Manifest(object):
|
||||
|
||||
def data_root():
|
||||
base = os.environ.get("HOOKSHOT_BUILDER_HOME") or os.environ.get("XDG_DATA_HOME") or os.path.expanduser("~/.local/share")
|
||||
return os.path.join(base, "hookshot", "builder")
|
||||
return os.path.join(base, "triforce", "builder")
|
||||
|
||||
|
||||
def parse_list(text, local=True):
|
||||
@@ -173,29 +183,34 @@ def game_version(folder):
|
||||
"""The release a folder was built with, when it still has the game files an update builds from."""
|
||||
if not folder:
|
||||
return None, False
|
||||
kept = os.path.isdir(os.path.join(folder, ".hookshot_exefs")) and os.path.isdir(os.path.join(folder, "romfs"))
|
||||
kept = (any(os.path.isdir(os.path.join(folder, name)) for name in KEPT_EXEFS)
|
||||
and os.path.isdir(os.path.join(folder, "romfs")))
|
||||
version = None
|
||||
try:
|
||||
with open(os.path.join(folder, "hookshot_version.txt"), encoding="utf-8") as f:
|
||||
for line in f:
|
||||
if line.startswith("version="):
|
||||
version = line[8:].strip() or None
|
||||
break
|
||||
except OSError:
|
||||
pass
|
||||
for name in VERSION_FILES:
|
||||
try:
|
||||
with open(os.path.join(folder, name), encoding="utf-8") as f:
|
||||
for line in f:
|
||||
if line.startswith("version="):
|
||||
version = line[8:].strip() or None
|
||||
break
|
||||
except OSError:
|
||||
continue
|
||||
break
|
||||
return version, kept
|
||||
|
||||
|
||||
def game_exe(folder):
|
||||
"""bin/hookshot under the launcher, or hookshot in a folder built before the launcher."""
|
||||
if not folder:
|
||||
"""bin/triforce under the launcher, or triforce in a folder built without one (Hookshot's names after them)."""
|
||||
if not folder or not os.path.isfile(os.path.join(folder, "image.bin")):
|
||||
return None
|
||||
nested = os.path.join(folder, "bin", "hookshot")
|
||||
if os.path.isfile(nested) and os.path.isfile(os.path.join(folder, "image.bin")):
|
||||
return nested
|
||||
flat = os.path.join(folder, "hookshot")
|
||||
if os.path.isfile(flat) and os.path.isfile(os.path.join(folder, "image.bin")):
|
||||
return flat
|
||||
for name in GAME_NAMES: # (under the launcher first: beside image.bin that name is the launcher itself)
|
||||
nested = os.path.join(folder, "bin", name)
|
||||
if os.path.isfile(nested):
|
||||
return nested
|
||||
for name in GAME_NAMES:
|
||||
flat = os.path.join(folder, name)
|
||||
if os.path.isfile(flat):
|
||||
return flat
|
||||
return None
|
||||
|
||||
|
||||
@@ -218,7 +233,7 @@ def _https(url):
|
||||
|
||||
def _request(url, timeout, limit=MAX_DOWNLOAD):
|
||||
# (no second argument: Request's second is the POST body, and a str body failed every download before connecting)
|
||||
req = urllib.request.Request(_https(url), headers={"User-Agent": "Hookshot", "Accept": "application/vnd.github+json"})
|
||||
req = urllib.request.Request(_https(url), headers={"User-Agent": "Triforce", "Accept": "application/vnd.github+json"})
|
||||
with urllib.request.urlopen(req, timeout=timeout) as response:
|
||||
return _read_at_most(response, limit)
|
||||
|
||||
@@ -238,7 +253,7 @@ def _api_download(url):
|
||||
for asset in json.loads(info.decode("utf-8")).get("assets", []):
|
||||
if asset.get("name") == name:
|
||||
req = urllib.request.Request(_https(asset.get("url")), headers={
|
||||
"User-Agent": "Hookshot", "Accept": "application/octet-stream"})
|
||||
"User-Agent": "Triforce", "Accept": "application/octet-stream"})
|
||||
with urllib.request.urlopen(req, timeout=120) as response:
|
||||
return _read_at_most(response, MAX_DOWNLOAD)
|
||||
return None
|
||||
@@ -276,6 +291,8 @@ def latest_tag(get=None):
|
||||
try:
|
||||
import json
|
||||
body = json.loads(get(LATEST_API).decode("utf-8"))
|
||||
if isinstance(body, list): # (releases?per_page=1: the newest first)
|
||||
body = body[0] if body else {}
|
||||
tag = body.get("tag_name")
|
||||
if tag:
|
||||
return tag
|
||||
@@ -462,7 +479,7 @@ def _finish_tree(dest):
|
||||
apprun = os.path.join(dest, "AppRun")
|
||||
shutil.copyfile(os.path.join(tools, "builder", "linux", "AppRun"), apprun)
|
||||
os.chmod(apprun, 0o755) # (rwxr-xr-x: the launcher must run; only its owner may change it)
|
||||
icon = os.path.join(tools, "assets", "hookshot.png")
|
||||
icon = os.path.join(tools, "assets", "triforce.png")
|
||||
if os.path.isfile(icon):
|
||||
shutil.copyfile(icon, os.path.join(dest, "hookshot.png"))
|
||||
desktop = os.path.join(tools, "builder", "linux", "hookshot-builder.desktop")
|
||||
@@ -529,6 +546,18 @@ def fetch_manifest(get=None):
|
||||
if override:
|
||||
with open(override, encoding="utf-8") as handle:
|
||||
return parse_list(handle.read())
|
||||
# (Triforce: the newest release's own list, by its tag, so a pre-release is found; /releases/latest is the fallback)
|
||||
try:
|
||||
import json
|
||||
body = json.loads(get(LATEST_API).decode("utf-8"))
|
||||
if isinstance(body, list):
|
||||
body = body[0] if body else {}
|
||||
tag = body.get("tag_name") or ""
|
||||
if tag and all(ch.isalnum() or ch in "._-" for ch in tag):
|
||||
url = "%s/releases/download/%s/%s" % (DOWNLOADS, tag, LIST_NAME)
|
||||
return parse_list(get(url).decode("utf-8"), local=False)
|
||||
except Exception:
|
||||
pass
|
||||
return parse_list(get(LATEST_LIST).decode("utf-8"), local=False)
|
||||
|
||||
|
||||
|
||||
@@ -232,16 +232,21 @@ def _kept_version(d):
|
||||
return bool(cur) and _same(cur, d)
|
||||
|
||||
|
||||
def freeable(after_build=False):
|
||||
def freeable(after_build=False, installing=False):
|
||||
"""What free lets go (measure counts it; nothing is changed here). (Triforce) Never an unfinished version that still holds
|
||||
folders of the installed one (setup_parts.lent: its reused.txt): deleted, the installed version lost its Python or its
|
||||
compiler for good. installing: another install holds the setup's folder now, and what it is putting together
|
||||
(downloads\\, versions\\) stays"""
|
||||
from . import setup_parts
|
||||
for d in (("sa", "exefs", "probe") if after_build else ("objcache", "sa", "exefs", "probe")):
|
||||
yield os.path.join(work(), d)
|
||||
for d in ("downloads", "update"):
|
||||
for d in ("update",) if installing else ("downloads", "update"):
|
||||
yield os.path.join(paths.base(), d)
|
||||
v = paths.versions()
|
||||
if os.path.isdir(v):
|
||||
if os.path.isdir(v) and not installing:
|
||||
for name in os.listdir(v):
|
||||
p = os.path.join(v, name)
|
||||
if os.path.isdir(p) and not _kept_version(p):
|
||||
if os.path.isdir(p) and not _kept_version(p) and not setup_parts.lent(p):
|
||||
yield p
|
||||
|
||||
|
||||
@@ -275,13 +280,24 @@ def measure():
|
||||
|
||||
def free(after_build=False):
|
||||
"""Lets go of what measure counts as freeable; returns the bytes it could not delete (a file in use)"""
|
||||
for d in list(freeable(after_build)):
|
||||
_delete(d)
|
||||
if not after_build:
|
||||
_delete(os.path.join(work(), "system_headers.txt"))
|
||||
return measure()[1]
|
||||
seen = set()
|
||||
return sum(_size(d, seen) for d in freeable(True))
|
||||
from . import setup_parts
|
||||
# ((Triforce) what a cut-off install moved from the installed version goes back first (setup_parts.undo_every_reuse), and
|
||||
# then its <tag>.part is freeable; one whose folders could not all go back stays. With the setup's folder held: an install
|
||||
# running now is not undone under it, and its folders are left alone)
|
||||
lock = setup_parts.take_lock(0)
|
||||
try:
|
||||
if lock:
|
||||
setup_parts.undo_every_reuse()
|
||||
for d in list(freeable(after_build, installing=not lock)):
|
||||
_delete(d)
|
||||
if not after_build:
|
||||
_delete(os.path.join(work(), "system_headers.txt"))
|
||||
return measure()[1]
|
||||
seen = set()
|
||||
return sum(_size(d, seen) for d in freeable(True, installing=not lock))
|
||||
finally:
|
||||
if lock:
|
||||
lock.release()
|
||||
|
||||
|
||||
def gb(n):
|
||||
|
||||
@@ -22,12 +22,80 @@ from . import REPO, paths
|
||||
UA = "HookshotBuilder-Setup/2.0"
|
||||
WAITS = (3, 6, 12, 20, 30, 45, 60) # (8 tries over ~3 minutes: GitHub's release downloads answered 504 for hours on 2026-11-08)
|
||||
OWN = ("python", "emsdk", "cpm", "third_party", "wgpu-native")
|
||||
MARGIN = 32 << 20 # ((Triforce) what a disk keeps free beyond what is about to be written to it: setup/Guard.cs Space.Margin)
|
||||
REUSED = "reused.txt" # ((Triforce) in versions\<tag>.part: the folders moved over from the installed version, reuse_part)
|
||||
DEVICES = {"CON", "PRN", "AUX", "NUL", "CONIN$", "CONOUT$"}
|
||||
LOCK_WAIT = 20 # ((Triforce) seconds an install waits for another one into the same folder before it says so: setup.c SETUP_LOCK_WAIT_MS)
|
||||
|
||||
|
||||
class SetupError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
def unsafe_member(name):
|
||||
"""(Triforce) Why a zip's member must not be unpacked under its name, None when it may (setup/Mods.cs Unsafe, the same
|
||||
rules): a path from the disk's root, a colon (a drive's letter, a hidden stream of another file), a path through "..", a
|
||||
name Windows keeps for a device (CON, NUL, COM1, lpt2.txt: with or without an extension), a name that ends in a dot or a
|
||||
space (Windows drops them, so the file would land under another name), a character Windows does not allow. zipfile's
|
||||
extractall drops some of these quietly and writes the file under another name; a device's name it writes to the device"""
|
||||
n = name.replace("\\", "/")
|
||||
if not n.strip():
|
||||
return "a member without a name"
|
||||
if n.startswith("/"):
|
||||
return "a path that starts at the disk's root"
|
||||
if ":" in n:
|
||||
return "a name with a colon or a drive's letter"
|
||||
for p in n.split("/"):
|
||||
if p in ("", "."):
|
||||
continue
|
||||
if p == "..":
|
||||
return "a path that leaves its own folder (..)"
|
||||
if p[-1] in ". ":
|
||||
return "a name that ends in a dot or a space, which Windows drops"
|
||||
stem = p.split(".", 1)[0].rstrip(" ").upper()
|
||||
# (COM1 to COM9 and LPT1 to LPT9; Windows takes the raised digits 1, 2 and 3 for digits there too)
|
||||
if stem in DEVICES or (len(stem) == 4 and stem[:3] in ("COM", "LPT") and stem[3] in "123456789\xb9\xb2\xb3"):
|
||||
return "a name Windows keeps for a device (%s)" % p
|
||||
if any(ord(c) < 32 or c in '<>"|?*' for c in p):
|
||||
return "a name with a character Windows does not allow"
|
||||
return None
|
||||
|
||||
|
||||
def check_zip(z, dest, what):
|
||||
"""(Triforce) Every member's name checked (unsafe_member) and the room for all of it asked before the first file is
|
||||
written: such a zip is refused whole"""
|
||||
need = 0
|
||||
for info in z.infolist():
|
||||
why = unsafe_member(info.filename)
|
||||
if why:
|
||||
raise SetupError("%s holds %s (\"%s\"): it was not unpacked." % (what, why, info.filename[:120]))
|
||||
need += info.file_size + 4096 # (a file takes whole clusters)
|
||||
room(dest, need, what)
|
||||
|
||||
|
||||
def free_bytes(folder):
|
||||
"""The free bytes of the disk that holds folder (asked of the nearest folder above it that is there); None when unknown"""
|
||||
d = os.path.abspath(folder)
|
||||
while not os.path.isdir(d):
|
||||
up = os.path.dirname(d)
|
||||
if up == d:
|
||||
return None
|
||||
d = up
|
||||
try:
|
||||
return shutil.disk_usage(d).free
|
||||
except OSError:
|
||||
return None
|
||||
|
||||
|
||||
def room(folder, need, what):
|
||||
"""(Triforce) SetupError before anything is written when the disk of folder has no room for need bytes and the margin"""
|
||||
free = free_bytes(folder)
|
||||
if free is not None and free < need + MARGIN:
|
||||
raise SetupError("There is no room for %s on %s: it takes %d MB there, and %d MB are free. Make room and try again."
|
||||
% (what, os.path.splitdrive(os.path.abspath(folder))[0] or folder, (need + MARGIN + (1 << 20) - 1) >> 20,
|
||||
free >> 20))
|
||||
|
||||
|
||||
class Part:
|
||||
def __init__(self, sha, size, dest, frm, to, url):
|
||||
self.sha, self.size, self.dest, self.frm, self.to, self.url = sha, int(size), dest, frm, to, url
|
||||
@@ -182,6 +250,17 @@ def reuse_part(tag, p, install):
|
||||
if not os.path.exists(src):
|
||||
return False
|
||||
os.makedirs(os.path.dirname(dst), exist_ok=True)
|
||||
# ((Triforce) written down before it moves: the installed version is the rollback point, and a cancelled or failed install
|
||||
# moves it back (undo_reuse). Before, a cancel left the installed version without the folders it lent and nothing ran)
|
||||
try:
|
||||
journal = os.path.join(install, REUSED)
|
||||
new = not os.path.isfile(journal)
|
||||
with open(journal, "a", encoding="utf-8") as f:
|
||||
f.write(("%s\n" % was if new else "") + rel + "\n")
|
||||
f.flush()
|
||||
os.fsync(f.fileno())
|
||||
except OSError:
|
||||
return False
|
||||
try:
|
||||
os.replace(src, dst)
|
||||
return True
|
||||
@@ -189,6 +268,139 @@ def reuse_part(tag, p, install):
|
||||
return False
|
||||
|
||||
|
||||
def undo_reuse(work):
|
||||
"""(Triforce) The folders reuse_part moved from the installed version into the unfinished one (work), moved back: what a
|
||||
cancelled, failed or cut-off install leaves is the version that was installed, whole. Each goes back only where the
|
||||
installed version has none; the list is removed once all went back"""
|
||||
journal = os.path.join(work, REUSED)
|
||||
try:
|
||||
with open(journal, encoding="utf-8") as f:
|
||||
lines = [l.rstrip("\n") for l in f if l.strip()]
|
||||
except OSError:
|
||||
return True
|
||||
if not lines:
|
||||
return True
|
||||
was, ok = lines[0], True
|
||||
for rel in lines[1:]:
|
||||
if os.path.isabs(rel) or ".." in rel.replace("\\", "/").split("/"):
|
||||
continue
|
||||
src, back = os.path.join(work, rel), os.path.join(paths.versions(), was, rel)
|
||||
if not os.path.exists(src) or os.path.exists(back):
|
||||
continue
|
||||
try:
|
||||
os.makedirs(os.path.dirname(back), exist_ok=True)
|
||||
os.replace(src, back)
|
||||
except OSError:
|
||||
ok = False
|
||||
if ok:
|
||||
try:
|
||||
os.remove(journal)
|
||||
except OSError:
|
||||
pass
|
||||
return ok
|
||||
|
||||
|
||||
def undo_every_reuse():
|
||||
"""(Triforce) undo_reuse for every unfinished version (versions\\*.part) that holds a reused.txt. Before, only the <tag>.part
|
||||
of the release being installed now was undone: an install of another release cut off before left the installed version's
|
||||
folders in its own <tag>.part, and the installed version ran without them. Returns the first such folder whose folders
|
||||
could not all go back (each is tried), None when nothing is left to move back"""
|
||||
v, left = paths.versions(), None
|
||||
try:
|
||||
names = sorted(os.listdir(v))
|
||||
except OSError:
|
||||
return None
|
||||
for name in names:
|
||||
work = os.path.join(v, name)
|
||||
if name.lower().endswith(".part") and os.path.isfile(os.path.join(work, REUSED)) and not undo_reuse(work):
|
||||
left = left or work
|
||||
return left
|
||||
|
||||
|
||||
def lent(folder):
|
||||
"""(Triforce) True when folder is an unfinished version (a versions\\*.part) that still holds folders of another version
|
||||
(its reused.txt): only undo_reuse may let it go, never a delete (core.freeable)"""
|
||||
return os.path.basename(folder.rstrip("\\/")).lower().endswith(".part") and os.path.isfile(os.path.join(folder, REUSED))
|
||||
|
||||
|
||||
def lock_name(base=None):
|
||||
"""(Triforce) The name of the lock every install into base holds (setup.c setup_lock_name and Reuse.cs LockName, the same):
|
||||
Local\\HookshotBuilder-Setup-<a 64-bit FNV-1a of the folder's full path with '\\' between its parts, none at its end, a to z
|
||||
in upper case, taken a UTF-16 unit at a time>. Local\\: this user's session"""
|
||||
full = os.path.abspath(base or paths.base()).replace("/", "\\").rstrip("\\")
|
||||
data, h = full.encode("utf-16-le", "surrogatepass"), 14695981039346656037 # (a name, not a secret)
|
||||
for i in range(0, len(data), 2):
|
||||
c = data[i] | data[i + 1] << 8
|
||||
h = ((h ^ (c - 32 if 97 <= c <= 122 else c)) * 1099511628211) & 0xFFFFFFFFFFFFFFFF
|
||||
return "Local\\HookshotBuilder-Setup-%016x" % h
|
||||
|
||||
|
||||
class Lock:
|
||||
"""(Triforce) The lock of the setup's folder, held (release() lets go of it; one that holds nothing where no lock could be
|
||||
made at all). Windows' named mutex belongs to the thread that took it: released on that thread"""
|
||||
|
||||
def __init__(self, handle=None, file=None):
|
||||
self.handle, self.file = handle, file
|
||||
|
||||
def release(self):
|
||||
if self.handle:
|
||||
k = ctypes_kernel32()
|
||||
k.ReleaseMutex(self.handle)
|
||||
k.CloseHandle(self.handle)
|
||||
self.handle = None
|
||||
if self.file:
|
||||
self.file.close() # (the flock goes with the file)
|
||||
self.file = None
|
||||
|
||||
|
||||
def ctypes_kernel32():
|
||||
import ctypes
|
||||
from ctypes import wintypes
|
||||
k = ctypes.WinDLL("kernel32", use_last_error=True)
|
||||
k.CreateMutexW.argtypes = [ctypes.c_void_p, wintypes.BOOL, wintypes.LPCWSTR]
|
||||
k.CreateMutexW.restype = wintypes.HANDLE
|
||||
k.WaitForSingleObject.argtypes = [wintypes.HANDLE, wintypes.DWORD]
|
||||
k.WaitForSingleObject.restype = wintypes.DWORD
|
||||
k.ReleaseMutex.argtypes = [wintypes.HANDLE]
|
||||
k.CloseHandle.argtypes = [wintypes.HANDLE]
|
||||
return k
|
||||
|
||||
|
||||
def take_lock(wait=LOCK_WAIT, base=None):
|
||||
"""(Triforce) The setup's folder for this install alone: Lock, or None when another install (this app's, or setup.c's)
|
||||
held it for wait seconds. Before, two installs into one folder ran at once, and one's sweep (undo_every_reuse) gave back
|
||||
the folders the other had just moved into its <tag>.part: that one then finished without its Python. Windows lets go of
|
||||
the mutex when its holder ends, however it ends; elsewhere a lock file (setup.lock in the folder) is flock'ed. Where no
|
||||
lock can be made at all nobody is refused"""
|
||||
base = base or paths.base()
|
||||
if os.name == "nt":
|
||||
k = ctypes_kernel32()
|
||||
h = k.CreateMutexW(None, False, lock_name(base))
|
||||
if not h: # (5: it is there, and belongs to a setup run as administrator)
|
||||
import ctypes
|
||||
return None if ctypes.get_last_error() == 5 else Lock()
|
||||
if k.WaitForSingleObject(h, int(max(0, wait) * 1000)) in (0, 0x80): # (0x80: its holder ended without letting go: ours)
|
||||
return Lock(handle=h)
|
||||
k.CloseHandle(h)
|
||||
return None
|
||||
try:
|
||||
import fcntl
|
||||
os.makedirs(base, exist_ok=True)
|
||||
f = open(os.path.join(base, "setup.lock"), "a")
|
||||
except (ImportError, OSError):
|
||||
return Lock()
|
||||
end = time.monotonic() + max(0, wait)
|
||||
while True:
|
||||
try:
|
||||
fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
return Lock(file=f)
|
||||
except OSError:
|
||||
if time.monotonic() >= end:
|
||||
f.close()
|
||||
return None
|
||||
time.sleep(0.2)
|
||||
|
||||
|
||||
def rmtree(p):
|
||||
shutil.rmtree(p, ignore_errors=True)
|
||||
|
||||
@@ -207,6 +419,29 @@ def current():
|
||||
|
||||
def install(status, progress=lambda f: None, tag=None, repair=False, cancel=None):
|
||||
"""Installs the release (the latest, or tag) unless it is there already; returns (tag, its folder)"""
|
||||
# ((Triforce) one install at a time into the setup's folder, its sweep included (take_lock): another one waits for it, a while)
|
||||
lock = take_lock(0)
|
||||
if lock is None:
|
||||
status("Another Hookshot Builder setup is installing. Waiting for it to finish...")
|
||||
lock = take_lock(LOCK_WAIT)
|
||||
if lock is None:
|
||||
raise SetupError("Another Hookshot Builder setup is installing into %s right now. Wait for it to finish (or close it), "
|
||||
"then try again." % paths.base())
|
||||
try:
|
||||
return install_locked(status, progress, tag, repair, cancel)
|
||||
finally:
|
||||
lock.release()
|
||||
|
||||
|
||||
def install_locked(status, progress, tag, repair, cancel):
|
||||
"""install's work, with the setup's folder held"""
|
||||
# ((Triforce) an install cut off before (the app closed), of this release or another: what it moved over from the installed
|
||||
# version goes back first, before the installed version is looked at, and a part folder whose folders could not all go back
|
||||
# is kept, not deleted with them)
|
||||
left = undo_every_reuse()
|
||||
if left:
|
||||
raise SetupError("The last install could not be undone: %s still holds folders of the installed version. Close every "
|
||||
"Hookshot window and try again." % left)
|
||||
tag, parts = read_manifest(status, tag, cancel)
|
||||
versions, downloads = paths.versions(), os.path.join(paths.base(), "downloads")
|
||||
final = os.path.join(versions, tag)
|
||||
@@ -216,39 +451,23 @@ def install(status, progress=lambda f: None, tag=None, repair=False, cancel=None
|
||||
rmtree(final)
|
||||
os.makedirs(work, exist_ok=True)
|
||||
os.makedirs(downloads, exist_ok=True)
|
||||
n = len(parts)
|
||||
for i, p in enumerate(parts, 1):
|
||||
if cancel and cancel():
|
||||
raise SetupError("cancelled")
|
||||
if reuse_part(tag, p, work):
|
||||
status("Part %d of %d unchanged: kept from the installed version" % (i, n))
|
||||
continue
|
||||
zpath = os.path.join(downloads, p.sha + ".zip")
|
||||
if not (os.path.isfile(zpath) and sha256_file(zpath) == p.sha):
|
||||
download_part(status, progress, p, i, n, zpath, cancel)
|
||||
status("Unpacking part %d of %d..." % (i, n))
|
||||
progress(-1)
|
||||
dest = work if p.dest == "." else os.path.join(work, p.dest.replace("/", os.sep))
|
||||
os.makedirs(dest, exist_ok=True)
|
||||
try:
|
||||
with zipfile.ZipFile(zpath) as z:
|
||||
z.extractall(dest)
|
||||
except (OSError, zipfile.BadZipFile) as e:
|
||||
raise SetupError("Unpacking part %d of %d failed: %s" % (i, n, e)) from None
|
||||
if p.frm != "-" and p.to != "-": # (llvm-mingw-<version>-ucrt-x86_64 -> llvm-mingw)
|
||||
src, dst = os.path.join(dest, p.frm), os.path.join(dest, p.to)
|
||||
if not os.path.exists(dst):
|
||||
try:
|
||||
os.replace(src, dst)
|
||||
except OSError:
|
||||
raise SetupError("Could not set up part %d of %d (renaming %s)." % (i, n, p.frm)) from None
|
||||
if not os.path.isfile(os.path.join(work, "HookshotBuilder", "tools", "nx2", "make_game.py")):
|
||||
raise SetupError("The build tools are missing after unpacking. Your antivirus may have removed them: allow the folder %s "
|
||||
"and try again." % paths.base())
|
||||
try:
|
||||
unpack_parts(status, progress, tag, parts, work, downloads, cancel)
|
||||
except BaseException:
|
||||
# ((Triforce) a cancel or a failure: the installed version gets back what was moved from it, and the partial goes)
|
||||
if undo_reuse(work):
|
||||
rmtree(work)
|
||||
raise
|
||||
try:
|
||||
os.replace(work, final)
|
||||
except OSError:
|
||||
if undo_reuse(work):
|
||||
rmtree(work)
|
||||
raise SetupError("Could not finish installing into %s." % final) from None
|
||||
try:
|
||||
os.remove(os.path.join(final, REUSED))
|
||||
except OSError:
|
||||
pass
|
||||
paths.write_small(os.path.join(final, "installed.txt"), tag)
|
||||
write_parts(final, parts)
|
||||
elif not os.path.isfile(os.path.join(final, "parts.txt")):
|
||||
@@ -258,8 +477,45 @@ def install(status, progress=lambda f: None, tag=None, repair=False, cancel=None
|
||||
return tag, final
|
||||
|
||||
|
||||
def unpack_parts(status, progress, tag, parts, work, downloads, cancel):
|
||||
"""Each part into work: moved over from the installed version, or downloaded (when not there already), checked and unpacked"""
|
||||
n = len(parts)
|
||||
for i, p in enumerate(parts, 1):
|
||||
if cancel and cancel():
|
||||
raise SetupError("cancelled")
|
||||
if reuse_part(tag, p, work):
|
||||
status("Part %d of %d unchanged: kept from the installed version" % (i, n))
|
||||
continue
|
||||
zpath = os.path.join(downloads, p.sha + ".zip")
|
||||
if not (os.path.isfile(zpath) and sha256_file(zpath) == p.sha):
|
||||
download_part(status, progress, p, i, n, zpath, cancel)
|
||||
status("Unpacking part %d of %d..." % (i, n))
|
||||
progress(-1)
|
||||
dest = work if p.dest == "." else os.path.join(work, p.dest.replace("/", os.sep))
|
||||
os.makedirs(dest, exist_ok=True)
|
||||
try:
|
||||
with zipfile.ZipFile(zpath) as z:
|
||||
check_zip(z, dest, "Part %d of %d" % (i, n)) # ((Triforce) every name, and the room, before the first file)
|
||||
z.extractall(dest)
|
||||
except (OSError, zipfile.BadZipFile) as e:
|
||||
raise SetupError("Unpacking part %d of %d failed: %s" % (i, n, e)) from None
|
||||
if p.frm != "-" and p.to != "-": # (llvm-mingw-<version>-ucrt-x86_64 -> llvm-mingw)
|
||||
src, dst = os.path.join(dest, p.frm), os.path.join(dest, p.to)
|
||||
if not os.path.exists(dst):
|
||||
try:
|
||||
os.replace(src, dst)
|
||||
except OSError:
|
||||
raise SetupError("Could not set up part %d of %d (renaming %s)." % (i, n, p.frm)) from None
|
||||
if not os.path.isfile(os.path.join(work, "HookshotBuilder", "tools", "nx2", "make_game.py")):
|
||||
raise SetupError("The build tools are missing after unpacking. Your antivirus may have removed them: allow the folder %s "
|
||||
"and try again." % paths.base())
|
||||
|
||||
|
||||
def download_part(status, progress, p, i, n, zpath, cancel):
|
||||
http, part = Http(), zpath + ".part"
|
||||
# ((Triforce) room for the size the list names, asked before the first byte: a full disk stopped the download half way with
|
||||
# Windows' own words for it. The part is written from its first byte at each try, so no address or mark is kept beside it)
|
||||
room(os.path.dirname(zpath), p.size, "part %d of %d" % (i, n))
|
||||
for attempt in range(len(WAITS) + 1):
|
||||
if attempt:
|
||||
status("Part %d of %d: GitHub didn't answer (%s). Trying again in %d s..." % (i, n, http.status or "no answer",
|
||||
|
||||
@@ -89,12 +89,21 @@ static void status(const wchar_t *fmt, ...) {
|
||||
PostMessageW(g_win, WM_STATUS, 0, 0);
|
||||
}
|
||||
|
||||
/* (Triforce) the unfinished version's folder while one is put together, and the versions folder: what fail() undoes (undo_reuse) */
|
||||
static wchar_t g_part_dir[MAX_PATH], g_versions_dir[MAX_PATH];
|
||||
static int undo_reuse(const wchar_t *versions, const wchar_t *install);
|
||||
static void rmtree(const wchar_t *dir);
|
||||
static void setup_lock_release(void);
|
||||
|
||||
static void fail(const wchar_t *fmt, ...) {
|
||||
wchar_t msg[1024];
|
||||
va_list ap;
|
||||
va_start(ap, fmt);
|
||||
vswprintf(msg, 1024, fmt, ap);
|
||||
va_end(ap);
|
||||
/* ((Triforce) the installed version gets back the folders that were moved from it, and the unfinished one goes) */
|
||||
if (g_part_dir[0] && undo_reuse(g_versions_dir, g_part_dir)) rmtree(g_part_dir);
|
||||
setup_lock_release(); /* ((Triforce) undone: the next setup may begin) */
|
||||
if (g_headless) say_error(msg), ExitProcess(1);
|
||||
MessageBoxW(g_win, msg, L"Hookshot Builder setup", MB_OK | MB_ICONERROR);
|
||||
PostMessageW(g_win, WM_DONE, 1, 0);
|
||||
@@ -318,6 +327,29 @@ static int part_folder(const Part *p, wchar_t *rel, int n) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
#define REUSED_NOTE L"reused.txt"
|
||||
/* ((Triforce) undo_reuse's note: rel added to <install>\reused.txt, the installed version's tag first when it is new; written
|
||||
through to the disk. 0: it could not be written (the folder is then not moved) */
|
||||
static int reuse_note(const wchar_t *install, const char *was, const wchar_t *rel) {
|
||||
wchar_t note[MAX_PATH];
|
||||
char line[2 * MAX_PATH + 160];
|
||||
swprintf(note, MAX_PATH, L"%ls\\" REUSED_NOTE, install);
|
||||
const int fresh = GetFileAttributesW(note) == INVALID_FILE_ATTRIBUTES;
|
||||
HANDLE f = CreateFileW(note, FILE_APPEND_DATA, 0, NULL, OPEN_ALWAYS, FILE_FLAG_WRITE_THROUGH, NULL);
|
||||
if (f == INVALID_HANDLE_VALUE) return 0;
|
||||
int n = fresh ? snprintf(line, sizeof line, "%s\n", was) : 0;
|
||||
const int k = WideCharToMultiByte(CP_UTF8, 0, rel, -1, line + n, (int)sizeof line - n - 2, NULL, NULL);
|
||||
DWORD put = 0;
|
||||
int ok = k > 0;
|
||||
if (ok) {
|
||||
n += k - 1;
|
||||
line[n++] = '\n';
|
||||
ok = WriteFile(f, line, (DWORD)n, &put, NULL) && put == (DWORD)n && FlushFileBuffers(f);
|
||||
}
|
||||
CloseHandle(f);
|
||||
return ok;
|
||||
}
|
||||
|
||||
/* (players asked for less in %LOCALAPPDATA%: the downloaded zips are not kept beside the unpacked version any more. So that an update
|
||||
still downloads only what changed, a part whose checksum the installed version lists in its parts.txt (and whose folder it has)
|
||||
is moved over from it instead of downloaded: that version is deleted after the install anyway) */
|
||||
@@ -343,9 +375,106 @@ static int reuse_part(const wchar_t *versions, const char *tag, const Part *p, c
|
||||
wcscpy(parent, to);
|
||||
wchar_t *slash = wcsrchr(parent, L'\\');
|
||||
if (slash) *slash = 0, mkdirs(parent);
|
||||
/* ((Triforce) written down before it moves: the installed version is the rollback point, undo_reuse) */
|
||||
if (!reuse_note(install, was, rel)) return 0;
|
||||
return MoveFileW(from, to) != 0;
|
||||
}
|
||||
|
||||
/* (Triforce) The folders reuse_part moved from the installed version into the unfinished one (install), moved back: what a
|
||||
failed, closed or cut-off setup leaves is the version that was installed, whole. Before, they stayed in <tag>.part, which
|
||||
the next run deleted with them, and the version still installed had lost them. Each goes back only where the installed
|
||||
version has none; the note (<tag>.part\reused.txt: the installed version's tag, then a folder a line) is removed once all
|
||||
went back. 1: nothing is left to move back */
|
||||
static int undo_reuse(const wchar_t *versions, const wchar_t *install) {
|
||||
wchar_t note[MAX_PATH];
|
||||
swprintf(note, MAX_PATH, L"%ls\\" REUSED_NOTE, install);
|
||||
HANDLE f = CreateFileW(note, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
|
||||
if (f == INVALID_HANDLE_VALUE) return 1;
|
||||
char buf[8192];
|
||||
DWORD got = 0;
|
||||
ReadFile(f, buf, sizeof buf - 1, &got, NULL);
|
||||
CloseHandle(f);
|
||||
buf[got] = 0;
|
||||
char *next = buf, *was = next_line(&next), *rel;
|
||||
int ok = 1;
|
||||
if (!was || !list_name_ok(was, 0)) return DeleteFileW(note), 1; /* (no version named: nothing was moved yet) */
|
||||
while ((rel = next_line(&next)) != NULL) {
|
||||
if (!list_name_ok(rel, 1)) continue;
|
||||
wchar_t wrel[MAX_PATH], from[MAX_PATH], back[MAX_PATH], parent[MAX_PATH];
|
||||
MultiByteToWideChar(CP_UTF8, 0, rel, -1, wrel, MAX_PATH);
|
||||
swprintf(from, MAX_PATH, L"%ls\\%ls", install, wrel);
|
||||
swprintf(back, MAX_PATH, L"%ls\\%hs\\%ls", versions, was, wrel);
|
||||
if (GetFileAttributesW(from) == INVALID_FILE_ATTRIBUTES || GetFileAttributesW(back) != INVALID_FILE_ATTRIBUTES) continue;
|
||||
wcscpy(parent, back);
|
||||
wchar_t *slash = wcsrchr(parent, L'\\');
|
||||
if (slash) *slash = 0, mkdirs(parent);
|
||||
if (!MoveFileW(from, back)) ok = 0;
|
||||
}
|
||||
if (ok) DeleteFileW(note);
|
||||
return ok;
|
||||
}
|
||||
|
||||
/* (Triforce) undo_reuse for every unfinished version (versions\*.part) that holds a note. Before, only the <tag>.part of the
|
||||
release being set up now was undone: a setup of another release cut off before left the installed version's folders in its
|
||||
own <tag>.part, and the installed version ran without them. Each is tried; 1: nothing is left to move back, 0: left names the
|
||||
first folder whose folders could not all go back */
|
||||
static int undo_every_reuse(const wchar_t *versions, wchar_t *left, size_t cap) {
|
||||
wchar_t pattern[MAX_PATH], dir[MAX_PATH], note[MAX_PATH];
|
||||
WIN32_FIND_DATAW fd;
|
||||
swprintf(pattern, MAX_PATH, L"%ls\\*", versions);
|
||||
HANDLE h = FindFirstFileW(pattern, &fd);
|
||||
if (h == INVALID_HANDLE_VALUE) return 1;
|
||||
int ok = 1;
|
||||
do {
|
||||
const size_t n = wcslen(fd.cFileName);
|
||||
if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || n < 6 || _wcsicmp(fd.cFileName + n - 5, L".part")) continue;
|
||||
swprintf(dir, MAX_PATH, L"%ls\\%ls", versions, fd.cFileName);
|
||||
swprintf(note, MAX_PATH, L"%ls\\" REUSED_NOTE, dir);
|
||||
if (GetFileAttributesW(note) == INVALID_FILE_ATTRIBUTES || undo_reuse(versions, dir)) continue;
|
||||
if (ok) wcsncpy(left, dir, cap - 1), left[cap - 1] = 0;
|
||||
ok = 0;
|
||||
} while (FindNextFileW(h, &fd));
|
||||
FindClose(h);
|
||||
return ok;
|
||||
}
|
||||
|
||||
/* (Triforce) One setup at a time for a setup folder (base), its sweep (undo_every_reuse) included. Two at once each undid the
|
||||
other's <tag>.part: the second one's sweep gave the installed version back the folders the first had just moved over, and
|
||||
the first finished without its Python. The lock is a named mutex (Windows lets go of it when its holder ends, however it
|
||||
ends), named as setup_parts.lock_name and Reuse.cs LockName name it: Local\HookshotBuilder-Setup-<a 64-bit FNV-1a of the
|
||||
folder's full path with '\' between its parts, none at its end, a to z in upper case>. Local\: this user's session */
|
||||
#define SETUP_LOCK_WAIT_MS 20000
|
||||
static HANDLE g_setup_lock;
|
||||
static void setup_lock_name(const wchar_t *base, wchar_t *name, size_t cap) {
|
||||
wchar_t full[2 * MAX_PATH];
|
||||
const DWORD got = GetFullPathNameW(base, 2 * MAX_PATH, full, NULL);
|
||||
if (!got || got >= 2 * MAX_PATH) wcsncpy(full, base, 2 * MAX_PATH - 1), full[2 * MAX_PATH - 1] = 0;
|
||||
size_t n = wcslen(full);
|
||||
for (size_t i = 0; i < n; i++) if (full[i] == L'/') full[i] = L'\\';
|
||||
while (n && full[n - 1] == L'\\') full[--n] = 0;
|
||||
unsigned long long h = 14695981039346656037ULL; /* (a name, not a secret) */
|
||||
for (size_t i = 0; i < n; i++) {
|
||||
const unsigned c = full[i] >= L'a' && full[i] <= L'z' ? full[i] - 32u : full[i];
|
||||
h = (h ^ c) * 1099511628211ULL;
|
||||
}
|
||||
swprintf(name, cap, L"Local\\HookshotBuilder-Setup-%016llx", h);
|
||||
}
|
||||
/* 1: this setup holds base (or no lock can be made at all: nobody is refused), 0: another setup held it for wait_ms */
|
||||
static int setup_lock_take(const wchar_t *base, DWORD wait_ms) {
|
||||
wchar_t name[96];
|
||||
if (g_setup_lock) return 1;
|
||||
setup_lock_name(base, name, 96);
|
||||
HANDLE m = CreateMutexW(NULL, FALSE, name);
|
||||
if (!m) return GetLastError() != ERROR_ACCESS_DENIED; /* (it is there, and belongs to a setup run as administrator) */
|
||||
const DWORD r = WaitForSingleObject(m, wait_ms);
|
||||
if (r == WAIT_OBJECT_0 || r == WAIT_ABANDONED) return g_setup_lock = m, 1; /* (abandoned: its holder ended, it is ours) */
|
||||
CloseHandle(m);
|
||||
return 0;
|
||||
}
|
||||
static void setup_lock_release(void) {
|
||||
if (g_setup_lock) ReleaseMutex(g_setup_lock), CloseHandle(g_setup_lock), g_setup_lock = NULL;
|
||||
}
|
||||
|
||||
/* The checksums of the parts this version holds in folders of their own (reuse_part reads them at the next update) */
|
||||
static void write_parts(const wchar_t *install, const Part *parts, int nparts) {
|
||||
wchar_t list[MAX_PATH], rel[MAX_PATH];
|
||||
@@ -536,6 +665,14 @@ static DWORD WINAPI work(LPVOID unused) {
|
||||
const wchar_t *tb = _wgetenv(L"HOOKSHOT_SETUP_BASE");
|
||||
if (tb && *tb) wcsncpy(base, tb, MAX_PATH - 1), base[MAX_PATH - 1] = 0;
|
||||
}
|
||||
/* ((Triforce) this folder for this setup alone until the builder starts, its sweep included (setup_lock_take): another one
|
||||
waits for it, a while) */
|
||||
if (!setup_lock_take(base, 0)) {
|
||||
status(L"Another Hookshot Builder setup is installing. Waiting for it to finish...");
|
||||
if (!setup_lock_take(base, SETUP_LOCK_WAIT_MS))
|
||||
fail(L"Another Hookshot Builder setup is installing into %ls right now. Wait for it to finish (or close it), then run the "
|
||||
L"setup again.", base);
|
||||
}
|
||||
swprintf(downloads, MAX_PATH, L"%ls\\downloads", base);
|
||||
mkdirs(downloads);
|
||||
|
||||
@@ -618,12 +755,21 @@ static DWORD WINAPI work(LPVOID unused) {
|
||||
swprintf(exe, MAX_PATH, L"%ls\\%ls", install, wrun);
|
||||
for (wchar_t *q = exe; *q; q++) if (*q == L'/') *q = L'\\';
|
||||
|
||||
{ /* ((Triforce) a setup cut off before, of this release or another: what it moved over from the installed version goes
|
||||
back first, before the installed version is looked at; a part folder whose folders could not all go back is kept, not
|
||||
deleted with them) */
|
||||
wchar_t left[MAX_PATH];
|
||||
if (!undo_every_reuse(versions, left, MAX_PATH))
|
||||
fail(L"The last setup could not be undone: %ls still holds folders of the installed version. Close every Hookshot window "
|
||||
L"and run the setup again.", left);
|
||||
}
|
||||
if (repair || GetFileAttributesW(marker) == INVALID_FILE_ATTRIBUTES || GetFileAttributesW(exe) == INVALID_FILE_ATTRIBUTES) {
|
||||
/* (unpacked into <tag>.part and renamed once complete: a setup stopped half way never leaves a version that looks installed) */
|
||||
swprintf(install, MAX_PATH, L"%ls\\%ls.part", versions, wtag);
|
||||
rmtree(install);
|
||||
rmtree(final_dir);
|
||||
mkdirs(install);
|
||||
wcscpy(g_versions_dir, versions), wcscpy(g_part_dir, install); /* (fail() undoes from here on) */
|
||||
for (int i = 0; i < nparts; i++) {
|
||||
Part *p = &parts[i];
|
||||
wchar_t zip[MAX_PATH], wsha[65];
|
||||
@@ -721,7 +867,13 @@ static DWORD WINAPI work(LPVOID unused) {
|
||||
if (GetFileAttributesW(staged_exe) == INVALID_FILE_ATTRIBUTES)
|
||||
fail(L"The builder is missing after unpacking (%ls). Your antivirus may have removed it: allow the folder %ls and run the setup again.", staged_exe, base);
|
||||
if (!MoveFileW(install, final_dir)) fail(L"Could not finish installing into %ls.", final_dir);
|
||||
g_part_dir[0] = 0; /* (installed: nothing to undo; the note goes) */
|
||||
wcscpy(install, final_dir);
|
||||
{
|
||||
wchar_t note[MAX_PATH];
|
||||
swprintf(note, MAX_PATH, L"%ls\\" REUSED_NOTE, final_dir);
|
||||
DeleteFileW(note);
|
||||
}
|
||||
write_small(marker, tag);
|
||||
write_parts(install, parts, nparts);
|
||||
}
|
||||
@@ -732,6 +884,7 @@ static DWORD WINAPI work(LPVOID unused) {
|
||||
}
|
||||
prune(versions, downloads, tag, parts, nparts);
|
||||
rmtree(downloads); /* (installed: its zips are not kept; an update moves unchanged folders over instead, reuse_part) */
|
||||
setup_lock_release(); /* ((Triforce) installed: the builder this starts may start a setup of its own) */
|
||||
|
||||
status(L"Starting the Hookshot Builder...");
|
||||
wchar_t cmd[4096], dir[MAX_PATH];
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<assemblyIdentity type="win32" name="Hookshot.BuilderSetup" version="1.0.0.0"/>
|
||||
<dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/></dependentAssembly></dependency>
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware></windowsSettings></application>
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings><dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware><longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware></windowsSettings></application>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/></requestedPrivileges></security></trustInfo>
|
||||
</assembly>
|
||||
|
||||
@@ -108,7 +108,11 @@ second game.
|
||||
7. **The CPU saturates first.** Ryzen 5 7600X, 6 cores / 12 threads: the game's threads, the replay, captures and
|
||||
pipeline compiles share it, and extra helper threads have lowered fps before. Thread counts are measured, never
|
||||
raised by default (`HOS_VCORES`, `RX_VK_CAPTURE_THREADS`, `HOS_THREAD_TIMES=<seconds>`, the `HOS_SAMPLE` profiler
|
||||
with `scripts/prof.py`).
|
||||
with `scripts/prof.py`). The one exception, by the owner's choice (2026-11-15): the Replay helper threads row is
|
||||
Automatic unless set, which is none on every PC since 2026-11-17 (the helper threads slowed the game's own threads in the
|
||||
owner's play); a count set on the row keeps its threads only where trials in play measure the
|
||||
frames shorter, or, without a trial, where the replay is plainly the frame's limit by a margin over the GPU's time
|
||||
(the rule in `gpu/vk/replay_threads.h`, fitted to the owner's logs; a trial that finds them slower holds it).
|
||||
|
||||
Also inherited, and game-specific in MKW: MKW's frame-pacer hooks at fixed guest addresses are gated on MKW's build
|
||||
id (`hos_game_is_mkw`); OoT gets its own once its pacer is found, never by address coincidence.
|
||||
|
||||
@@ -76,17 +76,31 @@ screen. It costs some GPU time on cards that cull quickly, so it is off unless s
|
||||
| Switch | What it does |
|
||||
|---|---|
|
||||
| `HOS_HEADLESS` (set) | No window: the renderer draws offscreen, for screenshots and frame dumps |
|
||||
| `HOS_WINDOW_SIZE=<w>x<h>` | The window's size in pixels (1280x720 by default, wider for an ultrawide picture) |
|
||||
| `HOS_WINDOW_SIZE=<w>x<h>` | The window's size in pixels (1280x720 by default, wider for an ultrawide picture; 64 to 16384 a side) |
|
||||
| `HOS_WINDOW_NOACTIVATE` (set) | The window opens behind the others and does not take the focus (Windows) |
|
||||
| `HOS_FULLSCREEN=1` | Starts in fullscreen; the Insert menu's Fullscreen row is then left alone |
|
||||
| `HOS_AUDIO=0` | No sound device is opened (the mixer still runs); `scripts/run-vk.ps1` sets it unless `-Sound` |
|
||||
| `HOS_LANGUAGE=<code>` | The game's language for this run, a code from `language.txt` |
|
||||
| `HOS_OUTPUT_RES=<0..3>`, `HOS_HANDHELD=1`, `HOS_ASPECT=<ratio>` | Over the options file: the output resolution (0 2048x1152, 1 2560x1440, 2 3840x2160, 3 1920x1080), the handheld profile, a picture wider than 16:9 (2.3889 for 3440x1440) |
|
||||
| `HOS_OUTPUT_RES=<0..3>`, `HOS_HANDHELD=1`, `HOS_ASPECT=<ratio>` | Over the options file: the output resolution (0 2048x1152, 1 2560x1440, 2 3840x2160, 3 1920x1080), the handheld profile, a picture wider than 16:9 (2.3889 for 3440x1440; the Ultrawide row's 21:9 is 2.3704, 64:27, and its 32:9 3.5556) |
|
||||
| `HOS_DYNRES=0`, `HOS_REALTIME_STEP=0`, `HOS_TEXT_SPEED=<0..3>` | Over the options file: Resolution 100% (non-zero: Auto), Game speed Per frame (1: Real time), Text speed |
|
||||
| `HOS_STEP_STEADY=0` | (Triforce, on by default since the lab's A/B; `=0` the mean of the last five as before) The game's real-time step kept steady, after NX2navi's steady step (`host/step_steady.h`, `host/nn_vi.c` `realtime_step`): the mean of the last 12 present intervals without their longest and shortest in place of the mean of the last five (`HOS_REALTIME_WINDOW`), the paced period itself where that mean is within 3% of it, and what the display showed and the game was not given repaid at a 64th a frame, 10% of the step at most (a quarter second owed at most). A cap the game holds steps it by the period exactly, and a hitch is paid back over most of a second instead of in the next five frames (a 50 ms frame at 240: 200 frames of at most 10% more, where the mean of five gave five steps of 13 ms). Game time still follows the clock |
|
||||
| `RX_VK_FRAMEGEN=0`, `RX_VK_FRAMEGEN_MULT=<2..8>`, `RX_VK_PACE=0`, `RX_VK_UPSCALE=<0..2>` | No frame generation whatever the menu says; over the options file: its multiplier, frame pacing, the upscaling filter |
|
||||
| `RX_VK_FRAMEGEN_FINE=0` | Frame generation's own made frames (Auto, 2x to 8x) the old way: a vector per 16x16 pixels in steps of 4 pixels, a blend of four of them per pixel, a pixel alike in both frames taken as still. Without it, a vector per 8x8 pixels to a fraction of a pixel, settled among its neighbours, and one motion per pixel (`gpu/vk/vk_framegen.cpp` `fine_vectors`, `shaders/fg_fine_*.comp`), which keeps moving straight lines straight and thin lines drawn (`tests/test_framegen_lines.py` measures both) |
|
||||
| `RX_VK_PACE_SMOOTH=0` | (Triforce, on by default since the lab's A/B; `=0` off) The Frame pacing row on the plain present too, without frame generation: with the row on, a picture of the game's that comes sooner than seven eighths of the recent interval after the last one waits for that, its blit on the queue and the queue's lock let go; a late one goes at once, and none waits more than 50 ms (`gpu/vk/present_smooth.h`, after NX2navi's `pace_smooth`). Without it the row spaces only frame generation's frames, as before. With `RX_VK_PRESENT_THREAD=0` the present is on the game's presenting thread, so a wait also holds that thread's next frame: what that does to the rate under the cap is for a measurement before it is on. A `vk: frame pacing` line every 1200 pictures says how many waited and how long |
|
||||
| `RX_VK_PRESENT_THREAD=1` | (off by default since the lab showed no gain) (Triforce, on by default; `=0` as before) The game's presents go out from a present thread of their own (`gpu/vk/present_thread.h`, after NX2navi's present thread): the presenting thread records and submits the blit as before (the frame fence, the swapchain's image, the overlays, the bug capture's copy and the frame log's: the same commands in the same order on the queue), then hands the pacing's wait (`RX_VK_PACE_SMOOTH`) and the present call to that thread and goes on to its next frame; the next present waits first until the one handed over is out, so one is in hand at most. Not with frame generation, NVIDIA DLSS frame generation or AMD Anti-Lag 2 (presents and stages of their own); NVIDIA Reflex's present markers carry their frame's id. The `vk: a frame's present` line every 120 presents says how many went out from it, the presenting thread's time in the present and how much of it was the wait for the present before, and the pacing's wait and the present call (on whichever thread); the stall line's present is the presenting thread's, with that wait named |
|
||||
| `RX_VK_REFLEX_LIMIT=1` | (Triforce, off by default) With the NVIDIA Reflex row on and no frame generation, Reflex's sleep holds the Game frame rate cap (the sleep mode's minimum interval) where each frame starts, in place of the game's own wait, as the Reflex frame limit row does with DLSS frame generation: one wait a frame, timed by the driver (`gpu/vk/vk_reflex.cpp` `reflex_pace`, the rule `gpu/vk/dlssg_pace.h`'s; after NX2navi's `low_latency`). The game's own wait holds a movie, a frame RivaTuner holds, a window that showed nothing for 200 ms, and the rest of the run once over half of 60 frames came sooner than three quarters of the period, or when the driver refuses the interval. `vk: NVIDIA Reflex: frame limit:` lines say who holds it; the Full overlay's Frame limit line says NVIDIA Reflex after the rate. The Reflex frame limit row's text does not cover this switch yet |
|
||||
| `HOS_PACE_HANDOFF=0` | The game's own wait paces every frame, whatever the Reflex frame limit row says and whether RivaTuner Statistics Server runs: the renderer is never asked whether another limiter holds a frame, and RivaTuner gets no limit from the game (`host/nn_vi.c` `pace_handed`, `gpu/vk/vk_pace.cpp`) |
|
||||
| `HOS_FPS_STEADY=0`, `=1`, `=2` | (Triforce, off by default: the Steady frame rate row, over it) 1 any rate, 2 steps of the display's refresh: the game's frames paced to a period this PC holds in the scene, never shorter than the Game frame rate cap's (`host/pace_steady.h`, `host/nn_vi.c` `steady_period`). The rate is chosen by probes (`pace_steady_probed`): 32 frames at the cap, unpaced, the last 24 of them measured, at the start, 2 s after a load, at least every 12 s, and when a quarter of the last 64 frames ran late (2 s after the last probe at the soonest, twice that each time a probe changes nothing, up to 12 s); the rate becomes the first the last three probes' 90th percentile fits in with 2% to spare where that is slower, or the first it fits in with 5% to spare where that is faster. A frame paced slower does more work (the lab's Market: 11.6 ms unpaced, 15.5 ms paced at 55 fps), so the frames' own measure as they run chased the rate down; frames late now only bring a probe on, and the rate is never under what a probe shows the PC holds. `HOS_FPS_STEADY_PROBE=0`: no probes, the rule below as before. Without probes: what a frame took is its present interval less the longest of the pacing's waits in it (the acquire's, on the presenting thread or another, and the present's hold), and what it needed the interval less all of them (OoT's main thread and Presentation Thread take turns; where the waits add up to the whole interval, the longest: `pace_steady_measure`); a quarter of the last 64 frames that took more than the period lowers it at once to the first rate their 90th percentile fits in with 2% to spare, and once it has held 3 s since a raise (6 s since a lowering, doubled for each lowering within 30 s of a raise, up to 120 s, and back to 6 s at a load) it rises to the fastest rate the 90th percentile of what the last 512 frames needed fits in with 5% to spare (one rate at a time where the game acquires on another thread). A frame that took over 2.5 times the median of the last 64 (hitches among them), a present interval over 250 ms, and the frames of the 2 s after such a load (the scene is not its measure yet) are left out; the first lowering after a load waits for 128 frames of the new scene and takes their 90th percentile. The acquire's wait starts the frames a period apart (the steady step then gives the game the period as its time step) and the present holds each picture of the game's to the period after the last, less a 64th of it (`gpu/vk/present_smooth.h` `present_smooth_paced_at`, with or without the Frame pacing row; not with frame generation). Another limiter holding the frames (RivaTuner, Reflex) puts the cap back while it does. `vi: steady frame rate:` lines at each change say what the frames needed, and every 5 s what the rule was given (what the frames took and needed at p50 and p90, the present interval's p50, the waits a frame by kind, the frames kept and left out by reason, how many of the last 64 kept were late, and the probes and what the last three took unpaced); the `vk: frame pacing` line counts the present's holds |
|
||||
| `HOS_FPS_STEADY_PROBE=0` | (Triforce, with `HOS_FPS_STEADY` or the Steady frame rate row) No unpaced probes: the rate by the frames' own measure as they run, as before test31 (`host/pace_steady.h` `pace_steady_probed`, `host/nn_vi.c` `steady_period`); the frames' work grows when they are paced slower, and that rule slides down |
|
||||
| `HOS_PACE_SPIN=0`, `HOS_PACE_SPIN=<microseconds>` | (Triforce) The game's own frame wait on the high-resolution timer for the whole wait, as before, which wakes up to about 0.5 ms after the frame's time. By default the timer takes the wait up to 0.6 ms before the frame's time and the rest is yielded away on the clock, so the frame starts on its time (`host/pace_wait.h`, `host/nn_vi.c` `pace_sleep`); a number is another margin. Every 5 s in which frames waited a `vi: frame waits` line says how long after their time the waits ended, on average and at most |
|
||||
| `HOS_RTSS=0` | RivaTuner Statistics Server is left out entirely: nothing of it is read or loaded and its profile is not touched; a line `triforce_rtss_profile.txt` holds from a run that did not close is only reported in the log (`gpu/vk/rtss_limit.cpp`, *The options file* below) |
|
||||
| `HOS_RTSS_DLSSG=1` | With DLSS frame generation RivaTuner is tried as the limiter too, at the cap times the multiplier in effect, with every safeguard (off: the game's own wait or Reflex, `gpu/vk/pace_rule.h` says why) |
|
||||
| `RX_VK_DEVICE=<n>` | The graphics card listed as `vk: device <n>` in the log, over the menu's GPU device |
|
||||
| `HOOKSHOT_NO_UPDATE_CHECK=1` | No look for a newer release at the start |
|
||||
| `HOS_SINGLE_INSTANCE=0` | (Triforce) No lock on the game folder: as before, a second copy of the game starts on a folder one already runs from. By default the first holds a lock named after its game folder (`host/hos_instance.h`), taken before the log is opened; a second copy waits up to 5 s for one that is ending (20 s after the menu's Restart), then says in a message box which process holds the folder and ends (a `--prepare-shaders` run or `HOS_HEADLESS`: an `@@error` line, and the prepare ends as one with no Vulkan). Other folders (the lab's copy, the owner's game) never meet. The log's `instance:` line says what this run did |
|
||||
| `HOS_TRACE=1` | Every Horizon call logged, as `--trace` does |
|
||||
| `HOS_SAVE_EXPORT_DIR=<folder>` | Where the System tab's Export save rows write their zip, in place of the Downloads folder (set in the environment; `tests/test_save_share.py` uses it) |
|
||||
| `HOS_SAVE_LOCK=0`, `TRIFORCE_SAVE_LOCK=0` | (Triforce) The save's lock between the game and Setup: the game holds `<user>\save.lock` open without sharing from its first save mount to its end, and Setup's Convert saves holds it across its copy (`host/save_tx.h` `save_tx_lock`, `setup/Guard.cs` `SaveLock`). A running game makes Setup refuse the copy; a game started during one waits for it (30 s at most) before it reads its save. `HOS_SAVE_LOCK=0`: the game takes none; `TRIFORCE_SAVE_LOCK=0`: Setup takes none and only looks at the running programs, as before |
|
||||
| `RX_BACKEND=<name>` | Unset or `vulkan`: `hookshot_vk.dll`; any other value but `eden`: the WebGPU renderer, when the exe was built with one |
|
||||
|
||||
### Input for scripted runs
|
||||
@@ -128,8 +142,11 @@ case-sensitive, and an unknown one is ignored.
|
||||
| `HOS_THREAD_TIMES=<seconds>` | Every interval, the threads that used over 5% of a core |
|
||||
| `HOS_FPS_LOG` (set), `HOS_PRESENT_TRACE=<csv>` | The game's frame limiter, VRR flags and nominal rate every 300 presents; a CSV line per game present |
|
||||
| `RX_VK_FRAME_LOG=<csv>` | A CSV line per present: frame, seconds, frame time in ms |
|
||||
| `RX_VK_FRAME_TRACE=1` | A line a frame in `triforce_frames.csv` beside the game (the lab's scenarios keep it as `frames.csv`): present to present, the waits for shaders and pipelines, the uploads, and the replay's parts (`memsync_ms` ... `tex_lookup_ms`: the draws' parts are sampled and summed over every thread that records). (Triforce, wp20, `gpu/vk/frame_trace.h`) Then each frame split as the stall line splits a long one: `replay_ms` (the submits and the present phase), `present_ms`, `dispatch_ms`, `qsubmit_ms`, `par_wait_ms` (the replay thread's waits for its helpers' segments), `outside_ms` (the frame less the replay and the present: the game's own update), `game_wait_ms` (the game's fence waits), `captures_ms` (the captures at its submits), `wb_wait_ms` and `wb_held_ms` (the waits for write-backs, and their part after the writer's recording was done: `RX_VK_WB_WAIT_REC`), `qs_bg_ms` (the queue submits beside a background import). `python -I scripts/frame_rank.py <run folder or csv>` ranks what made the frames over the 99th percentile and over 1.5x the median by these, per window (the Market, the tour's stays, the loads) |
|
||||
| `RX_VK_WB_WAIT_REC=1` | (Triforce, off by default; the handoff's §12.9, `gpu/vk/wb_rec_wait.h`) A wait for a write-back still on the GPU (a capture's late pages on the game's submitting thread, a read or binding of a page put off) ends once the recording its submission was finished in is done on the GPU, not when the submissions' timeline reaches it: that timeline is held below any submission stopped at an event wait, and the lab's Market had 20-46 ms waits of the game's thread with the GPU 4 submissions behind. Whatever the switch, the wait for the recording comes first and the rest is counted: the stall line's `N of them X ms after their writer's recording was done`, the `late:` line's `ms of the wait after the recording that finished it was done`, the frame trace's `wb_held_ms`. Off: the captures' late-page wait orders something not known yet (`RX_VK_LATE_NEW`), so it is tried with the lab's flicker count first |
|
||||
| `RX_VK_PASS_TIMING=1` or `2` | GPU time per pass (2: per program too), logged every 600 presents |
|
||||
| `RX_VK_SLOW_LOG=<ms>` | The replay's times for each frame that took longer than this |
|
||||
| `RX_VK_STALL_LOG=<ms>` or `0` | On in every run (`gpu/vk/stall_watch.h`): every 600 of the game's frames a `vk: frame times` line (the longest frame and how many were over 33, 50, 100 and 250 ms, present to present and in the replay's own time), and for each frame of 50 ms or more a `vk: stall` line of where its time went: the replay's phases, memory sync's parts, the waits for write-backs still on the GPU (how far ahead, and whether behind a present's blit), the waits for shaders or pipelines, the uploads, the pools imported where they were bound, the GPU behind, the present (its image, fence, call and Reflex's sleep), the game's fence waits, the rest, and a pool's trial in guest memory if one is under way (`RX_VK_DEMOTE_QUICK`); and the new textures left for the next frame and whether the frame's picture was held (`RX_VK_HOLD_MS`), whose holds the 600-frame line counts too. At most 3 stall lines a second and 1500 a session. `<ms>`: the stall line's threshold; `0`: neither line |
|
||||
| `HOS_PGO=<file>` | In a run of an `RX_PGO=gen` build: `<file>.reset` clears the counters, `<file>.dump` writes them to `<file>`. It is read before `hookshot_env.txt`, so set it in the environment |
|
||||
|
||||
### The GPU
|
||||
@@ -137,22 +154,116 @@ case-sensitive, and an unknown one is ignored.
|
||||
| Switch | What it does |
|
||||
|---|---|
|
||||
| `RX_VK_VALIDATION` (set) | The Khronos validation layer |
|
||||
| `RX_VK_CHECKPOINTS=0` | No NVIDIA checkpoints (on by default; after a lost device they name the draw it stopped at) |
|
||||
| `RX_VK_HANG_DUMP=<file>` | Every thread's stack to the file once no frame was shown for `RX_VK_HANG_SEC` seconds (20) (Windows) |
|
||||
| `RX_VK_CHECKPOINTS=0` | No NVIDIA checkpoints (on by default; after a lost device they name the draw it stopped at). (Triforce) The boundaries between a frame's work have markers too: the write-back diff pass, each recording's start, uploads and end, the present's blit and its menu (`gpu/vk/checkpoint_kinds.h`); the report reads the two stages' last markers together, says what followed the last one reached, and logs the switches, the queue's timeline and the mirrors' piece binds the submits wait for. (P4) Each marking thread numbers its own markers in a ring of its own (15 of 4096; threads after the 15th share a 16th), no atomic shared by the recording threads; the report names a marker's ring and reads the markers around it in that ring |
|
||||
| `RX_VK_HANG_DUMP=<file>` or `0` | The hang watch (Windows) is on in every run: once no frame was shown for `RX_VK_HANG_SEC` seconds (20) with the game's window in front, the top of every thread's stack goes into the log and the whole stacks into `triforce_hang.txt` in the game folder, once a stall and at most three times a run. `<file>`: that file instead, and every second counts whatever window is in front. `0`: no watch |
|
||||
| `RX_VK_NOOPT` (set) | Pipelines built without the driver's optimisations |
|
||||
| `RX_VK_PASS_BARRIER=game` or `full` | The barrier a draw pass starts with (`gpu/vk/pass_barrier.h`). `game`: a pass right after another, with nothing recorded between (no barrier of the game's, no copy, clear, uniform update or dispatch), waits for the earlier work in its fragment stages only, so its vertex, task and mesh work may overlap the earlier pass's fragments; a pass the replay itself split off for a hazard (`a pass of its own` in the log) and `RX_VK_BARRIER_EVERY_DRAW`'s keep a full one. (Triforce, P4) "Nothing recorded between" is the command buffer's own count (`RX_VK_BARRIER_CONTEXT`), so beside the Replay helper threads too. `full`: a full barrier at every pass start, as before. Unset: `game` with NVIDIA's driver, `full` on every other card. The log's `vk: pass barriers:` line says which, and the frame statistics' `pass starts ordered in their fragment stages only` how many a frame |
|
||||
| `RX_VK_SPLIT_BARRIER=pass` or `full` | (Triforce) A long submission goes to the GPU in parts of 120 draws and dispatches (`RX_VK_CHUNK`); `gpu/vk/barrier_rules.h`. `pass`: a pass open at a part's split goes on in the next part, begun again with the same targets behind a barrier of its attachments' outputs alone and with what its draws sampled and wrote, so the GPU does not drain between two draws of one of the game's passes; where the part's end records anything (its uniform updates, its write-backs) or an event's write is held, the full barriers as before. A parallel replay's segments are not split into parts: each begins and ends with a full barrier, so nothing goes on across a segment's edge. `full`: a full barrier at each part's end and the next one's start, as before. Unset: `pass` with NVIDIA's driver, `full` on every other card. The log's `vk: a submission's parts:` lines say which and, every 3,600 splits, how many went on in their pass and how many of those parts had uploads (whose own full barriers order them after the part before all the same) |
|
||||
| `RX_VK_EVENT_BARRIER=late` or `full` | (Triforce) An event signal in the game's command stream (`gpu/vk/barrier_rules.h`). `late`: nothing is recorded at the signal and its pass goes on (the word's buffer is bound there, as before); the event's word is written right after the next full barrier on its command buffer (the game's next barrier, a dispatch's or pass start's), so after all the work before the signal, and a recording's end writes what is still held behind a full barrier before its write-backs copy the words to the game's memory; a wait the replay finds met for an event whose write is held gets a full barrier first. The game sees the word at that barrier rather than at the signal. `full`: the pass ended, a full barrier and the write at each signal, as before. Unset: with the pass barriers' game mode (`RX_VK_PASS_BARRIER`: NVIDIA's driver). Not with the parallel replay. The `vk: event signals:` line says which |
|
||||
| `RX_VK_TAIL_EARLY=1` or `=0` | (Triforce, on by default since options_version 6; over the Debug tab's Start next frame early row, `tail_early=0` to turn it off; read at the start; after NX2navi's `tail_early`) The early tail (`gpu/vk/tail_early.h`, `gpu/vk/vk_replay.cpp`): the replay cuts a frame's recording at the gameplay upscale's dispatch (the game's network, or DLSS, DLAA, FSR in its place) and records the rest, the upscaler and the interface, as one command buffer; its event signals are held. At the recording's end a tail that wrote no binding (its inline uniform updates aside), bound no guest memory itself, ran no program of the game's that reaches guest memory through the page table or a texel buffer, and wrote no texture back has its event words written in its upload command buffer, after the scene's write-backs and ahead of its own commands: OoT's present poll then sees its frame's event while the GPU still runs the tail. Any other tail has the words written at its end, as before. Also with the parallel replay (its segments end at that dispatch) and with the lazy write-back. Not with `RX_VK_BENCH` or a frame dump. A `vk: the early tail` line at the start says on, and every 1200 tails how many went early and why the others did not. Not yet run in the game |
|
||||
| `RX_VK_DISPATCH_BARRIER=game` | (Triforce) Off unless set, not yet run in the game: a dispatch right after another, nothing recorded between, records no full barrier of its own (not an indirect one, nor a program a stand-in may take over), as NX2navi's `barrier_game` does; the game's own barriers order its dispatches. Only the game shows whether that is always so (a one-frame band or flicker where it is not): a switch for the lab. A `vk: RX_VK_DISPATCH_BARRIER=game:` line every 20,000 dispatches it left without one. (wp14, P4) It no longer stands aside while the Replay helper threads record (most frames at the Market, so the lab's earlier run of it measured little): "nothing recorded between" is the command buffer's own count of its commands (`gpu/vk/cmd_work.h`, `RX_VK_BARRIER_CONTEXT`), a segment being a command buffer of its own |
|
||||
| `RX_VK_BARRIER_CONTEXT=0` | (Triforce, P4; after NX2navi's per-context barrier state) What the barrier rules ask, "was anything recorded into this command buffer since its last full barrier, its last pass's end, its last dispatch", is answered by each command buffer's own count of its commands (`gpu/vk/cmd_work.h`), where one count of every thread's commands served before (an atomic add on every command by every recording thread). So the rules hold while the Replay helper threads record: the left-out repeats of a full barrier, `RX_VK_PASS_BARRIER`'s pass starts and `RX_VK_DISPATCH_BARRIER`. A command buffer's begin starts its state afresh; each segment begins and ends with a full barrier, so no rule relaxes across a segment's edge. `RX_VK_SPLIT_BARRIER` asks also whether anything went to the queue between two parts (every submit is counted). The rules' defaults are as they were. `0`: the one count, and the rules standing aside while the helper threads record, as before. The `vk: barrier state:` line at the start says which; the frame statistics' `full barriers recorded, ... left out` and `pass starts ordered in their fragment stages only` show the difference |
|
||||
| `RX_VK_BATCH=parts`, `1` or `0` | Held submits (`gpu/vk/vk_replay.cpp` `batch_way`). `1` (the default with Mesa's RADV): every submit held until something needs the GPU's results or the queue's order. (Triforce) `parts`, off unless set: only a whole submission's recordings are held, and only while the game's submit is being replayed; a part goes at once with those held before it, as do 4 held (`RX_VK_BATCH_MAX`), and the held go when the replay of the game's submit returns. Neither changes the command buffers or their order on the queue. `0`: each submit at once (the default elsewhere). The `vk: batched submits` lines say which and how many command buffers went in each queue call |
|
||||
| `RX_VK_FOLIAGE_SHADOW_CULL=<layer>[f]` | Off unless set, not yet run in the game: the draws of mesh programs into the sun's shadow cascades (depth only, square, wider than 768) from that layer of the cascades on (0 to 2; NX2navi's is 1) that cull neither face are drawn with their back faces culled (the front ones with `f`, as `1f`): the foliage's double-sided cards draw half their fragments there (`gpu/vk/foliage_shadow.h`). Not the same picture: a card facing away from the sun casts no shadow in those cascades. The log says `vk: RX_VK_FOLIAGE_SHADOW_CULL` at the start and names the first draws it culled (`vk: foliage shadow cull:`) |
|
||||
| `RX_VK_FIFO` (set), `RX_VK_IMMEDIATE` (set) | The swapchain's present mode for one run, over the Insert menu's VSync row: FIFO, as with vsync forced by a driver; immediate, where the surface lists it. Unset, the row decides (`gpu/vk/present_mode.h`): On is mailbox where the driver has it (immediate on Windows where it has none, FIFO elsewhere), Off immediate wherever the surface lists it |
|
||||
| `RX_VK_SKIP_PROG=<prefix>,...` | Leaves out the draws of these programs (default `53509044401d78d2`; `-` leaves out none) |
|
||||
| `RX_VK_PIPE_SKIP=0` | A draw whose pipeline is not ready waits for it, instead of being left out when its targets hold an earlier frame |
|
||||
| `RX_VK_PIPE_SKIP=0`, `1` or `2` | Default/`1`: wait for shader translation; a pending pipeline can be skipped only for attachment-only draws whose targets hold an earlier frame. `0`: wait for every pipeline too. `2`: restore the old skip for untranslated draws with persistent targets; this can omit writes before the shader is known. Translated memory-writing draws still wait |
|
||||
| `RX_VK_PIPE_FRAME_WAIT_MS=<ms>`, `RX_VK_PIPE_ONESHOT_BUDGET=1`, `RX_VK_PIPE_SKIP_NEW=0` | A draw whose pipeline is not ready (`gpu/vk/pipe_wait.h`, NX2navi's rules). A full-screen draw (at most 6 vertices over half the pass or more: a lighting, fog or tone mapping pass) into targets that hold an earlier frame is left out only where the hold of the last picture takes its frame (`RX_VK_HOLD_PIPELINES`); where it cannot (at its bound, resting after one, or off) the draw waits for its pipeline up to this many ms a frame in all (50, at most 500), then 40 ms more, and is left out after both; its job goes to the front of the workers' queue meanwhile. `0`: left out, as before. `RX_VK_PIPE_ONESHOT_BUDGET=1` (off; NX2navi has it on): draws into targets drawn once and draws whose shaders write memory wait from the same budget and are left out once it is spent, instead of waiting until their pipeline is made. `RX_VK_PIPE_SKIP_NEW=0`: a pass whose colour target is drawn for the first time is kept by its depth target alone, as before (by default its draws wait, as for any target drawn once: the game's item icon capture). The log's `vk: pipelines not ready` line counts them |
|
||||
| `RX_VK_PIPE_FAST_WORKERS=0`, `RX_VK_PIPE_LINK_MS=<ms>` | A pipeline whose stage libraries were cold has those libraries built by a worker first and is linked from them, ready with that link, and its whole optimised build follows as a job of its own (`gpu/vk/pipe_wait.h` `libs_first`, NX2navi's `pipe_fast_workers`); a draw that waits for it runs the libraries and the link, not the whole build. `0`: the whole build first and the cold libraries after it, as before. `RX_VK_PIPE_LINK_MS=<ms>` (0 by default, at most 100; NX2navi's 6): the links made on the draws' threads in a frame take at most this long; a new pipeline after that is linked by a worker, its draws left out or waited for meanwhile (needs the fast pipeline link and the first switch on) |
|
||||
| `RX_VK_PRECOMPILE=0` or `1` | The shader preparation before the title off or on (on in builds made with `RX_RELEASE=1`, as the builders' are) |
|
||||
| `RX_VK_PREPARE_THREADS=<n>` | The threads the shaders are translated and their driver's part made on before the title, 1 to 64. Unset: every processor, a thread past half of them for each GB of RAM free at the start, and half in a process started above normal priority (the log's "the shaders' preparation runs on" line says how many) |
|
||||
| `RX_VK_TASK_MESH_FALLBACK=0` or `1` | Task + mesh draws through the compute fallback (1) or the driver's mesh shaders (0). By default the fallback is on for AMD's Windows driver for RDNA 2 (every RX 6000 card and that generation's integrated GPUs: the driver whose `vk: vendor fixes` line names the "AMD proprietary shader compiler"), where the native path timed out the driver on the RX 6700 XT and RX 6800 XT (issue 996) |
|
||||
| `RX_VK_MESH_AHEAD=0` | (Triforce, on by default, after NX2navi's `mesh_ahead`; `=0` as before) An indirect mesh draw's records are copied into a ring as `{count, 1, 1}` before it, outside the pass, so each one ended its pass and the next draw began it again (OoT's foliage, grass and leaves: about 16 a frame at the Market). Now the first indirect mesh draw of a run copies the records of the indirect mesh draws after it as well, in the same three barriers, and those stay in the pass: a run is the indirect mesh draws after it with only state, draws, counter reports and render conditions between (`gpu/vk/vk_replay.cpp` `mesh_run_kind`); a dispatch, a barrier, a copy, a clear, a uniform update, new targets or an event ends it, so no work of the game's between can write the records after they were copied. A draw takes only the entry copied for it (its op, records, count and stride); at most 32 draws and 1 MB of the ring a run (`gpu/vk/mesh_ahead.h`). A `vk: indirect mesh draws` line every 20,000 conversions says how many took their records from an earlier draw |
|
||||
| `RX_VK_NO_PROGRAM_CACHE` (set) | Neither reads nor writes `hookshot_programs.bin` and the pipeline notes |
|
||||
| `RX_VK_PROGRAM_CARRY=0` | The program cache (`triforce_programs.bin`) is good for one build of the translator only, as before: any change to its files, a log line or a host option's number in `gpu/vk/vk_api.h` too, translates every program again, and the pipeline cache, the pipeline notes and the prepare's record go with it. By default the cache is carried over an update that changed nothing of what translates (`gpu/vk/program_carry.h` has the rule, `tests/test_program_carry.py` holds it): the translation stamp (`nx2/build.py` `translation_stamp`) is the translator's files without `vk_api.h`, without the parts of `vk_shader.cpp` marked as outside it, and without comments, blank lines and spaces at lines' ends. The log's `vk: program cache` line at the start says whether the programs were kept, carried over an update of the translator (and from which build), or translated again (and how many the cache had); while they are translated again a line now and then counts them. Switching it either way translates every program once more |
|
||||
| `RX_VK_GPL=1` or `0`, `RX_VK_GPL_KEEP_LINKS` (set) | The fast pipeline link (`VK_EXT_graphics_pipeline_library`; `gpu/vk/gpl_rules.h`), on by default since options_version 5: a new pipeline is linked from its program's two shader libraries where the driver has them compiled, and the optimised build replaces it. The Debug tab's Fast pipeline link row is the same without an environment to set (`fast_pipeline_link=1`); the switch goes over the row. With it the preparation has its driver's part ("Compiling shaders"), which now goes on after a start that died in it, leaving out the programs that start had in the driver's hands (`triforce_prepared.bin.warming` and `.warming.skip`), up to three starts in a row. `RX_VK_GPL_KEEP_LINKS`: the linked pipelines the optimised ones replaced are kept for the run, as before, instead of destroyed 600 presents and 10 s later. `RX_VK_NO_WARM` (set): no driver's part; `RX_VK_GPL_SYNC` (set): a cold library is compiled in the draw; `RX_VK_GPL_NO_CACHE` (set): the libraries are not kept in the pipeline cache |
|
||||
| `RX_VK_SPV_PACK=0` | Every shader module kept for the whole run, as before. By default the SPIR-V of graphics and mesh programs is kept packed in memory (`gpu/vk/spv_store.h`, to about 0.37 of its size) and their shader modules, which the driver otherwise holds for the whole run, are made only for the time a pipeline is created with them, on the thread that builds it. Compute programs, the programs the preparation lets go and the programs a draw reads from the cache itself keep their modules. The log's `vk: shader code packed` lines say what it comes to and what it costs |
|
||||
| `RX_VK_PCACHE_RAM=1` | Off by default (in its one session on, v0.4.0-test9, it gave back nothing the working set showed). With it, once the PC has had under 1.5 GB of RAM available at two looks a second apart, the pipeline cache (when it is 256 MB or more) is destroyed once no pipeline creation is using it (`gpu/vk/pcache_gate.h`): the pipelines built after that go without it and it is not saved again that session, so `mkw_vk_pipelines.bin` keeps its last save. The log's `vk: RAM short ...: the pipeline cache ... is let go` line says when and what the working set did. Whatever this switch says, the cache's save in play waits while a copy of it would not fit in the RAM available with 2 GB to spare (the save at the game's close does not), and the builder of the predicted pipelines behind the game rests while under 3 GB (or a tenth of a PC of more than 30 GB) is available (`gpu/vk/mem_parts.h`) |
|
||||
| `RX_VK_WRITERS_WAIT_MS=<ms>` | (Triforce) How long the game's close waits for the files the renderer is writing on threads of their own (`gpu/vk/file_writers.h`; 2000 by default, `0`: no wait and nothing refused, as before). The close ends the process through ExitProcess, which stops every other thread where it is: the pipeline cache's save in play, the order file, a bug capture's or a debug picture, the hang report, the predicted pipelines' list, the frame log. At the close (`HOS_OPT_EXITING`) no such write begins any more and the ones under way are waited for; one still going at the bound is cut, and is one of the files written whole beside the old (`.part` / `.tmp`, then put in place: the prepared record `triforce_prepared.bin` and the `.for` files are now too), or a list whose reader takes whole records only. The log's `vk: exit: the files being written ... were waited for` line says how long, and what was cut |
|
||||
| `RX_VK_OPTIONS_MERGE=0` | (Triforce) The menu writes its own values over `triforce_options.ini` in place at every change, as before. By default (`gpu/vk/ini_merge.h`, `vk_menu.cpp` `save`) each line it writes is merged by its key with the file as it is then: a line changed outside the game while it runs (a text editor, a tool) and not changed in the game since the game read or wrote the file is written as the file has it, so a change made outside and one made in the menu within the same second both stay (a row changed on both sides is the game's); the game takes such a line at its next start. The file is written whole beside the old one and put in its place (in place only where another program holds it open so that it cannot be replaced). The log's `menu: options: ... changed in triforce_options.ini outside the game` line names such lines |
|
||||
| `RX_VK_MEM_PARTS=0` | No `vk: memory, the parts` line. By default every 600 presents it gives the working set, the game's own memory committed and in RAM (a sample of its pages), the rest of the working set in RAM by what it is (a sample too: the program's code, the driver's code, other code, mapped files and views, write-combined or uncached memory, the heaps and other private memory), the shader modules alive and the packed stages, the pipeline cache, the pipelines and stage libraries kept (how many a draw has had, how many were given back) and the allocator's blocks in system memory (`gpu/vk/mem_parts.h`), and what its walks and samples took. It is written on a thread of its own that nothing waits for; the guest window's walk is made again every eighth line |
|
||||
| `HOS_MEM_CENSUS=<seconds>` or `0` | (Triforce) The guest memory census (`host/guest_census.h`), on by default every 5 seconds, on a thread of its own: a `mem: census` line with what the runtime handed out of the guest window by kind (the program and the system region, the heap, the address regions and the game's own pages in them, what lies outside them: the physical maps and first touches), the game's own count against the 9809 MB it is told it has, the pages the game let go that stay committed (zeroed under an import, or discarded with a freed region) and what the give-back gave back, the process's commit and working set, and the PC's commit and RAM; and a `mem: census, the renderer` line with the Vulkan back end's big holders (its imports, mirrors, VRAM in use, the allocator's blocks in system memory, the pipeline cache, the pipelines and stage libraries kept, the shader modules). A count of bits a 4 KB page, kept as each place commits, maps or lets go of guest pages. `0`: no line (and, with the give-back off, nothing kept) |
|
||||
| `HOS_MEM_GIVE_BACK=1` or `2` | (Triforce) Off by default, not yet run in the game: the pages the game let go that stay committed because an import held them (`FreeMemoryPages`, `UnmapPhysicalMemory`) or because they were discarded with a freed address region are decommitted once nothing of the renderer imports them, from 4 GB up (below it pages are handed out without a commit), up to 256 MB a census pass, in runs of 16 MB at most; the renderer answers and runs the decommit with its import locks held (`gpu/vk/vk_memory.cpp` `guest_release_unimported`), so no import can lock them between. `1`: every pass; `2`: only while the PC is short (its commit past 85% of its limit, or under 1.5 GB of RAM available). The census line's `given back` says how much |
|
||||
| `HOS_MEM_MAP_RESULT=0` | (Triforce) `MapPhysicalMemory` answers success even where Windows refused the commit, as before. By default it answers Horizon's LimitReached (`0x10801`), which the SDK turns into its out-of-memory result, and the log says `mem: MapPhysicalMemory ...: the commit failed` |
|
||||
| `RX_VK_PRECOMPILE_KEEP=1` or `0` | The precompile keeps every pipeline it builds for the session (1), or keeps none of them: they are built for the caches and let go, and a draw that first needs one builds it from there (0). Unset or `auto`: kept where the RAM available at the precompile and what the game holds already (less what reading the pipeline cache added, except on AMD's driver: `own_for_keep`) come to 22 GB or more, on a PC of 20 GB or more (`gpu/vk/mem_parts.h` keep_all_pipelines); the log's `vk: precompile:` line says which and why |
|
||||
| `RX_VK_PIPE_RELEASE=0`, `RX_VK_PIPE_RELEASE_EVERY=<presents>` | Every kept pipeline stays for the session, as before. By default, while the PC's RAM is short (under 1.5 GB available at two looks in a row), every 300 presents up to 512 of the kept pipelines no draw has had yet are given back to the driver (`gpu/vk/pipe_release.h`); a draw that needs one later has it built again by a worker. The log's `vk: RAM short: ... kept pipelines no draw has had given back` lines say how many and what the working set did |
|
||||
| `RX_VK_PCACHE_MAX_MB=<MB>` | The bound on the pipeline cache's file, `mkw_vk_pipelines.bin` (`gpu/vk/pcache_bound.h`): a file over it is not read (the cache starts empty and the next save writes a new one), and data over it is not written (the file keeps its last save). Unset: an eighth of the PC's RAM, 2048 MB at least and 8192 MB at most. `0`: no bound, as before |
|
||||
| `RX_VK_PCACHE_CARRY_MB=<MB>` | (Triforce, 11-18) The carry of the pipeline cache's file over an update that changed the translation (`gpu/vk/pcache_bound.h` `carried`): a file for other shaders is read all the same when it is no larger than this (1536 MB unset), leaves room under the bound for as much again and the PC has 31 GB of RAM or more (Windows), so the driver finds what it compiled for the shaders that did not change (AMD's driver keeps no cache of its own for these). `0`: never carried, the rule of 11-14 alone |
|
||||
| `RX_VK_PCACHE_PLAY_FILE=0`, `RX_VK_PCACHE_FOLD_MB=<MB>` | The pipeline cache's play file (`gpu/vk/pcache_play.h`, NX2navi's play cache): once the preparation is done, what a run compiles goes into a second cache with a file of its own, `mkw_vk_pipelines_play.bin` beside the first (a creation asks the first cache without compiling, then the play cache), and a save writes that small file; `mkw_vk_pipelines.bin` is written only when the preparation built into it. Before, a save after a few new pipelines wrote the whole file again (2.6 GB at the owner's start after its precompile). At a start whose play file has reached `RX_VK_PCACHE_FOLD_MB` (64) it is folded into the first cache, that session builds into it as before, and its first save writes it and removes the play file. Needs `pipelineCreationCacheControl`. `0`: no play file, as before |
|
||||
| `RX_VK_FETCH_BOUNDS=0` or `1`, `RX_VK_NAN_BITS=0` or `1`, `RX_VK_GATHER_OFFSET=0` or `1` | The translation's vendor and driver workarounds (`gpu/vk/vk_vendor.h`) off or on for one run, whatever the GPU; the log's `vk: vendor fixes` line says which are on. By default: out-of-bounds texel fetches answered with 0 on every GPU but NVIDIA's; NaN tests on a value's bits on AMD's older Windows shader compiler (RX 5000 and RX 6000); gathers nudged by 1/512 of a texel on AMD's and Intel's drivers. They change the shaders' translation (one preparation of the shaders) |
|
||||
| `RX_VK_MIRROR=0`, `RX_VK_MIRROR_MB=<MB>` | No VRAM mirrors of the game's memory pools (on for discrete cards); their budget |
|
||||
| `RX_VK_VRAM_MB=<MB>` | The texture cache's budget (default 70% of what the driver allows, at most 6 GB) |
|
||||
| `RX_VK_DEMOTE_QUICK=0` | A pool the CPU and the GPU both write is tried in guest memory (`vk_memory.cpp` `demote_trials`); by default a trial whose GPU time a frame is over 3 times its baseline and 5 ms more, after 3 frames or more, ends then, settling or measured, and is judged as a slower one is (mirrored again, measured again: `gpu/vk/demote_watch.h`). `0`: every trial runs its 10 settling and its measured frames, as before (in the owner's logs, some twenty frames of 100 ms for a pool at 106 ms against 7.4) |
|
||||
| `RX_VK_IMPORT_AHEAD=1` or `0` | On by default with NVIDIA's driver (`=0` off). Off for test12 to test14: the GPU hung at the title in 6 of 12 lab runs; the cause, the game's freed pages decommitted under an import the background thread had not finished (`bg_held`), is closed and the lab's A/B with it was clean in 10 of 10 (`gpu/vk/import_ahead.h`). The ranges of the game's memory a run imported on a binding's own thread (8 to 17 ms each on an RTX 5090), whole as they were imported (their span over the game's pools included; the first version kept 16 MB chunks, which a binding across their ends imported again as one), are kept in `triforce_imports_ahead.txt` beside the game, at most 256, and the next runs import them on the background import thread as soon as the game's pools reach them, 4 at a look, at each change of the pool table and every 8 submissions (`gpu/vk/import_ahead.h`), each range once a session, and none while the PC's RAM is low (under 3 GB available, or a tenth of the RAM: the RAM's rule gives idle imports back then, and the two took turns on the same ranges in the owner's test9 session). A file of the first version's chunks is read as it is. Unset: off (it was on with NVIDIA's driver only, as `RX_VK_ASYNC_IMPORT` is); `1`: on any card; `0`: off. (Triforce) A race that fits the hang is closed since: the host decommitted the game's freed pages under an import the background thread had locked and not yet put in the pool table (`vk_memory.cpp` `bg_held`; `RX_VK_BG_IMPORT_HOLD=0`: not, as before, for the A/B); it stays off until a lab A/B with `=1` hangs no more. The log's `vk: imports ahead` lines count them and name the ranges sent, `vk: the game's pages ... are freed under a background import` the frees that window met; the stall line's "pools imported where bound" is what is left |
|
||||
| `RX_VK_UPLOAD_AGAIN_MS=<ms>` | A texture uploaded before whose memory the game wrote again, met by a draw after the frame's uploads took this long (16), is uploaded at the next frame instead; its last bytes are drawn meanwhile, at most 8 frames in a row (`gpu/vk/upload_owed.h` `later`). New textures are never left so (theirs is `RX_VK_HOLD_MS`'s rule). `0`: every one at once, as before. The log's "left for the next frame" lines and the stall line count them. `RX_VK_UPLOAD_AGAIN_FRAMES=<n>`: a texture's upload is left so at most that many frames in a row (2: its last bytes drawn a frame or two at most; `8`: as before). With 16 ms nothing was ever left in the lab's runs (the frames with re-upload bursts took 9.8 ms of uploads); `3` spreads a burst over the frames after it, its textures a frame or two late meanwhile, which is why it is not the default |
|
||||
| `RX_VK_UPLOAD_TORN=0` | (Triforce, wp18-flash) A texture uploaded before, 1 MB or more, whose storage the CPU has rewritten since the copy its re-upload would read (a capture's copy of one of its whole pages, every 16th and the last, differs from guest memory at the draw's look) keeps its last bytes for that frame and is uploaded at the next frame with what that frame's capture took (`gpu/vk/upload_torn.h`): a copy taken while the game was still writing the texture was test29's white frames at the Market after a tour (BC6H bytes passing through, decoded to bright colours the bloom spread over the picture). At most one frame in a row, and not for a texture found so in the two presents before (one the CPU rewrites every frame is uploaded as before). Not a dispatch's upload. `0`: uploaded at once, as before. The log's `re-uploads of storage the CPU rewrote since its capture` lines count them, those found and those left (with `0` too: the measure of how often a copy may have been taken mid-write) |
|
||||
| `RX_VK_REUPLOAD_EARLY=0` | The textures the CPU keeps rewriting (uploaded again from its writes twice or more within 120 presents, 1 MB or more, sampled in the frame or the one before, not drawn into by the GPU) are looked at once on the replay thread before a parallel replay's segments begin, after the dry pass, their uploads in the recording before the segments: not made by a segment under the recording lock, where the other recording threads queued behind them (lab S2 after a tour: 4 to 12 such uploads of 28 to 84 MB in ~13% of the frames, the descriptor time 24 ms over the threads against 3). `0`: the segments' looks alone, as before. The log's `textures the CPU keeps rewriting, looked at before` line says how many and how long (`gpu/vk/reupload_early.h`) |
|
||||
| `RX_VK_UPLOAD_SAME=0` | (Triforce) A texture uploaded before whose storage the CPU wrote again is checked against the bytes its image holds (`gpu/vk/upload_same.h`): the units of its storage the writes reached (each level's and layer's GOB-block rows, as its upload reads them) whose bytes hash as at their last upload are not uploaded, and when that is all of them nothing is. The upload of the rest reads the copy the check hashed, so that what is kept is what the image got; any other upload and any GPU write forget it. Textures of 16 MB or less uploaded on the CPU (block-compressed, or under 8 MB), not sparse; one whose checks find nothing the same 4 times in a row is uploaded unchecked for its next 64 re-uploads. Lab S2 after some tours: the game rewrote a few big BC textures the Market samples with the bytes they had, 40 to 60 MB every 4 to 5 frames (the Market at 62-78 fps against 83-96, ~26 GB of uploads in its stay). `0`: every re-upload made as before. The log's `re-uploads checked against the bytes their images hold` line says what it looked at, found the same and uploaded. `RX_VK_UPLOAD_SAME_KEEP=0`: the check hashes every byte it looks at; by default a page the submit-time capture keeps a copy of is hashed once and its hash kept with the copy until a capture copies other bytes into it (about half of those textures' pages passed through other bytes between two captures) |
|
||||
| `RX_VK_UPLOAD_SAME_ASTC=0` | (Triforce) ASTC textures decoded on the GPU (kept as RGBA8, BC3 or BC1; 2D only) are checked too, by `RX_VK_UPLOAD_SAME`'s check: one unit a layer, its levels from the first one the image keeps, which is what the GPU decoder stages of a layer a write reached; the staging reads the copy the check hashed. Lab S2's Market after a tour: the game rewrote such textures with the bytes they had (1536 x 1536 ASTC 5x5 of 11 levels, 768 x 768 kept as BC3, 512 x 512), staged and decoded again unchecked, about 1.4 GB in 10 s (90 fps down to 72, the 1% low 57 to 33). `0`: ASTC re-uploads made as before, every layer a write reached staged and decoded. The `re-uploads checked` line says what of it was ASTC; the `re-uploads not checked` line every 600 frames counts the re-uploads made without the check, by route and by why |
|
||||
| `RX_VK_TWIN_SAME=0` | (Triforce) The parallel replay's twin (a texture an earlier segment samples that a later segment of the same submission uploaded, uploaded again in the earlier segment's uploads so that its draws see the bytes as submitted) uploads only what that submission's uploads into the image asked for (`gpu/vk/upload_same.h` `note_upload`; the whole storage when one of them was whole or the image was made again), and where every unit it reads has a hash kept by `RX_VK_UPLOAD_SAME`'s check, reads a copy of them hashed as copied: when the copy holds the bytes the hashes are of, the hashes are kept. Before, the twin uploaded the whole storage and, unchecked, forgot the hashes the later segment's checked upload had just kept, so the next rewrite of the same bytes was uploaded again, the twin with it, every few frames: lab S2's Market after a tour, about 97% of what was still uploaded unchecked in those loops, up to 6.9 GB in one stay. `0`: the twin uploads the whole storage and forgets the hashes, as before. The log's `the parallel replay's twins` line every 600 frames counts them, the bytes uploaded against the whole, and how many kept the hashes |
|
||||
| `RX_VK_UPLOAD_EARLIEST=0` | (Triforce) A parallel replay's upload of a texture, made by the worker of a later segment of the submission while an earlier one is still being recorded, is recorded into the init command buffer of the earliest segment still being recorded (submitted before that segment's uploads and commands; `gpu/vk/upload_earliest.h`, `vk_texture.cpp` `UploadRedirect`). Every segment before it has ended its recording and no longer samples the texture, and every one from it on finds the upload at or before its place in the queue, so no earlier segment uploads the texture again (the twin, `RX_VK_TWIN_SAME`): it is uploaded once, the same bytes. Lab S2's heavy Market loops (round 48) uploaded 2.1 GB of twins in their last minutes, the big streamed or new textures each uploaded once by a later segment and again by an earlier one; those twins took the frames' upload budget (`RX_VK_UPLOAD_NEW_MB`, `RX_VK_UPLOAD_NEW_MS`), and the new textures after them were left for the next frame, the picture held. Only an upload staged from the CPU as it is recorded is moved: not one read on the GPU (the GPU unswizzle, from the pool) or decided from live memory (the all-zero clear), which in the earlier segment's init would run before a segment between writes that memory on the GPU. Not for a texture the GPU drew (its contents are the GPU's; the CPU's writes over it, `RX_VK_CPU_OVER_GPU`, keep their own path) or a sparse one: those keep the segment's own uploads, and the twin. The uploads' GPU time in an init command buffer is not in the segments' GPU time. `0`: every upload in its segment's own uploads, the twin as before. The log's `uploads recorded into an earlier segment's init command buffer` line every 600 frames (with `0` too) counts them and the bytes, and how often and how long a segment's end waited for its init lock, each segment's own, held while such an upload (or a new image's first layout change) is recorded into its init (its submit waits as long) |
|
||||
| `RX_VK_SHADOW_KEEP=0` | (Triforce) A texture page the submit-time capture takes with the bytes its shadow copy holds (the copy the uploads read, `RX_VK_TEX_SAME`'s compare) keeps that copy as it is, not copied again, its kept hash with it (`gpu/vk/shadow_prev.h`). Lab S2's Market after some tours: about half of the ~400 texture pages a capture took, six captures a frame, held their copy's bytes. Only for a page the capture takes once; any other is copied as before, and the shadow holds what the capture holds either way. `0`: every page copied, as before. The log's `texture shadow (600 takes)` line counts the pages compared, left, given back and copied |
|
||||
| `RX_VK_SHADOW_PREV=0` | (Triforce) A texture page the capture takes with other bytes keeps the copy it had, and that copy's hash, beside the new one (`gpu/vk/shadow_prev.h` `Prev`), and a capture that brings those bytes back gives it back, hash and all: no copy, and the re-upload check after it finds the hashes kept (lab S2's Market after some tours: the other half of those pages went back and forth between two versions, and a check hashed each again after every change, 0.2 to 0.3 ms a frame). A kept copy that does not come back within 8 changes of its page, or within 64 captures, goes; at most 64 MB are kept. `0`: none kept, a changed page copied over as before. The `texture shadow` line says how many are kept and how many went |
|
||||
| `RX_VK_SHADOW_VERS` | (Triforce) The copies a texture page keeps beside its own in the shadow (`gpu/vk/shadow_prev.h` `Vers`): `RX_VK_SHADOW_PREV` keeps one, and a page whose captures bring more than two versions (A, B, C, A every few frames) is copied again for every version but the one before the last. `2` to `4` keep that many, newest first, and a capture that brings any kept version's bytes takes that one back, the copy it had becoming the newest, so each version a page cycles through while it is still among the kept copies is copied once: 4 KB a version, under the same 64 MB cap. Unset or `1`: one copy, as before. The `texture shadow` line counts the pages given a copy of their own, one before it, and two or more before |
|
||||
| `RX_VK_SHADOW_CHECK=1` | (Triforce) Each texture page `RX_VK_SHADOW_KEEP` or `RX_VK_SHADOW_PREV` left uncopied is compared with the capture's copy again after the capture is taken, and the hashes kept with the shadow's copies are hashed again: the `texture shadow check` line every 600 captures counts the copies that differ and the hashes that are not of their bytes, both of which must be 0. Slow: for the lab's checks. Unset or `0`: not checked |
|
||||
| `RX_VK_HOLD_MS=<ms>` | Hold the last picture (`gpu/vk/present_hold.h`, on by default): a new texture a draw samples after the frame's uploads took their budget (`RX_VK_UPLOAD_NEW_MS`, `RX_VK_UPLOAD_NEW_MB`) is uploaded at the next frame, the dummy drawn in its place, and that frame is not shown: the window gets the last complete picture again, the Insert menu, the counters and the notices drawn over it, until a frame is drawn with every texture complete. The game runs on underneath. No frame generation makes a frame from a held one, and the one shown after a hold starts its history anew (and the temporal upscalers theirs). `<ms>`: the hold's bound (250); at it the rest are uploaded at once and the next frame is shown whatever it holds, and no hold comes for 120 presents (twice as long after each hold at its bound that follows, up to 1920). `0`: no hold, no new texture left for later: the one frame that takes them all, as before. The log's `vk: hold:` lines, the stall line and the 600-frame line count them |
|
||||
| `RX_VK_HOLD_PIPELINES=0` | A frame with draws or dispatches left out because their program, pipeline or compute pipeline was still being made is held as one with a texture still owed its bytes (`RX_VK_HOLD_MS`'s hold, with its bound and its rests; NX2navi's frame hold, `gpu/vk/pipe_wait.h`): by default the window keeps the last complete picture instead of showing one that lacks a pass. `0`: such frames are shown, as before |
|
||||
| `RX_VK_UPLOAD_NEW_MS=<ms>`, `RX_VK_UPLOAD_NEW_MB=<MB>` | The new textures' budget a frame while the hold is on: once the frame's uploads took 12 ms or 64 MB, a new texture is left for the next frame (ASTC ones too; the frame's first upload always goes). 12 ms keeps an area change's frames near 16.7 ms with their draws and memory sync; 64 MB is what the GPU copies or decodes in a few milliseconds, so that no frame leaves it a backlog. `0`: that half of the budget off |
|
||||
| `RX_VK_UPLOAD_SPLIT_MB=<MB>` | A new layered ASTC texture whose texels are more than this (128) has its first upload in parts while the hold is on, the texture's layers over at most 6 frames (`gpu/vk/layer_split.h`): its draws sample the dummy and its frames are held until the last part is in; for a dispatch or at the hold's bound what is left goes at once. In the owner's test7 session one 1365 x 1365 x 90 texture kept as BC3 took one frame's upload command buffer 114.8 ms of GPU time. `0`: whole, as before. The stall line counts the parts |
|
||||
| `RX_VK_DUMMY_GEN=0` | A frame that left textures for later makes every texture view a draw resolved stale (`destroy_gen`), as before. By default only the looks that resolved to the dummy for want of their texture are (`texture_dummy_generation`, `vk_draw.cpp` `texture_view_of`); the stall line counts the views resolved anew |
|
||||
| `RX_VK_VIEW_KEEP=0` | Any texture's end (an eviction, a dead render target let go, a texture made BC3 from BC1, the compaction moving one) makes every texture look of every recording thread stale, and each is resolved anew when next met (the slot, the cache, the view, under the parallel replay's lock), as before. By default a thread that finds the destroy generation moved keeps the looks of the textures whose views did not go: those are noted by their creation number before the generation moves (`gpu/vk/view_keep.h`, `vk_draw.cpp` `texture_view_of`); never a look of no texture or no view, nor a flat texture's 3D copy. More than 1024 gone since a thread's last pass: all resolved anew. The log's `vk: texture looks kept` lines count them, the stall line the views resolved anew. After NX2navi's `tex_gen_undo` |
|
||||
| `RX_VK_DESC_KEEP=0` or `check` | The per-binding reuse of a draw's descriptors (`gpu/vk/desc_keep.h`, on by default): a draw that builds its descriptors takes, for each sampled texture, user uniform buffer, stage's constants and read-only storage buffer, what the program's last draw on that thread resolved it to, while everything it was resolved from is the same: the texture's handle, its slot's registration, the samplers', no texture destroyed or made again, no texture left for later and the same submission; the buffer's address and size, no inline uniform update, no pool moved or mirror made, the same recording. `0`: every descriptor resolved, as before (so also with `RX_VK_NO_DESC_REUSE`, `RX_VK_SAMPLER_CACHE=0` and the descriptor diagnostics). `check`: every descriptor resolved too, and one that comes out otherwise than what was kept for the same inputs is counted and logged (`vk: descriptor reuse check`): the way to try the rules. The frame statistics' `a frame's descriptors` line says how many were resolved and taken, how many pushes were whole, of the changed bindings or of nothing, and how many sets were written, through a template, or bound again |
|
||||
| `RX_VK_DESC_SIG=0` or `check` | The whole-draw skip by the signature of a draw's descriptor inputs (`gpu/vk/desc_sig.h`, on by default with the per-binding reuse): a draw whose bindings moved, of the program whose descriptors its last draw pushed in that command buffer, first reads what each of them is resolved from (a texture's handle and its slot's version, a user uniform buffer's address and size, a read-only storage buffer's address and size words, a driver bank's stage generation) and the stamps the per-binding reuse gives each kind; when that equals the signature the pushed descriptors were built from, and their build kept every one, the build and the push are left out (a build would take each of them again and push nothing). Push programs only, of the kinds the per-binding reuse keeps: not those with storage buffers they write, tables, texel buffers or storage images, not the mesh fallback or RenoDX's. `0`: built, as before. `check`: built too, and one that comes out otherwise than what is pushed is counted and logged (`vk: descriptor signature check`). The frame statistics' `a frame's descriptor signatures` line says how many draws read theirs and how many were kept whole |
|
||||
| `RX_VK_DESC_SET_KEEP=0`, `RX_VK_DESC_TEMPLATE=0` | A program over the driver's push limit (32 descriptors on NVIDIA's, AMD's and Intel's drivers) has a set written for each draw that builds its descriptors. By default a set whose descriptors are all as those of the last one written for that layout in the recording is bound again instead, while no texture was destroyed or made again and no pool moved, and a set written is written through the program's descriptor update template (Vulkan 1.1). (Triforce, after NX2navi's `desc_template`) A program within the push limit has its descriptors pushed whole (in a new command buffer, or after another program at its bind point) through a push descriptor template of its own (`vkCmdPushDescriptorSetWithTemplateKHR`, one a program and bind point, from the same entries and packed array as a set's), not with the write structs the driver walks one by one; a push of the changed bindings only keeps its write structs. The frame statistics' `a frame's descriptors` line counts the pushes made through it. With `RX_VK_RECORDER` the packet copies the packed array (`gpu/vk/vk_recorder.h`). `RX_VK_DESC_SET_KEEP=0`: a new set each time; `RX_VK_DESC_TEMPLATE=0`: sets written and pushes made with the write structs; both as before |
|
||||
| `RX_VK_CREATE_NEW_MS=<ms>` | While the hold is on, a sampled texture seen for the first time once the frame's makes took this long (8), or its uploads their budget, is not made yet (`vk_texture.cpp` `create_later`): the draw samples the dummy, the frame is held, the next frame makes it. The frame's first make always goes; never a dispatch's. `0`: made at once, as before (a texture left for later was made all the same). The stall line counts the textures made, their time, those not made yet, and the images made |
|
||||
| `RX_VK_UNSWIZZLE_MT_MB=<MB>` | A block-linear level unswizzled on the CPU is split over several threads (a thread for each 2 MB, 8 at most) from this size (4); `16`: from 16 MB, as before |
|
||||
| `RX_VK_PROGRAM_READAHEAD=<n>` | After a draw reads a program from the program cache itself, or takes one read ahead, workers read the next `n` programs (32) and keep them made for the draws that come to them, 512 at most (`gpu/vk/program_readahead.h`). `0`: none, as before. The log's `vk: programs from the cache` lines and the stall line count them |
|
||||
| `RX_VK_PROGRAM_READ_UNLOCKED=0` | A draw that reads a program from the program cache itself, or waits for one the read-ahead's worker is reading, lets the shaders' lock go meanwhile, so that the replay's helper threads go on picking their own programs (they queued behind it: "the program picks waited 169 ms for the shaders' lock" at the Market's arrival); a second draw of that program waits for the first's result, and the record stays listed until it is read (`gpu/vk/program_read_once.h`). A program's release waits until no pick has the lock let go. `0`: read and waited for under the lock, as before. The stall line counts the waits for another draw's read, and the picks' waits to take the lock again with their waits for it |
|
||||
| `RX_VK_STAGE_CODE_CACHE=<MB>` | What a program pick made of a stage's bytes (the control section and the code area read from guest memory: its code key, the instructions lowered to Maxwell) is kept by those bytes, 64 MB at most, the least recently used going first: a program object met for the first time whose stages' bytes were met before (the game makes them again at loads) takes a copy instead of decoding them again under the shaders' lock (`gpu/vk/stage_code_cache.h`; an entry is taken only for the same bytes, byte for byte). The save's load-in frame said "the program picks read the stages' code 45.6 ms": a stage was some 60 us to read and decode, and is 3 us to find. `0`: none, each stage decoded again for each program object, as before. The log's `vk: the stages' code read for the program picks` lines count them |
|
||||
| `RX_VK_STAGE_CODE_LAZY=0` | A program pick reads the stages of a program object it meets for the first time without lowering their code: their keys, NVN stages and headers (what finds the program) come from the control sections and code areas, and the code is lowered (and kept, `RX_VK_STAGE_CODE_CACHE`) only when the pick translates a variant. A program found in memory, read ahead or in the program cache was made from stages that lower (its key names them); one not found has its stages lowered before it is translated, and should one not lower, the pick starts again from those that do: the program it was before (`gpu/vk/stage_code_cache.h`). The save's load-in frame lowered every stage of each program object met, 48 of a stage's 60 us, for programs all prepared before the title. Not with `RX_VK_REJECT_STAGES`, `RX_VK_REJECT_KEYS`, `RX_VK_OLD_LOWERING`, `RX_VK_DUMP_NATIVE` or `RX_VK_DUMP_FAILED`, which act in the lowering. `0`: each stage lowered as it is read, as before. The log's `vk: the stages' code read for the program picks` lines count the stages read without lowering and those lowered since |
|
||||
| `RX_VK_STAGE_CODE_UNLOCKED=0` | A program pick reads the stages of a program object it meets for the first time (guest memory, their keys, the stage code cache) with the shaders' lock let go, as a draw's own read of a program (`gpu/vk/program_read_once.h`: a program's release waits until no pick has the lock let go), so that the replay's helper threads go on picking their own programs meanwhile; two picks of one object at once each read it, and the first list put stands. `0`: read under the lock, as before. The stall line's "the program picks read the stages' code" counts the read and the lock's taking again |
|
||||
| `RX_VK_PROGRAM_ORDER=0` | Each session writes the order its draws first needed their programs in (read from the program cache, or translated), the first 4096, into `triforce_program_order.bin` beside the cache now and then (this session's first, then those of the sessions before it has not met). The next session's read-ahead workers, from the first draw on (the title and the file select), read those programs in that order whenever no draw asks them for anything, the whole order, and keep them made apart from the shelf until a draw takes them (`RX_VK_PROGRAM_ORDER_KEEP` below; `gpu/vk/program_order.h`): the save's load-in frame read some 100 programs on the draws' threads before. Not with the RAM low. `0`: neither read nor written, as before. The stall line says why the draws read what they still read themselves (named by no order, read ahead and let go before, not read ahead yet) and how many they took in this order; the log says once when the whole order has been gone through, and how many programs it keeps |
|
||||
| `RX_VK_PROGRAM_ORDER_KEEP=0` | A program read ahead in the last sessions' order stays until a draw takes it, whatever the draws meet meanwhile, and nothing in the order is passed by: the workers read all of it (4096 at most) while the title and the file select stand still, and a program a draw's ask read that the order names is kept with these, not on the shelf, which lets its oldest go. Only a RAM gone short lets them go (all of them). The pipelines' warm keeps its window: the first 512 kept and not taken are read with it, those beyond without, each warmed as the draws take warmed ones (the nearest first). Some 40 to 50 KB a program packed: the owner's order of 2411 programs some 100 to 120 MB, 4096 at most some 200 MB. The owner's test37 session (SDR, where the order's sessions were HDR Native) took another path through the order and its load-in frame read 115 programs itself, 64 of them read ahead and let go as behind where the draws were, 51 passed by. `0`: the rules before: 512 at most, each until the draws are 256 places past it (where the draws are: the middle place of the last 16 programs they needed first), what lies behind not read |
|
||||
| `RX_VK_PROGRAM_READAHEAD_NOTES=0` | The read-ahead's next programs are those after it in the pipeline notes' order (the order earlier sessions first built their pipelines: an area's programs lie together), 4 workers, the compute programs too (in the order play first dispatched them, `triforce_computes.bin`), and a full shelf lets its oldest go; the program cache file's order only for a program neither names. `0`: the file's order (since the shaders are prepared before the title, the preparation's), one worker, no compute programs, and nothing more read once 512 wait, as before (test16's file select load took 7 of some 600 programs read ahead that way) |
|
||||
| `RX_VK_PIPELINE_WARM=0` or `1` | Where the precompile keeps no pipelines (the RAM spared) and the fast pipeline link is on, the read-ahead's worker that has just read a program makes, before any draw can have it, the stage libraries of the pipelines the pipeline notes name for it (asked of the caches only: one the driver would have to compile is left to its draw) and links them; the draw takes the link made in place of linking its own, and the whole build follows as before (`gpu/vk/pipe_warm.h`). At most 32 notes a program variant, 512 links held for draws that have not come (the oldest let go beyond) and 1024 libraries no draw has had; nothing made while the RAM is low or short, and what is held goes back to the driver while it is short. `0`: none, as before; `1`: the libraries only. The log's `vk: pipelines made behind the draws` lines count them |
|
||||
| `RX_VK_PIPELINE_WARM_FOLLOW=1` | Off by default (test19: the lab's tour showed no gain). `1`: the warm follows the draws: a program read within 64 places (in the notes' order) after one the draws consumed in the last 2 s has its libraries made and linked, one within 192 its libraries only, one farther (or once the draws stopped taking) nothing; and the libraries no draw has had are kept up to 2048, the oldest let go beyond (with the links made from it), so the bound never stops the warm (`gpu/vk/pipe_warm.h`, test18: 2266 links made, 276 taken, the libraries at their bound from the load on); it spends at most 250 ms of the workers' time a second (500 saved up), and never makes again a library it let go. Off: every program read is warmed whole and the libraries stop at 1024, as before |
|
||||
| `RX_VK_COMPUTE_WARM=1` | Off by default (test19: the lab's tour showed no gain). `1`: where the precompile keeps no pipelines, the read-ahead's worker that has just read a compute program play dispatched (`triforce_computes.bin`) makes its compute pipeline, asked of the caches only, as its first dispatch would; the dispatch that takes the program has it. One a program while it waits on the read-ahead's shelf, destroyed when the shelf lets the program go and given back while the RAM is short; once a program variant a session. Off: each compute pipeline is made at its first dispatch, as before |
|
||||
| `RX_VK_PIPELINE_ORDER=0` | Each session writes the order its draws first needed their pipelines in (a new one, or one the precompile kept that no draw had), the first 4096, into `triforce_pipeline_order.bin` beside the pipeline notes now and then, from the presents on a thread of its own (this session's first, then those of the sessions before it has not met). Where the pipeline warm runs (`RX_VK_PIPELINE_WARM`), the next session finds each one's note before play and the warm makes, for a program variant the read-ahead has read, the pipelines that order names for it and no other (32 at most a variant; the notes' other pipelines are not made then, and the warm does not follow the draws): their stage libraries asked of the caches and their links, held for the draws by their place in the order, 1024 at most (beyond, the farthest ahead goes, and none is made farther), and 2048 libraries no draw has had at most. Where the draws are: the middle place of the last 16 pipelines they needed first; a link held 512 places behind it goes with the libraries only it held, and none is made there (`gpu/vk/pipe_order.h`): the save's load-in frame made 86 to 92 ms of pipelines on the draws' threads, the warm's links from the notes let go before the load came (lab round 37: 1964 made, 54 taken). The first session after this writes the file; the next one has it. `0`: neither read nor written, the warm from the notes as before. The stall line counts the pipelines new to the draws, those linked ahead (of them in this order), and the links and stage libraries the draws made themselves; the log's `vk: pipelines made ahead in the order` lines the rest |
|
||||
| `RX_VK_VRAM_MB=<MB>` | The texture cache's budget as a fixed size, whatever the card. Unset: on a card the driver allows more than 8.5 GB, no size (`RX_VK_TEX_PRESSURE`); on a smaller one 45% of what the driver allows; with `RX_VK_TEX_PRESSURE=0` 70% of it above 8.5 GB, at most 6 GB (the rule before) |
|
||||
| `RX_VK_TEX_PRESSURE=0` or `=<pct>` | (Triforce, after NX2navi's `TEX_VRAM_PRESSURE`) On a card the driver allows more than 8.5 GB, with VK_EXT_memory_budget, not an integrated GPU, without `RX_VK_VRAM_MB` and without a quality preset whose budget applies, the texture budget follows the live use instead of the fixed 6 GB: textures go once the driver's count, less the free space in the blocks they can take back, is past 80% of what the driver allows now, the least recently used first, each unused 2 s or more, 64 a pass, down to 2% under that line (`gpu/vk/tex_pressure.h`); the 90% and 97% rules and the compaction's lines stay. While the system's commit is low the fixed size comes back (`RX_VK_TEX_COMMIT_FREE_MB`). `0`: the fixed size, as before; `<pct>`: that line (50 to 95). The log's `vk: texture budget` line at the start says which, and the `vk: VRAM:` line every 600 presents the budget (by live use: what the textures may hold before the line) and the line |
|
||||
| `RX_VK_TEX_KEEP_TAKEN=0` | (Triforce, after NX2navi's `TEX_KEEP_TAKEN`) While VRAM is short, a texture uploaded from memory that the game let go 30 presents ago goes first (`RX_VK_LET_GO_PCT`); one the game has taken back before waits 8 times the longest it stayed let go before a take-back, when that is longer (`gpu/vk/tex_pressure.h`): made again, the frame that wants it draws the dummy (NX2navi: Kakariko's haze gone every few seconds). The eviction by age still takes it. `0`: the 30 presents alone, as before |
|
||||
| `RX_VK_TEX_COME_BACK=0` | (Triforce, after NX2navi's pause for drops that come back) Where the budget follows the live use: when in 240 presents 64 or more textures the line let go went and half or more of them were made again within 600, the line stands aside for 600 presents, doubled at each such period up to 7200; a period with fewer back ends the doubling (`gpu/vk/tex_pressure.h` `ComeBack`). The 90% and 97% rules and the compaction's lines still hold meanwhile. The log says when a pause begins. `0`: no pause |
|
||||
| `RX_VK_TEX_STEP=<n>` | The live textures one pass of `texture_sweep` over the budget lets go of at most (64 where the budget follows the live use; the render targets drawn over since do not count), the rest at the next look two presents on, not ten. Set, on any card, the fixed size's too; `0`: no step, one cut as before |
|
||||
| `RX_VK_TEX_COMMIT_FREE_MB=<MB>` | Where the budget follows the live use: while less of the system's commit than that is free (the default: the larger of 4 GB and a tenth of the limit, NX2navi's), the fixed size is the budget again (Windows charges a discrete card's memory to the commit, and an allocation that fails there ends the game). `0`: never. Not on Linux |
|
||||
| `RX_VK_SWEEP_ALL=1` | Every texture of the cache ordered by its last use for every pass of `vk_texture.cpp` `texture_sweep`, as before. By default a pass under the budget (every 10 presents, and the dead render targets' passes between them) orders only the textures it can take: those the GPU drew and those the game let go; the others it passes over all the same. Over the budget every texture is ordered. The log's "passes for the dead render targets between the looks" line says what a pass costs |
|
||||
| `RX_VK_TEX_RATE_HIGH=0` | The texture eviction's waits (`vk_texture.cpp` `texture_sweep`: 60 presents unused over the budget, 30 after the game let a texture go, 600 or 3600 for one the GPU drew, the compaction's 600 and 1800) count presents above 60 a second, as before. By default they count their seconds at any rate up to 480 a second (`gpu/vk/present_rate.h`, after NX2navi's M19): at the Market's 94 a second "60 presents" were 0.64 s. Below 60 they count seconds unless `RX_VK_TEX_RATE_LOW=0`. The log says the first time a run goes above 68 a second |
|
||||
| `RX_VK_TEX_DETAIL=full`, `reduced` or `low` | The texture detail for one run, over the Insert menu's Texture detail row: whole textures, or the large ones without their largest level, or without two (`gpu/vk/tex_detail.h`). Unset, the row decides, and its Automatic goes by what the driver allows: full from 10,240 MB, low under 6,144 MB, never full on an integrated GPU |
|
||||
| `RX_VK_TEX_BC1=0/1` | Opaque ASTC textures kept as BC1 instead of BC3 for one run, or not, over the Debug tab's Opaque textures as BC1 row (on by default since options_version 5): a texture the renderer keeps as BC3 whose every block the GPU decoder writes opaque is encoded as BC1, half the video memory, the same texels (`gpu/vk/tex_bc1.h`, `gpu/vk/astc_opaque.h`). One whose memory later holds blocks with alpha, or that a copy on the GPU writes, becomes BC3 for good; the log counts both |
|
||||
| `RX_VK_COMPACT=1`, `RX_VK_COMPACT_PCT=<50..90>`, `RX_VK_COMPACT_MB=<MB>` | VRAM compaction (off by default): the textures that are not render targets in a pool of their own, moved out of sparsely used blocks a few a present so that the blocks go back to the driver, and the texture budget holding the driver's count at that share of what it allows (85); the free space that starts a run (512; 192 while the count is over 90%) |
|
||||
| `RX_VK_SKIP_COMPRESSED_OVER_RT=1` | A compressed (ASTC, BC, ETC2/EAC) texture made over storage render targets used is not uploaded, as before: bosses and new enemies all blue the first time |
|
||||
| `RX_VK_NO_WRITEBACK` (set) | GPU writes to mirrored pools are not copied back to guest memory (an experiment, for A/B) |
|
||||
| `RX_VK_WB_DIFF=0` | Write-backs copy every byte again instead of only what changed against a VRAM shadow (the diff is on by default; v2.0.9 and v2.0.10 had it off, issue 1161) |
|
||||
| `RX_VK_LAZY_WB=1`, `=2` or `=0` | The lazy write-back for one run, over the Debug tab's Lazy write-back row (`lazy_write-back=1`; on by default since options_version 5; `docs/lazy-writeback.md`, `gpu/vk/wb_lazy_state.h`): a whole page of what shaders write into a mirrored pool that the CPU leaves alone is no longer copied back at every submission; its page has no access, and whoever touches it (the game's code or the host's, by a fault; a host call that hands it to the kernel; the GPU through the import) has it copied down first. Windows only. On AMD's driver the row alone leaves it off, as NX2navi did after games ended in play there; `=1` turns it on anyway. `=2` is the self-check: every copy is still made, the pages are protected and paid as if not, and each payment compares what it would have copied with guest memory: a `MISMATCH at guest` line is a page it would have got wrong. The log says `vk: lazy write-back on` (or why off) at the start, and every 600 submits `vk: lazy write-back (600 submits)`: the MB not copied, the pages owed, the pages paid by a fault, a host call, a GPU read, a mirror given up and a recording's submit, the payments and their time, and what failed |
|
||||
| `RX_VK_LAZY_PAYERS=<1..4>` | (Triforce, 4 by default; `=1` as before) How many of the lazy write-back's payments copy at once (`gpu/vk/wb_lazy_payers.h`, NX2navi's `wb_lazy_unlocked`). A payment's copy goes onto the queue after everything submitted so far and its thread waits for it (0.5 to 3 ms each in the owner's sessions, up to 21 ms at a load); with one at a time, a second thread that touched another owed page, or the replay giving a mirror up, waited for the first one's copy to come back before its own went onto the queue. Each payment holds a slot of its own (a command buffer and a fence); the pages of two payments are never the same ones (`gpu/vk/wb_lazy_state.h`), and each copy still goes onto the one queue after everything before it. The 600-submit line `vk: lazy write-back (600 submits)` ends with the payments that waited for a free slot and the most slots in use at once |
|
||||
| `RX_VK_GEN_SEED=<n>` | The page write generations (`gpu/vk/write_gen.h`) start at `n` and not at 1 (decimal, or hex with `0x`; 2^62 at most). They are 64 bits; the 32-bit ones of earlier builds ran out after days of play, and textures and mirrors then kept old contents. `RX_VK_GEN_SEED=0xFFFF0000` takes a play test across 2^32 within seconds: the log says `the write generations start at` and, at the crossing, `this run has made 4294967296 write generations`, and nothing in the picture should change there |
|
||||
| `RX_VK_DLSS=0/1/2`, `RX_VK_DLSS_PRESET=<letter>`, `RX_VK_DLSS_LOG=1`, `RX_VK_REFLEX`, `RX_VK_REFLEX_LOG=1`, `RX_VK_ANTILAG=0/1` | NVIDIA DLSS and Reflex, and AMD Anti-Lag 2, for one run (`=-` on Reflex or Anti-Lag 2: its extensions not even enabled): the readme's NVIDIA DLSS section. `RX_VK_DLSS_TRACE=<frames>` logs one frame's large draws every that many frames, `RX_VK_DLSS_DEBUG=motion` shows the motion vectors, `=alternate` the game's own upscale every other frame |
|
||||
| `RX_VK_FSR4=0/1/2`, `RX_VK_FSR_DIR=<folder>` | AMD FSR 4 for one run (0 never, 1 FSR 4, 2 its Native AA), and another folder for AMD's DLLs (not from `hookshot_env.txt`): the readme's AMD FSR 4 section. `RX_VK_FSR4=1/2` and `RX_VK_DLSS=1/2` go over the Upscaler row, a saved FSR 3.1 too where the engine they ask for runs; `RX_VK_FSR=1` goes over them (one upscaler at a time). The DLSS trace and debug switches above apply to FSR 4 too, on the frame chain they share |
|
||||
| `RX_VK_FSR4=0/1/2`, `RX_VK_FSR_DIR=<folder>` | AMD FSR 4 for one run (0 never, 1 FSR 4, 2 its Native AA), and another folder for AMD's DLLs (not from `hookshot_env.txt`): the readme's AMD FSR 4 section. `RX_VK_FSR4=1/2` and `RX_VK_DLSS=1/2` go over the Upscaler row, a saved FSR 3.1 too where the engine they ask for runs; `RX_VK_FSR=1` goes over them (one upscaler at a time; `=2`: FSR 3.1 as its Native AA, the 3D at full size). The DLSS trace and debug switches above apply to FSR 4 too, on the frame chain they share |
|
||||
| `RX_VK_FSR4_FG=0/1` | AMD FSR 4's frame generation, the Frame generation row's AMD FSR 4 (`gpu/vk/vk_fsr4.cpp` `fsr4fg`): 0 never in this run (`RX_VK_FSR4=0` too, which keeps AMD's library unloaded); 1 any frame generation AMD's library lists for the card counts, an FSR 3.1 one too, so the path can be tried on a card without FSR 4's (the row then offers AMD FSR 4 there; the log names the version in use) |
|
||||
| `TRIFORCE_MENU_AHEAD=0` | (Triforce) What the options' rows ask of NVIDIA's and AMD's libraries (whether DLSS, FSR 4 and FSR 4's frame generation run here: NGX's start, AMD's loader) asked at the options' open on the presenting thread, as before, and not once on a thread of its own as soon as the game runs (`gpu/vk/vk_menu.cpp` `menu_ahead`; its log line says how long each took). For comparing: the first open waited about 2 s for them in test11 |
|
||||
| `RX_VK_AA=<0..3>`, `RX_VK_AA_KEEP=1` | The anti-aliasing for one run, over the Insert menu's Anti-aliasing row: 0 the game's own SMAA, 1 none, 2 FXAA, 3 SMAA at its Ultra preset in its place (`gpu/vk/aa_rows.h`, `gpu/vk/vk_aa.cpp`). Unset, the row decides; with DLSS, DLAA or FSR drawing, neither applies. The game's SMAA is three compute programs known by their keys (game build `e0f3ccfa`): with another choice in effect its composition is replaced and its edge and weight passes are left out, and `RX_VK_AA_KEEP=1` keeps those two running. The log says `vk: aa:` when a composition is first replaced, why one was left to the game, and when none was found for a minute |
|
||||
| `RX_VK_ASYNC=1` | The replay on a thread of its own instead of the game's submitting thread |
|
||||
| `RX_VK_OCC_QUERY=0`, `RX_VK_OCC_QUERY_SKIP=<addr>[,...]`, `RX_VK_OCC_COND=0`, `RX_VK_OCC_LOG_COND=1` | (on by default since 11-17: +2.7 to +4.6% fps in every scene measured, 10-12% fewer draws, no flicker added; `RX_VK_OCC_QUERY=0` turns it off) The game's samples-passed reports (which objects show; a count of 0 is not drawn) get their real counts: the replay still writes each report as it passes it with 4096 (`RX_VK_OCC_FIXED`, everything visible), and the draws from its reset are counted by Vulkan occlusion queries (precise where the card has them); once the GPU is done with the recording that holds them the count is written into the report's record over the 4096, as NX2navi writes it at completion. The done recordings are found with one look at the recordings' timeline (nothing waits) as a game's fence wait ends (the game reads its counts after it), at each recording's begin and each present, at the latest when the recording's slot comes round. The game's report records rotate (a ring: an address is another object's at its next report), so a count is written only while its report is still the newest at its address, and only when it is whole (every query available, no draw left out, reset and report in one recording, read back within 8 presents); otherwise the record keeps its 4096. The game also predicates draws and clears on these words (render conditions), decided as NX2navi decides them: a word whose newest report is a samples-passed one whose count is still to come is unknown and the condition renders; a word whose count was written (or for which none comes) is read from memory as before, where a written 0 skips the draws and clears it gates. A count goes in only over the value the replay left in the word (a compare-and-write: never over the game's CPU re-arming the record), and a record rewritten in the stream after its report (a small buffer clear, a report of another counter type) gets no count. A parallel replay's segments signal the recordings' timeline and are sealed as they are submitted, so their counts are written too. The count word is written as the replay writes a report (`guest_cpu_write`, and the word kept out of the mirrors' write-backs). With hostQueryReset (Vulkan 1.2) a recording's queries are reset on the CPU once read, only those it used. `RX_VK_OCC_QUERY_SKIP`: report addresses that keep the fixed answer (the log's `occlusion query sites` lines list the first 64 addresses with their counts). The log's `occlusion queries` line every 600 presents: the reports, how many were counted whole and why not, the counts written at completion (and of them 0), those not written and why (lost, superseded by a later report at the address, late, a render condition's), the mean latency in presents and how many were written after the next present, where the done recordings were found, and the render conditions on samples-passed words (rendered because a count was pending, rendered or skipped from a written count, from memory with no count to come, as before in the knob's off phases) with the draws and clears they skipped. `RX_VK_OCC_COND=0`: a condition on a samples-passed word always renders (the counts are still written), to tell the counts from the skips. `RX_VK_OCC_LOG_COND=1`: one such condition in 499 logged (300 lines), with both words, their sources (pending, written, memory) and the present. Lab: the knob `occq` in `RX_VK_LAB_AB` runs the queries the whole run and writes the counts of the reports made in its phases (`gpu/vk/occ_answer.h`, `vk_replay.cpp` "occlusion queries") |
|
||||
| `RX_VK_GATE_WAIT_MS=<1..100>` | (Triforce, off unless set, after NX2navi's `gate_wait_ms`, whose default is 10; not yet run in the game) A submission whose first command buffer begins (after state only) with a wait for an event the game signals from the CPU, unmet in the replay's order, waits at its submit for that signal, at most this long, before its capture and its replay (`gpu/vk/gate_wait.h`, `gpu/vk/vk_replay.cpp` `gate_wait_signal`): the capture then holds what the game wrote up to its signal, and the submission is replayed in the submit call on the submitting thread, instead of stopping at the wait and going on from the order thread (`sync_watch`) with a second capture once the signal came. The wait holds no lock and looks at the event's word in the game's memory. One that runs out goes as before; after 4 that ran out, once they are more than a tenth, it is off for the run (logged). A `vk: RX_VK_GATE_WAIT_MS` line every 600 waits gives their mean and how many ran out; the order line's `captures at a CPU event's wait` and `made to go by presents` say how often the old way was taken |
|
||||
| `RX_VK_CAPTURE_BEHIND=0` | (Triforce, on by default; `=0` as before) The submit-time capture (`gpu/vk/vk_memory.cpp` `capture_make`) takes the write marks on the game's submitting thread and copies there only the pages read at once (the late pages and the texture storage); the rest of its copies, in parts of 32 pages, go to the capture's copy helpers while that thread replays the submission (`gpu/vk/capture_behind.h`). A read of a page as submitted copies its part itself when no helper has taken it yet, or waits for the helper; every part is done and flushed before a recording is submitted and before the thread goes back to the game. Only with the replay on the submitting thread (not `RX_VK_ASYNC=1`), with copy helpers (`RX_VK_CAPTURE_THREADS`, not `RX_VK_LOW_SPEC`), at least 128 pages behind and at most 512 ahead (a scene's load: copied whole as before). At the Market the old copy was ~0.25 ms of each submit's ~0.35 ms capture, six submits a frame. The 120-present line `a frame's captures at the game's submits` gives their time on the game's threads (the scan, the copies made there, and the copies behind made or waited for by the replay), the MB copied and behind, and who copied the parts; the stall line names the captures when they took 1 ms or more |
|
||||
| `RX_VK_PARALLEL=<0..8>`, `RX_VK_PARALLEL_AUTO=<2..8>` | The parallel replay: a frame's large command buffers recorded on that many threads, always, or wherever short trials as the game runs find it faster than the replay thread alone; `RX_VK_PARALLEL=0`: never. The Debug tab's Replay helper threads row is the second without an environment to set (`replay_helper_threads=` 1 to 7 for 2 to 8 threads); either switch goes over the row. The row's Automatic (8), which it is unless the options file says otherwise, is the count `gpu/vk/replay_threads.h` gives the PC: none, on every PC since 11-17 (it was 2 or 3 with five cores or more: in the owner's play the helper threads brought 10-25 s stretches at 39-48 fps when moving, the game's own frame time 4 to 10-13 ms, and with none there were none); a count on the row, or `RX_VK_PARALLEL_AUTO`, still runs them. The log says at the start what was chosen (`replay helper threads:`) and at each trial which way is in use (`parallel replay, trial`). Between trials the tuner's rule (`gpu/vk/replay_threads.h` `rule`) judges every 120 frames on the replay thread alone: where the replay is plainly the frame's limit (70% of the frame or more) and the helper threads would take at least 1 ms and a tenth of the frame off it, never counting below the GPU's time (the game waits for each frame's GPU work), they are turned on without a trial; where they cannot pay (no command buffer large enough to cut, the GPU's time about as long as the replay's, or the replay under 60% of the frame: the game's own threads are its limit) no trial is made while that holds; trials decide the rest, and a trial that takes the helpers back off holds the rule's "on" for 3,600 presents. The log says so (`parallel replay, the rule`) when its verdict changes. `RX_VK_PARALLEL_RULE=0`: trials only, as before. With DLSS or FSR on, for upscaling or frame generation, the dry pass tells their hooks in the draws in stream order, and each command buffer from the first draw or dispatch that takes what they noted (the upscale, or the engine's point before the bloom) on is recorded in order after the segments before it (`gpu/vk/stream_order.h`); `RX_VK_PARALLEL_TEMPORAL=0`: the replay thread records alone then, as before. The frame statistics' `a frame's parallel replay:` line says in how many frames the threads recorded, the command buffers in segments and alone (and why), and the time in them; the next one (`its parts`) where that time went: the setup before the threads begin, how soon each command buffer's first segment reached the GPU, the helper threads' wake-up, each command buffer's longest segment, the replay thread's wait, the submits, the recording lock's waits, and the segments' GPU time (the `GPU time` line counts the segments too; it left them out). After each trial's line a `trial N's parts` line gives its three parts' frame, replay thread's time, GPU time, the rest of the frame, full barriers and draws, and the helper threads' parts. That header lists what an audit of the parallel replay found and fixed, and what is left. `RX_VK_NO_DRY_COPIES=1`: the dry pass does not mark what copies and texture clears write, as before. The replay thread records the next segment to submit itself when no helper thread has begun it (it only waited before, on the core kept for it); `RX_VK_PARALLEL_OWN=0`: it waits for the helper threads, as before. `RX_VK_PARALLEL_SEG=<32..>`: the draws and dispatches a segment is cut for (160); `RX_VK_PARALLEL_SEGS=<2..12>`: the most segments a command buffer is cut into (6), without which a smaller `RX_VK_PARALLEL_SEG` cuts no finer once a command buffer has six segments' worth |
|
||||
| `RX_VK_PARALLEL_BACKOFF=0` | The tuner's trials as before: one every 1,800 presents after one that kept the way, each with 104 frames the other way. With the back-off (the default, `gpu/vk/replay_threads.h` `Tuner`) each trial that keeps the way, the other way longer than both of its own parts, puts the next one off twice as long (3,600, 7,200, then 14,400 presents at most; a margin of 10% or more counts twice), one too close to tell keeps the old interval (the first such one after a change of scene or way: 900 presents), and once the way has held so the other way is tried for 64 frames, not 104; a short trial that finds the other way shorter changes nothing itself, a full trial follows at once. The next trial comes early (900 presents after the last one at the soonest, never while the rule says no trial) when the scene clearly changes: two windows of 120 frames in a row whose draws moved by a quarter (200 at least) or whose replay or GPU time moved by 30% (1 ms at least) from the first window after the way was set, or a trial whose first and last parts did. In the lab's steady Market a trial came every ~2,090 presents, each ~100 frames 1.9 ms longer; the trial lines now end with when the next may come, and `parallel replay, the scene changed` says when one was brought forward |
|
||||
| `RX_VK_RECORDER=thread`, `=defer`, `=sync` | (off unless set; not yet measured in the game) `thread`: the replay thread's `vkCmd*` calls packed with copies of their arguments into a ring and made by a recorder thread of their own, in order (`gpu/vk/vk_recorder.h`); the replay thread waits for it at every command buffer begin, end and reset, submit, wait, readback and destruction. Beside the Replay helper threads too (no longer refused with `RX_VK_PARALLEL`): a parallel replay's segments make their calls themselves, after the ring has been run (`segments_begin`), and the recorder is idle while they record. With it on, the frame statistics' `a frame's recorder thread` line says how many of the replay's calls it made a frame and in how long, and how long the replay thread waited for it; what it saves is the replay time line's `commands` with it against without it. `defer` and `sync` are its test steps (held and run on the same thread). `RX_VK_RECORDER_RING_MB` (8), `RX_VK_RECORDER_SPIN_US`, `RX_VK_RECORDER_STATS=0`, `RX_VK_RECORDER_POISON=1`, `RX_VK_RECORDER_PIN` (`next`, `sibling` or a mask) |
|
||||
| `RX_VK_REPLAY_PRIO=0` or `1` | (Triforce, on by default, after NX2navi's `recorder_prio`; `=0` as before) A thread runs at the highest priority while it replays the game's frames (the submitting thread's replay and its capture, the present, the stopped work the order thread lets on: `gpu/vk/vk_replay.cpp` `ReplayPin`) and gets its own priority back after, so the game's code it runs between replays keeps the game's priority; the core kept for the replay is kept from the game's threads only, and the helper threads and the capture's copy helpers (above normal) outranked a replay at the game's priority there. A thread at that priority or above already is left alone. The replay thread of `RX_VK_ASYNC=1` and the recorder thread of `RX_VK_RECORDER=thread` take the level for good. `=1`: above normal. The log's `vk: a thread that replays runs at` line says which (`gpu/vk/replay_prio.h`) |
|
||||
| `HOS_VCORES=0`, `HOS_CORES=<1..8>`, `HOS_RESERVE_CORE=0` | No virtual cores; the cores the game sees (6); no core kept for the replay (one is, with 8 or more logical processors) |
|
||||
| `HOS_VCORE_SPIN_US=<us>`, `HOS_VCORE_SPIN_MAX=<n>` | (Triforce, on by default; `HOS_VCORE_SPIN_US=0` as before) A game thread that waits for a virtual core it asked a holder to give up spins for it, up to 250 us, before it sleeps (`host/hos_thread.c` `vc_spin`, after NX2navi's `core_take`): the holder gives the core up at its next checkpoint, mostly within microseconds, and the waiter then runs without an OS wake. Who gets a core does not change, only how soon. At most `HOS_VCORE_SPIN_MAX` threads spin at once and the rest sleep at once: by default a quarter of the logical processors beyond 8, at most 4 (none with 8 or fewer, 1 with 12, 2 with 16). The `vcores:` line (every 5 s) counts the waits that ended in the spin and those that slept, the time spun, the spins left out for the cap, and how soon a granted core ran after a spin and after a sleep; the start's `vcores: a waiter spins up to` line says what is in effect. A yield with no thread waiting for a core takes no lock (NX2navi's yield fast path) |
|
||||
| `RX_VK_HELPER_SPIN_US=<us>` | (Triforce, on by default; `=0` as before) The parallel replay's spins (`gpu/vk/helper_spin.h`, after NX2navi's replay workers): a helper thread with no segment to record spins up to 100 us for the next before it sleeps, and the replay thread spins as long for a segment a helper records before it sleeps for it. The frame statistics' `its spins` line, after the parallel replay's parts, says how often each ended in the spin or slept and the time spun |
|
||||
| `HOS_X3D=0` | (Windows) The game's threads and the replay's core are not kept on the die with the largest L3 cache. By default they are, on a processor whose L3 caches differ in size and whose largest serves 8 or more cores (AMD's two-die X3D parts: a 7950X3D's or 9950X3D's 3D V-Cache die; `host/hos_x3d.h`), and the log's `cpu: logical processors ... share the largest L3 cache` line says so. On every other processor nothing changes and the log has no such line |
|
||||
| `HOS_POWER_THROTTLING=1` | (Windows) Windows' power throttling of a window not in front left as it is (for A/B runs). By default every run, the shader preparation's too, opts out of it at the start: full speed, not the efficiency speed (EcoQoS) Windows 11 gives such a process, and the 1 ms timer resolution kept, which Windows 11 may otherwise ignore for it (Windows 10: full speed only). The log's `power:` line says what Windows took |
|
||||
| `HOS_HOST_ZSTD=1` or `2` | The game's files (`.zs`) decoded by the host's zstd (`third_party/zstd`) instead of the game's own translated decoder; off unless set, and nobody has played with it on. `1`: the host decodes what `host/host_zstd.h` takes (whole buffers, and the loading threads' streams with their content size and room for it), the game's code the rest, errors included. `2`: check, the game's code decodes everything as before and the host beside it, and the log's `zstd check: ... MISMATCH` lines name every difference (its `zstd:` lines count what was compared): the way to try it before `1`. Game build `e0f3ccfa` only. The lift needs both of its calls (`nx2/oot_patches.py` `patch_host_zstd`): a build log that says `the host's zstd decoder's calls were found at 1 of 2 places` has one only, and the switch then covers only that function |
|
||||
|
||||
### Building
|
||||
|
||||
@@ -162,9 +273,14 @@ A build reads and writes tens of gigabytes. When the game folder or the build fi
|
||||
| Switch | What it does |
|
||||
|---|---|
|
||||
| `HOOKSHOT_JOBS=<n>` (or `--jobs`) | Compilers at once (default one per CPU thread, each started when the free memory holds it; `HOOKSHOT_MEM_GATE=0` turns that check off) |
|
||||
| `HOOKSHOT_LIFT_JOBS=<n>` | Processes that write the lifted C (default the cores, at most 16) |
|
||||
| `HOOKSHOT_LIFT_JOBS=<n>` | Processes that write the lifted C. Forked on Linux and macOS: default the cores, at most 16, one per 2 GB of free memory. Spawned on Windows (`nx2/emit_pool.py`), where they also cut the big chunks and share the page marks: default half the processors, at most 8, one per GB of free memory. `1`: one process, on every system; the C is the same whatever the count |
|
||||
| `HOOKSHOT_KEEP_BUILD_FILES=1` | Keeps the lifted C and the objects after a build, so that the next one compiles only what changed |
|
||||
| `HOOKSHOT_EARLY_COMPILE=0` | (Windows) Not compiled beside the lift: libopus and the two renderers, which need no translated code. By default `make_game.py` starts `build.py` with `RX_EARLY=1` for them while the game is translated (the lift's own processes take at most half the processors there), and the build proper finds their objects made |
|
||||
| `HOOKSHOT_MEM_GIANT=1` or `0` | Whether the memory gate counts a function of 1.2 MB or more by the square of its size (a chunk that is one 5 MB function takes 6.2 GB, not the 1.9 GB it is counted at otherwise). By default only on a PC with less than 14 GB free when the compile starts: with more, counting the giants in full halves the compilers running at once for no need |
|
||||
| `HOOKSHOT_MEM_LOG=1` | For each file compiled, `@@mem <file> <peak MB> <counted MB> <seconds>`: the most memory its compiler was seen holding, beside what the memory gate counted it at (`mem_need` in `nx2/build.py`). For fitting the gate after a change to the lift or the compiler |
|
||||
| `HOOKSHOT_MINGW=<dir>`, `HOOKSHOT_MSVC=1` | The llvm-mingw to build with; the Visual Studio route instead |
|
||||
| `HOOKSHOT_SINGLE_INSTANCE=0` | (Triforce) Hookshot Builder takes no lock on its build tools, as before. By default a second builder for the same tools folder (`builder/HookshotBuilder/Instance.cs`, named after `Tools.Root`), its `--cli` included, waits up to 5 s for one that is ending, then says so and ends: two of them built into one work folder and stopped each other's build. Triforce Setup has its own lock (`setup/Guard.cs` `Instance`) |
|
||||
| `TRIFORCE_LEGACY_PATHS=1` | (Triforce) Triforce Setup keeps .NET Framework's legacy path checks, which refuse paths of 260 characters and more whatever its manifest says (an exe csc builds is taken as written for .NET 4.0). By default `setup/Setup.cs` `Main` sets the two switches 4.6.2 defaults to (`Switch.System.IO.UseLegacyPathHandling`, `Switch.System.IO.BlockLongPaths`) before any path is used, so that with Windows' own LongPathsEnabled on Setup reads and writes deep paths |
|
||||
| `RX_CPM=<dir>`, `WGPU_NATIVE=<dir>` | The CPM cache (Vulkan and SPIR-V headers, VMA, FFmpeg) and wgpu-native |
|
||||
| `RX_TARGET=windows` | On Linux: the Windows game, with llvm-mingw's Linux build in `HOOKSHOT_MINGW` |
|
||||
| `RX_RELEASE=1` | A release build (`make_game.py` sets it): no console window, the shaders prepared before the title |
|
||||
@@ -172,36 +288,154 @@ A build reads and writes tens of gigabytes. When the game folder or the build fi
|
||||
| `RX_MARCH=<level>` | The CPU level to build for (default this PC's: `x86-64-v3`, else `x86-64-v2`, else `x86-64`) |
|
||||
| `RX_VK_ONLY=1` | Only the Vulkan back end, with no lift |
|
||||
| `OOT_WORK`, `OOT_DUMP`, `OOT_EXEFS`, `OOT_ROMFS` | The work folder and the dump's folders, over `work/dump.txt` |
|
||||
| `HOS_MODS=<folder>` | The mods folder, in place of `mods` in the game folder: for the running game (RomFS mods, cheat files) and for a build (the code patches it applies) |
|
||||
|
||||
## Mods: code patches and cheats
|
||||
|
||||
The game loads RomFS mods at its start (`host/mods.c`). The two kinds of mod that change what the game *does* go other
|
||||
ways, because the game's code is C compiled ahead of time and cannot be patched while it runs.
|
||||
|
||||
**The mods folder**, for the game and for a build alike (`host/mods.c` `find_mods`, `nx2/code_mods.py` `find_mods`,
|
||||
which must stay the same walk): a mod is a folder under `mods` that holds a `romfs`, `exefs` or `cheats` folder, at
|
||||
most four levels down, and nothing below a mod is looked at. A folder whose name starts with `-` or `_` is off, one
|
||||
that starts with `.` is skipped. Mods are ordered by their path under `mods`, ASCII letters' case ignored, and the last
|
||||
one wins. Triforce Setup's mod manager can switch a mod by renaming its folder and order mods by a prefix, and needs
|
||||
no other file.
|
||||
|
||||
**Code patches** (`<mod>/exefs/*.ips`, `*.pchtxt`), `nx2/code_mods.py`:
|
||||
|
||||
- `make_game.py` calls `build_step` once its copy of the game's code (`<work>/exefs`) is there and checked, after the
|
||||
copy the game folder keeps for updates (`.triforce_exefs`) is made and before the lift key is taken. The patches go
|
||||
into that copy, a module with a patch written again as a plain NSO, and the lift reads it: `lift.py`, `chunks.py`
|
||||
and the rest of the translator know nothing of mods.
|
||||
- The lift key hashes the files of that copy, so the patched bytes are in it: a patch added, taken out, switched off
|
||||
or edited translates the game again, a patch that changes no byte does not, and neither does a change to
|
||||
`code_mods.py` itself (`LIFT_KEY_NOT`).
|
||||
- A patch names its module by build id (the `.ips` file's name, the `.pchtxt` file's `@nsobid-`, trailing zeros left
|
||||
out or not) and may be for any module of the exefs. Offsets count the NSO's 0x100-byte header, as Atmosphere and the
|
||||
emulators read them; `.pchtxt` knows `@flag offset_shift`, `@enabled`, `@disabled`, `@little-endian`, `@big-endian`
|
||||
and `@stop`. Mods in order, a mod's files by name, the later write wins and the build says which file wrote over
|
||||
which.
|
||||
- A file is refused whole, with a line that says why: another build's, cut short, a value that cannot be read, a write
|
||||
into the header, past the image or between the segments. The last leaves out code caves, which the translator has
|
||||
not been tried on.
|
||||
- The build writes `triforce_code_mods.txt` into the game folder when it is done: a line per patch file, tab
|
||||
separated, `applied` or `refused`, the file's FNV-1a 64 and size, its path under the mods folder, then the module
|
||||
and the bytes changed, or the reason. The next build (the game's update offer runs `--update`) reads the mods folder
|
||||
again, so the same patches are built in again, and says which of the record's are gone, changed or refused now. The
|
||||
game reads the record at its start (`host/mod_code.h`) and logs for each patch file whether it is built in or waits
|
||||
for a build, and which built-in patches are gone from the folder.
|
||||
|
||||
**Cheats** (`<mod>/cheats/<first 16 digits of main's build id>.txt`), `host/mod_cheats.h` and `host/mod_cheats.c`:
|
||||
|
||||
- Read at the start, run by an interpreter once a game frame, at the game's present and on its thread
|
||||
(`hos_mod_cheats_frame`). Nothing is compiled in, so a cheat file needs no build. NX2navi compiled in the cheats that
|
||||
write instructions; Triforce's translator has no switchable patches, so such a cheat (an opcode 0 into a module's
|
||||
`.text`) is refused and belongs in a code patch.
|
||||
- The opcodes it runs are listed at the top of `host/mod_cheats.h`: 0 to A and C0 to C3 of Atmosphere's cheat machine.
|
||||
Any other is refused when the file is read, the whole cheat, by name. Registers are shared by one file's cheats within
|
||||
a frame and cleared between frames; a master code runs first.
|
||||
- Memory is the program image and the heap, each access checked (`mod_cheat_readable`); the modules' code
|
||||
(`hos_code` in the generated `hos_image.c`) is never written. Region 0 is the module main's base (`hos_main_base`),
|
||||
1 and 2 `HOS_HEAP_BASE`, 3 `0x08000000`, as `host/hos_svc.c` tells the game.
|
||||
- Each cheat that is not a heading has a row on the System tab, 96 at most (`gpu/vk/mod_cheat_rows.h`; option ids 130
|
||||
to 133 in `gpu/vk/vk_api.h`). The rows are not in the options file: `triforce_cheats.txt` in the game folder has a
|
||||
line for each cheat that is on, its number (FNV-1a 32 of `<mod>/<name>`) and that text, and a cheat listed there is
|
||||
on at the start.
|
||||
|
||||
## The options file
|
||||
|
||||
`hookshot_options.ini`, in the game folder, holds the Insert menu's rows as `<key>=<number>`: the row's name in lower
|
||||
case with `_` for spaces (`frame_generation=2`, `invert_camera_x=1`), except Output resolution, which is `output_res`.
|
||||
`gpu/vk/vk_menu.cpp` writes the whole file at every change (`save`), with `options_version=4`,
|
||||
`gpu/vk/vk_menu.cpp` writes the whole file at every change (`save`; (Triforce) merged by key with a change made outside the game meanwhile, and written whole: `RX_VK_OPTIONS_MERGE` above), with `options_version=4`,
|
||||
`microphone_device=<name>` when a microphone is chosen by name, and the controls (`pad_<button>` and `key_<button>`:
|
||||
the README's [Controls](../readme.md#controls)). A value outside a row's range is clamped when it is read. Where the
|
||||
number is not the obvious one:
|
||||
|
||||
| Key | Values |
|
||||
|---|---|
|
||||
| `quality_preset` | 0 Custom, 1 Minimum (4GB), 2 Low (6GB), 3 Balanced (8GB), 4 High (12GB), 5 Ultra (16GB+) |
|
||||
| `quality_preset` | 0 Custom, 1 Minimum (6GB), 2 Low (8GB), 3 Balanced (12GB), 4 High (16GB), 5 Ultra (20GB+); each sets Texture detail: Low, Reduced, Full, Full, Full |
|
||||
| `gpu_device` | 0 Auto, n the n-th card with Vulkan 1.3 as the row lists them |
|
||||
| `frame_generation` | 0 Off, 2 to 8 the multiplier |
|
||||
| `frame_generation` | 0 Off, 1 Auto, 2 to 8 the multiplier, 9 AMD FSR 4 (the made frame by AMD's frame generation library, `gpu/vk/vk_fsr4.cpp` `fsr4fg`; where that cannot run the value stays in the file and the row shows and runs 2x: `gpu/vk/framegen_rows.h`) |
|
||||
| `frame_rate_cap` | 0 60, 1 90, 2 120, 3 144, 4 165, 5 240, 6 the monitor's refresh rate; -1 45, -2 40, -3 30 |
|
||||
| `steady_frame_rate` | 0 Off, 1 any rate (the cap, then 200, 180, 160, 144, 120, 110, 100, 90, 80, 72, 66, 60, 55, 50, 45, 40, 36, 30 under it), 2 whole divisions of the display's refresh rate under the cap, from 30 up (`host/pace_steady.h`) |
|
||||
| `resolution` | 0 Auto, 1 100%, 2 75%, 3 67%, 4 50% |
|
||||
| `output_res` | 0 2048x1152, 1 2560x1440, 2 3840x2160, 3 1920x1080, 4 5120x1440, 5 5120x2880 |
|
||||
| `ultrawide` | 0 16:9, 1 16:10, 2 21:9, 3 32:9 (before `options_version` 6, 1 was the monitor's shape: read as the nearest of the four, `gpu/vk/ultrawide_rows.h`) |
|
||||
| `hdr` | 0 Off, 1 Expanded, 2 Native (the game's own) |
|
||||
| `hdr_paper_white`, `hdr_peak_brightness` | nits: 80 to 400, and 400 to 10,000 |
|
||||
| `renodx_tonemapper` | 0 Vanilla, 1 PsychoV35, 2 RenoDRT |
|
||||
| `renodx_gamma_correction` | 0 Off, 1 2.2, 2 BT.1886 (2.4) |
|
||||
| `renodx_match_tone_slope` | 0 Off, 1 On (as out of the box): PsychoV35's rows, with `renodx_tone_slope` and `renodx_hue_clip` |
|
||||
| `renodx_tone_slope`, `renodx_highlight_saturation` | 0 to 100, 50 unchanged: the first PsychoV35's, the second RenoDRT's |
|
||||
| `renodx_blowout`, `renodx_flare` | 0 to 100, 0 none: RenoDRT's |
|
||||
| `renodx_hue_clip`, `renodx_hue_correction`, `renodx_color_grading` | percent, 0 to 100: 50, 100 and 100 out of the box; the first PsychoV35's, the others RenoDRT's |
|
||||
| `dlss` | the Upscaler: 0 the game's own, 1 NVIDIA DLSS, 2 NVIDIA DLAA, 3 AMD FSR 3.1, 4 AMD FSR 4, 5 AMD FSR 4 Native AA, 6 AMD FSR 3.1 Native AA (the row shows it after FSR 3.1) |
|
||||
| `upscaling` | 0 Off, 1 Catmull-Rom, 2 Lanczos |
|
||||
| `anti-aliasing` | 0 the game's own SMAA, 1 Off, 2 FXAA, 3 SMAA Ultra |
|
||||
| `texture_detail` | 0 Automatic, 1 Full, 2 Reduced, 3 Low |
|
||||
| `fps_counter` | 0 Off, 1 On, 2 Full (NX2navi's full performance overlay in the counter's place: `vk_menu.cpp` `draw_perf`, the frame times and the figures per frame `gpu/vk/perf_stats.h`, the machine's numbers sampled twice a second on a thread of their own `gpu/vk/perf_machine.cpp`) |
|
||||
| `opaque_textures_as_bc1` | 0 Off, 1 On |
|
||||
| `sharpness`, `rumble_strength`, `motion_sensitivity_x`, `motion_sensitivity_y` | percent |
|
||||
| `mouse_sensitivity` | hundredths: 100 is 1.00 |
|
||||
| `stick_dead_zone` | 0 Default (24%), 1 5%, 2 10%, 3 15%, 4 20%, 5 30% |
|
||||
| `left_stick_dead_zone`, `right_stick_dead_zone` | -1 As Stick dead zone, 0 to 50 percent |
|
||||
| `vibration_curve` | hundredths, 20 to 150: the power on the motors' rumble, 100 is 1.00 (none) |
|
||||
| `walk_key` | 0 Off, 1 Caps Lock, 2 Shift, 3 Ctrl, 4 Tab |
|
||||
| `walk_scale` | hundredths, 20 to 90: 51 is 0.51 of the stick's travel |
|
||||
| `robust_buffers` | 0 Auto (on), 1 Off, 2 On |
|
||||
| `game_speed` | 0 Per frame, 1 Real time |
|
||||
| `text_speed` | 0 Normal, 1 2x, 2 4x, 3 Instant |
|
||||
| `menu_sounds` | percent, 0 to 100: 80 unless set, 0 silent. The settings' own sounds, the game's interface sounds from its RomFS (`host/menu_sound.c`, `gpu/vk/menu_sound_events.h`; option ids 135 and 136), under `master_volume` |
|
||||
| `microphone` | 0 Off, 1 Default, 2 and up a microphone (the name in `microphone_device` decides which) |
|
||||
| `mouse_camera` | 0 As the stick, 1 Native |
|
||||
| `layout_preset` | 0 Nintendo, 1 Xbox / PC, 2 Swap Face, 3 Custom |
|
||||
| `button_prompts` | 0 Auto (the controller there at the start; none: the keyboard and mouse), 1 Switch, 2 Xbox, 3 PlayStation 4, 4 PlayStation 5, 5 Steam Deck, 6 Keyboard & mouse (`host/prompts.c`, `nx2/prompt_keys.py`) |
|
||||
| `replay_helper_threads` | 0 Off, 1 to 7 the parallel replay tried on 2 to 8 threads, 8 Automatic (the default; the Debug tab). A file that says 0 stays Off: delete the line, or choose Automatic on the Debug tab, for the default |
|
||||
|
||||
The Game language row is not in this file: its choice is the code line of `language.txt` in the game folder, which the
|
||||
menu rewrites in place (`gpu/vk/game_language.h`: the code alone on that line, the rest of the file as it was, and only a
|
||||
code the file itself names) and the host reads at the start (`host/nn_applet.c`). Nor are the Mod cheats rows: which
|
||||
of a mod's cheats are on is the host's to keep, in `triforce_cheats.txt` (*Mods: code patches and cheats* above).
|
||||
|
||||
The other rows are 0 Off and 1 On. Some are read at the start, before the menu exists, by the code that needs them:
|
||||
`handheld_profile` and `output_res` (`host/nn_applet.c`), `ultrawide` (`host/hos_main.c`), `robust_buffers`
|
||||
(`gpu/vk/vk_main.cpp`) and the controls (`host/nn_hid.c`).
|
||||
`handheld_profile` and `output_res` (`host/nn_applet.c`), `ultrawide` (`host/hos_main.c`), `frame_rate_cap`
|
||||
(`host/nn_vi.c`; the monitor's rate is the display's the window opens on, rounded, 30 to 240, and 60 when it cannot be read), `robust_buffers`
|
||||
(`gpu/vk/vk_main.cpp`), `texture_detail` (`gpu/vk/vk_texture.cpp`, at the first texture) and the controls (`host/nn_hid.c`).
|
||||
|
||||
The `renodx_` rows other than `renodx_hdr` are read at every frame (`gpu/vk/vk_renodx.cpp` `fill_settings`), and the
|
||||
menu shows the rows of one tonemapper while it is the one chosen. RenoDX's mod for this game has Vanilla and PsychoV35;
|
||||
RenoDRT and the gamma correction come from `gpu/vk/shaders/renodx_glue`, three files of Triforce's own that
|
||||
`scripts/renodx_shaders.py` compiles together with RenoDX's scene shaders and its output encoder as the build fetched them
|
||||
(nothing of RenoDX is in the repository or changed). RenoDRT calls RenoDX's library; the gamma correction is on the
|
||||
finished picture, HUD included, and the tone mappers are given a peak with it taken out, so that the brightest light
|
||||
still lands on the HDR peak brightness. A change to a glue file changes the stamp of `renodx_spv.h`, which the next build
|
||||
then compiles again.
|
||||
|
||||
RivaTuner Statistics Server has no row: where it is installed and running it is the game's frame limiter, and an options
|
||||
file that still has the test builds' `rivatuner_limit=` is read by nothing (the next save drops the line). A thread of
|
||||
`gpu/vk/rtss_limit.cpp` looks twice a second: it puts the limit (`gpu/vk/pace_rule.h` `pace_rtss_want`: the cap in
|
||||
effect, Monitor's rate and the caps under 60 included, times the frames shown for each of the game's with frame
|
||||
generation 2x to 8x or AMD FSR 4) into RTSS's profile for the executable through RTSS's own hooks library
|
||||
(`RTSSHooks64.dll` from RTSS's folder: `FramerateLimit` and `FramerateLimitDenominator`, nothing else, no other profile),
|
||||
reads it back, and once RTSS is seen holding the game to it (`gpu/vk/rtss_decide.h` `rtss_decide`) the host's wait steps
|
||||
aside (`gpu/vk/vk_pace.cpp`), the in-house frame generation's display thread leaves its own spacing of made frames to
|
||||
RTSS, and Reflex is given no frame limit. A limit lower than the profile's waits 5 s before it is written, a higher one
|
||||
1 s, so a multiplier that changes in play does not rewrite the profile each time. What the profile held is kept in
|
||||
`triforce_rtss_profile.txt` in the game folder before the first change (one line per executable, the others' lines
|
||||
kept, a file that does not read left alone) and goes back at the exit; the next start puts it back after a kill or a
|
||||
crash, unless the player changed the profile since. The game's own wait holds the frames instead with frame generation
|
||||
on Auto (its presents follow the screen's refresh, not the game, so no limit on them holds the game) and with DLSS frame
|
||||
generation (Streamline presents on a pace of its own: `HOS_RTSS_DLSSG=1` tries RTSS there), during movies (the profile
|
||||
keeps the play limit), while no picture went out for 200 ms (a minimised window), while RTSS is not installed, not
|
||||
running or has not hooked the game, and when the profile does not keep the limit (no administrator rights) or RTSS
|
||||
refuses it, unless a limit the player set in RTSS, at or under the game's, holds the game (then RTSS holds movies too).
|
||||
A hold needs a present since the frame start two frames back, so a window that stops showing gives the frames back
|
||||
within two frames. RTSS's count past 1.05 times the limit three
|
||||
periods running, 30 s hooked with the limit and no hold, or the game's frames coming sooner than the cap give the frames
|
||||
back; RTSS is tried again a minute later (three times), and at once when RTSS starts again or another limit is wanted.
|
||||
The game never starts RTSS, installs nothing and asks for no rights. `vk: pace:` lines in the log say which limiter is in
|
||||
force and why; the Full overlay's Frame limit line names RivaTuner or NVIDIA Reflex after the rate when either holds the frames.
|
||||
|
||||
## Layout
|
||||
|
||||
@@ -213,9 +447,10 @@ The other rows are 0 Off and 1 On. Some are read at the start, before the menu e
|
||||
| `gpu/vk/` | the Vulkan back end (`hookshot_vk.dll`, `hookshot_vk.so`), with Eden's shader recompiler and sirit |
|
||||
| `gpu/render/`, `gpu/third_party/` | the WebGPU renderer the Windows exe falls back to when it was built with wgpu-native, its op stream (`rx_nvn.h`), suyu's decoders |
|
||||
| `builder/` | Hookshot Builder: the Windows app (.NET 8 WPF), its setup and MSI, and the Linux builder and launcher scripts |
|
||||
| `setup/` | Triforce Setup, the program players run (.NET Framework 4.8, WPF): `Setup.cs` installs, updates and runs `make_game.py`, `Shell*.cs` and `Main.xaml` are its window, `Guard.cs` is what keeps a run from damaging an install, `Mods.cs` the mods folder as the Mods page lists and changes it, `Steam.cs` and `SteamArt.cs` the Add to Steam shortcut and its pictures, `Sound.cs` the game's own decide and cancel sounds as Setup plays them (decoded in memory from the player's game folder: no sound is shipped; `TRIFORCE_SOUND_LOG=<file>` writes down, in a test run, the sounds that would have played) ([CONTRIBUTING.md](../CONTRIBUTING.md#triforce-setup)) |
|
||||
| `scripts/` | test runs, the profile and log readers, the save copier (`oot_saves.py`), release tooling, `scripts/linux` (dependencies, AppImage) |
|
||||
| `tests/` | the game-free checks, all run by `tests/run_all.py` |
|
||||
| `third_party/` | a64-kit (Hookshot's few changes marked `(hookshot)`), libopus, zbic (Atmosphere's zstd with ZBIC, for unpacking only), SDL2's licence, Dear ImGui and its Vulkan backend, zstd's decoder, the Libertinus fonts |
|
||||
| `third_party/` | a64-kit (Hookshot's few changes marked `(hookshot)`), libopus, zbic (Atmosphere's zstd with ZBIC, for unpacking only), SDL2's licence, Dear ImGui and its Vulkan backend, zstd's decoder, the Libertinus fonts, SMAA's reference shader and lookup textures (the Anti-aliasing row's SMAA Ultra) |
|
||||
|
||||
License: GPL-3.0-or-later, as mkw-recomp: a64-kit's translator is suyu's (GPL-2.0-or-later) and Eden's code is
|
||||
GPL-3.0.
|
||||
|
||||
@@ -29,3 +29,24 @@ It needs Vulkan headers but no GPU, SDK vendor runtime or game assets.
|
||||
Injected failures in these tests do not prove actual driver OOM recovery or
|
||||
device-loss handling. A successful game smoke validates integration, not a fault
|
||||
injection into the player's GPU.
|
||||
|
||||
## AMD FSR 4's frame generation
|
||||
|
||||
The Frame generation row's AMD FSR 4 (`vk_fsr4.cpp`, `fsr4fg`) holds one frame generation context of AMD's library and
|
||||
one image the made frame is written into. They follow the same rules:
|
||||
|
||||
- The image is made first, then the context; both are published together, only when both exist. A failure destroys
|
||||
what was made, turns AMD's frame generation off for the session (the row then shows what runs, 2x by the renderer's
|
||||
own interpolation) and is logged once. Nothing is retried per frame.
|
||||
- A context is replaced (another picture size, a scene larger than it was made for, another kind of depth range) before
|
||||
anything of the new frame is recorded: the queue and the device idle, AMD's context destroyed, then the image.
|
||||
- A context that failed while a frame was being recorded stays until the second present after it, since that frame's
|
||||
commands name it and are not on the queue yet; a context the row has left stays 120 presents. Both go at the
|
||||
present's tick (`framegen_present_tick`), in the same order.
|
||||
- At the process's exit (`HOS_OPT_EXITING`) nothing of AMD's is destroyed and nothing of it is called again: there is no
|
||||
swapchain or thread of AMD's to stop, and the context goes with the process, as the upscaler's does.
|
||||
|
||||
The order is one function, `framegen_rows.h` `teardown`, which the real code and `tests/test_framegen_fsr4.py` both
|
||||
run; the test also runs the real section against a stand-in for AMD's library and checks each of the cases above. It
|
||||
does not prove what AMD's library or a driver does with these calls: nobody has run them on a card with FSR 4's frame
|
||||
generation.
|
||||
|
||||
185
docs/lazy-writeback.md
Normal file
185
docs/lazy-writeback.md
Normal file
@@ -0,0 +1,185 @@
|
||||
# Lazy write-back: built, on by default
|
||||
|
||||
**Since options_version 5 (2026-11-16): on by default, at the owner's word, with the row and `RX_VK_LAZY_WB` to
|
||||
turn it off; still never on AMD's driver by the row alone. The status below is from before.**
|
||||
|
||||
**Status (2026-11-15): built behind the hidden Debug tab's Lazy write-back row, off unless set, and `RX_VK_LAZY_WB`
|
||||
(`=1` on, `=0` off, `=2` the self-check) over it. Nobody has run it in the game.** The design below is what was built;
|
||||
"As built" at the end says how, and what only the game can show. The note was first written when it was studied for the
|
||||
port of NX2navi's features and left out, because in this code base it cannot be proven correct without running the
|
||||
game; the owner then asked for it to be built all the same, off by default, so that it can be turned on and compared.
|
||||
The reasons in "Why it is not built" still stand as the things to watch for.
|
||||
|
||||
## What it is
|
||||
|
||||
What a shader writes into a mirrored pool lives in the pool's VRAM mirror. At the end of every submission the renderer
|
||||
copies it back into guest memory, in case the CPU reads it (`gpu/vk/vk_memory.cpp`, the end of
|
||||
`memory_end_submission`). The game's CPU reads very little of it. NX2navi stopped copying a range once it had gone
|
||||
back one time, and copies it only when something touches it: "about a third more frames" in open areas, with 66 MiB a
|
||||
frame no longer crossing PCIe (7 to 9 ms of a frame's 13 to 15 ms of GPU time there).
|
||||
|
||||
How NX2navi knows about a touch: it takes the access away from the range's pages (no read, no write). The first access
|
||||
faults, the fault handler has the renderer copy the range down, gives the pages back and runs the access again
|
||||
(NX2navi's `runtime/memory.c` "Lazy write-back", `runtime/vk_memory.c` `lazy_fetch`). Around that sit a thaw before every
|
||||
kernel call that is handed guest memory, a list of ranges in flight, a window between the replay's last check and its
|
||||
hand-over, a hold after a touch, and a choice by driver (`wb_lazy_choice.h`: off on AMD's driver after two reports of
|
||||
the game ending in play, off outside Windows). It took several releases of play tests to get there, and one of its
|
||||
refinements still loses the device on some loads.
|
||||
|
||||
## What is different here
|
||||
|
||||
- **CPU writes are known late, CPU reads never.** Lifted stores mark their page in a table (`A64_MARK`, the soft
|
||||
write watch) and the renderer collects the marks at the next submission (`memory_collect_written`). A load is a
|
||||
plain pointer access (`A64_PTR`) with no hook. So "copy it when the CPU touches it" has only two possible sources
|
||||
here: page protection, as in NX2navi, or the calls the game makes before it reads.
|
||||
- **Most of the gain is already taken another way.** Since 2026-11-09 a write-back is a compute pass that compares
|
||||
the mirror with a VRAM shadow of guest memory and writes only the words that differ (`wb_diff`, on by default).
|
||||
Measured where NX2navi measured (Hyrule Field, about 69 MB a frame of written ranges): the whole copies took 4.4 ms
|
||||
of the GPU's 13, the pass takes about 0.7 ms. What a lazy write-back could still save here is that pass, the pages
|
||||
it reads into the shadows, and the waits of captures for write-backs still on the GPU (`wb_pages`, the "late"
|
||||
pages of `take_capture`). Nobody has measured how much that is.
|
||||
- **The order in which the GPU's words reach guest memory is tuned by play.** The exposure meter is a sum the GPU
|
||||
adds to and the CPU reads and clears; the readback waits in `vk_replay.cpp` `invalidate`, the late pages, the
|
||||
deferred syncs and the report words cut out of write-backs (`memory_cpu_owned`) each fixed a flicker that only
|
||||
showed in the game (white flashes, blinking cells, a dark frame every 15 to 30). A lazy write-back moves every one
|
||||
of those moments.
|
||||
|
||||
## Who reads what is written back
|
||||
|
||||
Everything below would see old bytes while a copy is owed, unless it is made to pay first.
|
||||
|
||||
| Reader | Where | Can it be caught? |
|
||||
|---|---|---|
|
||||
| The game's own code | lifted loads, any thread | Only by a fault. `nvnBufferInvalidateMappedRange` and `nvnMemoryPoolInvalidateMappedRange` reach the renderer (`host/nvn_native.c`, `rx_nvn_invalidate`), and it already waits there for the range's write-back. Whether the game calls one before every read of GPU results is not known; `HOS_NVN_LOG_FLUSH` logs the calls |
|
||||
| NVN event words | `nvnEventGetValue`, `hos_nvn_event_value` (the present poll, `host/hos_thread.c`) read guest memory with no call into the renderer | A hook in the host |
|
||||
| Host code given game buffers | `memcpy` and the like through `GP()`: audio voices on the mixer thread, the movie's packets, the codec, `nn_libc.c` | By a fault, on that thread |
|
||||
| The kernel | `ReadFile` and `WriteFile` straight on guest pointers (`host/nn_fs.c` `read_at` and the write beside it: every file read, every save); the same as `pread`/`pwrite` on Linux | **No.** A call into a page without access fails with an error and no fault (`host/mkw_glue.c` says so of reserved pages). Each needs a thaw before it, as NX2navi has |
|
||||
| The renderer's CPU reads | captures (`capture_make` on the game's thread and its helpers, `guarded_copy`, which drops a page that faults on Windows and is a plain `memcpy` on Linux), `memory_read_as_submitted`, texture uploads (`vk_texture.cpp` `guest_bytes`), shader code, the bank's descriptors | By a fault, but on threads that hold `pools_mu` or `replay_mu`, which a copy must not need |
|
||||
| The GPU through the import | every `vkCmdCopyBuffer` from `Pool::buffer` (`mirror_make`, `mirror_pieces_make`, `mirror_sync`'s live pages, `memory_rb_refresh`, `late_deferred_bound`, the shadows' fill) and every binding `gpu_buffer_bind` or `gpu_buffer` gives the import for | Never by a fault: each site has to pay first or bind the mirror |
|
||||
| Code that takes guest memory for complete | a mirror given back or remade (`mirror_free`, `mirrors_give_back`, `demote_trials`, `pieces_set_direct`, `retire_pool` with its inheritance), `texture_flush_to_guest` | Each has to pay first |
|
||||
|
||||
And three things undo a page's protection behind the renderer's back on Windows: `import_pool` commits its whole
|
||||
range again (`VirtualAlloc(MEM_COMMIT, PAGE_READWRITE)`, which its own comment says resets protection), `hos_commit`
|
||||
does the same for the game's mappings, and `hos_mem.c` discards and decommits pages.
|
||||
|
||||
## A design for Triforce
|
||||
|
||||
The states of a guest page of a mirrored pool, as a write-back sees them:
|
||||
|
||||
| State | Guest memory holds | How it is left |
|
||||
|---|---|---|
|
||||
| current | everything the GPU wrote | a written binding of a later submission: **written** |
|
||||
| written | all but this submission's writes | the submission's end: copied (the diff pass), then current; or, when the page went back once before and nothing forbids it, no copy: **owed** |
|
||||
| owed | an older version; the mirror alone has the GPU's | a reader: **paying**; a later written binding: stays owed, the newer write joins the same debt (one copy pays for all of them, mirror to guest, so they land in order by construction) |
|
||||
| paying | being copied by one thread | the copy done and waited for: current. Every other reader of the page waits for that copy, none starts a second |
|
||||
|
||||
Rules that keep it correct:
|
||||
|
||||
1. A page is owed only whole, only in a pool with a mirror in memory there (not a piece left in guest memory), only
|
||||
when the mirror holds every CPU write to it (`page_gen(page) <= synced_gen`: a copy from the mirror would
|
||||
otherwise put older bytes over the CPU's), and never where the replay writes words itself (the report words).
|
||||
2. Every reader in the table above pays before it reads. For CPU reads that means the page has no access while it is
|
||||
owed and the fault handler pays; for the kernel a thaw before the call; for the GPU's reads and for code that gives
|
||||
a mirror up, a call that pays the range first.
|
||||
3. A CPU write to an owed page pays first, like a read (the write faults). It does not drop the debt: the write
|
||||
covers part of the page and the rest is the GPU's. Only a write of the whole page, which nothing here can
|
||||
recognise, could drop it. The page then goes the usual way (marked, collected, synced into the mirror), and is not
|
||||
owed again for a while (NX2navi holds it 1 s, doubling to 32 s while it keeps being touched).
|
||||
4. A payment copies after everything submitted so far, in a command buffer of its own that the paying thread waits
|
||||
for; the part being recorded checks at its end whether a range it left owed was paid meanwhile and copies it then.
|
||||
5. The shadows of the write-back diff stay true without change: an owed page was not written by the pass, so the
|
||||
shadow still equals guest memory, and a payment is the same pass run later.
|
||||
6. A capture's wait (`wb_pages`) has nothing to wait for on an owed page: no submission writes it back. The wait
|
||||
moves into the payment.
|
||||
|
||||
The page-state logic belongs in a header of its own with tests for the rules above (each reader pays first; a CPU
|
||||
write pays and does not drop; debts merge; one payer at a time), as the write generations have theirs
|
||||
(`gpu/vk/write_gen_table.h`).
|
||||
|
||||
## Why it is not built
|
||||
|
||||
None of these can be settled by a test without the game:
|
||||
|
||||
- **The set of kernel accesses.** One missed `ReadFile` into an owed page is a short read handed to the game, with no
|
||||
fault and no log. The list above is what a search of `host/` found, not a proof; libraries and drivers that are
|
||||
handed guest pointers (the movie decoder, audio) were read, not run.
|
||||
- **The driver.** The pages are imported into Vulkan as host memory (`VK_EXT_external_memory_host`; a `udmabuf` on
|
||||
Linux). Taking their access away while the import lives is what NX2navi's AMD reports point at. Importing a pool
|
||||
whose pages have no access is likely to fail outright.
|
||||
- **Locks.** The fault can come on any thread, including the replay thread and the capture helpers while they hold
|
||||
the renderer's locks, and on Linux inside a signal handler. NX2navi's rules for this (ranges in flight, the
|
||||
window, fetches outside its freeze lock) were found by profiles and stalls in play.
|
||||
- **The game's timing.** See "tuned by play" above. Paying at the first touch instead of at the submission's end
|
||||
changes when the exposure meter, the event words and the culling's results appear to the CPU.
|
||||
- **Whether it is worth it.** With the diff pass in place the saving is unmeasured and may be small.
|
||||
|
||||
What was considered and rejected as a shortcut: paying only at `nvn*InvalidateMappedRange` and the host's own reads,
|
||||
with no page protection. It needs no fault handler and no thaw, but it is right only if the game announces every read,
|
||||
which nobody knows; a read that is not announced gets old data silently. `RX_VK_WB_MAX_KB` is the same bet made by
|
||||
size, and is off by default for that reason.
|
||||
|
||||
## What to do first, in the game
|
||||
|
||||
1. Measure what is left to gain: `RX_VK_PASS_TIMING` gives the GPU time of "wb diff" and "wb copies" a frame, and the
|
||||
log's "write-back diff (600 submits)" and "a capture taken" lines give the bytes compared and the takes that waited
|
||||
for late pages. `RX_VK_NO_WRITEBACK=1` is the upper bound on frame rate (its picture is wrong wherever the CPU reads
|
||||
results: do not judge the picture with it).
|
||||
2. If that is worth the work: log which written-back ranges the game announces before reading
|
||||
(`HOS_NVN_LOG_FLUSH`, `RX_VK_LOG_INVALIDATE`, `RX_VK_LOG_WRITEBACK`), and build the page probe NX2navi used before
|
||||
its lazy write-back (protect a written-back range, log the first access with its thread and address, give the page
|
||||
back): that turns "the CPU does not read most of it" from NX2navi's game build into a fact about this one, and
|
||||
finds the kernel accesses on the way.
|
||||
3. Then the host side (the fault hook, a thaw before `read_at` and the save writes, the commits that reset
|
||||
protection), the renderer side (rules 1 to 6), a Debug tab row that is off by default, and the same choice by
|
||||
driver NX2navi ended with.
|
||||
|
||||
## As built (2026-11-15)
|
||||
|
||||
Steps 1 and 2 above were not done first: the owner asked for it built behind a row, so that the first run with it on
|
||||
is the measurement. What is where:
|
||||
|
||||
- **The page states**, `gpu/vk/wb_lazy_state.h`, with the rules and a threaded stress test in
|
||||
`tests/test_wb_lazy_state.py`. A page is not owed at once: it is first WATCHED (read-only, still copied at every
|
||||
submission) until a collection of the write watch and a capture, both numbered after the watch began, have come
|
||||
and named no CPU write to it. That is rule 1 for the writes the renderer learns of late; the renderer adds the rest
|
||||
of it: the CPU's newest write generation for the page no newer than its pool's `synced_gen` (`lazy_page_takes`).
|
||||
That asks `cpu_gens`, the CPU's writes alone, and not the one table of generations: the first build asked that one,
|
||||
where every storage buffer a draw or a dispatch writes is stamped while it is recorded (`memory_stamp_gpu`) and
|
||||
`synced_gen` is raised only at the submission's end, so every page being written back looked newer than its sync
|
||||
and the owner's first session with the row on watched and owed nothing (`tests/test_lazy_wb_cpu_gens.py`). A CPU write to a watched page faults and ends the watch with no copy; to an owed
|
||||
page it pays first. A payment between a recording's end and its submit leaves the rest PENDING until that submit
|
||||
(`memory_lazy_submitted`, called from `submit_recording` under the queue's lock). A touch holds its 64 KB block
|
||||
for a second, doubling to 32 s, as NX2navi does. Whether it runs: `wb_lazy::choose`.
|
||||
- **The renderer**, `gpu/vk/vk_memory.cpp` "lazy write-back": `lazy_runs` at each write-back (after the CPU's words
|
||||
are cut and the runs clipped to a mirror's resident pieces; never a page with event words), the payment (`lazy_pay`:
|
||||
its own command buffer after everything submitted, the held submits flushed first, waited for; the shadows told of
|
||||
the pages, rule 5), `lazy_settle` before every copy out of an import and every binding given the import (rule 2 for
|
||||
the GPU), and before a mirror, a piece, a retired pool or an import is given up; `import_pool` holds the pages
|
||||
while it commits and imports. The fault handler is the process's first vectored handler, added when the renderer
|
||||
starts, ahead of host/mkw_glue.c's. Locks: see the section's comment (a payment needs neither `pools_mu` nor
|
||||
`replay_mu`, and logs nothing). `tests/test_lazy_wb_hooks.py` holds these hooks in place.
|
||||
- **Several payments at once** (2026-11-16, NX2navi's `wb_lazy_unlocked`): each payment holds one of four slots, a
|
||||
command buffer and a fence of its own (`gpu/vk/wb_lazy_payers.h`); it was one payer at a time, so a thread that
|
||||
touched another owed page, or the replay giving a mirror up, waited for the first one's copy before its own went onto
|
||||
the queue. Two payments never have the same pages (the table's PAYING has one payer), and each copy still goes onto
|
||||
the one queue after everything before it. `RX_VK_LAZY_PAYERS=1`: one at a time again. The threaded stress test runs
|
||||
with four slots and with one. What it does not change: a payment for a mirror given up still runs on the replay
|
||||
thread under `pools_mu` (NX2navi moved its own out of its pool lock as well); moving it would mean reworking every
|
||||
give-up path, for payments of which the owner's sessions have a few a minute.
|
||||
- **The host**: `hos_guest_io_begin` / `hos_guest_io_end` (`host/rx_backend.c`) around every kernel call on guest
|
||||
memory and every change of guest pages' state: `read_at` and the file writes (the saves too) in `host/nn_fs.c`, the
|
||||
image's read, `hos_commit`, the discards and decommits of `host/hos_mem.c` and `host/hos_svc.c`, the host zstd
|
||||
decoder's one-shot, and the debug dumps. `tests/test_lazy_wb_host.py` reads `host/*.c` for kernel calls that do
|
||||
neither, and every exception is in its list with a reason. Audio, the movie and the codec reach guest memory with
|
||||
the CPU only (`memcpy` and the like): their touches fault and pay.
|
||||
- **Linux**: off (`wb_lazy::choose`), the row not shown. **AMD's driver**: the row alone leaves it off;
|
||||
`RX_VK_LAZY_WB=1` turns it on there.
|
||||
- **The self-check**, `RX_VK_LAZY_WB=2`: guest memory is the eager copy (every copy still made); a payment reads the
|
||||
mirror's pages, what it would have copied, and compares them with guest memory. A difference is logged with its
|
||||
address at the next 600-submit line (`MISMATCH at guest`), not from inside the fault.
|
||||
|
||||
What only the game can show: whether the driver keeps an import whose pages have no access (NX2navi's AMD reports),
|
||||
whether the list of kernel calls is whole in practice (a missed one is a short read with no fault), how often the game
|
||||
touches what is owed (a touch costs a GPU round trip on the touching thread), and the timing of the exposure meter and
|
||||
the event words. The 600-submit line `vk: lazy write-back (600 submits)` says what it saved and who paid; with
|
||||
`RX_VK_LAZY_WB=2` the `check` line says whether it would have been right.
|
||||
@@ -25,3 +25,12 @@ These checks use no driver or real cache and do not reproduce issue #1022's repo
|
||||
its root cause, validate saving a multi-gigabyte driver cache, force an OS thread-resource failure, or change cache
|
||||
size/retry policy. The existing wait-then-store protocol for concurrent forced callers is unchanged; the current
|
||||
force call is in prepare-only startup. Driver/native faults and thread-detach failures are outside this change.
|
||||
|
||||
## The file's bound
|
||||
|
||||
The cache's size has a rule since: `gpu/vk/pcache_bound.h`. A file over the bound is not read (the cache starts
|
||||
empty), and data over the bound is neither fetched nor written, so the file keeps its last save
|
||||
(`RX_VK_PCACHE_MAX_MB`, in the development guide's switches). The fixture's `over-bound` case runs the save's side
|
||||
against the actual function: under and at the bound the data is written as ever, over it the old file stays, in a
|
||||
forced save and on the worker, and with the bound lifted the same data is written. The read's side is
|
||||
`tests/test_pcache_bound.py`. A read that ends early is refused whole by the header; no test makes a read end early.
|
||||
|
||||
@@ -109,6 +109,31 @@ that only exists on that side does not stay mixed in with the new save.
|
||||
- **Backups.** The script keeps one for every copy. Delete old ones when you no longer need them.
|
||||
- Start each program once and save in it before the first copy, so that its save folder exists.
|
||||
|
||||
## A save as one zip, from the game itself
|
||||
|
||||
The System tab of the game's Options has **Export save**, **Export save for a bug report** and **Import a save**
|
||||
(`host/save_share.c`; the readme's *Export and import a save*). They move one zip, not a folder:
|
||||
|
||||
```
|
||||
manifest.json "format": "triforce-save", "format_version": 1, the game's title id, the Triforce version, the export time (UTC)
|
||||
save/ account.sav, option.sav, slot_00/ ... as above
|
||||
bug-report/ in a bug report: triforce_log.txt, triforce_log.1.txt, triforce_options.ini, triforce_hang.txt
|
||||
```
|
||||
|
||||
- The export is the save the next start would load, read with no save in progress (`host/nn_fs.c` `hos_fs_save_read`):
|
||||
a finished commit still waiting in `user/save-tx/<user id>/ready-<n>`, else `user/save/<user id>`. It goes to the
|
||||
Downloads folder (`HOS_SAVE_EXPORT_DIR=<folder>`: there instead), or beside the game when that cannot be written.
|
||||
- The import takes the newest `.zip` of the game folder's `save-import` folder: this format or NX2navi's own
|
||||
(`"format": "nx2navi-save"`, the same layout). It is checked whole first (`host/save_pack.c`: the manifest, every path
|
||||
inside the save, no links, sizes, each file's CRC-32) and refused otherwise. Its save then waits in
|
||||
`user/save-tx/<user id>/import` and the zip moves to `save-import/imported`.
|
||||
- The next start copies the save about to be replaced to `user/save-backup/<user id>/import-<UTC date>-<time>` (kept until
|
||||
you delete it: the five rolling backups beside it are the saves' own), then makes the import the save
|
||||
(`host/save_tx_share.h`). Choosing the row again before that start cancels it.
|
||||
- Triforce Setup's Convert saves, used after an import was left waiting, drops the waiting import: what was converted last
|
||||
is the save.
|
||||
- With `HOS_SAVE_TX=0` the game writes its save in place, and nothing is exported or imported in that run.
|
||||
|
||||
## What was tested
|
||||
|
||||
- Linux (Arch-based), Hookshot v2.0.5 and Lichii built from source on the same day.
|
||||
|
||||
@@ -16,6 +16,9 @@ otherwise.
|
||||
|---|---|---|---|---|---|---|---|
|
||||
| 2026-11-10 | host `v2.0.11-438-gcd544a7` (source `8bdd7a54`); renderer main `8bac8aa` + #1502 + the host-clock capture change | Windows 11 Home N, 26300 | RX 9070 XT 16 GB, 32.0.32015.12012 | Ryzen 7 5700X3D, 64 GB | 2560x720 window, 32:9 camera, serial, FG off, dense capture, core validation; fresh prepared shader bank | Boot, title, save load; gameplay not reached | 96 s: 1,476 consecutive original capture records; all 1,461 records covered by the flushed native trace align one-to-one with native returns. Movement window rejected: no filled gameplay interval. No new validation IDs; existing `02251`, and two `08737` errors during full preparation. No gameplay speed or performance claim |
|
||||
| 2026-11-10 | v2.0.11-447-gcbe49eb, sampler admission branch (main 8bac8aa + sampler checks + staging fixture repair) | Windows 11, windowed | RTX 5070 Ti, 621.01 | Ryzen 7 9800X3D, 32 GB | 3440x1440 picture, native upscaling, fixed FG 2x, 1 MB recording streams; serial and parallel replay (2 workers, batch 1) | Kokiri Forest, inside Link's house; copied checkpoint | Both runs rendered the scene, maximized/restored (client 1444x720 to 1440x829 and back), and exited normally. Six representative PNGs decoded at 3440x1440; original checkpoint hashes unchanged. Healthy-path validation only; no FPS comparison or native OOM recovery claim |
|
||||
| 2026-11-10 | host `0f5d423a` (API13 diagnostic backport), renderer main `dadecd53` | Windows 11 | RX 9070 XT 16 GB, 32.0.32015.12012 | Ryzen 7 5700X3D, 64 GB | 32:9, serial, FG off, GPU profiling/validation off; menu-only CPU program bank plus fixed warmed application pipeline caches; sparse screenshots | Hyrule Field, first entry, control first | 96 s; reached gameplay, terrain checked, no fatal error, original saves unchanged. 557 readiness waits totaling 30.725 s; longest native-present interval 32.568 s. Empty 40-60 s window rejected. Driver/OS caches uncontrolled; no FPS claim |
|
||||
| 2026-11-10 | same host, renderer `d39e988c` (#1573) | as above | as above | as above | identical nine-file starting cache hashes and settings | Hyrule Field, first entry, candidate second | 96 s; terrain/grass/castle checked, no fatal error, original saves unchanged. 815 readiness waits totaling 3.120 s; longest native-present interval 2.114 s. CPU decision tests do not prove GPU writes; no speedup claim |
|
||||
| 2026-11-10 | same host, renderer main `dadecd53` | as above | as above | as above | identical nine-file starting cache hashes and settings | Hyrule Field, first entry, control repeated third | 96 s; terrain checked, no fatal error, original saves unchanged. 557 readiness waits totaling 0.923 s; longest native-present interval 2.128 s. Unchanged control also lost its long freeze: do not attribute the first/second difference to #1573 |
|
||||
| 2026-11-10 | main b2bb214 (+ #1447 #1451 #1520 #1660 #1619 #1448 #1654 #1612 #1600, unmerged then) | Ubuntu 26.04.1, KDE Plasma 6.6.6 Wayland | RTX 4070 Ti 12 GB, 595.99.02 | Ryzen 7 9800X3D, 32 GB | 3840x2160 output, DLSS Quality, no mods | Hyrule Castle road (child) | 48-50 fps. Same spot at 2560x1440 output: 56.3 fps. No device lost, saves written |
|
||||
| 2026-11-10 | main b2bb214 + #1459 (Dear ImGui menu) | as above | as above | as above | as above, windowed | Title, Hyrule Castle road | F1 menu, help box, prompts, the game's font and the FPS badge all correct; 60 fps |
|
||||
| 2026-11-10 | main b2bb214 | as above | as above | as above | HDR on | start-up | KDE offers an HDR10 surface (`vk: HDR: an HDR10 surface (format 58)`) |
|
||||
|
||||
@@ -38,8 +38,8 @@ Agents may add and re-score rows; a person reviews the change like any other PR.
|
||||
| 0.29 | Amd RX 580 (Polaris, no mesh shaders): hair renders white and bright, and the game crashes when Link moves; a second RX 580 8 GB user reports the same | S1 | 0.145 | 0.4 | | #bug-reporting "Amd rx 580 crashes" (no log yet) |
|
||||
| 0.24 | Handheld with no keyboard (Asus ROG Xbox Ally X, controller only): fullscreen and the F1 options menu cannot be reached; no log yet | S1 | 0.12 | 0.4 | | #bug-reporting "Xinput devices cannot enter fullscreen or menu" |
|
||||
| 0.12 | AMD RX 9070 XT: texture glitch that appears after some play (since v2.0.5); same as the tracked AMD texture artifact | S2 | 0.10 | 0.4 | | #bug-reporting "texture glitch on 9070 XT aris"; #57, #1006 |
|
||||
| 0.11 | Intel GPU: black screen after loading a save (or on the Deku Tree), sound only, very low fps; three reports, no logs yet; tracked in the GitHub issue linked in #bug-reporting replies (#999) | S0 | 0.035 | 0.4 | | #bug-reporting "Intel G3E. Title and intro loads...", "intel arc b580 problems", "game gets stuck on a black screen when loading a save (intel gpu... gulp...)" |
|
||||
| 0.11 | Crash at the door after the owl intro (Navi wakes Link, 2.0.13): access violation in `igvk64.dll` at start-up; GPU not given yet, reach uses Intel's 3.5% until it is | S0 | 0.035 | 0.4 | | #bug-reporting "2.0.13 Crash after you see the owl during intro cutscene" (5 logs) |
|
||||
| 0.11 | Intel GPU: black screen after loading a save (or on the Deku Tree), sound only, very low fps; three reports, no logs yet; tracked in the GitHub issue linked in #bug-reporting replies (#999). What a log would settle: `vk: pool ... not imported (VkResult ...)` lines (the driver refusing host memory, whose bindings then draw nothing) against a `device lost` report. Not a case for running without the host-memory import: the renderer has no such path (`memory_init` in `gpu/vk/vk_memory.cpp` stops without it), and NX2navi's Intel branch, which tried one, found it drew the 3D black and went back | S0 | 0.035 | 0.4 | | #bug-reporting "Intel G3E. Title and intro loads...", "intel arc b580 problems", "game gets stuck on a black screen when loading a save (intel gpu... gulp...)" |
|
||||
| 0.11 | Crash at the door after the owl intro (Navi wakes Link, 2.0.13): access violation in `igvk64.dll` at start-up; GPU not given yet, reach uses Intel's 3.5% until it is. To check in the logs: the address. `igvk64.dll+0x79ddf3` (read of 0x190) is the driver's `vkGetPipelineCacheData` beside a pipeline build on the same cache, which `pipeline_cache_save` (`gpu/vk/vk_draw.cpp`) has kept apart for the saves in play since 11-12, on Intel; the saves asked for outright (the prepare, the stage libraries' pass, the exit) still fetch the cache whatever else builds. It is not the host-memory import: NX2navi's Intel branch took its crash for that first and found the same address | S0 | 0.035 | 0.4 | | #bug-reporting "2.0.13 Crash after you see the owl during intro cutscene" (5 logs) |
|
||||
|
||||
|
||||
## Fixed, waiting for a release
|
||||
|
||||
@@ -146,7 +146,9 @@ Designed after totk-pc-recomp's runtime/vk_*.c (MIT) and Eden's renderer_vulkan,
|
||||
- **Mesh shading**: `NOP_DRAW_MESH` records NVN2's DrawMeshTasks*; programs whose code writes the internal stage
|
||||
buffer are the task / mesh stages (marked in their headers as Eden's GraphicsEnvironment does). Unverified.
|
||||
- **Frame interpolation** (`vk_framegen.cpp`, `RX_VK_FRAMEGEN=1`): the WebGPU renderer's, ported to GLSL
|
||||
(`shaders/`, compiled with glslang): made frames between the game's, shown evenly by a display thread.
|
||||
(`shaders/`, compiled with glslang): made frames between the game's, shown evenly by a display thread. (Triforce) Its
|
||||
vectors are refined to one per 8x8 pixels, to a fraction of a pixel, and each made pixel takes one motion
|
||||
(`fg_half`, `fg_fine_flow`, `fg_fine_pick`, `fg_fine_synth`; `RX_VK_FRAMEGEN_FINE=0`: the 16x16 blocks as ported).
|
||||
- **Headless**: without a window presents render offscreen; `RX_VK_SHOTS=<dir>` writes every `RX_VK_SHOT_EVERY`-th
|
||||
as a PNG. `work/run-vk.ps1` runs it (refuses while Siege runs, stops past `-MaxGB` of working set);
|
||||
`work/vksum.py <run>` summarises the log.
|
||||
|
||||
141
gpu/vk/aa_rows.h
Normal file
141
gpu/vk/aa_rows.h
Normal file
@@ -0,0 +1,141 @@
|
||||
/* (Triforce) The Insert menu's Anti-aliasing row (vk_menu.cpp), and the rule that finds the game's own anti-aliasing passes
|
||||
among a frame's compute dispatches (vk_draw.cpp aa_stand_in, vk_aa.cpp), as plain functions. No Vulkan, no menu:
|
||||
tests/test_aa_row.py compiles and runs them. After NX2navi's aa setting (its runtime/vk_aa.c and vk_exec_draw.c
|
||||
aa_dispatch).
|
||||
|
||||
OoT anti-aliases every frame of the 3D with SMAA in three compute passes, right after the draw that adds the bloom and
|
||||
tone maps: the edges (4 x 4 pixel tiles), the blending weights from them (an indirect dispatch over the tiles with edges)
|
||||
and the composition, which samples the tone mapped picture and the weights and stores the smoothed picture into the
|
||||
target the gameplay upscale then takes. It stores each channel's square root, the three packed as one RGB9E5 word, through
|
||||
an integer view of that B10G11R11 target (shaders/aa_common.glsl). */
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include "upscaler_rows.h"
|
||||
|
||||
namespace mkwvk::aa_rows {
|
||||
|
||||
/// The Anti-aliasing row (opts.aa, saved as anti-aliasing; RX_VK_AA over it): the game's own SMAA as it is, none (the tone
|
||||
/// mapped picture stored as it is), FXAA over it (shaders/aa_fxaa.glsl), or SMAA at its Ultra preset in place of the game's
|
||||
/// (shaders/smaa_*.comp). The saved values keep their meaning: a new choice comes after these
|
||||
enum { GAME = 0, OFF = 1, FXAA = 2, SMAA = 3, kValues = 4 };
|
||||
inline const char* name(int v) {
|
||||
switch (v) {
|
||||
case OFF: return "Off";
|
||||
case FXAA: return "FXAA";
|
||||
case SMAA: return "SMAA Ultra";
|
||||
default: return "Game SMAA"; // (also for a value past the row; "Game", the owner's word, 11-16)
|
||||
}
|
||||
}
|
||||
/// The row's value as one of its choices, RX_VK_AA=<0..3> over it (env: its number, -1 unset). Anything else is the game's own
|
||||
inline int chosen(int row, int env) {
|
||||
const int v = env >= 0 ? env : row;
|
||||
return v >= GAME && v < kValues ? v : GAME;
|
||||
}
|
||||
/// DLSS, DLAA, FSR 3.1, FSR 4 and their native modes anti-alias the 3D themselves, from frames the game's own pass has not
|
||||
/// smoothed any better: while one of them draws (upscaler: what runs, upscaler_rows.h) the row does not apply
|
||||
inline bool upscaler_own(int upscaler) { return upscaler != upscaler_rows::GAME; }
|
||||
/// What is in effect: the choice, or the game's own while such an upscaler draws (its frame is then drawn as before the row)
|
||||
inline int effective(int choice, int upscaler) { return upscaler_own(upscaler) ? (int)GAME : choice; }
|
||||
/// The row has nothing to choose then (shown without arrows; Left and Right leave the saved value alone), nor with
|
||||
/// RX_VK_AA set for the run
|
||||
inline bool fixed(int upscaler, bool env_set) { return upscaler_own(upscaler) || env_set; }
|
||||
|
||||
// ---- the game's passes ----
|
||||
|
||||
/// The game's three SMAA programs, by their keys (vk_shader.cpp code_key: a hash of the compute stage's control section and
|
||||
/// code as the game hands them over, the same on every PC and with every setting). Game build e0f3ccfa. NX2navi knows the
|
||||
/// same three by another hash of the same code (fcb21f2afa88378c, e44377cbfafc1101, 470d661afb1cb73a in its vk_aa.c): these
|
||||
/// are the programs of a build's shader list (triforce_shaders.bin) with those hashes. Another game version has other keys:
|
||||
/// nothing is then found, and the frame is drawn as before the row (vk_aa.cpp says so in the log)
|
||||
enum { NONE = 0, EDGES = 1, WEIGHTS = 2, COMPOSE = 3 };
|
||||
constexpr uint64_t kEdgesKey = 0x26fe0c70ab9fc547ull, kWeightsKey = 0x685adb41edc19de7ull, kComposeKey = 0x6637ac1d052d22d4ull;
|
||||
constexpr int role(uint64_t key) {
|
||||
return key == kEdgesKey ? EDGES : key == kWeightsKey ? WEIGHTS : key == kComposeKey ? COMPOSE : NONE;
|
||||
}
|
||||
|
||||
/// What a dispatch has at one of its program's texture or image bindings, as far as the rule looks
|
||||
enum { OTHER = 0, R11 = 1, E5 = 2 }; // (the image's own format: B10G11R11, the scene's and the picture's; E5B9G9R9; anything else)
|
||||
struct Bound {
|
||||
uint64_t image = 0; // (which image: any number that tells two apart; 0 nothing bound)
|
||||
int format = OTHER;
|
||||
uint32_t width = 0, height = 0;
|
||||
bool flat = false; // (a plain 2D image, one sample, seen as 2D at its first level)
|
||||
bool written = false; // (an image binding the program stores into)
|
||||
bool integer = false; // (the program reads or stores it as integer words, not as colours: the variant of the program
|
||||
// that runs is the one translated for the views bound, so this is the view's kind)
|
||||
};
|
||||
/// The composition's two ends among what its dispatch has bound (the program's own bindings, in its order): the target, the one
|
||||
/// flat B10G11R11 (or E5B9G9R9: the same words) image it stores integer words into, and the tone mapped picture, the one flat
|
||||
/// B10G11R11 texture of the target's size it samples as colours that is another image (the weights it samples too are read
|
||||
/// as integer words). src and dst: their places in the lists. why: nullptr when both are found, else what was not as expected;
|
||||
/// the game's own pass then runs, nothing is guessed
|
||||
struct Ends {
|
||||
int src = -1, dst = -1;
|
||||
const char* why = nullptr;
|
||||
};
|
||||
inline Ends compose_ends(const Bound* textures, int ntex, const Bound* images, int nimg) {
|
||||
Ends e;
|
||||
int found = 0;
|
||||
for (int i = 0; i < nimg; i++) {
|
||||
const Bound& b = images[i];
|
||||
if (!b.image || !b.written || !b.integer || !b.flat || (b.format != R11 && b.format != E5) || !b.width || !b.height) continue;
|
||||
if (!found++) e.dst = i;
|
||||
}
|
||||
if (found != 1) return e.dst = -1, e.why = found ? "it stores into more than one such target" : "it stores into no B10G11R11 target as integer words", e;
|
||||
const Bound& d = images[e.dst];
|
||||
found = 0;
|
||||
for (int i = 0; i < ntex; i++) {
|
||||
const Bound& b = textures[i];
|
||||
if (!b.image || b.image == d.image || b.integer || !b.flat || b.format != R11 || b.width != d.width || b.height != d.height) continue;
|
||||
if (!found++) e.src = i;
|
||||
}
|
||||
if (found != 1) return e.src = e.dst = -1, e.why = found ? "it samples more than one picture of its target's size" : "it samples no B10G11R11 picture of its target's size", e;
|
||||
return e;
|
||||
}
|
||||
|
||||
/// Whether a dispatch of the game's edge or weight pass is left out: only the composition reads what they make, so they go
|
||||
/// while another choice than the game's own is in effect and the composition before this one was replaced. One that could
|
||||
/// not be replaced runs as the game's, and these two run again from the next frame on, until one is replaced again.
|
||||
/// keep (RX_VK_AA_KEEP=1): never left out
|
||||
constexpr bool leave_out(int role, int mode, bool last_replaced, bool keep) {
|
||||
return (role == EDGES || role == WEIGHTS) && mode != GAME && last_replaced && !keep;
|
||||
}
|
||||
|
||||
/// What the row says under its help about the passes (vk_aa.cpp aa_state): nothing asked or nothing seen yet, the game's
|
||||
/// composition replaced, or none replaced for a while with another choice than the game's own in effect
|
||||
enum { QUIET = 0, REPLACED = 1, MISSING = 2 };
|
||||
/// The frames with a choice in effect and no composition replaced after which that is said (a minute at 60 a second: a
|
||||
/// loading screen or a menu without the 3D that lasts longer says it too)
|
||||
constexpr uint64_t kMissingFrames = 3600;
|
||||
|
||||
/// What vk_aa.cpp keeps about the game's passes from frame to frame (one for the run, under its lock)
|
||||
struct Track {
|
||||
int mode = GAME; // (the choice in effect in the frame before)
|
||||
bool last_replaced = false; // (the last composition met was replaced: what leave_out asks)
|
||||
int state = QUIET;
|
||||
uint64_t since = 0; // (the frame the choice came into effect, or a composition was last replaced)
|
||||
/// A frame begins with `want` in effect. true: the row's line became MISSING just now (said once in the log)
|
||||
constexpr bool begin(uint64_t frame, int want) {
|
||||
bool missing = false;
|
||||
if (want == GAME) {
|
||||
// (the game's own passes all run from here on: a composition replaced before says nothing about the next choice's
|
||||
// first frame, whose edge and weight passes must run until one is replaced again)
|
||||
last_replaced = false, state = QUIET;
|
||||
} else if (mode != want) {
|
||||
since = frame, state = QUIET; // (another choice: counted anew)
|
||||
} else if (state != MISSING && frame - since >= kMissingFrames) {
|
||||
state = MISSING, missing = true;
|
||||
}
|
||||
mode = want;
|
||||
return missing;
|
||||
}
|
||||
/// A composition met with a choice in effect: replaced, or left to the game
|
||||
constexpr void composed(uint64_t frame, bool replaced) {
|
||||
last_replaced = replaced;
|
||||
if (replaced) since = frame, state = REPLACED;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace mkwvk::aa_rows
|
||||
111
gpu/vk/astc_opaque.h
Normal file
111
gpu/vk/astc_opaque.h
Normal file
@@ -0,0 +1,111 @@
|
||||
// (Triforce) Which ASTC blocks the GPU decoder (host_shaders/astc_decoder_comp_spv.h, Eden's) writes with alpha 255 in every
|
||||
// texel, told from the block's 16 bytes alone: what lets a decoded ASTC texture be kept as BC1 instead of BC3 (vk_texture.cpp,
|
||||
// tex_bc1.h). tests/test_tex_bc1.py
|
||||
//
|
||||
// The answer has to be the decoder's, not the ASTC specification's: a block the decoder takes for an error is written as
|
||||
// (0, 0, 0, 0), alpha 0, and its endpoint modes with alpha may still decode to 255 everywhere. So this says yes only where the
|
||||
// decoder's own code leaves no other outcome, and no everywhere else (a no keeps the texture BC3, as it was):
|
||||
//
|
||||
// - a void extent: the decoder's IsError takes one for an error when it is the HDR kind (bit 9) or bits 10 and 11 are not both
|
||||
// set, and FillVoidExtentLDR writes the constant's alpha, bits 112 to 127, divided by 65535: 255 only for 0xFFFF. It does
|
||||
// not look at the extent's coordinates, so neither does this.
|
||||
// - any other block, the errors in DecompressBlock's order: the reserved block modes (bits 0 to 3 zero; bits 0 and 1 zero
|
||||
// with bits 6 to 8 set), a weight grid larger than the block, four partitions with two planes, more than 64 weights, the
|
||||
// weights' bits under 24 or over 96, and no room left for the colour data (its count of the remaining bits wraps).
|
||||
// - then the colour endpoint modes. Modes 0, 1, 6, 8 and 9 (luminance and RGB, low dynamic range) give both endpoints the
|
||||
// alpha 255 as a constant (ComputeEndpoints; BlueContract and ClampByte pass it through), and the decoder's interpolation
|
||||
// of two equal 16-bit values, (65535 * (64 - w) + 65535 * w + 32) / 64, is 65535 for every weight, which it writes as
|
||||
// 65535 / 65535 = 1. Modes 4, 5, 10, 12 and 13 carry alpha, and 2, 3, 7, 11, 14 and 15 are the HDR ones, which take the
|
||||
// decoder's other path: no for all of those, without decoding them (such a block may be opaque all the same).
|
||||
// One partition has its mode in bits 13 to 16. Several partitions share one mode when bits 23 and 24 are zero (the mode is
|
||||
// bits 25 to 28); when they do not, the modes' other bits sit below the weights and are not looked for: no.
|
||||
#pragma once
|
||||
#include <cstdint>
|
||||
|
||||
namespace astc_opaque {
|
||||
|
||||
/// `n` bits (16 at most) of a block from bit `at`, the lowest first, as the decoder's StreamBits reads them
|
||||
inline uint32_t bits(const uint8_t* b, unsigned at, unsigned n) {
|
||||
uint32_t v = 0;
|
||||
for (unsigned i = 0; i < 3 && at / 8 + i < 16; i++) v |= (uint32_t)b[at / 8 + i] << (8 * i);
|
||||
return (v >> (at & 7)) & ((1u << n) - 1);
|
||||
}
|
||||
|
||||
/// The bits `n` weights take in the weight range `index` (0 to 11: 2, 3, 4, 5, 6, 8, 10, 12, 16, 20, 24 and 32 levels), as
|
||||
/// the decoder's GetBitLength counts them: the plain bits, and a trit for every 8/5 of a bit or a quint for every 7/3
|
||||
inline unsigned weight_bits(unsigned n, unsigned index) {
|
||||
static const uint8_t plain[12] = {1, 0, 2, 0, 1, 3, 1, 2, 4, 2, 3, 5};
|
||||
static const uint8_t kind[12] = {0, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0}; // (1: with a trit, 2: with a quint)
|
||||
unsigned total = n * plain[index];
|
||||
if (kind[index] == 1) total += (n * 8 + 4) / 5;
|
||||
if (kind[index] == 2) total += (n * 7 + 2) / 3;
|
||||
return total;
|
||||
}
|
||||
|
||||
/// Whether the decoder writes alpha 255 into every texel of this block of bw x bh texels (see the top of the file). False
|
||||
/// for a block size the decoder is not given (under 4 or over 12 a side)
|
||||
inline bool block(const uint8_t b[16], unsigned bw, unsigned bh) {
|
||||
if (bw < 4 || bh < 4 || bw > 12 || bh > 12) return false;
|
||||
const uint32_t mode = bits(b, 0, 11);
|
||||
if ((mode & 0x1FF) == 0x1FC) { // (a void extent)
|
||||
if (mode & 0x200) return false;
|
||||
if (!(mode & 0x400) || !bits(b, 11, 1)) return false;
|
||||
return b[14] == 0xFF && b[15] == 0xFF;
|
||||
}
|
||||
if (!(mode & 0xF)) return false;
|
||||
if (!(mode & 3) && (mode & 0x1C0) == 0x1C0) return false;
|
||||
// (the weight grid, by the decoder's FindLayout and DecodeBlockSize)
|
||||
const unsigned a = (mode >> 5) & 3, b2 = (mode >> 7) & 3, b1 = (mode >> 7) & 1;
|
||||
unsigned layout, w, h;
|
||||
if (mode & 3) {
|
||||
if (mode & 8) {
|
||||
if (!(mode & 4)) layout = 2, w = a + 2, h = b2 + 8;
|
||||
else if (mode & 0x100) layout = 4, w = b1 + 2, h = a + 2;
|
||||
else layout = 3, w = a + 2, h = b1 + 6;
|
||||
} else if (mode & 4) {
|
||||
layout = 1, w = b2 + 8, h = a + 2;
|
||||
} else {
|
||||
layout = 0, w = b2 + 4, h = a + 2;
|
||||
}
|
||||
} else if (mode & 0x100) {
|
||||
if (!(mode & 0x80)) layout = 9, w = a + 6, h = ((mode >> 9) & 3) + 6;
|
||||
else if (mode & 0x20) layout = 8, w = 10, h = 6;
|
||||
else layout = 7, w = 6, h = 10;
|
||||
} else if (mode & 0x80) {
|
||||
layout = 6, w = a + 2, h = 12;
|
||||
} else {
|
||||
layout = 5, w = 12, h = a + 2;
|
||||
}
|
||||
if (w > bw || h > bh) return false;
|
||||
const bool dual = layout != 9 && (mode & 0x400);
|
||||
const unsigned parts = bits(b, 11, 2) + 1;
|
||||
if (parts == 4 && dual) return false;
|
||||
const unsigned weights = w * h * (dual ? 2 : 1);
|
||||
if (weights > 64) return false;
|
||||
// (the weights' range, by the decoder's DecodeMaxWeight: bit 4 and two more bits, less 2, six further with bit 9)
|
||||
unsigned range = ((mode >> 4) & 1) | (layout < 5 ? (mode & 3) << 1 : (mode & 0xC) >> 1);
|
||||
if (range < 2) return false; // (cannot be: the reserved modes above)
|
||||
range = range - 2 + (layout != 9 && (mode & 0x200) ? 6 : 0);
|
||||
const unsigned wbits = weight_bits(weights, range);
|
||||
if (wbits < 24 || wbits > 96) return false;
|
||||
unsigned read, cem;
|
||||
if (parts == 1) {
|
||||
cem = bits(b, 13, 4), read = 17;
|
||||
} else {
|
||||
const uint32_t base = bits(b, 23, 6);
|
||||
if (base & 3) return false; // (a mode a partition: not looked for)
|
||||
cem = base >> 2, read = 29;
|
||||
}
|
||||
// (the decoder's last error, its count of the remaining bits wrapping. With one shared mode it cannot: 96 + 29 + 2)
|
||||
if (wbits + read + (dual ? 2u : 0u) > 128) return false;
|
||||
return cem == 0 || cem == 1 || cem == 6 || cem == 8 || cem == 9;
|
||||
}
|
||||
|
||||
/// Whether every one of `n` blocks (16 bytes each, in any order) is one the decoder writes opaque
|
||||
inline bool all(const uint8_t* blocks, uint64_t n, unsigned bw, unsigned bh) {
|
||||
for (uint64_t i = 0; i < n; i++)
|
||||
if (!block(blocks + 16 * i, bw, bh)) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace astc_opaque
|
||||
143
gpu/vk/barrier_rules.h
Normal file
143
gpu/vk/barrier_rules.h
Normal file
@@ -0,0 +1,143 @@
|
||||
// (Triforce) Where the replay records less than a full barrier between work the game left unordered: a part's split inside a
|
||||
// pass, an event's signal, a dispatch right after another; and when held submits go to the queue (RX_VK_BATCH). Apart from
|
||||
// Vulkan so that tests/test_barrier_rules.py can run the rules over recorded command streams and check every hazard the game's
|
||||
// ordering asks for against what the recorded barriers order (and, a rule dropped at a time, that a hazard is then left open).
|
||||
//
|
||||
// What the game's ordering asks for (NVN's, as the replay keeps it): work after one of the game's barriers after the work before
|
||||
// it; a draw after a dispatch and a dispatch after a draw (the console's 3D and compute work share the engine and drain at the
|
||||
// switch); copies, clears and uniform updates after and before what they touch; the colour, depth and stencil outputs of draws
|
||||
// in the order they were drawn, from pass to pass too; a draw that samples a target its pass wrote, or writes one its pass
|
||||
// sampled, after the draws before (the replay ends the pass there itself: vk_draw.cpp draw_hazards); an event's word written
|
||||
// after the work before its signal, and a wait's work after the work before the signal it waits for. A signal is no barrier on
|
||||
// the console: the work after it in the same queue is not ordered after the work before it.
|
||||
//
|
||||
// 1. A part's split (RX_VK_SPLIT_BARRIER; vk_replay.cpp maybe_split). A long submission goes to the GPU in parts of 120 draws and
|
||||
// dispatches (RX_VK_CHUNK) so that the GPU starts early. Each part ended its pass with a full barrier, and the next began with
|
||||
// another: the GPU drained between two draws of one of the game's passes, about 27 times a frame. With the rule the open pass
|
||||
// goes on in the next part: the part ends it, and the next begins it again with the same targets behind a barrier of the
|
||||
// attachments' outputs alone (colour output and the depth and stencil tests, their writes before their reads and writes), and
|
||||
// keeps what the pass's draws sampled and wrote, so that draw_hazards ends the pass where it would have without the split. That
|
||||
// orders all that the same draws in one pass ordered (RX_VK_CHUNK=0): within a pass Vulkan orders the attachments' accesses
|
||||
// alone. Only where nothing else was recorded at the split (the part's uniform updates, its write-backs, an event's write held:
|
||||
// then the full barriers as before), and a pass open. A part's uploads keep their own full barriers (vk_texture.cpp upload_cmd,
|
||||
// texture_uploads_recorded), and anything recorded or submitted between the part's submit and the pass's start again (another
|
||||
// submitter's work on the queue) gives the next part a full barrier first. Unset: on with NVIDIA's driver; =pass: on any card;
|
||||
// =full (or any other value): as before. ((Triforce, P4) A parallel replay's segments are never split: they are the parts there,
|
||||
// each begun and ended with a full barrier (vk_replay.cpp record_segment), so nothing goes on across a segment's edge; the rule
|
||||
// acts in the serial replay's parts, as before. "Recorded between" is the replaying thread's own commands and every submit to the
|
||||
// queue (cmd_work.h work_between); RX_VK_BARRIER_CONTEXT=0: every thread's commands, as before)
|
||||
// 2. An event's signal (RX_VK_EVENT_BARRIER; vk_replay.cpp NOP_SIGNAL_EVENT). Each signal ended the pass and drained the GPU before
|
||||
// its word's write. With the rule nothing is recorded at the signal: its word's buffer is bound there (so its page is among the
|
||||
// recording's write-backs, as before), and the write waits for the next full barrier on its command buffer (the game's next
|
||||
// barrier, the next dispatch's or pass start's) and goes right after it, so it still follows all the work before the signal;
|
||||
// a recording's end writes what is still held behind a full barrier first, before its write-backs copy the words to the game's
|
||||
// memory (that barrier is recorded under the pools' lock, so the writes take none: their buffers were bound at the signals). The
|
||||
// writes count as work for the next barrier's look, so the write-backs' barrier is never left out after them. The writes held
|
||||
// for one barrier go in the order of their signals, a barrier of the transfers between each two, so the game sees them done in
|
||||
// that order (two signals of one word too). A wait met in the replay's order whose event's write is still held gets a full
|
||||
// barrier first: the waiting queue's work is then after the signalling queue's work before the signal, as the drain at the
|
||||
// signal made it. The game sees the word later (at that barrier, not at the signal). NX2navi records nothing at a signal at all
|
||||
// (its CPU writes the word once the submission is done). Unset: with the pass barrier's game mode (NVIDIA's driver,
|
||||
// pass_barrier.h); =late: on any card; =full (or any other value): as before. Not with the parallel replay.
|
||||
// 3. A dispatch right after another (RX_VK_DISPATCH_BARRIER; vk_draw.cpp dispatch). Off unless asked for: =game leaves out the
|
||||
// full barrier of a dispatch whose command buffer's last command was the dispatch before it (no barrier of the game's, no copy,
|
||||
// no draw between; not an indirect one, whose grid another dispatch may have written), as NX2navi's barrier_game does. The game
|
||||
// orders its dependent dispatches with its own barriers on the console; whether it always does, only the game can show (a
|
||||
// one-frame band or flicker where it does not), so it is a switch for the lab. (Triforce, wp14, P4) Beside the parallel replay too:
|
||||
// "nothing between" is the command buffer's own count of its commands (cmd_work.h), and a segment is a command buffer of its own;
|
||||
// with the global count the rule stood aside while the helper threads recorded, which at the Market is most frames
|
||||
// (RX_VK_BARRIER_CONTEXT=0: so again). The event rule above still does (event_hold).
|
||||
// 4. Held submits (RX_VK_BATCH; vk_replay.cpp submit_recording, submit_job). =1 (on by default with Mesa's RADV) holds every submit
|
||||
// until something needs the GPU's results or the queue's order. =parts holds a whole submission's recording only while the game's
|
||||
// submit is being replayed: a part (split off to start the GPU early) goes to the queue at once with what is held, so does the
|
||||
// held when there are RX_VK_BATCH_MAX (4 here) of them, and what is held goes when the replay of the game's submit returns.
|
||||
// Holding changes neither the command buffers nor their order on the queue, only how many vkQueueSubmit2 calls carry them.
|
||||
#pragma once
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
namespace mkwvk::barrier_rules {
|
||||
|
||||
/// RX_VK_SPLIT_BARRIER: "pass" the rule on any card; "full" (or any other value) a full barrier at each split, as before; unset or
|
||||
/// empty: on with NVIDIA's driver (vendor 0x10de). every_draw: RX_VK_BARRIER_EVERY_DRAW (an experiment that ends the pass at each
|
||||
/// draw) keeps the old way
|
||||
inline bool split_in_pass(const char* env, uint32_t vendor, bool every_draw) {
|
||||
if (every_draw) return false;
|
||||
if (env && *env) return std::strcmp(env, "pass") == 0;
|
||||
(void)vendor; // ((Triforce, 11-16) off unless asked: the lab's Market had the same ~500 full barriers a frame with it on (the
|
||||
return false; // helper threads record most frames there, and the rule stands aside for them) and no gain (90.6 / 89.2 fps
|
||||
// against 92.8 / 90.3 with the old barriers)
|
||||
}
|
||||
/// Whether a part's split goes on in the same pass: the rule on, a pass open at the split, nothing recorded at the part's end (quiet:
|
||||
/// the work count as it was after the pass's end) and no event's write held then (written behind a full barrier before the part's
|
||||
/// write-backs, which copy its word to the game's memory: the GPU drained there all the same). ((Triforce, P4) no parallel replay's
|
||||
/// argument: its segments are never split, maybe_split runs in the serial replay only)
|
||||
inline bool split_carry(bool on, bool pass_open, bool quiet, bool writes_held) {
|
||||
return on && pass_open && quiet && !writes_held;
|
||||
}
|
||||
/// Whether the next part starts with a full barrier: always when the pass is not carried, and when it is but something was recorded
|
||||
/// between the part's submit and the pass's start again (into its command buffer, by this thread into another, or submitted to the
|
||||
/// queue by any thread: cmd_work.h work_between)
|
||||
inline bool split_start_full(bool carry, bool recorded_between) {
|
||||
return !carry || recorded_between;
|
||||
}
|
||||
|
||||
/// RX_VK_EVENT_BARRIER: "late" the rule on any card; "full" (or any other value) as before; unset or empty: with the pass barrier's
|
||||
/// game mode (pass_barrier::game: NVIDIA's driver unless RX_VK_PASS_BARRIER says otherwise)
|
||||
inline bool event_late(const char* env, bool pass_game) {
|
||||
if (env && *env) return std::strcmp(env, "late") == 0;
|
||||
(void)pass_game; // ((Triforce, 11-16) off unless asked, as the split rule above: no gain measured)
|
||||
return false;
|
||||
}
|
||||
/// Whether a signal's write is held for the next full barrier: the rule on, no parallel replay (its segments' threads share the
|
||||
/// command buffers), and room for it (most: the held writes a command buffer may have)
|
||||
inline bool event_hold(bool on, bool parallel, int held, int most) {
|
||||
return on && !parallel && held < most;
|
||||
}
|
||||
/// A wait the replay finds met: a full barrier first when the write of its event's signal is still held
|
||||
inline bool wait_barrier(bool its_write_held) {
|
||||
return its_write_held;
|
||||
}
|
||||
|
||||
/// RX_VK_DISPATCH_BARRIER: "game" the barrier of a dispatch right after another left out; anything else, or unset: as before
|
||||
inline bool dispatch_game(const char* env) {
|
||||
return env && std::strcmp(env, "game") == 0;
|
||||
}
|
||||
/// Whether a dispatch records its full barrier. work_since: GPU work recorded on the command buffer since its start (vk_draw.cpp
|
||||
/// work_since_barrier); no_order: RX_VK_NO_DISPATCH_ORDER; right_after: the command buffer's last command was a dispatch's (by the
|
||||
/// command buffer's own count, cmd_work.h: with the parallel replay too)
|
||||
inline bool dispatch_barrier(bool work_since, bool no_order, bool game, bool right_after, bool indirect) {
|
||||
if (!work_since || no_order) return false;
|
||||
return !(game && right_after && !indirect);
|
||||
}
|
||||
|
||||
/// RX_VK_BATCH
|
||||
enum class Batch { Off, Hold, Parts };
|
||||
/// "parts": Parts; otherwise set: Hold where its number is not 0, Off where it is (as RX_VK_BATCH was read); unset: Hold with RADV,
|
||||
/// Off elsewhere
|
||||
inline Batch batch_mode(const char* env, bool radv) {
|
||||
if (env) {
|
||||
if (std::strcmp(env, "parts") == 0) return Batch::Parts;
|
||||
return std::atoi(env) != 0 ? Batch::Hold : Batch::Off;
|
||||
}
|
||||
return radv ? Batch::Hold : Batch::Off;
|
||||
}
|
||||
/// Whether a recording is held rather than handed to the queue: Hold always; Parts only a whole submission's (not a part's), and
|
||||
/// only inside the replay of a game's submit (in_submit: submit_job's)
|
||||
inline bool batch_hold(Batch m, bool part, bool in_submit) {
|
||||
if (m == Batch::Hold) return true;
|
||||
return m == Batch::Parts && !part && in_submit;
|
||||
}
|
||||
/// Whether what is held goes to the queue now, after a submit was added to it (held: recordings held now, the added one too): Hold at
|
||||
/// cap (RX_VK_BATCH_MAX, 32) as before; Parts at most (RX_VK_BATCH_MAX, 4) or when the added one was not held (a part: it goes with
|
||||
/// those before it, in order)
|
||||
inline bool batch_flush(Batch m, bool added_held, size_t held, size_t cap) {
|
||||
if (m == Batch::Off) return true;
|
||||
if (m == Batch::Parts && !added_held) return true;
|
||||
return held >= cap;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::barrier_rules
|
||||
87
gpu/vk/bugshot_pixels.h
Normal file
87
gpu/vk/bugshot_pixels.h
Normal file
@@ -0,0 +1,87 @@
|
||||
// (Triforce) The pixels of a bug capture's picture (vk_bugshot.cpp): the window's image as the GPU copied it out, into the
|
||||
// R, G, B, 255 bytes a PNG is written from. Apart from Vulkan, so tests/test_bug_capture.py compiles it alone. The formats
|
||||
// are the ones create_swapchain picks (vk_main.cpp): 8-bit RGBA or BGRA, UNORM or sRGB (the bytes are sRGB codes either
|
||||
// way), and with the Insert menu's HDR a 10-bit HDR10 image, ST 2084 codes of Rec. 2020 light. That one is brought to
|
||||
// sRGB with the picture's paper white as white, so a PNG viewer shows what an SDR screen would show of the game:
|
||||
// highlights above white and colours outside sRGB are cut off.
|
||||
#pragma once
|
||||
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
namespace bugshot {
|
||||
|
||||
enum Kind { NONE, RGBA8, BGRA8, A2B10G10R10, A2R10G10B10 };
|
||||
|
||||
/// What a window image's format is to this conversion, by its VkFormat number (vk_bugshot.cpp checks the numbers against
|
||||
/// Vulkan's names); NONE: not one it reads
|
||||
inline Kind kind_of(int vk_format) {
|
||||
switch (vk_format) {
|
||||
case 37: case 43: return RGBA8; // (R8G8B8A8_UNORM, R8G8B8A8_SRGB)
|
||||
case 44: case 50: return BGRA8; // (B8G8R8A8_UNORM, B8G8R8A8_SRGB)
|
||||
case 64: return A2B10G10R10; // (A2B10G10R10_UNORM_PACK32: red in the low ten bits)
|
||||
case 58: return A2R10G10B10; // (A2R10G10B10_UNORM_PACK32: blue in the low ten bits)
|
||||
default: return NONE;
|
||||
}
|
||||
}
|
||||
|
||||
/// ST 2084's curve the display's way: a code 0 to 1 as nits, 0 to 10000
|
||||
inline double pq_to_nits(double code) {
|
||||
const double m1 = 2610.0 / 16384.0, m2 = 2523.0 / 4096.0 * 128.0;
|
||||
const double c1 = 3424.0 / 4096.0, c2 = 2413.0 / 4096.0 * 32.0, c3 = 2392.0 / 4096.0 * 32.0;
|
||||
const double p = std::pow(code < 0 ? 0 : code > 1 ? 1 : code, 1.0 / m2);
|
||||
return 10000.0 * std::pow((p > c1 ? p - c1 : 0) / (c2 - c3 * p), 1.0 / m1);
|
||||
}
|
||||
|
||||
/// Linear light 0 to 1 as an sRGB code 0 to 255
|
||||
inline uint8_t srgb8(double linear) {
|
||||
const double x = linear < 0 ? 0 : linear > 1 ? 1 : linear;
|
||||
const double e = x <= 0.0031308 ? 12.92 * x : 1.055 * std::pow(x, 1.0 / 2.4) - 0.055;
|
||||
return (uint8_t)(e * 255.0 + 0.5);
|
||||
}
|
||||
|
||||
/// n texels at px, four bytes each as the GPU wrote them, to R, G, B, 255 in place. hdr10: the image holds ST 2084 codes of
|
||||
/// Rec. 2020 light (a 10-bit format only), and white_nits is the picture's paper white. False: not a format this reads
|
||||
inline bool to_rgba8(uint8_t* px, size_t n, Kind kind, bool hdr10, double white_nits) {
|
||||
if (kind == NONE) return false;
|
||||
if (kind == RGBA8 || kind == BGRA8) {
|
||||
for (size_t i = 0; i < n; i++) {
|
||||
uint8_t* q = px + i * 4;
|
||||
if (kind == BGRA8) {
|
||||
const uint8_t b = q[0];
|
||||
q[0] = q[2], q[2] = b;
|
||||
}
|
||||
q[3] = 255;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// (ten bits a channel. HDR: a table from a code to its light, white at 1, and one from light to an sRGB code, so a 4K
|
||||
// picture is a few table reads a texel and not nine pow calls)
|
||||
constexpr int kSteps = 4096;
|
||||
std::vector<float> light(hdr10 ? 1024 : 0);
|
||||
std::vector<uint8_t> code8(hdr10 ? kSteps + 1 : 0);
|
||||
const double white = white_nits > 1 ? white_nits : 1;
|
||||
for (size_t v = 0; v < light.size(); v++) light[v] = (float)(pq_to_nits((double)v / 1023.0) / white);
|
||||
for (size_t v = 0; v < code8.size(); v++) code8[v] = srgb8((double)v / kSteps);
|
||||
const auto out8 = [&](float x) { return code8[x <= 0 ? 0 : x >= 1 ? kSteps : (int)(x * kSteps + 0.5f)]; };
|
||||
for (size_t i = 0; i < n; i++) {
|
||||
uint8_t* q = px + i * 4;
|
||||
const uint32_t v = (uint32_t)q[0] | (uint32_t)q[1] << 8 | (uint32_t)q[2] << 16 | (uint32_t)q[3] << 24;
|
||||
const uint32_t lo = v & 1023, mid = (v >> 10) & 1023, hi = (v >> 20) & 1023;
|
||||
const uint32_t r = kind == A2B10G10R10 ? lo : hi, g = mid, b = kind == A2B10G10R10 ? hi : lo;
|
||||
if (!hdr10) { // (sRGB codes with ten bits: the nearest of eight)
|
||||
q[0] = (uint8_t)((r * 255 + 511) / 1023), q[1] = (uint8_t)((g * 255 + 511) / 1023), q[2] = (uint8_t)((b * 255 + 511) / 1023);
|
||||
} else { // (Rec. 2020 light to Rec. 709's primaries, ITU-R BT.2087's matrix, then sRGB's curve)
|
||||
const float lr = light[r], lg = light[g], lb = light[b];
|
||||
q[0] = out8(1.6605f * lr - 0.5876f * lg - 0.0728f * lb);
|
||||
q[1] = out8(-0.1246f * lr + 1.1329f * lg - 0.0083f * lb);
|
||||
q[2] = out8(-0.0182f * lr - 0.1006f * lg + 1.1187f * lb);
|
||||
}
|
||||
q[3] = 255;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace bugshot
|
||||
129
gpu/vk/capture_behind.h
Normal file
129
gpu/vk/capture_behind.h
Normal file
@@ -0,0 +1,129 @@
|
||||
/* (Triforce) A submit-time capture's copies behind the game's ordering point (vk_memory.cpp capture_make, RX_VK_CAPTURE_BEHIND).
|
||||
With the replay on the submitting thread (RX_VK_ASYNC off, the default) the game's thread was held for the whole capture before
|
||||
its replay began: the scan of the write marks, then the copy of every page they named. At the Castle Town Market that was
|
||||
~0.35 ms a submit, six submits a frame: 2.1 ms of a 10.6 ms frame, outside the replay (the frame trace of 2026-11-15: scan 0.10
|
||||
ms over ~1,240 ranges, ~2,000 pages copied, 7.8 MB). The scan is the ordering point: the pages written before the submit, their
|
||||
marks taken. The copy need not be on the game's thread before the replay: the submitting thread replays the submission before it
|
||||
returns to the game, so nothing it writes after its submit can reach the copy, and what reads the copy comes after the scan: the
|
||||
replay's reads as submitted, the late pages' second copy and the texture shadow (take_capture), and the GPU's copies into the
|
||||
mirrors once a recording is submitted. So the copy is cut in parts of consecutive pages that the capture's copy helpers take as
|
||||
soon as the scan is done, while the submitting thread replays. A reader of a page whose part nobody has taken yet copies that part
|
||||
itself; one whose part is being copied waits for it. Before a recording goes to the GPU, and before the submitting thread goes
|
||||
back to the game, every part is done. Each page is copied once, by whoever claims its part.
|
||||
Plain C++, no Vulkan: tests/test_capture_behind.py compiles it with stand-ins. */
|
||||
#pragma once
|
||||
|
||||
#include <atomic>
|
||||
#include <condition_variable>
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <vector>
|
||||
|
||||
namespace mkwvk::capture_behind {
|
||||
|
||||
constexpr int64_t kPartPages = 32; // (128 KB a part: what a reader that needs one of its pages copies itself, ~10 us)
|
||||
|
||||
struct Part {
|
||||
int64_t i0 = 0, i1 = 0; // (the capture's indices [i0, i1): consecutive, none of them copied ahead)
|
||||
std::atomic<uint8_t> state{0}; // (0 nobody's yet, 1 being copied, 2 copied)
|
||||
};
|
||||
|
||||
/// A capture's pages left to copy, in parts. An index is the page's place in the capture (its slot in the capture's buffer).
|
||||
/// copy(i0, i1) is the caller's: it copies indices [i0, i1), and is run once for each part, by the thread that claims it
|
||||
struct Work {
|
||||
std::unique_ptr<Part[]> parts;
|
||||
int nparts = 0;
|
||||
std::vector<int32_t> part_of; // (by index: its part; -1: copied ahead, not one of this work's)
|
||||
std::atomic<int> left{0}; // (the parts not copied yet)
|
||||
std::mutex mu; // (the waits for a part another thread copies)
|
||||
std::condition_variable cv;
|
||||
|
||||
/// The parts: the indices i < n with ahead[i] == 0 (ahead: null for none), in runs of at most part_pages cut at every index
|
||||
/// copied ahead
|
||||
void plan(const uint8_t* ahead, int64_t n, int64_t part_pages = kPartPages) {
|
||||
if (part_pages < 1) part_pages = 1;
|
||||
part_of.assign((size_t)(n > 0 ? n : 0), -1);
|
||||
std::vector<std::pair<int64_t, int64_t>> runs;
|
||||
for (int64_t i = 0; i < n;) {
|
||||
if (ahead && ahead[i]) {
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
int64_t j = i + 1;
|
||||
while (j < n && !(ahead && ahead[j]) && j - i < part_pages) j++;
|
||||
runs.push_back({i, j});
|
||||
i = j;
|
||||
}
|
||||
nparts = (int)runs.size();
|
||||
parts.reset(new Part[(size_t)nparts]);
|
||||
for (int k = 0; k < nparts; k++) {
|
||||
parts[k].i0 = runs[(size_t)k].first, parts[k].i1 = runs[(size_t)k].second;
|
||||
for (int64_t i = parts[k].i0; i < parts[k].i1; i++) part_of[(size_t)i] = k;
|
||||
}
|
||||
left.store(nparts, std::memory_order_release);
|
||||
}
|
||||
/// Part k is this thread's to copy (nobody had taken it)
|
||||
bool claim(int k) {
|
||||
uint8_t free = 0;
|
||||
return parts[k].state.compare_exchange_strong(free, 1, std::memory_order_acq_rel);
|
||||
}
|
||||
/// Part k copied, by the thread that claimed it: its bytes are there for every thread that sees it so
|
||||
void copied(int k) {
|
||||
{
|
||||
std::lock_guard lk(mu);
|
||||
parts[k].state.store(2, std::memory_order_release);
|
||||
left.fetch_sub(1, std::memory_order_acq_rel);
|
||||
}
|
||||
cv.notify_all();
|
||||
}
|
||||
bool done() const { return left.load(std::memory_order_acquire) == 0; }
|
||||
/// Index i is copied (or was copied ahead)
|
||||
bool ready(int64_t i) const {
|
||||
if (i < 0 || (size_t)i >= part_of.size()) return true;
|
||||
const int32_t k = part_of[(size_t)i];
|
||||
return k < 0 || parts[k].state.load(std::memory_order_acquire) == 2;
|
||||
}
|
||||
/// Part k copied on return: by this thread when nobody had taken it, else by whoever took it, waited for. 1: this thread
|
||||
/// copied it, 2: it waited, 0: it was copied already
|
||||
template <class Copy> int make_ready(int k, Copy&& copy) {
|
||||
if (parts[k].state.load(std::memory_order_acquire) == 2) return 0;
|
||||
if (claim(k)) {
|
||||
copy(parts[k].i0, parts[k].i1);
|
||||
copied(k);
|
||||
return 1;
|
||||
}
|
||||
std::unique_lock lk(mu);
|
||||
cv.wait(lk, [&] { return parts[k].state.load(std::memory_order_acquire) == 2; });
|
||||
return 2;
|
||||
}
|
||||
/// Index i copied on return (make_ready of its part)
|
||||
template <class Copy> int ensure(int64_t i, Copy&& copy) {
|
||||
if (i < 0 || (size_t)i >= part_of.size()) return 0;
|
||||
const int32_t k = part_of[(size_t)i];
|
||||
return k < 0 ? 0 : make_ready(k, copy);
|
||||
}
|
||||
/// Every part copied on return: those nobody had taken by this thread, in order, then the others waited for. The parts this
|
||||
/// thread copied
|
||||
template <class Copy> int finish(Copy&& copy) {
|
||||
int made = 0;
|
||||
for (int k = 0; k < nparts; k++)
|
||||
if (parts[k].state.load(std::memory_order_acquire) == 0 && claim(k)) {
|
||||
copy(parts[k].i0, parts[k].i1);
|
||||
copied(k);
|
||||
made++;
|
||||
}
|
||||
std::unique_lock lk(mu);
|
||||
cv.wait(lk, [&] { return done(); });
|
||||
return made;
|
||||
}
|
||||
};
|
||||
|
||||
/// Whether a capture's copies go behind: helpers to take them, enough pages for them (copy_split's own threshold: under it the
|
||||
/// submitting thread copies all at once, cheaper than waking a helper), and few to copy ahead (the late pages and the texture
|
||||
/// storage: take_capture reads those at once; many of them, as at a scene's load, and the capture is copied whole as before)
|
||||
inline bool worth_behind(int helpers, int64_t pages, int64_t ahead, int64_t min_pages = 128, int64_t max_ahead = 512) {
|
||||
return helpers > 0 && pages - ahead >= min_pages && ahead <= max_ahead;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::capture_behind
|
||||
81
gpu/vk/checkpoint_kinds.h
Normal file
81
gpu/vk/checkpoint_kinds.h
Normal file
@@ -0,0 +1,81 @@
|
||||
/* (Triforce) The kinds of RX_VK_CHECKPOINTS markers (vk_draw.cpp checkpoint, checkpoint_mark) and what lies after each, for the
|
||||
device lost's report. The owner's test11 and test12 and two lab runs of five lost the device at the title the same way: the
|
||||
top and the bottom of the pipe both at "write-back of pool ...", the next marker the next frame's first dispatch, never
|
||||
reached. Between those two markers there was a pool's write-back copies, the write-back diff pass, the end of that recording,
|
||||
the whole present (its recording, the blit to the window's image after its acquire, the menu) and the next recording's start
|
||||
and uploads: none of them had a marker, and the report could not say which the GPU stopped in. Now each of those has one, and
|
||||
the report says what the work after the last marker reached is (gap). Plain functions: tests/test_checkpoint_kinds.py. */
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace mkwvk::checkpoint_kinds {
|
||||
|
||||
/// A marker's kind as the report names it; its key follows the name in the report (a program, a pool, a texture, a recording's
|
||||
/// timeline value, a swapchain image's index or a chunk count, as the name says)
|
||||
inline const char* name(char c) {
|
||||
switch (c) {
|
||||
case 'd': return "draw of program";
|
||||
case 'c': return "dispatch of program";
|
||||
case 'i': return "INDIRECT dispatch of program";
|
||||
case 'm': return "mirror sync of pool";
|
||||
case 'b': return "write-back of pool";
|
||||
case 'u': return "upload of texture";
|
||||
case 'g': return "GPU unswizzle of texture";
|
||||
case 'w': return "write-back diff pass, chunks";
|
||||
case 'r': return "recording begun, value";
|
||||
case 'v': return "uploads of the recording, value";
|
||||
case 'z': return "recording ended, value";
|
||||
case 'p': return "present blit begun, image";
|
||||
case 'M': return "menu drawn over the present, image";
|
||||
case 'P': return "present blit ended, image";
|
||||
default: return "?";
|
||||
}
|
||||
}
|
||||
|
||||
/// What the GPU had to do after a marker of this kind, up to the next marker recorded: where a device lost whose last marker
|
||||
/// reached at the top of the pipe is this one stopped
|
||||
inline const char* gap(char c) {
|
||||
switch (c) {
|
||||
case 'd': case 'c': case 'i':
|
||||
return "that draw or dispatch itself (its marker is set just before it), or what its command buffer records after it before the "
|
||||
"next marker: barriers, copies, clears, queries";
|
||||
case 'm': return "that mirror sync's copies (guest memory -> the pool's VRAM mirror), in the recording's uploads";
|
||||
case 'b':
|
||||
return "that pool's write-back copies (its mirror -> guest memory, and the shadow's fill), then the write-back diff pass if "
|
||||
"one follows (w): with no w after it, the end of the recording (z)";
|
||||
case 'u': case 'g': return "that texture's upload or unswizzle itself";
|
||||
case 'w':
|
||||
return "the write-back diff pass (one compute dispatch over every pool's chunks, reading mirrors and shadows and writing guest "
|
||||
"memory by device address), then its barrier and the end of the recording (z)";
|
||||
case 'r': return "the recording's first commands: its barrier, and the replay's work before its first marked draw or dispatch";
|
||||
case 'v': return "the recording's uploads: mirror pieces filled, mirror syncs, the page table's changes, texture uploads";
|
||||
case 'z':
|
||||
return "the next submission: its waits on the queue (the mirrors' new pieces bound, a swapchain image acquired) or its first "
|
||||
"commands (r, v, or the present's p next)";
|
||||
case 'p': return "the present's blit: the game's picture scaled into the window's image, the HDR pass and the bars, before the menu (M)";
|
||||
case 'M': return "the menu's drawing (Dear ImGui) over the present, then its last barrier (P)";
|
||||
case 'P': return "the present of that image, then the next submission's waits and first commands";
|
||||
default: return "not known (a marker of no named kind)";
|
||||
}
|
||||
}
|
||||
|
||||
/// The two stages' last markers (sequence numbers; 0: none reached): one sentence of what they mean together
|
||||
inline const char* reading(uint32_t top, uint32_t bottom) {
|
||||
if (!top) return "no marker was reached at the top of the pipe";
|
||||
if (bottom == top)
|
||||
return "every command up to the last marker reached is done and nothing after it began: the GPU stopped in what follows that "
|
||||
"marker (below), or in a wait before the next one";
|
||||
if (bottom < top)
|
||||
return "the work between the bottom's last marker and the top's was running: the GPU stopped in it (a draw or dispatch that "
|
||||
"did not end, or a fault)";
|
||||
return "the bottom of the pipe is past the top: the markers are not in order (several queues or threads), read them with care";
|
||||
}
|
||||
/// (Triforce, P4) The two stages' last markers are of two threads' rings (vk_draw.cpp checkpoint_next: each recording thread
|
||||
/// numbers its own): their numbers say nothing of each other's order
|
||||
inline const char* apart() {
|
||||
return "the two are of two threads' recordings (each numbers its own markers: the replay thread's, a helper thread's, the "
|
||||
"present's): their numbers say nothing of their order, read each with the markers around it (below)";
|
||||
}
|
||||
|
||||
} // namespace mkwvk::checkpoint_kinds
|
||||
128
gpu/vk/cmd_work.h
Normal file
128
gpu/vk/cmd_work.h
Normal file
@@ -0,0 +1,128 @@
|
||||
// (Triforce) What the replay's barrier rules ask of the command buffer they record into, kept per command buffer: how many
|
||||
// commands went into it, and where its last full barrier, its last draw pass's end and its last dispatch were (vk_work.h counts
|
||||
// the commands; vk_texture.cpp full_barrier, pass_start_barrier and pass_resume_barrier, vk_draw.cpp dispatch read and set the
|
||||
// marks). Apart from Vulkan's calls so that tests/test_barrier_rules.py, test_pass_barrier.py and test_dispatch_rule_threads.py can
|
||||
// run it.
|
||||
//
|
||||
// After NX2navi's per-context state (runtime/vk_exec.h VkExec.recorded, barrier_at, bar_dirty, bar_passes, bar_dispatches;
|
||||
// vk_exec.c barrier_to_why, chunk_record, group_put): there a recording context counts its own commands, so its rules hold inside
|
||||
// the worker threads' chunks. Here one count served every thread (work_epoch, an atomic add on every command from every recording
|
||||
// thread), so each rule stood aside while the Replay helper threads recorded (most frames at the Market: about 500 full barriers a
|
||||
// frame, no pass start in its fragment stages only). A command buffer is recorded by one thread at a time (Vulkan asks for that),
|
||||
// and its state here is only touched by whoever records into it, so nothing in it needs to be atomic; the table that finds it is.
|
||||
// Another thread's commands go into its own command buffers and leave this one's marks alone; a command buffer two threads take
|
||||
// turns at (a parallel replay's segment init command buffer, vk_texture.cpp InitRedirect) has every turn's commands counted in it.
|
||||
//
|
||||
// RX_VK_BARRIER_CONTEXT=0: the one count of every thread's commands, and the rules standing aside while the helper threads record,
|
||||
// as before (vk_texture.cpp rules_aside).
|
||||
#pragma once
|
||||
|
||||
#include <vulkan/vulkan_core.h>
|
||||
|
||||
#include <atomic>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
namespace mkwvk {
|
||||
|
||||
extern std::atomic<uint64_t> work_epoch; // (vk_texture.cpp: RX_VK_BARRIER_CONTEXT=0's count, every thread's commands)
|
||||
inline thread_local uint64_t work_mine = 0; // (this thread's commands, into any command buffer: work_between)
|
||||
inline std::atomic<uint64_t> work_submits{0}; // (every queue submit through vk_work.h, any thread's: work_between)
|
||||
|
||||
/// RX_VK_BARRIER_CONTEXT=0: the global count, as before; anything else, or unset: per command buffer. Read at the first command
|
||||
/// (0: not read yet, 1: per command buffer, 2: global)
|
||||
inline std::atomic<int> work_way{0};
|
||||
inline bool work_global() {
|
||||
int w = work_way.load(std::memory_order_relaxed);
|
||||
if (!w) [[unlikely]] {
|
||||
const char* e = std::getenv("RX_VK_BARRIER_CONTEXT");
|
||||
w = e && std::strcmp(e, "0") == 0 ? 2 : 1;
|
||||
work_way.store(w, std::memory_order_relaxed);
|
||||
}
|
||||
return w == 2;
|
||||
}
|
||||
|
||||
/// One command buffer's state. The marks are counts of it (work_at) taken right after the command they mark; a mark equal to the
|
||||
/// count now: nothing was recorded into it since
|
||||
struct CmdWork {
|
||||
uint64_t n = 0; // (its commands, and its begins: work_begun)
|
||||
uint64_t barrier_at = UINT64_MAX; // (right after its last full barrier: full_barrier leaves out a second one there)
|
||||
uint64_t pass_end_at = UINT64_MAX; // (right after its last draw pass ended, unless the replay split that pass for a hazard)
|
||||
uint64_t dispatch_at = UINT64_MAX; // (right after its last dispatch: RX_VK_DISPATCH_BARRIER)
|
||||
bool known = true; // (false: the stand-in for a command buffer the table had no room for, never right after anything)
|
||||
};
|
||||
|
||||
/// The table: a slot a command buffer, taken at its first command or begin by whichever thread comes first and kept for good (the
|
||||
/// replay makes its command buffers once: a few hundred at most). Full: cmd_work_none, which no rule relaxes on
|
||||
constexpr size_t kCmdWorkSlots = 1024;
|
||||
struct alignas(64) CmdWorkSlot { // (a cache line each: two threads recording two command buffers share none)
|
||||
std::atomic<VkCommandBuffer> cmd{VK_NULL_HANDLE};
|
||||
CmdWork w;
|
||||
};
|
||||
inline CmdWorkSlot cmd_work_slots[kCmdWorkSlots];
|
||||
inline thread_local CmdWork cmd_work_none{0, UINT64_MAX, UINT64_MAX, UINT64_MAX, false}; // (vk_texture.cpp full_barrier tells it once)
|
||||
inline CmdWork* cmd_work_find(VkCommandBuffer cmd) {
|
||||
if (cmd == VK_NULL_HANDLE) return &cmd_work_none;
|
||||
const size_t h = (size_t)(((uint64_t)(uintptr_t)cmd * 0x9E3779B97F4A7C15ull) >> 54); // (10 bits: kCmdWorkSlots)
|
||||
for (size_t k = 0; k < kCmdWorkSlots; k++) {
|
||||
CmdWorkSlot& s = cmd_work_slots[(h + k) % kCmdWorkSlots];
|
||||
VkCommandBuffer at = s.cmd.load(std::memory_order_acquire);
|
||||
if (at == VK_NULL_HANDLE && s.cmd.compare_exchange_strong(at, cmd, std::memory_order_acq_rel)) return &s.w;
|
||||
if (at == cmd) return &s.w; // (its own, or taken by another thread just now)
|
||||
}
|
||||
return &cmd_work_none;
|
||||
}
|
||||
/// cmd's state (the last one this thread asked for is at hand: most commands go into the command buffer of the one before)
|
||||
inline thread_local VkCommandBuffer cmd_work_last = VK_NULL_HANDLE;
|
||||
inline thread_local CmdWork* cmd_work_last_w = nullptr;
|
||||
inline CmdWork& cmd_work(VkCommandBuffer cmd) {
|
||||
if (cmd != cmd_work_last || !cmd_work_last_w) [[unlikely]] cmd_work_last_w = cmd_work_find(cmd), cmd_work_last = cmd;
|
||||
return *cmd_work_last_w;
|
||||
}
|
||||
|
||||
/// The count a mark is taken in: the command buffer's own; RX_VK_BARRIER_CONTEXT=0, every thread's (work_epoch), as before
|
||||
inline uint64_t work_at(const CmdWork& w) {
|
||||
return work_global() ? work_epoch.load(std::memory_order_relaxed) : w.n;
|
||||
}
|
||||
/// Whether nothing was recorded into the command buffer since the mark was taken
|
||||
inline bool work_right_after(const CmdWork& w, uint64_t mark) {
|
||||
return w.known && mark == work_at(w);
|
||||
}
|
||||
|
||||
/// A command that does or orders GPU work, into cmd (vk_work.h's macros; by hand after a library recorded into cmd itself)
|
||||
inline void note_work(VkCommandBuffer cmd) {
|
||||
// (RX_VK_BARRIER_CONTEXT=0: an add, not a load and a store: a thread preempted between the two would store a stale count over
|
||||
// another thread's, which could make the count equal the one a barrier was recorded at with work recorded since)
|
||||
if (work_global()) work_epoch.fetch_add(1, std::memory_order_relaxed);
|
||||
else cmd_work(cmd).n++;
|
||||
work_mine++;
|
||||
}
|
||||
inline VkCommandBuffer work_on(VkCommandBuffer cmd) {
|
||||
note_work(cmd);
|
||||
return cmd;
|
||||
}
|
||||
/// cmd begun (vkBeginCommandBuffer): a new recording starts afresh, whatever its handle held before (its last command may have
|
||||
/// been a full barrier, and the work submitted since then is not after it)
|
||||
inline VkCommandBuffer work_begun(VkCommandBuffer cmd) {
|
||||
CmdWork& w = cmd_work(cmd);
|
||||
w.n++;
|
||||
w.barrier_at = w.pass_end_at = w.dispatch_at = UINT64_MAX;
|
||||
return cmd;
|
||||
}
|
||||
/// A submit to the queue (vkQueueSubmit2), any thread's
|
||||
inline VkQueue work_submitted(VkQueue q) {
|
||||
work_submits.fetch_add(1, std::memory_order_relaxed);
|
||||
return q;
|
||||
}
|
||||
/// Whether anything was recorded or submitted between two points of this thread's recording: equal before and after, nothing.
|
||||
/// What crosses command buffers asks this (vk_replay.cpp maybe_split: a pass going on in the next part; finish_recording: the
|
||||
/// early tail's write-back): this thread's own commands, into any command buffer, and every submit to the queue, any thread's
|
||||
/// (another thread's recording reaches the queue between two of this thread's command buffers only by a submit).
|
||||
/// RX_VK_BARRIER_CONTEXT=0: every thread's commands, as before
|
||||
inline uint64_t work_between() {
|
||||
return work_global() ? work_epoch.load(std::memory_order_relaxed) : work_mine + work_submits.load(std::memory_order_relaxed);
|
||||
}
|
||||
|
||||
} // namespace mkwvk
|
||||
333
gpu/vk/debug_names.h
Normal file
333
gpu/vk/debug_names.h
Normal file
@@ -0,0 +1,333 @@
|
||||
// (Triforce) The names on the Debug tab's Game flags, Cutscenes and Scan amiibo pages (vk_menu.cpp draws them), and what
|
||||
// a page keeps: the list in groups, the choice, the cards shown. No Vulkan, no ImGui and no file here:
|
||||
// tests/test_debug_names.py compiles this header and runs it on bytes of its own making.
|
||||
//
|
||||
// The game knows a flag (a Bool of its GameData) by the MurmurHash3 of its name and nothing else; its files list the
|
||||
// Bools by hash (GameData/GameDataList.Product.<n>.byml.zs) and use their names in the event flows
|
||||
// (Event/EventFlow/<event>.bfevfl.zs). So the flags' names are every text of the event flows whose hash is a Bool's, and
|
||||
// the events are the event flows that hold a script (a flowchart: the others are a cutscene's timelines, which a script
|
||||
// plays). After NX2navi's F9 panel, which found its names the same way; no line of it is here, and no name: both lists
|
||||
// are made in memory from the player's own game files each run, and written nowhere.
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "oot_debug_link.h"
|
||||
|
||||
namespace mkwvk::debug_names {
|
||||
|
||||
/// A BYML file's Data.Bool[i].Hash values, sorted, with no number twice: the Bools of a GameDataList (either byte order;
|
||||
/// the game's is the big-endian one). false when the bytes are not such a file. Nothing outside the bytes is read
|
||||
inline bool gamedata_bools(const std::vector<unsigned char>& b, std::vector<uint32_t>& out) {
|
||||
out.clear();
|
||||
const size_t n = b.size();
|
||||
if (n < 16 || !((b[0] == 'B' && b[1] == 'Y') || (b[0] == 'Y' && b[1] == 'B'))) return false;
|
||||
const bool big = b[0] == 'B';
|
||||
bool bad = false; // (a read outside the file: everything read after it is 0, and the file is refused)
|
||||
auto u8 = [&](size_t o) -> uint32_t { return o < n ? b[o] : (bad = true, 0u); };
|
||||
auto u24 = [&](size_t o) -> uint32_t {
|
||||
if (o > n || n - o < 3) return bad = true, 0u;
|
||||
return big ? (uint32_t)b[o] << 16 | (uint32_t)b[o + 1] << 8 | b[o + 2] : (uint32_t)b[o + 2] << 16 | (uint32_t)b[o + 1] << 8 | b[o];
|
||||
};
|
||||
auto u32 = [&](size_t o) -> uint32_t {
|
||||
if (o > n || n - o < 4) return bad = true, 0u;
|
||||
return big ? (uint32_t)b[o] << 24 | (uint32_t)b[o + 1] << 16 | (uint32_t)b[o + 2] << 8 | b[o + 3]
|
||||
: (uint32_t)b[o + 3] << 24 | (uint32_t)b[o + 2] << 16 | (uint32_t)b[o + 1] << 8 | b[o];
|
||||
};
|
||||
// the keys' table: 0xc2, how many, an offset each (and one past the last) from the table's start, the texts
|
||||
const size_t keys = u32(4), root = u32(12);
|
||||
if (bad || !keys || u8(keys) != 0xc2) return false;
|
||||
const uint32_t key_count = u24(keys + 1);
|
||||
auto key_index = [&](const char* name) -> int64_t {
|
||||
const size_t len = strlen(name);
|
||||
for (uint32_t i = 0; i < key_count && !bad; i++) {
|
||||
const size_t at = keys + (size_t)u32(keys + 4 + 4 * (size_t)i);
|
||||
if (!bad && at < n && n - at > len && !memcmp(b.data() + at, name, len + 1)) return i;
|
||||
}
|
||||
return -1;
|
||||
};
|
||||
const int64_t k_data = key_index("Data"), k_bool = key_index("Bool"), k_hash = key_index("Hash");
|
||||
if (bad || k_data < 0 || k_bool < 0 || k_hash < 0) return false;
|
||||
// a dictionary: 0xc1, how many, then eight bytes each: the key's index (three bytes), the value's type, the value
|
||||
auto member = [&](size_t dict, int64_t key, uint32_t* type) -> uint32_t {
|
||||
if (u8(dict) != 0xc1) return bad = true, 0u;
|
||||
const uint32_t count = u24(dict + 1);
|
||||
for (uint32_t i = 0; i < count && !bad; i++) {
|
||||
const size_t e = dict + 4 + 8 * (size_t)i;
|
||||
if (u24(e) == (uint32_t)key) return *type = u8(e + 3), u32(e + 4);
|
||||
}
|
||||
return *type = 0, 0u;
|
||||
};
|
||||
uint32_t type = 0;
|
||||
const size_t data = member(root, k_data, &type);
|
||||
if (bad || type != 0xc1) return false;
|
||||
const size_t bools = member(data, k_bool, &type);
|
||||
if (bad || type != 0xc0 || u8(bools) != 0xc0) return false;
|
||||
// an array: 0xc0, how many, a type byte each (to a multiple of four), then four bytes each
|
||||
const uint32_t count = u24(bools + 1);
|
||||
const size_t values = bools + 4 + (((size_t)count + 3) & ~(size_t)3);
|
||||
if (bad || count > n / 4) return false;
|
||||
out.reserve(count);
|
||||
for (uint32_t i = 0; i < count; i++) {
|
||||
if (u8(bools + 4 + i) != 0xc1) return out.clear(), false;
|
||||
const uint32_t hash = member(u32(values + 4 * (size_t)i), k_hash, &type);
|
||||
if (bad || (type != 0xd3 && type != 0xd1)) return out.clear(), false; // (an unsigned number, or a signed one)
|
||||
if (hash) out.push_back(hash);
|
||||
}
|
||||
std::sort(out.begin(), out.end());
|
||||
out.erase(std::unique(out.begin(), out.end()), out.end());
|
||||
return !out.empty();
|
||||
}
|
||||
|
||||
/// An event flow that holds a script: a little-endian BFEVFL whose header counts a flowchart at least (0x20)
|
||||
inline bool event_has_script(const std::vector<unsigned char>& f) {
|
||||
return f.size() >= 0x24 && !memcmp(f.data(), "BFEVFL\0\0", 8) && f[0xc] == 0xff && f[0xd] == 0xfe && (f[0x20] | f[0x21] << 8) >= 1;
|
||||
}
|
||||
|
||||
/// The texts of a file that are flags' names: every run of a name's characters, 3 to OOT_NAME_MAX of them with a 0 after,
|
||||
/// whose hash is one of bools (sorted). Added to out (the same name more than once: make_list sorts that out)
|
||||
inline void flag_names(const std::vector<unsigned char>& f, const std::vector<uint32_t>& bools, std::vector<std::string>& out) {
|
||||
const size_t n = f.size();
|
||||
for (size_t i = 0; i < n;) {
|
||||
if (!oot_name_char(f[i])) {
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
size_t end = i;
|
||||
while (end < n && oot_name_char(f[end])) end++;
|
||||
const size_t len = end - i;
|
||||
if (end < n && !f[end] && len >= 3 && len <= OOT_NAME_MAX &&
|
||||
std::binary_search(bools.begin(), bools.end(), oot_name_hash((const char*)f.data() + i, len)))
|
||||
out.emplace_back((const char*)f.data() + i, len);
|
||||
i = end;
|
||||
}
|
||||
}
|
||||
|
||||
/// The event an event flow's file is: its name without ".bfevfl.zs" and without a version before that (".110"); "" when
|
||||
/// the file is not an event flow's or its name not an event's
|
||||
inline std::string event_of_file(const std::string& file) {
|
||||
static const char kEnd[] = ".bfevfl.zs";
|
||||
const size_t end = sizeof kEnd - 1;
|
||||
if (file.size() <= end || file.compare(file.size() - end, end, kEnd)) return "";
|
||||
std::string name = file.substr(0, file.size() - end);
|
||||
const size_t dot = name.rfind('.');
|
||||
if (dot != std::string::npos && dot + 1 < name.size() && name.find_first_not_of("0123456789", dot + 1) == std::string::npos) name.resize(dot);
|
||||
return oot_name_ok(name.c_str()) ? name : "";
|
||||
}
|
||||
|
||||
// ---- a page's list: the names sorted, each once, in groups by what they begin with ----
|
||||
struct Group {
|
||||
std::string title;
|
||||
int first = 0, count = 0; // (its names: [first, first + count) of the list)
|
||||
bool begins = false; // (its names all begin with its title: not Other, and not a list without groups)
|
||||
};
|
||||
struct List {
|
||||
std::vector<std::string> names;
|
||||
std::vector<uint32_t> hashes; // (each name's, for the flags)
|
||||
std::vector<Group> groups; // (never empty while there are names)
|
||||
};
|
||||
constexpr int kGroupMin = 6; // (a beginning that fewer names share has no group of its own: they are in "Other")
|
||||
/// What a name begins with: its text before the first _ or . (the whole name when it has neither)
|
||||
inline std::string name_prefix(const std::string& name) {
|
||||
const size_t cut = name.find_first_of("_.");
|
||||
return cut == std::string::npos || cut == 0 ? name : name.substr(0, cut);
|
||||
}
|
||||
/// The list of some names (any order, any name any number of times). grouped false: one group of them all (the amiibo
|
||||
/// folder's files)
|
||||
inline List make_list(std::vector<std::string> names, bool grouped = true, const char* one_title = "All") {
|
||||
List list;
|
||||
std::sort(names.begin(), names.end());
|
||||
names.erase(std::unique(names.begin(), names.end()), names.end());
|
||||
names.erase(std::remove(names.begin(), names.end(), std::string()), names.end());
|
||||
if (names.empty()) return list;
|
||||
std::vector<std::pair<std::string, std::string>> keyed; // (the group's title, the name)
|
||||
keyed.reserve(names.size());
|
||||
if (!grouped) {
|
||||
for (std::string& name : names) keyed.emplace_back(one_title, std::move(name));
|
||||
} else {
|
||||
// (sorted, so the names of one beginning are together: counted in one pass)
|
||||
std::vector<std::string> prefixes;
|
||||
prefixes.reserve(names.size());
|
||||
for (const std::string& name : names) prefixes.push_back(name_prefix(name));
|
||||
std::vector<std::string> counted = prefixes;
|
||||
std::sort(counted.begin(), counted.end());
|
||||
for (size_t i = 0; i < names.size(); i++) {
|
||||
const auto range = std::equal_range(counted.begin(), counted.end(), prefixes[i]);
|
||||
const bool own = range.second - range.first >= kGroupMin;
|
||||
// ("\x7f" sorts Other after every group of a beginning: a name's characters are all below it)
|
||||
keyed.emplace_back(own ? prefixes[i] : std::string("\x7f"), std::move(names[i]));
|
||||
}
|
||||
std::sort(keyed.begin(), keyed.end());
|
||||
}
|
||||
for (size_t i = 0; i < keyed.size(); i++) {
|
||||
if (list.groups.empty() || keyed[i].first != keyed[i - 1].first) {
|
||||
Group g;
|
||||
g.title = keyed[i].first == "\x7f" ? "Other" : keyed[i].first;
|
||||
g.begins = grouped && keyed[i].first != "\x7f";
|
||||
g.first = (int)i;
|
||||
list.groups.push_back(std::move(g));
|
||||
}
|
||||
list.groups.back().count++;
|
||||
list.hashes.push_back(oot_name_hash(keyed[i].second.data(), keyed[i].second.size()));
|
||||
list.names.push_back(std::move(keyed[i].second));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
/// A name as its card shows it: without the beginning its group is named for, and the _ or . after that (the group's
|
||||
/// title says it once for all of them, and the room goes to where the names differ). The whole name in Other, in a list
|
||||
/// without groups, and where nothing would be left
|
||||
inline std::string card_label(const List& list, int group, int index) {
|
||||
const std::string& name = list.names[index];
|
||||
const Group& g = list.groups[group];
|
||||
if (!g.begins || name.size() <= g.title.size() + 1) return name;
|
||||
return name.substr(g.title.size() + 1);
|
||||
}
|
||||
/// A text that does not fit, cut in its middle: a third of what fits from its start, "..." and the rest from its end (the
|
||||
/// game's names tell each other apart at their ends). fits(text): whether a text fits; it must hold for a shorter one when
|
||||
/// it holds for a longer. The text itself when it fits, "..." when nothing more does. UTF-8 is cut between characters
|
||||
template <class Fits>
|
||||
std::string elide_middle(const std::string& text, Fits fits) {
|
||||
if (fits(text)) return text;
|
||||
const size_t n = text.size();
|
||||
auto cut = [&](size_t keep) { // (keep bytes of the text at most: a head and a tail on character boundaries)
|
||||
size_t head = keep / 3, tail = n - (keep - head);
|
||||
while (head > 0 && ((unsigned char)text[head] & 0xc0) == 0x80) head--;
|
||||
while (tail < n && ((unsigned char)text[tail] & 0xc0) == 0x80) tail++;
|
||||
return text.substr(0, head) + "..." + text.substr(tail);
|
||||
};
|
||||
size_t lo = 0, hi = n ? n - 1 : 0; // (the most bytes kept that fit: lo fits or is 0, more than hi does not)
|
||||
while (lo < hi) {
|
||||
const size_t mid = (lo + hi + 1) / 2;
|
||||
if (fits(cut(mid))) lo = mid;
|
||||
else hi = mid - 1;
|
||||
}
|
||||
return cut(lo);
|
||||
}
|
||||
|
||||
// ---- a page: a list, the group shown, the name chosen in it, and the cards as last drawn ----
|
||||
struct Page {
|
||||
List list;
|
||||
int group = 0; // (the group shown)
|
||||
int choice = 0; // (the name chosen: its place in list.names, inside the group)
|
||||
int columns = 1, capacity = 1; // (as last drawn: the cards in a row, on a page)
|
||||
int shown = 0; // (the page of cards shown: the choice's, or another the wheel turned to)
|
||||
|
||||
bool empty() const { return list.names.empty(); }
|
||||
int begin() const { return empty() ? 0 : list.groups[group].first; }
|
||||
int end() const { return empty() ? 0 : list.groups[group].first + list.groups[group].count; }
|
||||
int pages() const { return std::max(1, (end() - begin() + std::max(1, capacity) - 1) / std::max(1, capacity)); }
|
||||
/// The cards shown: [first, last) of list.names
|
||||
int first() const { return begin() + std::clamp(shown, 0, pages() - 1) * std::max(1, capacity); }
|
||||
int last() const { return std::min(end(), first() + std::max(1, capacity)); }
|
||||
/// The page of cards the choice is on
|
||||
void reveal() { shown = empty() ? 0 : (choice - begin()) / std::max(1, capacity); }
|
||||
/// A new list (the files were read, or the folder listed again): the choice kept by its name when the new list has it
|
||||
void set_list(List next) {
|
||||
const std::string was = !empty() && choice >= 0 && choice < (int)list.names.size() ? list.names[choice] : std::string();
|
||||
list = std::move(next);
|
||||
group = 0, choice = 0, shown = 0;
|
||||
if (empty()) return;
|
||||
const auto at = std::find(list.names.begin(), list.names.end(), was);
|
||||
if (!was.empty() && at != list.names.end()) {
|
||||
choice = (int)(at - list.names.begin());
|
||||
for (int g = 0; g < (int)list.groups.size(); g++)
|
||||
if (choice >= list.groups[g].first && choice < list.groups[g].first + list.groups[g].count) group = g;
|
||||
}
|
||||
reveal();
|
||||
}
|
||||
/// Another group: dir -1 the one before, 1 the one after, round the ends; its first name chosen
|
||||
void turn_group(int dir) {
|
||||
if (empty()) return;
|
||||
const int n = (int)list.groups.size();
|
||||
group = ((group + dir) % n + n) % n;
|
||||
choice = begin(), shown = 0;
|
||||
}
|
||||
/// The choice moved: by cards (Left and Right), rows (Up and Down), pages, or to the group's first or last name. It
|
||||
/// stays in the group; the page shown follows it
|
||||
void move(int cards, int rows, int by_pages, bool home, bool to_end) {
|
||||
if (empty()) return;
|
||||
const int step = cards + rows * std::max(1, columns) + by_pages * std::max(1, capacity);
|
||||
choice = home ? begin() : to_end ? end() - 1 : std::clamp(choice + step, begin(), end() - 1);
|
||||
reveal();
|
||||
}
|
||||
/// A card clicked: chosen, when it is one of the group's
|
||||
bool choose(int index) {
|
||||
if (empty() || index < begin() || index >= end()) return false;
|
||||
choice = index;
|
||||
return true;
|
||||
}
|
||||
/// The wheel: the page of cards shown, the choice where it is
|
||||
void turn_shown(int by) { shown = std::clamp(shown + by, 0, pages() - 1); }
|
||||
/// The hashes of the names shown now, and of the chosen one when the wheel turned its page away, at most OOT_WATCH_MAX:
|
||||
/// the flags whose states the page asks for
|
||||
std::vector<uint32_t> watched() const {
|
||||
std::vector<uint32_t> hashes;
|
||||
for (int i = first(); i < last() && (int)hashes.size() < OOT_WATCH_MAX; i++) hashes.push_back(list.hashes[i]);
|
||||
if (!empty() && (choice < first() || choice >= last()) && (int)hashes.size() < OOT_WATCH_MAX) hashes.push_back(list.hashes[choice]);
|
||||
return hashes;
|
||||
}
|
||||
};
|
||||
|
||||
/// The flags' states as the game's side last said them, for the cards shown
|
||||
struct States {
|
||||
std::vector<uint32_t> hashes; // (the list asked for)
|
||||
std::string states; // (a character each: 1, 0, - or ?; empty until an answer for this list came)
|
||||
/// The list asked for changed: true when a new W line is to be sent. The states known are forgotten then
|
||||
bool ask(const std::vector<uint32_t>& now) {
|
||||
if (now == hashes) return false;
|
||||
hashes = now, states.clear();
|
||||
return true;
|
||||
}
|
||||
/// A line of states: kept when it answers the list asked for
|
||||
bool take(const char* line) {
|
||||
std::string got(hashes.size(), '?');
|
||||
if (!oot_states_parse(line, oot_watch_sum(hashes.data(), (int)hashes.size()), (int)hashes.size(), got.data())) return false;
|
||||
states = std::move(got);
|
||||
return true;
|
||||
}
|
||||
/// A flag's state: 1, 0, - (the save data has no such flag) or ? (not known: no save loaded, or no answer yet)
|
||||
char of(uint32_t hash) const {
|
||||
for (size_t i = 0; i < hashes.size() && i < states.size(); i++)
|
||||
if (hashes[i] == hash) return states[i];
|
||||
return '?';
|
||||
}
|
||||
};
|
||||
|
||||
/// The lines a page waits to send, a byte a read (HOS_OPT_DEBUG_ASK, HOS_OPT_AMIIBO_ASK): each ends with a line feed,
|
||||
/// 0 while there is none. The game's side reads them only while the game runs, so of the lines that only say what the
|
||||
/// page shows now (those beginning with `latest`: W) the newest alone is kept, and no more than kLinesMax wait
|
||||
struct Lines {
|
||||
static constexpr int kLinesMax = 32;
|
||||
std::vector<std::string> waiting;
|
||||
size_t at = 0; // (how much of waiting[0] was read)
|
||||
void push(const std::string& line, char latest = 0) {
|
||||
for (size_t i = at ? 1 : 0; latest && i < waiting.size();) { // (an older one not yet begun: dropped)
|
||||
if (!waiting[i].empty() && waiting[i][0] == latest) waiting.erase(waiting.begin() + (long)i);
|
||||
else i++;
|
||||
}
|
||||
if ((int)waiting.size() < kLinesMax) waiting.push_back(line);
|
||||
}
|
||||
int take() {
|
||||
if (waiting.empty()) return 0;
|
||||
if (at < waiting[0].size()) return (unsigned char)waiting[0][at++];
|
||||
waiting.erase(waiting.begin()), at = 0;
|
||||
return '\n';
|
||||
}
|
||||
/// The same line as the last one waiting: a key held on a request repeats it, and one of them is enough
|
||||
bool repeats(const std::string& line) const { return !waiting.empty() && waiting.back() == line; }
|
||||
/// The lines waiting are given up but those beginning with `keep` and one already half read (the Debug tools were
|
||||
/// turned off: what was asked of the game and not yet taken is not done after all; a W still says what is shown)
|
||||
void drop_but(char keep) {
|
||||
for (size_t i = at ? 1 : 0; i < waiting.size();) {
|
||||
if (waiting[i].empty() || waiting[i][0] != keep) waiting.erase(waiting.begin() + (long)i);
|
||||
else i++;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace mkwvk::debug_names
|
||||
42
gpu/vk/debug_pending.h
Normal file
42
gpu/vk/debug_pending.h
Normal file
@@ -0,0 +1,42 @@
|
||||
// (Triforce) The Inventory page's change asked of the game and not yet taken by it (vk_menu.cpp keeps it in cheat_action;
|
||||
// host/hos_main.c takes it at Link's update, which does not run while the game's own Options screen has the game paused).
|
||||
// The arithmetic is here so that tests/test_debug_pending.py can run it.
|
||||
//
|
||||
// An action is OOT_CHEAT_ITEM_ACTION + item * 256 + op: op 0..127 adds op - 64 to the item's amount, op 200 unlocks it (1)
|
||||
// or relocks it (0). Only one action waits at a time. Before, each press replaced the last: ten presses of Right on an
|
||||
// amount in the paused Options screen made it one more, and the card showed the amount as it was; a second press of Unlock
|
||||
// unlocked it all the same. Now a press adds to the same item's waiting change, and the card shows what it will be.
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "oot_cheat_items.h"
|
||||
|
||||
namespace mkwvk::debug_pending {
|
||||
|
||||
/// The change to item's amount the waiting action asks (0: none, or the action is not that item's amount)
|
||||
inline int amount_delta(int pending, int item) {
|
||||
const int base = OOT_CHEAT_ITEM_ACTION + item * 256;
|
||||
return pending >= base && pending < base + 128 ? pending - base - 64 : 0;
|
||||
}
|
||||
/// Whether the waiting action is item's unlock or relock
|
||||
inline bool toggles(int pending, int item) { return pending == OOT_CHEAT_ITEM_ACTION + item * 256 + 200; }
|
||||
|
||||
/// The action after a step (dir 1 or -1) on item's amount, count what the game last said it has (0 or more): the item's
|
||||
/// waiting change and the step together, kept to what the game allows (0 to 999) and to what one action says (-64 to 63).
|
||||
/// Another item's waiting action is replaced, as before
|
||||
inline int amount_step(int pending, int item, int count, int dir) {
|
||||
const int delta = std::clamp(amount_delta(pending, item) + dir, std::max(-64, -count), std::min(63, 999 - count));
|
||||
return OOT_CHEAT_ITEM_ACTION + item * 256 + 64 + delta;
|
||||
}
|
||||
/// The action after a press of Unlock or Relock on item: a second press before the game took the first takes it back (0)
|
||||
inline int toggle(int pending, int item) { return toggles(pending, item) ? 0 : OOT_CHEAT_ITEM_ACTION + item * 256 + 200; }
|
||||
|
||||
/// What item's card shows: count, what the game last said, with the waiting change made (count < 0, unknown: as it is)
|
||||
inline int shown(int pending, int item, int count) {
|
||||
if (count < 0) return count;
|
||||
if (toggles(pending, item)) return count > 0 ? 0 : 1;
|
||||
return std::clamp(count + amount_delta(pending, item), 0, 999);
|
||||
}
|
||||
|
||||
} // namespace mkwvk::debug_pending
|
||||
41
gpu/vk/debug_tab_layout.h
Normal file
41
gpu/vk/debug_tab_layout.h
Normal file
@@ -0,0 +1,41 @@
|
||||
// (Triforce) The Debug tab's value cells: how wide they are, and whether the tools stand in two columns (vk_menu.cpp
|
||||
// draw_debug_rows measures the texts and draws; the arithmetic is here so that tests/test_debug_tab_layout.py can run it).
|
||||
//
|
||||
// The tab has the Debug tools switch across its top, the tools under their groups' headings in one column or two, and the
|
||||
// Developer rows across its foot. The cells of what stands under one another are one width, so their left edges line up:
|
||||
// a column's tools alike, and the switch and the Developer rows, which span the columns, alike. A Developer row of more
|
||||
// than two values asks more than Off and On: before, it alone was wider than the rows around it.
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
namespace mkwvk::debug_tab {
|
||||
|
||||
struct Widths {
|
||||
bool two = false; // (the tools in two columns)
|
||||
float cell[2] = {}; // (a column's tools' cells; both the same in one column)
|
||||
float span = 0; // (the switch's and the Developer rows' cells)
|
||||
};
|
||||
|
||||
/// col_w: a column's width when there are two; room: the tab's width. name_need: the longest name of each column with its
|
||||
/// room in the name's cell; cell_full and cell_tight: what the column's widest cell asks, and its narrowest. span_need: what
|
||||
/// the widest of the switch's and the Developer rows' cells asks.
|
||||
/// Two columns only when each holds its longest name whole beside its cells at their narrowest; the cells are then as wide
|
||||
/// as the name leaves them, up to what they ask, and the spanning cells as wide as the second column's (they end at the
|
||||
/// same edge) or as they ask. In one column every cell is one width: what the widest of all asks, less only when the
|
||||
/// longest name needs the room, and never under the narrowest
|
||||
inline Widths widths(float col_w, float room, const float name_need[2], const float cell_full[2], const float cell_tight[2], float span_need) {
|
||||
Widths w;
|
||||
w.two = col_w >= name_need[0] + cell_tight[0] && col_w >= name_need[1] + cell_tight[1];
|
||||
if (w.two) {
|
||||
for (int k = 0; k < 2; k++) w.cell[k] = std::max(cell_tight[k], std::min(cell_full[k], col_w - name_need[k]));
|
||||
w.span = std::max(span_need, w.cell[1]);
|
||||
} else {
|
||||
const float widest = std::max({cell_full[0], cell_full[1], span_need});
|
||||
const float narrowest = std::max(cell_tight[0], cell_tight[1]);
|
||||
w.cell[0] = w.cell[1] = w.span = std::max(std::min(widest, room - std::max(name_need[0], name_need[1])), narrowest);
|
||||
}
|
||||
return w;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::debug_tab
|
||||
36
gpu/vk/demote_watch.h
Normal file
36
gpu/vk/demote_watch.h
Normal file
@@ -0,0 +1,36 @@
|
||||
/* (Triforce) When a pool's trial in guest memory ends early (vk_memory.cpp demote_trials). A pool the CPU and the GPU both write
|
||||
is tried out of the mirrors: its pieces (or the whole pool) are bound in guest memory, 10 frames to settle, then up to 90
|
||||
measured, and the GPU's time a frame is compared with the window before. Only the measured frames were judged, and only after
|
||||
ten of them: in the owner's log (RTX 5090, 2026-11-15, test4) a 16 MB pool took the GPU 106 ms a frame in guest memory
|
||||
against 7.4 before, and the game's thread waited for that GPU in every capture (memory sync 99 ms a submit, 18 ms a frame
|
||||
over 120 presents): some twenty frames of 100 ms, the same again at its second trial, and a 32 MB pool's two trials at 39 ms
|
||||
against 7.7. A fresh install tries every such pool (a pool that failed twice is kept in triforce_mirror_keep.txt for later
|
||||
runs), which is what a benchmark plays. So a trial far over its baseline ends as soon as a few frames say so, settling or
|
||||
measured, the way a slower one ends: mirrored again and measured once more that way, and judged against that (phase 4), so
|
||||
an early end that was wrong costs a second measure, not the pool. Of the 84 trials in the owner's five logs the four costly
|
||||
ones were 4.7 to 19 times their baseline; every other was under 2.3 times but one, 3.6 times, whose mirrored-again frames were
|
||||
as slow (its baseline was off; it stayed in guest memory): under this rule's line too. RX_VK_DEMOTE_QUICK=0: as before. Plain
|
||||
functions: tests/test_demote_watch.cpp checks them. */
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
|
||||
namespace mkwvk::demote_watch {
|
||||
|
||||
constexpr uint64_t kFrames = 3; // (the frames since the trial's start, or its measure's, before one is judged: the GPU's time comes
|
||||
// in as submissions finish, a frame or two late, so the first frames weigh less than they cost)
|
||||
constexpr double kTimes = 3.0; // (over kTimes the baseline and kOverMs more: see above. The trial's own rule, twice the
|
||||
constexpr double kOverMs = 5.0; // baseline and 1 ms after 10 measured frames, stays as it was)
|
||||
|
||||
/// Whether a trial whose frames so far took ms_a_frame of GPU time each, over frames of them, ends now: far slower than base_ms
|
||||
inline bool gross(double base_ms, double ms_a_frame, uint64_t frames) {
|
||||
return base_ms > 0 && frames >= kFrames && ms_a_frame > base_ms * kTimes + kOverMs;
|
||||
}
|
||||
|
||||
/// RX_VK_DEMOTE_QUICK: on unless "0"
|
||||
inline bool quick_on(const char* env) {
|
||||
return !(env && *env && std::atoi(env) == 0 && env[0] == '0');
|
||||
}
|
||||
|
||||
} // namespace mkwvk::demote_watch
|
||||
113
gpu/vk/desc_keep.h
Normal file
113
gpu/vk/desc_keep.h
Normal file
@@ -0,0 +1,113 @@
|
||||
// (Triforce) Per-binding descriptor reuse (vk_draw.cpp build_descriptors), apart from Vulkan so that tests/test_desc_keep.py can run
|
||||
// it. NX2navi's per-binding reuse (runtime/vk_exec_draw.c pb_take and pb_keep, chrg6's) is the model; the rules below are this
|
||||
// renderer's own, from what each of its descriptors is resolved from.
|
||||
//
|
||||
// A draw whose program, bindings, texture slots and uniform updates are all as the draw before it keeps that draw's descriptors whole
|
||||
// (vk_draw.cpp same_desc). In the owner's test7 session that was 0 to 349 draws a frame of 2,300 to 2,870, and "descriptors" was 1.5
|
||||
// to 2.2 ms of a replay of 7.4 to 9.8 ms: a draw that binds one uniform buffer of its own, or anything bound anywhere, built every
|
||||
// descriptor again, each texture through the views' map and the sampler table, each buffer through its pool. Now each descriptor of
|
||||
// a graphics program keeps its last result beside what it was resolved from, for the last kSlots programs a recording thread drew,
|
||||
// and a descriptor whose inputs and stamps are all the same takes that result instead of resolving again. What a result stands on,
|
||||
// by its kind (stamps_of: the stamps are read before the descriptor is resolved, so that one moved by the resolution itself, or by
|
||||
// another thread meanwhile, makes the next one resolve again):
|
||||
// - a sampled texture (TEX): its handle, view type and depth compare as inputs; the slot's version (the slot registered anew), the
|
||||
// samplers' generation (a sampler registration's contents changed), the destroy generation (a texture destroyed or made again:
|
||||
// a kept view would name freed memory, issue 1126), the dummy generation (a frame left a texture for later: a dummy is looked
|
||||
// up again) and the texture epoch (a view's texture is touched once a submission: texture_view_of does it on its first look);
|
||||
// - a user uniform buffer (UBO, c3 on): its address and size; the recording, the stream's inline uniform updates (ub_generation:
|
||||
// an update into the range is a copy with it in) and the bind stamp (gpu_bind_stamp: a pool gone or imported, a mirror made, the
|
||||
// next submission). Only a pool's or a mirror's range is kept: a copy into the recording's stream (an overlay, an unaligned range,
|
||||
// a range read where it was bound) is made again each time, as it is today;
|
||||
// - a stage's own constants (C1): the recording (they are uploaded once a recording, RecordingRes::c1_at);
|
||||
// - a storage buffer the program only reads (SSBO, a single one, not a table): its address and size; the recording and the bind
|
||||
// stamp. A pool's or a mirror's range only, as for UBO.
|
||||
// The rest is resolved every time as before: the driver's banks (c0, c2: kept by their stages' generations already), storage buffers
|
||||
// the program writes (each binding stamps its pages for the write-back), storage buffer tables, texel buffers and storage images.
|
||||
// A failed resolution (no sampler, no buffer) is never kept: the next draw tries again.
|
||||
#pragma once
|
||||
|
||||
#include <array>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
namespace desc_keep {
|
||||
|
||||
enum Kind : uint8_t { kNone = 0, kTex, kUbo, kC1, kSsbo };
|
||||
|
||||
/// The stamps results stand on, read where a descriptor is about to be resolved (only those of its kind are read: stamps_of)
|
||||
struct Stamps {
|
||||
uint64_t rec = 0; // the recording (vk_draw.cpp desc_rec: moved at each recording's begin)
|
||||
uint64_t bind = 0; // gpu_bind_stamp
|
||||
uint64_t ub = 0; // ub_generation
|
||||
uint64_t samp = 0; // sampler_registrations_generation
|
||||
uint64_t destroy = 0; // texture_destroy_generation
|
||||
uint64_t dummy = 0; // texture_dummy_generation
|
||||
uint64_t epoch = 0; // texture_epoch
|
||||
};
|
||||
|
||||
/// The stamps a result of that kind stands on, in a fixed order (unused ones 0)
|
||||
inline std::array<uint64_t, 4> stamps_of(Kind k, const Stamps& s) {
|
||||
switch (k) {
|
||||
case kTex: return {s.samp, s.destroy, s.dummy, s.epoch};
|
||||
case kUbo: return {s.rec, s.bind, s.ub, 0};
|
||||
case kC1: return {s.rec, 0, 0, 0};
|
||||
case kSsbo: return {s.rec, s.bind, 0, 0};
|
||||
default: return {~0ull, ~0ull, ~0ull, ~0ull};
|
||||
}
|
||||
}
|
||||
|
||||
/// One descriptor's last resolution: what it was resolved from, and its result (a buffer: handle, offset, range; a texture:
|
||||
/// sampler, view as texture_view_of gave it (null: the dummy is drawn), the Texture). flags: a TEX's slot was a registered one
|
||||
struct Elem {
|
||||
uint8_t kind = kNone;
|
||||
uint8_t flags = 0;
|
||||
uint32_t version = 0; // (TEX: the slot's version)
|
||||
uint64_t in[2]{};
|
||||
std::array<uint64_t, 4> at{};
|
||||
uint64_t out[3]{};
|
||||
};
|
||||
|
||||
/// Whether e's result serves a descriptor of kind k with those inputs (version: a TEX's slot version, 0 for the rest), now
|
||||
inline bool take(const Elem& e, Kind k, uint64_t in0, uint64_t in1, uint32_t version, const Stamps& now) {
|
||||
return k != kNone && e.kind == k && e.in[0] == in0 && e.in[1] == in1 && e.version == version && e.at == stamps_of(k, now);
|
||||
}
|
||||
|
||||
/// A descriptor resolved: kept with its inputs and the stamps read before it was resolved (before)
|
||||
inline void keep(Elem& e, Kind k, uint64_t in0, uint64_t in1, uint32_t version, const Stamps& before, uint64_t out0,
|
||||
uint64_t out1, uint64_t out2, uint8_t flags = 0) {
|
||||
e.kind = k, e.flags = flags, e.version = version;
|
||||
e.in[0] = in0, e.in[1] = in1;
|
||||
e.at = stamps_of(k, before);
|
||||
e.out[0] = out0, e.out[1] = out1, e.out[2] = out2;
|
||||
}
|
||||
|
||||
/// Not kept (a failed resolution, or a result that is not to be taken again)
|
||||
inline void drop(Elem& e) { e.kind = kNone; }
|
||||
|
||||
/// (RX_VK_DESC_KEEP=check) Whether a descriptor resolved again came out as its kept result
|
||||
inline bool same(const Elem& e, uint64_t out0, uint64_t out1, uint64_t out2, uint8_t flags = 0) {
|
||||
return e.out[0] == out0 && e.out[1] == out1 && e.out[2] == out2 && e.flags == flags;
|
||||
}
|
||||
|
||||
/// A recording thread's kept results: the last programs drawn, one a slot by the program's address
|
||||
inline constexpr size_t kSlots = 16;
|
||||
struct Prog {
|
||||
const void* prog = nullptr;
|
||||
std::vector<Elem> e; // (by descriptor, in build_descriptors' order)
|
||||
};
|
||||
inline size_t slot_of(const void* prog) {
|
||||
const uintptr_t p = (uintptr_t)prog;
|
||||
return (size_t)((p >> 6) ^ (p >> 13)) % kSlots;
|
||||
}
|
||||
/// prog's kept results, n descriptors: emptied when its slot held another program's, or another count of them
|
||||
inline Prog& prog_of(std::array<Prog, kSlots>& t, const void* prog, size_t n) {
|
||||
Prog& p = t[slot_of(prog)];
|
||||
if (p.prog != prog || p.e.size() != n) {
|
||||
p.prog = prog;
|
||||
p.e.assign(n, Elem{});
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
} // namespace desc_keep
|
||||
95
gpu/vk/desc_sig.h
Normal file
95
gpu/vk/desc_sig.h
Normal file
@@ -0,0 +1,95 @@
|
||||
// (Triforce) The whole-draw skip by the signature of a draw's descriptor inputs (vk_draw.cpp desc_sig_walk and draw), apart from
|
||||
// Vulkan so that tests/test_desc_sig.py can run it. NX2navi's bind_sig (runtime/vk_exec_draw.c) is the model; its code is not
|
||||
// chrg6's, so this is written anew from what it does, on this renderer's own rules (desc_keep.h).
|
||||
//
|
||||
// A draw keeps the descriptors the draw before it pushed only while nothing at all was bound anew, no inline uniform update came and
|
||||
// no texture slot changed (vk_draw.cpp same_desc): 381 of 2,830 draws a frame in the owner's test18. The others build every
|
||||
// descriptor again, even when what they read is what the draw before them read: a uniform buffer bound for another stage, a texture
|
||||
// bound at a slot the program does not sample. Through the per-binding reuse (desc_keep.h) each of their descriptors then takes the
|
||||
// result it had, and the push finds nothing changed: the build and the compare were the work, 2.0 to 3.3 ms a frame.
|
||||
//
|
||||
// Now such a draw first reads its signature: what each of its descriptors would be resolved from (desc_keep.h's inputs: a texture's
|
||||
// handle and its slot's version, a user uniform buffer's address and size, a read-only storage buffer's address and size words, a
|
||||
// driver bank's stage generation), and the stamps desc_keep.h's rules give each kind it has (stamps_of), read before the inputs.
|
||||
// When it equals the signature of the descriptors at the graphics bind point, which are this program's, the build and the push are
|
||||
// left out: a build would take every one of them from what was kept (each input and stamp is the same) and push nothing.
|
||||
// That holds only where every descriptor of the last build was kept, so the signature stands for
|
||||
// - push programs only (a set's bind point state is not followed), not the mesh fallback, not RenoDX's;
|
||||
// - programs whose every descriptor is of a kind the reuse keeps (shape_of): sampled textures, user uniform buffers (c3 to c18),
|
||||
// a stage's constants (c1), single read-only storage buffers, and the driver's banks (c0, c2), which their own cache keeps by
|
||||
// the stage's generations. Not storage buffers a program writes (each build stamps their pages for the write-back), tables,
|
||||
// texel buffers or storage images;
|
||||
// - builds that dropped nothing (armed): a failed resolution, a copy in the recording's stream (an inline update's overlay, an
|
||||
// unaligned range) or an unbound buffer make the next draw build again.
|
||||
// The textures a hit samples that the GPU wrote (pass hazards: gfx_sampled) are read again from the last build's textures, as a
|
||||
// build would. A signature is the bind point's only once that draw's descriptors were bound: a draw left out between its build and
|
||||
// its bind leaves the last one in place.
|
||||
// RX_VK_DESC_SIG=0: every such draw builds, as before. =check: a hit builds too, and one whose descriptors or sampled textures come
|
||||
// out otherwise than what is pushed is counted and logged ("vk: descriptor signature check").
|
||||
#pragma once
|
||||
|
||||
#include <array>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
#include "desc_keep.h"
|
||||
|
||||
namespace desc_sig {
|
||||
|
||||
/// The kinds of descriptor a program has, one bit each by desc_keep::Kind (bit kTex, kUbo, kC1, kSsbo); kBank its driver banks
|
||||
enum : uint8_t { kBank = 1u << 7 };
|
||||
constexpr uint8_t bit(desc_keep::Kind k) { return (uint8_t)(1u << k); }
|
||||
|
||||
/// What a program's descriptors are, from its stages' lists (made once a program: they do not change once it is translated)
|
||||
struct Shape {
|
||||
const void* prog = nullptr;
|
||||
bool ok = false; // (every descriptor of a kind the signature stands for)
|
||||
uint8_t kinds = 0;
|
||||
};
|
||||
inline constexpr size_t kShapes = 64;
|
||||
inline size_t shape_slot(const void* prog) {
|
||||
const uintptr_t p = (uintptr_t)prog;
|
||||
return (size_t)((p >> 6) ^ (p >> 14)) % kShapes;
|
||||
}
|
||||
|
||||
/// The signature's head: the program, the recording (c1 and the banks live in its streams), and the stamps of each kind it has, in
|
||||
/// desc_keep.h's order (the same stamps a kept result of that kind stands on)
|
||||
inline void put_head(std::vector<uint64_t>& out, const void* prog, uint8_t kinds, const desc_keep::Stamps& now) {
|
||||
out.push_back((uint64_t)(uintptr_t)prog);
|
||||
out.push_back(now.rec);
|
||||
out.push_back(kinds);
|
||||
for (desc_keep::Kind k : {desc_keep::kTex, desc_keep::kUbo, desc_keep::kC1, desc_keep::kSsbo})
|
||||
if (kinds & bit(k))
|
||||
for (uint64_t v : desc_keep::stamps_of(k, now)) out.push_back(v);
|
||||
}
|
||||
|
||||
/// A signature, and what its build left besides the descriptors: the textures it sampled through a view (draw_sampled keeps those
|
||||
/// the GPU wrote) and the dummy counts it added (the frame statistics')
|
||||
struct Sig {
|
||||
const void* prog = nullptr;
|
||||
bool armed = false; // (every descriptor of that build was kept: a draw with the same signature may take them all)
|
||||
std::vector<uint64_t> w;
|
||||
std::vector<const void*> tex;
|
||||
int64_t dummies = 0, dummies_known = 0;
|
||||
};
|
||||
|
||||
/// Whether a draw of prog whose signature is now may keep the descriptors bound, which bound's draw built
|
||||
inline bool hit(const Sig& bound, const Sig& now, const void* prog) {
|
||||
return bound.armed && bound.prog == prog && now.prog == prog && !now.w.empty() && bound.w == now.w;
|
||||
}
|
||||
/// now's draw built its descriptors and they were bound: its signature is the bind point's (armed: none of them dropped)
|
||||
inline void commit(Sig& bound, Sig& now, bool armed) {
|
||||
std::swap(bound.w, now.w);
|
||||
std::swap(bound.tex, now.tex);
|
||||
bound.prog = now.prog, bound.armed = armed;
|
||||
bound.dummies = now.dummies, bound.dummies_known = now.dummies_known;
|
||||
now.prog = nullptr, now.w.clear();
|
||||
}
|
||||
/// Descriptors bound that no signature stands for (a program the skip does not take, a build that dropped one)
|
||||
inline void forget(Sig& bound) {
|
||||
bound.prog = nullptr, bound.armed = false;
|
||||
bound.w.clear();
|
||||
}
|
||||
|
||||
} // namespace desc_sig
|
||||
@@ -1,5 +1,6 @@
|
||||
// (hookshot) NVIDIA DLSS's actor motion (vk_dlss.cpp): what is worked out on the CPU for a skinned draw drawn again, kept
|
||||
// apart so tests/test_dlss_actor.cpp checks it without a GPU. Header only, no Vulkan.
|
||||
// (hookshot) The temporal upscaler's own motion (vk_temporal.cpp): what is worked out on the CPU for a draw drawn again, from
|
||||
// its bones (actor_motion) or from the positions its vertex stage stored (capture_motion), kept apart so
|
||||
// tests/test_dlss_actor.cpp checks it without a GPU. Header only, no Vulkan.
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
@@ -36,21 +37,119 @@ struct Push {
|
||||
uint32_t pos, sets; // (bytes in a vertex: the position; the joint and weight sets, 1 or 2)
|
||||
uint32_t joints[2], weights[2];
|
||||
uint32_t formats; // (kHalfPosition, kByteJoints << set)
|
||||
uint32_t tolerance; // (depth steps from the scene's within which a pixel is the draw's)
|
||||
uint32_t tolerance; // (unused: dlss_actor.frag reads the cameras' buffer's word 66)
|
||||
};
|
||||
static_assert(sizeof(Push) == 6 * 8 + 14 * 4 && sizeof(Push) <= 128, "dlss_actor.vert's push constants");
|
||||
|
||||
/// A draw's pose in a pose buffer: its origin (12 bytes, at 0), the view it was drawn with (3 x 4 row major, at 16), its
|
||||
/// projection (4 x 4, at 64), then its bones (at kPoseHead); Push::origins and bones point there
|
||||
constexpr uint32_t kPoseHead = 128;
|
||||
|
||||
/// Push::itype of a draw without indices (a plain vertex array): its vertex i is base_vertex + i
|
||||
constexpr int kNoIndices = 3;
|
||||
|
||||
/// Where a draw's indices are for the shader: the address 4-aligned down, and its first index from there
|
||||
inline void index_start(uint64_t address, int itype, uint64_t* aligned, uint32_t* first) {
|
||||
*aligned = address & ~3ull;
|
||||
*first = (uint32_t)((address & 3) >> (itype < 0 ? 0 : itype > 2 ? 2 : itype));
|
||||
}
|
||||
|
||||
/// Push::formats: the position is RGBA16F (else RGB32F); a set's joints are RGBA8UI (else RGBA16UI)
|
||||
constexpr uint32_t kHalfPosition = 1, kByteJoints = 2;
|
||||
/// Push::formats: the position is RGBA16F (else RGB32F); a set's joints are 8-bit (else 16-bit); how many joints and weights
|
||||
/// a set has (kCountShift + 2 * set: 0 four, 1 one, 2 two: RGBA, R or RG formats); kRigid: no weights, set 0's one joint has
|
||||
/// all of the vertex (a part that moves with one bone). Joints and weights are read byte by byte, at any offset
|
||||
constexpr uint32_t kHalfPosition = 1, kByteJoints = 2, kCountShift = 4, kRigid = 1u << 8;
|
||||
/// The count code of a set of n joints and weights (1, 2 or 4), for Push::formats; 3 (none) for any other n
|
||||
inline uint32_t count_code(int n) { return n == 4 ? 0u : n == 1 ? 1u : n == 2 ? 2u : 3u; }
|
||||
/// How many joints and weights a set has, from Push::formats
|
||||
inline int set_count(uint32_t formats, int set) {
|
||||
const uint32_t c = (formats >> (kCountShift + 2 * set)) & 3u;
|
||||
return c == 0 ? 4 : c == 1 ? 1 : c == 2 ? 2 : 0;
|
||||
}
|
||||
|
||||
/// The cameras' buffer, 36 words: this frame's camera (as drawn, jittered), the frame before's (its jitter taken off), this
|
||||
/// frame's jitter in clip space, the render size
|
||||
constexpr uint32_t kHeadWords = 36;
|
||||
/// The cameras' buffer: this frame's camera (as drawn, jittered), the frame before's (its jitter taken off), this frame's
|
||||
/// jitter in clip space, the render size (words 0 to 35); then this frame's view (3 x 4, row major) and projection (4 x 4),
|
||||
/// apart, as the game's vertex shaders apply them (36 to 63); then its near and far planes (0: not a plain perspective
|
||||
/// projection), for the fragment stage's test in distance (64, 65); the tolerance of that test in thousandths of the
|
||||
/// distance, kMarkBit for RX_VK_DLSS_DEBUG=actors and kOwnBit with it for =characters (66); the frame before's jitter in clip space (68, 69), which
|
||||
/// dlss_capture.vert takes off the positions stored then; this frame's clip space to the frame before's (72 to 87, as
|
||||
/// shaders/dlss_prep.comp's reproject: the camera's motion), which the fragment stage's mark compares the draw's own with
|
||||
constexpr uint32_t kHeadWords = 88;
|
||||
constexpr uint32_t kToleranceWord = 66, kJitterBeforeWord = 68, kReprojectWord = 72, kMarkBit = 0x80000000u;
|
||||
/// (with kMarkBit: the mark is not a motion but kOwnMark in x, which no motion is, and in y how far the draw's own motion
|
||||
/// is from the camera's, in render pixels: shaders/dlss_prep.comp's flag 8 shows those pixels blue on grey)
|
||||
constexpr uint32_t kOwnBit = 0x40000000u;
|
||||
constexpr float kOwnMark = -30000.0f;
|
||||
|
||||
/// shaders/dlss_capture.vert's push constants: a draw's slots this frame and the frame before (the address of the first, the
|
||||
/// vertex index it is, how many)
|
||||
struct CapturePush {
|
||||
uint64_t now;
|
||||
uint64_t before;
|
||||
uint32_t first_now;
|
||||
uint32_t first_before;
|
||||
uint32_t count_now;
|
||||
uint32_t count_before;
|
||||
float jitter_now[2]; // (the jitter of the camera the draw was drawn with, in clip space: this frame's, the frame before's)
|
||||
float jitter_before[2];
|
||||
};
|
||||
static_assert(sizeof(CapturePush) == 48, "dlss_capture.vert's push constants");
|
||||
|
||||
/// The jitter of the camera a draw was drawn with, from its projection (4 x 4 row major, the vertex stage's uniform buffer 3
|
||||
/// at 0x70): the offset in its third column, as the scene's (vk_temporal.cpp temporal_note_scene_draw). False when it is not
|
||||
/// a perspective projection (its w row not 0, 0, -1, 0) or the offset is not a sub-pixel one: the scene's is used then
|
||||
inline bool camera_jitter(const float proj[16], float out[2]) {
|
||||
if (proj[12] != 0.0f || proj[13] != 0.0f || proj[14] != -1.0f || proj[15] != 0.0f) return false;
|
||||
const float x = -proj[2], y = -proj[6];
|
||||
if (!(x > -0.05f && x < 0.05f && y > -0.05f && y < 0.05f)) return false;
|
||||
out[0] = x, out[1] = y;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// The vertices an indexed draw's count indices name (itype 0, 1, 2: 8, 16, 32 bits): the least and the greatest. With
|
||||
/// restart, the restart index (all ones) is none. False when there is none
|
||||
inline bool index_range(const void* indices, int count, int itype, bool restart, uint32_t* lo, uint32_t* hi) {
|
||||
if (count <= 0 || itype < 0 || itype > 2) return false;
|
||||
const uint32_t size = 1u << itype;
|
||||
const uint32_t cut = itype == 0 ? 0xffu : itype == 1 ? 0xffffu : 0xffffffffu;
|
||||
uint32_t a = UINT32_MAX, b = 0;
|
||||
bool any = false;
|
||||
for (int i = 0; i < count; i++) {
|
||||
uint32_t v = 0;
|
||||
std::memcpy(&v, (const uint8_t*)indices + (size_t)i * size, size);
|
||||
if (restart && v == cut) continue;
|
||||
a = std::min(a, v), b = std::max(b, v), any = true;
|
||||
}
|
||||
if (any) *lo = a, *hi = b;
|
||||
return any;
|
||||
}
|
||||
|
||||
/// A draw's slots for its stored positions: the vertex index of the first (as the vertex stage sees it, the base vertex in it)
|
||||
/// and how many, at most max. Indexed (itype 0 to 2): base_vertex + lo to base_vertex + hi; without indices (kNoIndices):
|
||||
/// base_vertex (the draw's first) and count on. False when there are none, or more than max
|
||||
inline bool capture_span(int itype, int count, int base_vertex, uint32_t lo, uint32_t hi, uint32_t max, uint32_t* first,
|
||||
uint32_t* n) {
|
||||
if (count <= 0) return false;
|
||||
uint64_t many;
|
||||
if (itype == kNoIndices) *first = (uint32_t)base_vertex, many = (uint64_t)count;
|
||||
else if (itype >= 0 && itype <= 2 && lo <= hi) *first = (uint32_t)base_vertex + lo, many = (uint64_t)hi - lo + 1;
|
||||
else return false;
|
||||
if (many > max) return false;
|
||||
*n = (uint32_t)many;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// The slot of a vertex (its VertexIndex) in a span, as the vertex stages take it (unsigned, wrapping): false when outside
|
||||
inline bool capture_slot(int32_t vertex_index, uint32_t first, uint32_t n, uint32_t* slot) {
|
||||
const uint32_t s = (uint32_t)vertex_index - first;
|
||||
if (s >= n) return false;
|
||||
*slot = s;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// A clip position stored the frame before, its jitter taken off (dlss_capture.vert; dlss_math::unjitter on a camera)
|
||||
inline void unjitter_position(float p[4], const float jitter[2]) {
|
||||
p[0] -= jitter[0] * p[3];
|
||||
p[1] -= jitter[1] * p[3];
|
||||
}
|
||||
|
||||
} // namespace dlss_actor
|
||||
|
||||
74
gpu/vk/dlssg_pace.h
Normal file
74
gpu/vk/dlssg_pace.h
Normal file
@@ -0,0 +1,74 @@
|
||||
// (Triforce) Who holds the frame limit while NVIDIA DLSS frame generation runs: Reflex's sleep, where the game's frame
|
||||
// starts, or the game's own wait (host/nn_vi.c hos_vi_native_acquire). After NX2navi's runtime/dlssg_pace.h, whose rule
|
||||
// this is. A function of what the game's presenting thread sees and nothing else, so tests/test_dlssg_pace.py drives
|
||||
// it without a GPU (plain C: the test compiles it as C and as C++).
|
||||
//
|
||||
// The period counts the frames the game draws (the Game frame rate cap's, the host's own). Reflex holds it only while
|
||||
// every one of these is so, and the game's own wait holds the whole period otherwise: the caller allows it (the
|
||||
// Reflex frame limit row on, frames being generated now, a Streamline whose Reflex sleeps here and refused no limit);
|
||||
// there is a period (the caller passes 0 while no frame is generated: a menu, a load, a movie); a present went out,
|
||||
// and within DLSSG_HOLD_IDLE_NS (a minimized window gives the driver no present to time a frame by: Reflex's sleep is
|
||||
// left out then, vk_dlssg.cpp frame_start); the limit Reflex should hold is the one Streamline last took; and the
|
||||
// frames have not shown that Reflex does not hold it (for the rest of the run then).
|
||||
//
|
||||
// The frames are checked over windows of DLSSG_PACE_WINDOW presents Reflex held to one period and one multiplier.
|
||||
// Over half of them sooner than three quarters of the period: nothing holds the game, and the game's own wait takes
|
||||
// the limit for the run. Over half of them about the multiplier times the period apart (within half a period): the
|
||||
// driver counted the frames on screen, the generated ones too, so Reflex is given the period over the multiplier from
|
||||
// then on; the same again (a GPU that only managed that rate) gives the limit to the game's own wait for the run. A
|
||||
// frame a load or a hitch held counts as neither.
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
|
||||
#define DLSSG_HOLD_IDLE_NS 200000000ull // no present for this long: Reflex's sleep is left out
|
||||
#define DLSSG_PACE_WINDOW 60 // presents over which Reflex's hold of the limit is checked
|
||||
|
||||
enum { DLSSG_PACE_SAME, DLSSG_PACE_FAST, DLSSG_PACE_SHOWN, DLSSG_PACE_SLOW }; // what the last window found
|
||||
|
||||
typedef struct {
|
||||
uint64_t last_ns; // the newest frame start Reflex held, 0 when the game's own wait held it
|
||||
uint64_t last_period; // its period
|
||||
int last_mult; // and its multiplier
|
||||
int window, fast, slow; // frames counted in the window, those too soon, those about the multiplier periods apart
|
||||
int shown; // Reflex counts the frames on screen: it is given the period over the multiplier
|
||||
int bad; // Reflex did not hold the limit: the game's own wait holds it for the rest of the run
|
||||
} DlssgPace;
|
||||
|
||||
// now: the clock where the game's frame starts. period_ns: the period of the cap in effect (0: no frame is generated
|
||||
// now, or no limit). mult: frames on screen per drawn frame now. hosted_ns: the clock after the newest present, 0
|
||||
// before the first. allowed: Reflex may hold the limit. applied_us: the limit Streamline last took. *want_us: the
|
||||
// limit Reflex should hold, 0 none. *found: what a window that ended here found (DLSSG_PACE_*). Returns 1 when Reflex
|
||||
// holds this frame's limit: the game's own wait steps aside, and only then.
|
||||
static inline int dlssg_pace_step(DlssgPace *p, uint64_t now, uint64_t period_ns, int mult, uint64_t hosted_ns,
|
||||
int allowed, uint32_t applied_us, uint32_t *want_us, int *found) {
|
||||
*found = DLSSG_PACE_SAME;
|
||||
if (mult < 1) mult = 1;
|
||||
if (!p->bad && p->last_ns && now >= p->last_ns && p->last_period == period_ns && p->last_mult == mult) {
|
||||
uint64_t d = now - p->last_ns, m = (uint64_t)mult;
|
||||
if (d < period_ns / 4 * 3) p->fast++;
|
||||
else if (m > 1 && d * 2 > period_ns * (2 * m - 1) && d * 2 < period_ns * (2 * m + 1)) p->slow++;
|
||||
if (++p->window >= DLSSG_PACE_WINDOW) {
|
||||
if (p->fast > DLSSG_PACE_WINDOW / 2) p->bad = 1, *found = DLSSG_PACE_FAST;
|
||||
else if (p->slow > DLSSG_PACE_WINDOW / 2 && p->shown) p->bad = 1, *found = DLSSG_PACE_SLOW;
|
||||
else if (p->slow > DLSSG_PACE_WINDOW / 2) p->shown = 1, *found = DLSSG_PACE_SHOWN;
|
||||
p->window = p->fast = p->slow = 0;
|
||||
}
|
||||
} else {
|
||||
p->window = p->fast = p->slow = 0; // a window counts only frames Reflex held to one period and multiplier
|
||||
}
|
||||
uint64_t us = 0;
|
||||
// a present stamped after now went out while this thread read the clock: as recent as one can be
|
||||
int live = hosted_ns && (hosted_ns >= now || now - hosted_ns < DLSSG_HOLD_IDLE_NS);
|
||||
if (allowed && period_ns && !p->bad && live) {
|
||||
uint64_t per = p->shown ? period_ns / (uint64_t)mult : period_ns;
|
||||
us = (per + 500) / 1000;
|
||||
if (!us) us = 1;
|
||||
if (us > 0x7fffffffu) us = 0; // no limit Reflex could be given: the game's own wait keeps it
|
||||
}
|
||||
*want_us = (uint32_t)us;
|
||||
int held = us && applied_us == (uint32_t)us;
|
||||
p->last_ns = held ? now : 0;
|
||||
p->last_period = held ? period_ns : 0;
|
||||
p->last_mult = mult;
|
||||
return held;
|
||||
}
|
||||
@@ -117,6 +117,15 @@ void EmitInst(EmitContext& ctx, IR::Inst* inst) {
|
||||
EmitInstOf(ctx, inst);
|
||||
} catch (const NotImplementedException& e) {
|
||||
throw NotImplementedException("{} ({})", e.what(), IR::NameOf(inst->GetOpcode()));
|
||||
} catch (const std::runtime_error& e) { // (super build: sirit's null Id, named by the IR op that asked for it)
|
||||
std::string args;
|
||||
for (size_t i = 0; i < inst->NumArgs(); ++i) {
|
||||
const IR::Value a{inst->Arg(i)};
|
||||
args += a.IsImmediate() ? " imm" : a.IsEmpty() ? " empty" : a.IsIdentity() ? " identity"
|
||||
: (" " + std::string(IR::NameOf(a.InstRecursive()->GetOpcode())) +
|
||||
(a.InstRecursive()->Definition<Id>().value == 0 ? "(undefined)" : ""));
|
||||
}
|
||||
throw LogicError("{} ({}; args:{})", e.what(), IR::NameOf(inst->GetOpcode()), args);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -45,6 +45,13 @@ constexpr u32 MESH_FALLBACK_PAYLOAD_PUSH_OFFSET = MESH_FALLBACK_PUSH_OFFSET;
|
||||
constexpr u32 MESH_FALLBACK_RECORDS_PUSH_OFFSET = MESH_FALLBACK_PUSH_OFFSET + 8;
|
||||
constexpr u32 MESH_FALLBACK_INDIRECT_INPUT_PUSH_OFFSET = MESH_FALLBACK_PUSH_OFFSET + 16;
|
||||
constexpr u32 MESH_FALLBACK_PUSH_END = MESH_FALLBACK_PUSH_OFFSET + 24;
|
||||
// (hookshot) a scene vertex stage's position capture (RuntimeInfo::capture_position), after them: the u64 address its slots
|
||||
// start at (0: none), the vertex index of slot 0 (a u32, the slot taken from VertexIndex wrapping) and the slots there are
|
||||
// (u32). A vertex stores its position (vec4, 16 bytes) at address + (VertexIndex - first) * 16 when that is below the count
|
||||
constexpr u32 CAPTURE_PUSH_OFFSET = MESH_FALLBACK_PUSH_END;
|
||||
constexpr u32 CAPTURE_FIRST_PUSH_OFFSET = CAPTURE_PUSH_OFFSET + 8;
|
||||
constexpr u32 CAPTURE_COUNT_PUSH_OFFSET = CAPTURE_PUSH_OFFSET + 12;
|
||||
constexpr u32 CAPTURE_PUSH_END = CAPTURE_PUSH_OFFSET + 16;
|
||||
// (hookshot) the fallback's mesh workgroups a draw can run: each a slot, a word of the payload buffer saying whether its task
|
||||
// started it; then each task workgroup's payload. It was 1024, a record block each, and Ocarina's floor grass (433 tasks of
|
||||
// 32 slots) lost 13 of 14 meshlets. At 16384, Hyrule Field's far trees (3cb76827/4f0c0b40: 721 tasks of 32) lost the tasks
|
||||
|
||||
@@ -323,7 +323,16 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, Id vertex) {
|
||||
}
|
||||
const Id pointer{
|
||||
AttrPointer(ctx, generic.pointer_type, vertex, generic.id, ctx.Const(element))};
|
||||
const Id value{ctx.OpLoad(generic.component_type, pointer)};
|
||||
Id value{ctx.OpLoad(generic.component_type, pointer)};
|
||||
if (ctx.stage == Stage::Fragment && ctx.noperspective_as_smooth_inputs[index]) {
|
||||
// Written times Position.w and interpolated perspective-correct: undo with 1/w.
|
||||
// Only float inputs are marked, and DefineInputs forces FragCoord for them.
|
||||
ASSERT(generic.load_op == InputGenericLoadOp::None && ValidId(ctx.input_position));
|
||||
const Id frag_w{ctx.OpLoad(
|
||||
ctx.F32[1],
|
||||
ctx.OpAccessChain(ctx.input_f32, ctx.input_position, ctx.Const(3u)))};
|
||||
value = ctx.OpFMul(ctx.F32[1], value, frag_w);
|
||||
}
|
||||
return [&ctx, generic, value]() {
|
||||
switch (generic.load_op) {
|
||||
case InputGenericLoadOp::Bitcast:
|
||||
@@ -431,13 +440,6 @@ void EmitSetAttribute(EmitContext& ctx, IR::Attribute attr, Id value, [[maybe_un
|
||||
value = ctx.OpBitcast(output->type, value);
|
||||
}
|
||||
|
||||
static constexpr IR::Attribute cd0 = IR::Attribute::ClipDistance0;
|
||||
static constexpr IR::Attribute cd7 = IR::Attribute::ClipDistance7;
|
||||
|
||||
if (attr >= cd0 && attr <= cd7) {
|
||||
const u32 idx = (u32) attr - (u32) cd0;
|
||||
clip_distance_written.set(idx);
|
||||
}
|
||||
ctx.OpStore(output->pointer, value);
|
||||
}
|
||||
|
||||
@@ -502,7 +504,7 @@ void EmitSetFragColor(EmitContext& ctx, u32 index, u32 component, Id value) {
|
||||
const Id pointer{ctx.OpAccessChain(ctx.output_f32, ctx.frag_color.at(index), component_id)};
|
||||
if (frag_nan_guard) { // (amd-fix, mma_layout.h) NaN -> 0, the rest clamped to +-1e30
|
||||
const Id clamped{ctx.OpNMin(ctx.F32[1], ctx.OpNMax(ctx.F32[1], value, ctx.Const(-1e30f)), ctx.Const(1e30f))};
|
||||
value = ctx.OpSelect(ctx.F32[1], ctx.OpIsNan(ctx.U1, value), ctx.Const(0.0f), clamped);
|
||||
value = ctx.OpSelect(ctx.F32[1], IsNan(ctx, value, 32), ctx.Const(0.0f), clamped);
|
||||
}
|
||||
ctx.OpStore(pointer, value);
|
||||
} else if (type == AttributeType::UnsignedInt) {
|
||||
|
||||
@@ -155,7 +155,7 @@ Id EmitConvertF16F32(EmitContext& ctx, Id value) {
|
||||
return ctx.OpFConvert(ctx.F16[1], value);
|
||||
#else
|
||||
const auto result = ctx.OpFConvert(ctx.F16[1], value);
|
||||
const auto isOverflowing = ctx.OpIsNan(ctx.U1, result);
|
||||
const auto isOverflowing = IsNan(ctx, result, 16); // (hookshot: mma_layout.h nan_bits)
|
||||
return ctx.OpSelect(ctx.F16[1], isOverflowing, ctx.Constant(ctx.F16[1], 0), result);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "shader_recompiler/backend/spirv/emit_spirv_instructions.h"
|
||||
#include "shader_recompiler/backend/spirv/mma_layout.h"
|
||||
#include "shader_recompiler/backend/spirv/spirv_emit_context.h"
|
||||
#include "shader_recompiler/frontend/ir/modifiers.h"
|
||||
|
||||
@@ -381,16 +382,40 @@ Id EmitFPUnordGreaterThanEqual64(EmitContext& ctx, Id lhs, Id rhs) {
|
||||
return FPUnordCompare(&EmitContext::OpFUnordGreaterThanEqual, ctx, lhs, rhs);
|
||||
}
|
||||
|
||||
// (hookshot) isnan of a scalar float of that many bits. With nan_bits (mma_layout.h: AMD's older Windows shader compiler) it is
|
||||
// a test of the value's bits, a NaN being an exponent of all ones and a mantissa that is not 0, which no float-mode setting of the
|
||||
// compiler can fold away; else OpIsNan, as before
|
||||
Id IsNan(EmitContext& ctx, Id value, u32 bits) {
|
||||
if (!nan_bits) {
|
||||
return ctx.OpIsNan(ctx.U1, value);
|
||||
}
|
||||
if (bits == 64) {
|
||||
const Id words{ctx.OpBitcast(ctx.U32[2], value)};
|
||||
const Id high{ctx.OpBitwiseAnd(ctx.U32[1], ctx.OpCompositeExtract(ctx.U32[1], words, 1U),
|
||||
ctx.Const(0x7fffffffu))};
|
||||
const Id low{ctx.OpCompositeExtract(ctx.U32[1], words, 0U)};
|
||||
const Id infinity{ctx.Const(0x7ff00000u)};
|
||||
return ctx.OpLogicalOr(ctx.U1, ctx.OpUGreaterThan(ctx.U1, high, infinity),
|
||||
ctx.OpLogicalAnd(ctx.U1, ctx.OpIEqual(ctx.U1, high, infinity),
|
||||
ctx.OpINotEqual(ctx.U1, low, ctx.u32_zero_value)));
|
||||
}
|
||||
if (bits == 16) {
|
||||
value = ctx.OpFConvert(ctx.F32[1], value); // (exact: a NaN stays a NaN, and nothing else becomes one)
|
||||
}
|
||||
const Id magnitude{ctx.OpBitwiseAnd(ctx.U32[1], ctx.OpBitcast(ctx.U32[1], value), ctx.Const(0x7fffffffu))};
|
||||
return ctx.OpUGreaterThan(ctx.U1, magnitude, ctx.Const(0x7f800000u));
|
||||
}
|
||||
|
||||
Id EmitFPIsNan16(EmitContext& ctx, Id value) {
|
||||
return ctx.OpIsNan(ctx.U1, value);
|
||||
return IsNan(ctx, value, 16);
|
||||
}
|
||||
|
||||
Id EmitFPIsNan32(EmitContext& ctx, Id value) {
|
||||
return ctx.OpIsNan(ctx.U1, value);
|
||||
return IsNan(ctx, value, 32);
|
||||
}
|
||||
|
||||
Id EmitFPIsNan64(EmitContext& ctx, Id value) {
|
||||
return ctx.OpIsNan(ctx.U1, value);
|
||||
return IsNan(ctx, value, 64);
|
||||
}
|
||||
|
||||
} // namespace Shader::Backend::SPIRV
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "common/settings.h"
|
||||
#include "shader_recompiler/backend/spirv/emit_spirv.h"
|
||||
#include "shader_recompiler/backend/spirv/emit_spirv_instructions.h"
|
||||
#include "shader_recompiler/backend/spirv/mma_layout.h"
|
||||
#include "shader_recompiler/backend/spirv/spirv_emit_context.h"
|
||||
#include "shader_recompiler/frontend/ir/modifiers.h"
|
||||
|
||||
@@ -445,9 +446,10 @@ Id ImageGatherSubpixelOffset(EmitContext& ctx, const IR::TextureInstInfo& info,
|
||||
case TextureType::Color2DRect:
|
||||
return calculate_coords(2);
|
||||
case TextureType::ColorArray2D:
|
||||
case TextureType::ColorCube:
|
||||
return calculate_coords(3);
|
||||
default:
|
||||
// (hookshot) a cube's coordinates are a direction: no texel to nudge by, and its size query has two components, not
|
||||
// three (the cube case here made invalid SPIR-V: OpImageQuerySizeLod's result of three components on a cube)
|
||||
return coords;
|
||||
}
|
||||
}
|
||||
@@ -488,6 +490,64 @@ void AddOffsetToCoordinates(EmitContext& ctx, const IR::TextureInstInfo& info, I
|
||||
}
|
||||
coords = ctx.OpIAdd(result_type, coords, offset);
|
||||
}
|
||||
// (hookshot, mma_layout.h fetch_bounds) Whether a texel fetch of image at coords (with its level, or its sample, when it has one)
|
||||
// is inside the image, as U1; coords, lod and sample are made ones that are (a coordinate out of range 0, a level or sample past
|
||||
// the last 0), so that the fetch itself never leaves the image, and the caller answers zero for it. NVIDIA's GPUs answer an
|
||||
// out-of-bounds fetch with zero (measured on an RTX 3090 with robustness off: every texture type, past each edge, past the last
|
||||
// level and the last sample; the alpha of a format without one is 1 there, as in range, and 0 here: the translation does not
|
||||
// know the format). Vulkan leaves such a fetch undefined without robustImageAccess, and on AMD the ground fog's depth reads at
|
||||
// points projected off screen took the other branch: a pale box at the screen's edges (found by Ocarina of Lain's author on
|
||||
// an RX 9070). Id{}: a type left as it was: a texel buffer while robustBufferAccess2 is on (on by default: the Robust buffers
|
||||
// row), which answers its out-of-bounds reads with zero already (fetch_bounds_buffers), and the cube types, which no fetch reads
|
||||
Id FetchInBounds(EmitContext& ctx, const IR::TextureInstInfo& info, Id image, Id& coords, Id& lod, Id& sample) {
|
||||
u32 dims{};
|
||||
switch (info.type) {
|
||||
case TextureType::Buffer:
|
||||
if (!fetch_bounds_buffers) {
|
||||
return Id{};
|
||||
}
|
||||
dims = 1;
|
||||
break;
|
||||
case TextureType::Color1D:
|
||||
dims = 1;
|
||||
break;
|
||||
case TextureType::ColorArray1D:
|
||||
case TextureType::Color2D:
|
||||
case TextureType::Color2DRect:
|
||||
dims = 2;
|
||||
break;
|
||||
case TextureType::ColorArray2D:
|
||||
case TextureType::Color3D:
|
||||
dims = 3;
|
||||
break;
|
||||
default:
|
||||
return Id{};
|
||||
}
|
||||
const Id size_type{ctx.U32[dims]};
|
||||
Id level_ok{};
|
||||
Id size{};
|
||||
if (Sirit::ValidId(lod)) {
|
||||
const Id levels{ctx.OpImageQueryLevels(ctx.U32[1], image)};
|
||||
level_ok = ctx.OpULessThan(ctx.U1, lod, levels);
|
||||
lod = ctx.OpSelect(ctx.U32[1], level_ok, lod, ctx.u32_zero_value);
|
||||
size = ctx.OpImageQuerySizeLod(size_type, image, lod);
|
||||
} else {
|
||||
size = ctx.OpImageQuerySize(size_type, image); // (a texel buffer, or a multisampled image)
|
||||
}
|
||||
// (unsigned: a negative coordinate is past the end too)
|
||||
const Id inside{ctx.OpULessThan(dims == 1 ? ctx.U1 : ctx.TypeVector(ctx.U1, dims), coords, size)};
|
||||
coords = ctx.OpSelect(size_type, inside, coords, ctx.ConstantNull(size_type));
|
||||
Id in_bounds{dims == 1 ? inside : ctx.OpAll(ctx.U1, inside)};
|
||||
if (Sirit::ValidId(level_ok)) {
|
||||
in_bounds = ctx.OpLogicalAnd(ctx.U1, in_bounds, level_ok);
|
||||
}
|
||||
if (Sirit::ValidId(sample)) {
|
||||
const Id sample_ok{ctx.OpULessThan(ctx.U1, sample, ctx.OpImageQuerySamples(ctx.U32[1], image))};
|
||||
sample = ctx.OpSelect(ctx.U32[1], sample_ok, sample, ctx.u32_zero_value);
|
||||
in_bounds = ctx.OpLogicalAnd(ctx.U1, in_bounds, sample_ok);
|
||||
}
|
||||
return in_bounds;
|
||||
}
|
||||
} // Anonymous namespace
|
||||
|
||||
Id EmitBindlessImageSampleImplicitLod(EmitContext&) {
|
||||
@@ -724,6 +784,17 @@ Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id c
|
||||
// This image is multisampled, lod must be implicit
|
||||
lod = Id{};
|
||||
}
|
||||
if (fetch_bounds) { // (hookshot: FetchInBounds)
|
||||
const Id image{TextureImage(ctx, info, index)};
|
||||
const Id in_bounds{FetchInBounds(ctx, info, image, coords, lod, ms)};
|
||||
const ImageOperands operands(lod, ms);
|
||||
Id color{Emit(&EmitContext::OpImageSparseFetch, &EmitContext::OpImageFetch, ctx, inst,
|
||||
result_type, image, coords, operands.MaskOptional(), operands.Span())};
|
||||
if (Sirit::ValidId(in_bounds)) {
|
||||
color = ctx.OpSelect(result_type, in_bounds, color, ctx.ConstantNull(result_type));
|
||||
}
|
||||
return is_integer ? ctx.OpBitcast(ctx.F32[4], color) : color;
|
||||
}
|
||||
const ImageOperands operands(lod, ms);
|
||||
const Id color{Emit(&EmitContext::OpImageSparseFetch, &EmitContext::OpImageFetch, ctx, inst,
|
||||
result_type, TextureImage(ctx, info, index), coords,
|
||||
|
||||
@@ -644,4 +644,7 @@ Id EmitDPdyFine(EmitContext& ctx, Id op_a);
|
||||
Id EmitDPdxCoarse(EmitContext& ctx, Id op_a);
|
||||
Id EmitDPdyCoarse(EmitContext& ctx, Id op_a);
|
||||
|
||||
// (hookshot) Helpers the emitters share, not IR instructions
|
||||
Id IsNan(EmitContext& ctx, Id value, u32 bits); // (OpIsNan, or a test of the bits: mma_layout.h nan_bits)
|
||||
|
||||
} // namespace Shader::Backend::SPIRV
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "shader_recompiler/backend/spirv/emit_spirv.h"
|
||||
#include "shader_recompiler/backend/spirv/emit_spirv_instructions.h"
|
||||
#include "shader_recompiler/backend/spirv/spirv_emit_context.h"
|
||||
@@ -20,6 +23,74 @@ void ConvertDepthMode(EmitContext& ctx) {
|
||||
ctx.OpStore(ctx.output_position, vector);
|
||||
}
|
||||
|
||||
/// Output variable and the unscaled value it held before ScaleNoPerspectiveOutputs.
|
||||
using ScaledOutputs = std::vector<std::pair<Id, Id>>;
|
||||
|
||||
/// Write screen-linear generic outputs times Position.w (see RuntimeInfo::noperspective_outputs).
|
||||
/// Returns the unscaled values so a geometry shader can restore them after EmitVertex.
|
||||
ScaledOutputs ScaleNoPerspectiveOutputs(EmitContext& ctx) {
|
||||
ScaledOutputs saved;
|
||||
if (ctx.runtime_info.noperspective_outputs.none() || !Sirit::ValidId(ctx.output_position)) {
|
||||
return saved;
|
||||
}
|
||||
const Id position{ctx.OpLoad(ctx.F32[4], ctx.output_position)};
|
||||
const Id w{ctx.OpCompositeExtract(ctx.F32[1], position, 3u)};
|
||||
for (size_t index = 0; index < ctx.output_generics.size(); ++index) {
|
||||
if (!ctx.runtime_info.noperspective_outputs.test(index)) {
|
||||
continue;
|
||||
}
|
||||
Id last{};
|
||||
for (const GenericElementInfo& element : ctx.output_generics[index]) {
|
||||
if (!Sirit::ValidId(element.id) || element.id.value == last.value ||
|
||||
element.num_components == 0) {
|
||||
continue;
|
||||
}
|
||||
last = element.id;
|
||||
const Id type{ctx.F32[element.num_components]};
|
||||
const Id value{ctx.OpLoad(type, element.id)};
|
||||
const Id scaled{element.num_components == 1 ? ctx.OpFMul(type, value, w)
|
||||
: ctx.OpVectorTimesScalar(type, value, w)};
|
||||
ctx.OpStore(element.id, scaled);
|
||||
saved.emplace_back(element.id, value);
|
||||
}
|
||||
}
|
||||
return saved;
|
||||
}
|
||||
|
||||
/// A geometry shader keeps its outputs between EmitVertex calls: restore the unscaled values.
|
||||
void RestoreNoPerspectiveOutputs(EmitContext& ctx, const ScaledOutputs& saved) {
|
||||
for (const auto& [id, value] : saved) {
|
||||
ctx.OpStore(id, value);
|
||||
}
|
||||
}
|
||||
|
||||
/// (hookshot) RuntimeInfo::capture_position: the position as the stage leaves it, stored at the pushed address's slot for
|
||||
/// this vertex (CAPTURE_PUSH_OFFSET), when the address is not 0 and the slot below the pushed count. What is drawn is not
|
||||
/// changed: the store is the stage's last act, and reads only what it wrote
|
||||
void CapturePosition(EmitContext& ctx) {
|
||||
const auto push = [&](Id type, u32 member) {
|
||||
const Id pointer{ctx.TypePointer(spv::StorageClass::PushConstant, type)};
|
||||
return ctx.OpLoad(type, ctx.OpAccessChain(pointer, ctx.rescaling_push_constants, ctx.Const(member)));
|
||||
};
|
||||
const Id address{push(ctx.U64, ctx.capture_address_member_index)};
|
||||
const Id first{push(ctx.U32[1], ctx.capture_first_member_index)};
|
||||
const Id count{push(ctx.U32[1], ctx.capture_count_member_index)};
|
||||
const Id slot{ctx.OpISub(ctx.U32[1], ctx.OpLoad(ctx.U32[1], ctx.capture_vertex_index), first)};
|
||||
const Id zero{ctx.Constant(ctx.U64, u64{0})};
|
||||
const Id wanted{ctx.OpLogicalAnd(ctx.U1, ctx.OpINotEqual(ctx.U1, address, zero), ctx.OpULessThan(ctx.U1, slot, count))};
|
||||
const Id store_label{ctx.OpLabel()};
|
||||
const Id end_label{ctx.OpLabel()};
|
||||
ctx.OpSelectionMerge(end_label, spv::SelectionControlMask::MaskNone);
|
||||
ctx.OpBranchConditional(wanted, store_label, end_label);
|
||||
ctx.AddLabel(store_label);
|
||||
const Id offset{ctx.OpIMul(ctx.U64, ctx.OpUConvert(ctx.U64, slot), ctx.Constant(ctx.U64, u64{16}))};
|
||||
const Id at{ctx.OpIAdd(ctx.U64, address, offset)};
|
||||
const Id position{ctx.OpLoad(ctx.F32[4], ctx.output_position)};
|
||||
ctx.OpStore(ctx.OpConvertUToPtr(ctx.capture_pointer, at), position, spv::MemoryAccessMask::Aligned, 16U);
|
||||
ctx.OpBranch(end_label);
|
||||
ctx.AddLabel(end_label);
|
||||
}
|
||||
|
||||
void SetFixedPipelinePointSize(EmitContext& ctx) {
|
||||
if (ctx.runtime_info.fixed_state_point_size) {
|
||||
const float point_size{*ctx.runtime_info.fixed_state_point_size};
|
||||
@@ -126,11 +197,9 @@ void EmitPrologue(EmitContext& ctx) {
|
||||
|
||||
if (Sirit::ValidId(ctx.clip_distances)) {
|
||||
for (u32 i = 0; i < ctx.profile.max_user_clip_distances; ++i) {
|
||||
if (!clip_distance_written.test(i)) {
|
||||
const Id idx = ctx.Const(i);
|
||||
const Id element = ctx.OpAccessChain(ctx.output_f32, ctx.clip_distances, idx);
|
||||
ctx.OpStore(element, ctx.Const(0.0f));
|
||||
}
|
||||
const Id idx = ctx.Const(i);
|
||||
const Id element = ctx.OpAccessChain(ctx.output_f32, ctx.clip_distances, idx);
|
||||
ctx.OpStore(element, ctx.Const(0.0f));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -151,6 +220,12 @@ void EmitEpilogue(EmitContext& ctx) {
|
||||
!ctx.profile.support_native_ndc) {
|
||||
ConvertDepthMode(ctx);
|
||||
}
|
||||
if (ctx.stage == Stage::VertexB || ctx.stage == Stage::TessellationEval) {
|
||||
ScaleNoPerspectiveOutputs(ctx);
|
||||
}
|
||||
if (ctx.stage == Stage::VertexB && ctx.wants_capture) { // (after the depth's conversion: the position as drawn)
|
||||
CapturePosition(ctx);
|
||||
}
|
||||
if (ctx.stage == Stage::Fragment) {
|
||||
AlphaTest(ctx);
|
||||
}
|
||||
@@ -160,6 +235,7 @@ void EmitEmitVertex(EmitContext& ctx, const IR::Value& stream) {
|
||||
if (ctx.runtime_info.convert_depth_mode && !ctx.profile.support_native_ndc) {
|
||||
ConvertDepthMode(ctx);
|
||||
}
|
||||
const ScaledOutputs scaled{ScaleNoPerspectiveOutputs(ctx)};
|
||||
if (!ctx.profile.support_geometry_streams) {
|
||||
throw NotImplementedException("Geometry streams");
|
||||
} else if (stream.IsImmediate()) {
|
||||
@@ -170,6 +246,7 @@ void EmitEmitVertex(EmitContext& ctx, const IR::Value& stream) {
|
||||
}
|
||||
// Restore fixed pipeline point size after emitting the vertex
|
||||
SetFixedPipelinePointSize(ctx);
|
||||
RestoreNoPerspectiveOutputs(ctx, scaled);
|
||||
}
|
||||
|
||||
void EmitEndPrimitive(EmitContext& ctx, const IR::Value& stream) {
|
||||
|
||||
@@ -25,5 +25,15 @@ inline bool frag_nan_guard = false;
|
||||
// the colour pass is then rejected in spots: holes showing the bright sky, blown up by bloom (the glowing flowers).
|
||||
// On for every card but NVIDIA (vk_coopmat.cpp); RX_VK_NO_INVARIANT=1 off. From NX2navi patch 0007.
|
||||
inline bool position_invariant = false;
|
||||
// (hookshot) An out-of-bounds texel fetch answers zero, as NVIDIA's GPUs answer it (measured on an RTX 3090), rather than
|
||||
// whatever the host's does (EmitImageFetch). Vulkan leaves it undefined without robustImageAccess; on AMD the ground fog's
|
||||
// off-screen depth reads drew a pale box at the screen's edges. Every card but NVIDIA (gpu/vk/vk_vendor.h); RX_VK_FETCH_BOUNDS
|
||||
inline bool fetch_bounds = false;
|
||||
// (hookshot) and texel buffers' fetches too: only when robustBufferAccess2 is off (the Debug tab's Robust buffers Off, RX_VK_ROBUST=0,
|
||||
// or a driver without it), which otherwise answers their out-of-bounds reads with zero already (vk_coopmat.cpp)
|
||||
inline bool fetch_bounds_buffers = false;
|
||||
// (hookshot) isnan tested on the value's bits (IsNan in emit_spirv_floating_point.cpp), not OpIsNan, for AMD's older Windows
|
||||
// shader compiler (RX 5000 and RX 6000: gpu/vk/vk_vendor.h); RX_VK_NAN_BITS=0 or 1
|
||||
inline bool nan_bits = false;
|
||||
|
||||
} // namespace Shader::Backend::SPIRV
|
||||
|
||||
@@ -524,6 +524,12 @@ EmitContext::EmitContext(const Profile& profile_, const RuntimeInfo& runtime_inf
|
||||
if (runtime_info.mesh_fallback || runtime_info.mesh_fallback_vertex) {
|
||||
wants_mesh_fallback = true; // (before any DefineRescalingInputPushConstant, which is made once)
|
||||
}
|
||||
// (hookshot) a scene vertex stage's position capture: its members go in the one push block, so decided before it is made.
|
||||
// Not with the render area's block (a second push block; full-screen passes, never the scene's geometry)
|
||||
if (runtime_info.capture_position && stage == Stage::VertexB && !runtime_info.mesh_fallback_vertex &&
|
||||
profile.unified_descriptor_binding && profile.support_int64 && !program.info.uses_render_area) {
|
||||
wants_capture = true;
|
||||
}
|
||||
DefineCommonTypes(program.info);
|
||||
DefineCommonConstants();
|
||||
DefineInterfaces(program);
|
||||
@@ -576,6 +582,21 @@ EmitContext::EmitContext(const Profile& profile_, const RuntimeInfo& runtime_inf
|
||||
mesh_info = program.mesh;
|
||||
DefineRescalingInputPushConstant();
|
||||
}
|
||||
if (wants_capture) { // (the store itself: EmitEpilogue, emit_spirv_special.cpp)
|
||||
if (!Sirit::ValidId(U64)) {
|
||||
AddCapability(spv::Capability::Int64);
|
||||
U64 = Name(TypeInt(64, false), "u64");
|
||||
}
|
||||
AddCapability(spv::Capability::PhysicalStorageBufferAddresses);
|
||||
AddExtension("SPV_KHR_physical_storage_buffer");
|
||||
SetMemoryModel(spv::AddressingModel::PhysicalStorageBuffer64, spv::MemoryModel::GLSL450);
|
||||
// (Vulkan's VertexIndex, base vertex included: the redraw draws the same indices with the same base)
|
||||
capture_vertex_index = Sirit::ValidId(vertex_index)
|
||||
? vertex_index
|
||||
: DefineInput(*this, U32[1], true, spv::BuiltIn::VertexIndex);
|
||||
capture_pointer = TypePointer(spv::StorageClass::PhysicalStorageBuffer, F32[4]);
|
||||
program.info.captures_position = true;
|
||||
}
|
||||
DefineMesh(program);
|
||||
DefineLocalMemory(program);
|
||||
DefineSharedMemory(program);
|
||||
@@ -592,6 +613,13 @@ EmitContext::EmitContext(const Profile& profile_, const RuntimeInfo& runtime_inf
|
||||
DefineGlobalMemoryFunctions(program.info);
|
||||
DefineRescalingInput(program.info);
|
||||
DefineRenderArea(program.info);
|
||||
// (the capture's push block, when nothing above made it. Not made before them: the block is made once, with the members
|
||||
// wanted by then, and DefineGlobalMemoryFunctions asks for the page table's (wants_guest_pages) only as it runs. Made
|
||||
// earlier, the block had no such member, the stage read the table's address from member 0, and the GPU was lost at the
|
||||
// first frame in play)
|
||||
if (wants_capture) {
|
||||
DefineRescalingInputPushConstant();
|
||||
}
|
||||
}
|
||||
|
||||
EmitContext::~EmitContext() = default;
|
||||
@@ -1603,6 +1631,14 @@ void EmitContext::DefineRescalingInputPushConstant() {
|
||||
mesh_fallback_indirect_input_member_index = member_index++;
|
||||
}
|
||||
}
|
||||
if (wants_capture) {
|
||||
members.push_back(U64);
|
||||
capture_address_member_index = member_index++;
|
||||
members.push_back(U32[1]);
|
||||
capture_first_member_index = member_index++;
|
||||
members.push_back(U32[1]);
|
||||
capture_count_member_index = member_index++;
|
||||
}
|
||||
const Id push_constant_struct{TypeStruct(std::span(members.data(), members.size()))};
|
||||
Decorate(push_constant_struct, spv::Decoration::Block);
|
||||
Name(push_constant_struct, "ResolutionInfo");
|
||||
@@ -1641,6 +1677,14 @@ void EmitContext::DefineRescalingInputPushConstant() {
|
||||
MESH_FALLBACK_INDIRECT_INPUT_PUSH_OFFSET);
|
||||
}
|
||||
}
|
||||
if (wants_capture) {
|
||||
MemberDecorate(push_constant_struct, capture_address_member_index, spv::Decoration::Offset, CAPTURE_PUSH_OFFSET);
|
||||
MemberDecorate(push_constant_struct, capture_first_member_index, spv::Decoration::Offset, CAPTURE_FIRST_PUSH_OFFSET);
|
||||
MemberDecorate(push_constant_struct, capture_count_member_index, spv::Decoration::Offset, CAPTURE_COUNT_PUSH_OFFSET);
|
||||
MemberName(push_constant_struct, capture_address_member_index, "capture_address");
|
||||
MemberName(push_constant_struct, capture_first_member_index, "capture_first");
|
||||
MemberName(push_constant_struct, capture_count_member_index, "capture_count");
|
||||
}
|
||||
const Id pointer_type{TypePointer(spv::StorageClass::PushConstant, push_constant_struct)};
|
||||
rescaling_push_constants = AddGlobalVariable(pointer_type, spv::StorageClass::PushConstant);
|
||||
Name(rescaling_push_constants, "rescaling_push_constants");
|
||||
@@ -2017,6 +2061,12 @@ void EmitContext::DefineImages(const Info& info, u32& binding, u32& scaling_inde
|
||||
void EmitContext::DefineInputs(const IR::Program& program) {
|
||||
const Info& info{program.info};
|
||||
const VaryingState loads{info.loads.mask | info.passthrough.mask};
|
||||
const bool noperspective_as_smooth{
|
||||
stage == Stage::Fragment && runtime_info.scaled_noperspective_inputs &&
|
||||
std::ranges::any_of(info.interpolation,
|
||||
[](Interpolation mode) {
|
||||
return mode == Interpolation::NoPerspective;
|
||||
})};
|
||||
|
||||
if (info.uses_workgroup_id) {
|
||||
workgroup_id = DefineInput(*this, U32[3], false, spv::BuiltIn::WorkgroupId);
|
||||
@@ -2084,7 +2134,8 @@ void EmitContext::DefineInputs(const IR::Program& program) {
|
||||
layer = DefineInput(*this, U32[1], false, spv::BuiltIn::Layer);
|
||||
Decorate(layer, spv::Decoration::Flat);
|
||||
}
|
||||
if (loads.AnyComponent(IR::Attribute::PositionX)) {
|
||||
if (loads.AnyComponent(IR::Attribute::PositionX) ||
|
||||
info.passthrough.AnyComponent(IR::Attribute::PositionX) || noperspective_as_smooth) {
|
||||
const bool is_fragment{stage == Stage::Fragment};
|
||||
if (!is_fragment && profile.has_broken_spirv_position_input) {
|
||||
need_input_position_indirect = true;
|
||||
@@ -2189,7 +2240,12 @@ void EmitContext::DefineInputs(const IR::Program& program) {
|
||||
case Interpolation::Smooth:
|
||||
break;
|
||||
case Interpolation::NoPerspective:
|
||||
Decorate(id, spv::Decoration::NoPerspective);
|
||||
// The previous stage may write it times Position.w (noperspective_outputs).
|
||||
if (!runtime_info.scaled_noperspective_inputs) {
|
||||
Decorate(id, spv::Decoration::NoPerspective);
|
||||
} else {
|
||||
noperspective_as_smooth_inputs[index] = true;
|
||||
}
|
||||
break;
|
||||
case Interpolation::Flat:
|
||||
Decorate(id, spv::Decoration::Flat);
|
||||
@@ -2256,7 +2312,11 @@ void EmitContext::DefineMesh(const IR::Program& program) {
|
||||
mesh_attribute_words = (std::max)(
|
||||
mesh_primitive_base + Common::DivCeil(mesh_info.max_primitives, 32U) * primitive_lines * 32,
|
||||
1U);
|
||||
mesh_map_bytes = 4 + mesh_info.Corners() * mesh_info.max_primitives;
|
||||
// Whole blocks of 32 primitives, as the attributes: the program writes the index bytes of every primitive block, lanes past
|
||||
// max_primitives too (a count of 0 wraps its min(count - 1, lane) to every lane). Sized to max_primitives, those writes were
|
||||
// clamped onto the last byte, the last primitive's last corner: with 126 primitives (most of OoT's) a stray vertex, flashing
|
||||
// triangles over Kokiri's foliage and ground (as nxnative found: "primitive index bytes for every primitive block")
|
||||
mesh_map_bytes = 4 + mesh_info.Corners() * Common::DivCeil(mesh_info.max_primitives, 32U) * 32;
|
||||
mesh_shared_u32 = TypePointer(spv::StorageClass::Workgroup, U32[1]);
|
||||
mesh_attributes = DefineVariable(*this, TypeArray(U32[1], Const(mesh_attribute_words)),
|
||||
std::nullopt, spv::StorageClass::Workgroup);
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
namespace Shader::Backend::SPIRV {
|
||||
|
||||
static std::bitset<8> clip_distance_written;
|
||||
|
||||
using Sirit::Id;
|
||||
|
||||
class VectorTypes {
|
||||
@@ -369,6 +367,8 @@ public:
|
||||
bool need_input_position_indirect{};
|
||||
Id input_position{};
|
||||
std::array<InputGenericInfo, 32> input_generics{};
|
||||
/// Screen-linear fragment inputs read through perspective interpolation, times FragCoord.w.
|
||||
std::array<bool, 32> noperspective_as_smooth_inputs{};
|
||||
|
||||
Id output_point_size{};
|
||||
Id output_position{};
|
||||
@@ -429,6 +429,13 @@ public:
|
||||
u32 mesh_fallback_payload_member_index{};
|
||||
u32 mesh_fallback_records_member_index{};
|
||||
u32 mesh_fallback_indirect_input_member_index{};
|
||||
/// (hookshot) RuntimeInfo::capture_position: the push block's capture members, the vertex index and a vec4 pointer type
|
||||
bool wants_capture{};
|
||||
u32 capture_address_member_index{};
|
||||
u32 capture_first_member_index{};
|
||||
u32 capture_count_member_index{};
|
||||
Id capture_vertex_index{};
|
||||
Id capture_pointer{};
|
||||
/// A pointer to the u32 at a PhysicalStorageBuffer device address
|
||||
Id MeshFallbackWord(Id address);
|
||||
|
||||
|
||||
@@ -284,6 +284,9 @@ inline LoweredProgram LowerToMaxwellWith(std::span<const Instruction> code, u32
|
||||
if (!entered)
|
||||
for (u32 pc = index + 1; pc < target; ++pc) dead_instructions[pc] = true;
|
||||
}
|
||||
// (hookshot) A shared memory store (STS) not yet followed by a barrier: an LDS after it may read what another lane of the
|
||||
// warp stored (see LDS below)
|
||||
bool shared_store_pending = false;
|
||||
for (u32 index = 0; index < code.size(); ++index) {
|
||||
auto insn = code[index];
|
||||
result.source_instruction_offsets.push_back(static_cast<u32>(result.instructions.size()));
|
||||
@@ -1701,6 +1704,7 @@ inline LoweredProgram LowerToMaxwellWith(std::span<const Instruction> code, u32
|
||||
case 0xb1d: // BAR.SYNC 0 (bit 80: .DEFER_BLOCKING), full workgroup.
|
||||
if (insn.words[1] || (insn.words[2] & ~0x10000U) || native_predicate != 7)
|
||||
return fail(index, "native workgroup barrier mode");
|
||||
shared_store_pending = false;
|
||||
emit(0xf0a8000000000000ULL | predicate | (u64{1} << 43) |
|
||||
(u64{1} << 44) | (u64{1} << 39) | (u64{7} << 39));
|
||||
break;
|
||||
@@ -1757,6 +1761,23 @@ inline LoweredProgram LowerToMaxwellWith(std::span<const Instruction> code, u32
|
||||
}
|
||||
const bool store = opcode != 0x984;
|
||||
const u32 data = store ? insn.Bits(32, 8) : static_cast<u32>(dest);
|
||||
// (hookshot) A warp stores to shared memory (STS) and reads it back (LDS) with no barrier between: the Switch runs a
|
||||
// warp's shared memory accesses in order, Vulkan orders another lane's store and this lane's load only through a
|
||||
// barrier, and the driver's compiler may move them past each other (OoT's 4/3 gameplay network on NVIDIA's cooperative
|
||||
// matrix path: 16x2 bright bars, Hookshot issue 2455). As for LDSM: a subgroup barrier before the first LDS after an
|
||||
// STS, only where the LDS is not predicated (every lane of the warp reaches it). RX_VK_SHARED_NO_LDS_BARRIER=1: none, as before
|
||||
// ((Triforce) both our STS forms, 0x388 and 0x988 with a uniform base, count as the store; the switch read here, as
|
||||
// this file's others are: upstream's env_on is in a header we do not have)
|
||||
static const bool lds_barrier = [] {
|
||||
const char* e = std::getenv("RX_VK_SHARED_NO_LDS_BARRIER");
|
||||
return !(e && *e && *e != '0');
|
||||
}();
|
||||
if (store) {
|
||||
shared_store_pending = true;
|
||||
} else if (shared_store_pending && lds_barrier && native_predicate == 7) {
|
||||
emit(0xef98000000000000ULL | predicate | (u64{1} << 20)); // (MEMBAR, bit 20: barrier_operations.cpp)
|
||||
shared_store_pending = false;
|
||||
}
|
||||
emit((store ? 0xef58000000000000ULL : 0xef48000000000000ULL) |
|
||||
predicate | data | (u64{address} << 8) | (u64{insn.Bits(40, 24)} << 20) |
|
||||
(u64{width} << 48));
|
||||
@@ -1877,6 +1898,9 @@ inline LoweredProgram LowerToMaxwellWith(std::span<const Instruction> code, u32
|
||||
return fail(index, "native matrix load mode");
|
||||
u32 address = insn.Bits(24, 8);
|
||||
const u64 offset = insn.Bits(40, 24);
|
||||
// (Fritchii f130f0c50; ours had it already) An address the results overwrite is copied first, to R254: the paths below
|
||||
// use R246-R253, and R253 is where each matrix's row address is shuffled to, so with the copy there matrices 1-3 of
|
||||
// an .x2/.x4 read matrix 0's rows (OoT has one such LDSM.x4, gpu/vk/tests/ldsm_address_test.cpp)
|
||||
if (uniform_offset) {
|
||||
const u32 uniform = uniform_register(insn.Bits(32, 8));
|
||||
if (uniform == ~0U) return fail(index, "native matrix load uniform offset");
|
||||
|
||||
@@ -146,6 +146,10 @@ void TranslateF2I(TranslatorVisitor& v, u64 insn, const IR::F16F32F64& src_a) {
|
||||
}()};
|
||||
const bool is_signed{f2i.is_signed != 0};
|
||||
const auto [max_bound, min_bound] = ClampBounds(f2i.dest_format, is_signed);
|
||||
// (Fritchii eba45b151, zortos293/Lichii#1051 by myshadowww) INT32_MAX rounds up to 2^31 as an F32 bound, so an input at or
|
||||
// above it reached OpConvertFToS out of range, which is undefined. The clamp stops below 2^31 and the exact INT32_MAX is
|
||||
// selected after the conversion
|
||||
const bool signed_f32_i32{f2i.dest_format == DestFormat::I32 && f2i.src_format == SrcFormat::F32 && is_signed};
|
||||
|
||||
IR::F16F32F64 intermediate;
|
||||
switch (f2i.src_format) {
|
||||
@@ -156,7 +160,7 @@ void TranslateF2I(TranslatorVisitor& v, u64 insn, const IR::F16F32F64& src_a) {
|
||||
break;
|
||||
}
|
||||
case SrcFormat::F32: {
|
||||
const IR::F32 max_val{v.ir.Imm32(static_cast<f32>(max_bound))};
|
||||
const IR::F32 max_val{v.ir.Imm32(signed_f32_i32 ? 0x1.fffffep30f : static_cast<f32>(max_bound))};
|
||||
const IR::F32 min_val{v.ir.Imm32(static_cast<f32>(min_bound))};
|
||||
intermediate = v.ir.FPClamp(rounded_value, min_val, max_val);
|
||||
break;
|
||||
@@ -173,6 +177,10 @@ void TranslateF2I(TranslatorVisitor& v, u64 insn, const IR::F16F32F64& src_a) {
|
||||
|
||||
const size_t bitsize{std::max<size_t>(32, BitSize(f2i.dest_format))};
|
||||
IR::U16U32U64 result{v.ir.ConvertFToI(bitsize, is_signed, intermediate)};
|
||||
if (signed_f32_i32) {
|
||||
result = IR::U32{v.ir.Select(v.ir.FPGreaterThanEqual(op_a, v.ir.Imm32(0x1p31f)),
|
||||
v.ir.Imm32(static_cast<u32>((std::numeric_limits<s32>::max)())), result)};
|
||||
}
|
||||
|
||||
bool handled_special_case = false;
|
||||
const bool special_nan_cases =
|
||||
|
||||
@@ -61,6 +61,20 @@ IR::U32 SmallAbs(TranslatorVisitor& v, const IR::U32& value, int bitsize) {
|
||||
return IR::U32{v.ir.Select(is_least, value, absolute)};
|
||||
}
|
||||
|
||||
// (Fritchii, zortos293 f6a8f5132) U32 -> F32 rounded toward zero. OpConvertUToF rounds to nearest whatever the IR's rounding
|
||||
// asks, so an input of 2^24 or more could round up: 0xffffff80..0xffffffff became 2^32 instead of 0x4f7fffff (a hash times 2^-32
|
||||
// reached 1.0). The top 24 significant bits make the float, the rest are dropped; an input below 2^24 converts exactly
|
||||
IR::F32 ConvertUnsigned32ToFloatRZ(TranslatorVisitor& v, const IR::U32& source) {
|
||||
auto& ir = v.ir;
|
||||
const IR::U32 msb{ir.Select(ir.INotEqual(source, ir.Imm32(0)), ir.FindUMsb(source), ir.Imm32(0))};
|
||||
const IR::U32 shift{ir.ISub(ir.UMax(msb, ir.Imm32(23)), ir.Imm32(23))};
|
||||
const IR::U32 retained{ir.ShiftRightLogical(source, shift)};
|
||||
const IR::U32 bits{ir.BitwiseOr(ir.ShiftLeftLogical(ir.IAdd(msb, ir.Imm32(127)), ir.Imm32(23)),
|
||||
ir.BitwiseAnd(retained, ir.Imm32(0x7fffff)))};
|
||||
const IR::F32 exact{ir.ConvertIToF(32, 32, false, ir.BitwiseAnd(source, ir.Imm32(0xffffff)))};
|
||||
return IR::F32{ir.Select(ir.IGreaterThan(msb, ir.Imm32(23), false), ir.BitCast<IR::F32>(bits), exact)};
|
||||
}
|
||||
|
||||
void I2F(TranslatorVisitor& v, u64 insn, IR::U32U64 src) {
|
||||
const Encoding i2f{insn};
|
||||
if (i2f.cc != 0) {
|
||||
@@ -99,7 +113,12 @@ void I2F(TranslatorVisitor& v, u64 insn, IR::U32U64 src) {
|
||||
.rounding = CastFpRounding(i2f.fp_rounding),
|
||||
.fmz_mode = IR::FmzMode::DontCare,
|
||||
};
|
||||
auto value{v.ir.ConvertIToF(size_t(dst_bitsize), size_t(conversion_src_bitsize), is_signed, src, fp_control)};
|
||||
IR::F16F32F64 value;
|
||||
if (!is_signed && conversion_src_bitsize == 32 && dst_bitsize == 32 && i2f.fp_rounding == FpRounding::RZ) {
|
||||
value = ConvertUnsigned32ToFloatRZ(v, IR::U32{src});
|
||||
} else {
|
||||
value = v.ir.ConvertIToF(size_t(dst_bitsize), size_t(conversion_src_bitsize), is_signed, src, fp_control);
|
||||
}
|
||||
if (i2f.neg != 0) {
|
||||
if (i2f.abs != 0 || !is_signed) {
|
||||
// We know the value is positive
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include "shader_recompiler/environment.h"
|
||||
#include "shader_recompiler/frontend/ir/program.h"
|
||||
|
||||
@@ -31,6 +32,11 @@ void SsaRewritePass(IR::Program& program);
|
||||
void PositionPass(Environment& env, IR::Program& program);
|
||||
void BlitConstantsPass(Environment& env, IR::Program& program);
|
||||
void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo& host_info);
|
||||
/// (hookshot) The texture handles of the last translation on this thread that no handle program could follow (they take
|
||||
/// the first constant buffer word on their path): how many, and the operations the programs stopped at. Resets them.
|
||||
u32 TakeHandleFallbacks(std::string& stopped_at);
|
||||
/// (Triforce) The texture handles of the last translation on this thread that were given a handle table. Resets them.
|
||||
u32 TakeHandleTables();
|
||||
void LayerPass(IR::Program& program, const HostTranslateInfo& host_info);
|
||||
void VendorWorkaroundPass(IR::Program& program);
|
||||
void VerificationPass(const IR::Program& program);
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include <algorithm>
|
||||
#include <atomic> // (EDEN_IR_PRE below. The players' compiler has libc++, which does not bring it in by itself)
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <queue>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
@@ -248,10 +251,16 @@ bool IsStorageImageOpcode(IR::Opcode opcode) {
|
||||
|
||||
u32 DynamicSampledTextureArrayCount(const TextureInstVector& to_replace) {
|
||||
u32 count{};
|
||||
// (hookshot) the samples of one handle table share one descriptor: counted once (the water's 69 shadow samples of
|
||||
// one table cut its share of the budget to 14 elements)
|
||||
std::unordered_set<u32> tables;
|
||||
for (const TextureInst& inst : to_replace) {
|
||||
const auto flags{inst.inst->Flags<IR::TextureInstInfo>()};
|
||||
if (inst.cbuf.count > 1 && !IsStorageImageOpcode(IndexedInstruction(*inst.inst)) &&
|
||||
flags.type != TextureType::Buffer) {
|
||||
if (inst.cbuf.handle_program != ~0U && !tables.insert(inst.cbuf.handle_program).second) {
|
||||
continue;
|
||||
}
|
||||
++count;
|
||||
}
|
||||
}
|
||||
@@ -451,6 +460,13 @@ bool IsUndefined(IR::Opcode opcode) {
|
||||
thread_local std::unordered_map<const IR::Inst*, u32> g_handle_slots;
|
||||
thread_local u32 g_handle_slot_count{};
|
||||
thread_local int g_handle_depth{};
|
||||
// (hookshot) A handle table read in a loop (a light's shadow map, the light's index from a per-pixel list): the
|
||||
// element index, built as HandleOp::Index wherever the handle reads it
|
||||
thread_local const IR::Inst* g_index_operand{};
|
||||
// (hookshot) The handles no handle program followed in this translation, and where they stopped (TakeHandleFallbacks)
|
||||
thread_local u32 g_fallbacks{};
|
||||
thread_local u32 g_tables{}; // (Triforce: the handles given a table in this translation, TakeHandleTables)
|
||||
thread_local std::string g_fallback_ops;
|
||||
|
||||
bool BuildHandleNode(const IR::Value& value, std::vector<u32>& code, int& budget,
|
||||
const IR::Block* block);
|
||||
@@ -524,6 +540,10 @@ bool BuildHandleNode(const IR::Value& value, std::vector<u32>& code, int& budget
|
||||
return true;
|
||||
}
|
||||
const IR::Inst* const inst{value.InstRecursive()};
|
||||
if (inst == g_index_operand) {
|
||||
emit(Op::Index);
|
||||
return true;
|
||||
}
|
||||
const auto build = [&](size_t arg) { return BuildHandleProgram(inst->Arg(arg), code, budget, block); };
|
||||
const auto binary = [&](Op op) {
|
||||
if (!build(0) || !build(1)) return false;
|
||||
@@ -587,7 +607,8 @@ bool BuildHandleNode(const IR::Value& value, std::vector<u32>& code, int& budget
|
||||
case IR::Opcode::GetCbufU32:
|
||||
case IR::Opcode::LoadStorage32:
|
||||
return load_word(inst, 0);
|
||||
case IR::Opcode::CompositeExtractU32x2: {
|
||||
case IR::Opcode::CompositeExtractU32x2:
|
||||
case IR::Opcode::CompositeExtractU32x4: {
|
||||
const IR::Value element{inst->Arg(1)};
|
||||
if (!element.IsImmediate() || inst->Arg(0).IsImmediate()) return false;
|
||||
return load_word(inst->Arg(0).InstRecursive(), element.U32() * 4);
|
||||
@@ -930,10 +951,140 @@ std::optional<ConstBufferAddr> TryGetConstBuffer(const IR::Inst* inst, Environme
|
||||
};
|
||||
}
|
||||
|
||||
IR::Value SkipIdentity(IR::Value v) {
|
||||
for (int i = 0; i < 16 && !v.IsImmediate() && v.InstRecursive()->GetOpcode() == IR::Opcode::Identity; ++i) {
|
||||
v = v.InstRecursive()->Arg(0);
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
// The value a 16-bit half extract reads (BitFieldUExtract x, 0, 16: the low half of an XMAD pair's index), else itself
|
||||
IR::Value IndexThroughLowHalf(IR::Value v) {
|
||||
v = SkipIdentity(v);
|
||||
if (v.IsImmediate()) return v;
|
||||
const IR::Inst* const i{v.InstRecursive()};
|
||||
if (i->GetOpcode() == IR::Opcode::BitFieldUExtract) {
|
||||
const IR::Value offset{SkipIdentity(i->Arg(1))};
|
||||
const IR::Value count{SkipIdentity(i->Arg(2))};
|
||||
if (offset.IsImmediate() && count.IsImmediate() && offset.U32() == 0 && count.U32() == 16) {
|
||||
return SkipIdentity(i->Arg(0));
|
||||
}
|
||||
}
|
||||
return v;
|
||||
}
|
||||
|
||||
// (hookshot) The handle is a word of a storage buffer record whose address adds index * stride, a table of records:
|
||||
// Ocarina of Time's water and wet floors read each light's shadow map handle from the light's record, for the lights
|
||||
// of the pixel's cluster. The index (in *index) when the handle is read so: a multiply by a stride of 4..4096 bytes (or
|
||||
// an XMAD pair's halves of one) or a shift by 2..12, in the sums that make the record's address.
|
||||
bool FindHandleTableIndex(const IR::Value& handle, IR::Value& index) {
|
||||
const IR::Value v{SkipIdentity(handle)};
|
||||
if (v.IsImmediate()) return false;
|
||||
const IR::Inst* load{v.InstRecursive()};
|
||||
if (load->GetOpcode() == IR::Opcode::CompositeExtractU32x2 ||
|
||||
load->GetOpcode() == IR::Opcode::CompositeExtractU32x4) {
|
||||
const IR::Value src{SkipIdentity(load->Arg(0))};
|
||||
if (src.IsImmediate()) return false;
|
||||
load = src.InstRecursive();
|
||||
}
|
||||
switch (load->GetOpcode()) {
|
||||
case IR::Opcode::LoadStorage32:
|
||||
case IR::Opcode::LoadStorage64:
|
||||
case IR::Opcode::LoadStorage128:
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
// Through the sums that make the record's address only
|
||||
std::vector<IR::Value> work{load->Arg(1)};
|
||||
for (int steps = 0; !work.empty() && steps < 64; ++steps) {
|
||||
const IR::Value cur{SkipIdentity(work.back())};
|
||||
work.pop_back();
|
||||
if (cur.IsImmediate()) continue;
|
||||
const IR::Inst* const i{cur.InstRecursive()};
|
||||
switch (i->GetOpcode()) {
|
||||
case IR::Opcode::IAdd32:
|
||||
case IR::Opcode::ISub32:
|
||||
work.push_back(i->Arg(0));
|
||||
work.push_back(i->Arg(1));
|
||||
break;
|
||||
case IR::Opcode::IMul32:
|
||||
for (size_t a = 0; a < 2; ++a) {
|
||||
const IR::Value k{SkipIdentity(i->Arg(a))};
|
||||
const IR::Value x{IndexThroughLowHalf(i->Arg(1 - a))};
|
||||
if (k.IsImmediate() && k.U32() >= 4 && k.U32() <= 4096 && !x.IsImmediate()) {
|
||||
index = x;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case IR::Opcode::ShiftLeftLogical32: {
|
||||
const IR::Value k{SkipIdentity(i->Arg(1))};
|
||||
const IR::Value x{SkipIdentity(i->Arg(0))};
|
||||
if (k.IsImmediate() && k.U32() >= 2 && k.U32() <= 12 && !x.IsImmediate()) {
|
||||
index = x;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// (Triforce, 11-13) The handle behind the merges of a register. Ocarina of Time's wet floors and water filter each
|
||||
// projector's shadow map in one of several ways, picked by a jump table; the 9- and the 16-sample filters come after the
|
||||
// others, and their handle is a Phi of the record's handle word (the one value, on every path that leads to them) and of
|
||||
// an earlier filter's RESULT, which the same register held on a path that does not lead to them. The search for the
|
||||
// handle's constant buffer word went into that result's sample, down to its coordinates, and took the first constant it
|
||||
// met there for the handle: a float, 0.001, no texture. Every one of those 25 samples then read the stand-in texture,
|
||||
// "in shadow", and the projector's whole cluster tiles lost their local lights: the dark squares on wet floors (upstream
|
||||
// issue 2509; its pull request 3047 gives the handle's table to the 44 samples that read the record directly, and
|
||||
// these 25 stayed as they were). A texture sample's result is never a handle: such inputs are left out, and when what is
|
||||
// left is one and the same value, that value is the handle. Anything else is returned as it is.
|
||||
// EDEN_HANDLE_PHI=0: as before
|
||||
IR::Value ResolveHandlePhi(const IR::Value& handle) {
|
||||
static const char* const off_env{std::getenv("EDEN_HANDLE_PHI")};
|
||||
if (off_env && off_env[0] == '0') return handle;
|
||||
const IR::Value start{SkipIdentity(handle)};
|
||||
if (start.IsImmediate() || start.InstRecursive()->GetOpcode() != IR::Opcode::Phi) return handle;
|
||||
std::vector<IR::Value> work{start};
|
||||
std::unordered_set<const IR::Inst*> seen;
|
||||
const IR::Inst* found{};
|
||||
IR::Value found_value;
|
||||
for (int steps = 0; !work.empty(); ++steps) {
|
||||
if (steps > 512) return handle;
|
||||
const IR::Value cur{SkipIdentity(work.back())};
|
||||
work.pop_back();
|
||||
if (cur.IsImmediate()) return handle; // (a constant on a path: not this case)
|
||||
const IR::Inst* const i{cur.InstRecursive()};
|
||||
if (i->GetOpcode() == IR::Opcode::Phi) {
|
||||
if (seen.insert(i).second) {
|
||||
for (size_t a = 0; a < i->NumArgs(); ++a) work.push_back(i->Arg(a));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
// (a sample's result, or its bits)
|
||||
const IR::Inst* source{i};
|
||||
if (source->GetOpcode() == IR::Opcode::BitCastU32F32) {
|
||||
const IR::Value bits{SkipIdentity(source->Arg(0))};
|
||||
if (!bits.IsImmediate()) source = bits.InstRecursive();
|
||||
}
|
||||
if (IsTextureInstruction(*source)) continue;
|
||||
if (found && found != i) return handle; // (two different values: a real choice, left to the search)
|
||||
found = i;
|
||||
found_value = cur;
|
||||
}
|
||||
return found ? found_value : handle;
|
||||
}
|
||||
|
||||
TextureInst MakeInst(Environment& env, IR::Block* block, IR::Inst& inst, const HostTranslateInfo& host_info) {
|
||||
ConstBufferAddr addr;
|
||||
if (IsBindless(inst)) {
|
||||
const std::optional<ConstBufferAddr> track_addr{TrackCached(inst.Arg(0), env, host_info, block)};
|
||||
const IR::Value handle{ResolveHandlePhi(inst.Arg(0))};
|
||||
const std::optional<ConstBufferAddr> track_addr{TrackCached(handle, env, host_info, block)};
|
||||
|
||||
if (track_addr) {
|
||||
addr = *track_addr;
|
||||
@@ -942,10 +1093,61 @@ TextureInst MakeInst(Environment& env, IR::Block* block, IR::Inst& inst, const H
|
||||
std::vector<u32> code;
|
||||
int budget = 4096;
|
||||
g_handle_failure = IR::Opcode::Void;
|
||||
if (!g_handle_programs || !BuildHandleProgram(inst.Arg(0), code, budget, block)) {
|
||||
if (!g_handle_programs || !BuildHandleProgram(handle, code, budget, block)) {
|
||||
// (hookshot) A table read in a loop: one texture for each element, picked in the shader by the
|
||||
// element's index (RX_VK_HANDLE_TABLE=0: the search below, one texture for all of them)
|
||||
static const char* const table_env = std::getenv("RX_VK_HANDLE_TABLE");
|
||||
static const bool table_on = !(table_env && table_env[0] == '0');
|
||||
static const u32 table_count = [] {
|
||||
const char* const c = std::getenv("RX_VK_HANDLE_TABLE_COUNT");
|
||||
const long n = c ? std::strtol(c, nullptr, 0) : 64;
|
||||
return static_cast<u32>(std::clamp<long>(n, 2, 256));
|
||||
}();
|
||||
IR::Value index_value;
|
||||
if (table_on && g_handle_programs && FindHandleTableIndex(handle, index_value)) {
|
||||
code.clear();
|
||||
budget = 4096;
|
||||
g_index_operand = index_value.InstRecursive();
|
||||
const bool built = BuildHandleProgram(handle, code, budget, block);
|
||||
g_index_operand = nullptr;
|
||||
if (built) {
|
||||
++g_tables;
|
||||
auto& programs{*g_handle_programs};
|
||||
auto it{std::ranges::find(programs, code)};
|
||||
if (it == programs.end()) {
|
||||
programs.push_back(std::move(code));
|
||||
it = programs.end() - 1;
|
||||
}
|
||||
// The element's index as a descriptor offset (the array reads it back: offset >> 3)
|
||||
IR::IREmitter ir{*block, IR::Block::InstructionList::s_iterator_to(inst)};
|
||||
const IR::U32 offset{ir.ShiftLeftLogical(IR::U32{index_value}, ir.Imm32(DESCRIPTOR_SIZE_SHIFT))};
|
||||
return TextureInst{
|
||||
.cbuf = ConstBufferAddr{
|
||||
.index = 0,
|
||||
.offset = 0,
|
||||
.shift_left = 0,
|
||||
.secondary_index = 0,
|
||||
.secondary_offset = 0,
|
||||
.secondary_shift_left = 0,
|
||||
.dynamic_offset = offset,
|
||||
.count = table_count,
|
||||
.has_secondary = false,
|
||||
.handle_program = static_cast<u32>(it - programs.begin()),
|
||||
},
|
||||
.inst = &inst,
|
||||
.block = block,
|
||||
};
|
||||
}
|
||||
code.clear();
|
||||
budget = 4096;
|
||||
}
|
||||
++g_fallbacks;
|
||||
if (g_fallback_ops.size() < 200) {
|
||||
g_fallback_ops += fmt::format("{}{}", g_fallback_ops.empty() ? "" : ", ", g_handle_failure);
|
||||
}
|
||||
// Not computable for a whole draw (a handle that changes in a loop): keep the
|
||||
// earlier search through loads, which at least gives the shader a texture.
|
||||
const std::optional<ConstBufferAddr> legacy{IR::BreadthFirstSearch(inst.Arg(0),
|
||||
const std::optional<ConstBufferAddr> legacy{IR::BreadthFirstSearch(handle,
|
||||
[&env, &host_info, block](const IR::Inst* candidate) {
|
||||
return TryGetConstBuffer(candidate, env, host_info, block);
|
||||
}, [&](IR::Value operand) { return ResolveConditionalPhi(operand, block); })};
|
||||
@@ -1167,7 +1369,39 @@ void PatchTexelFetch(IR::Block& block, IR::Inst& inst, TexturePixelFormat pixel_
|
||||
}
|
||||
} // Anonymous namespace
|
||||
|
||||
u32 TakeHandleTables() {
|
||||
const u32 n = g_tables;
|
||||
g_tables = 0;
|
||||
return n;
|
||||
}
|
||||
|
||||
u32 TakeHandleFallbacks(std::string& stopped_at) {
|
||||
const u32 n = g_fallbacks;
|
||||
stopped_at = std::move(g_fallback_ops);
|
||||
g_fallbacks = 0;
|
||||
g_fallback_ops.clear();
|
||||
return n;
|
||||
}
|
||||
|
||||
void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo& host_info) {
|
||||
// (lab, 11-13) EDEN_IR_PRE=<n>: the programs with n depth-compare samples whose handle is still to be found are
|
||||
// written out as they come INTO this pass (ir_pre_<n>_<blocks>.txt beside the game): where a sample's handle comes
|
||||
// from can only be read there, this pass replaces it. An EDEN_ name: the shaders are translated again for it
|
||||
if (static const char* const pre = std::getenv("EDEN_IR_PRE"); pre) {
|
||||
size_t n = 0;
|
||||
for (IR::Block* const b : program.blocks)
|
||||
for (IR::Inst& i : b->Instructions()) n += i.GetOpcode() == IR::Opcode::BindlessImageSampleDrefImplicitLod;
|
||||
static std::atomic<int> written{0}; // (at least n of them; the first twelve programs)
|
||||
if (n && n >= static_cast<size_t>(std::atoi(pre)) && written++ < 12) {
|
||||
char name[64];
|
||||
std::snprintf(name, sizeof name, "ir_pre_%zu_%zu.txt", n, program.blocks.size());
|
||||
if (FILE* const f = std::fopen(name, "w")) {
|
||||
const std::string text{IR::DumpProgram(program)};
|
||||
std::fwrite(text.data(), 1, text.size(), f);
|
||||
std::fclose(f);
|
||||
}
|
||||
}
|
||||
}
|
||||
// reset per-pass caches
|
||||
env.cbuf_word_cache.clear();
|
||||
env.handle_cache.clear();
|
||||
|
||||
@@ -88,6 +88,12 @@ struct RuntimeInfo {
|
||||
VaryingState previous_stage_stores;
|
||||
/// Fragment stage after a mesh program: generic inputs it writes per primitive.
|
||||
std::bitset<32> per_primitive_generics{};
|
||||
/// Last pre-rasterization stage: generic outputs the fragment stage reads screen-linear.
|
||||
/// They are written times Position.w and the fragment stage reads them perspective-correct
|
||||
/// times FragCoord.w, so clipping a primitive close to the camera interpolates them right.
|
||||
std::bitset<32> noperspective_outputs{};
|
||||
/// Fragment stage: the previous stage writes noperspective_outputs (not a mesh program).
|
||||
bool scaled_noperspective_inputs{};
|
||||
/// Fragment stage after a mesh program that draws points: generic inputs the hardware's point sprite
|
||||
/// replaces with the coordinate within the point (s, t, 0, 1), as NVN's do with the generics the mesh
|
||||
/// program leaves unwritten.
|
||||
@@ -111,6 +117,10 @@ struct RuntimeInfo {
|
||||
u32 mesh_fallback_task_threads{};
|
||||
/// (hookshot) the fallback's record slots: mesh workgroups past this one write nothing
|
||||
u32 mesh_fallback_capacity{};
|
||||
/// (hookshot) a vertex stage that also stores its final position (clip space, after convert_depth_mode) at a pushed
|
||||
/// device address, one vec4 a vertex: the temporal upscaler's motion of what the game moves in its shaders
|
||||
/// (vk_temporal.cpp). A zero address stores nothing (Info::captures_position says it was emitted)
|
||||
bool capture_position{};
|
||||
|
||||
TessPrimitive tess_primitive{};
|
||||
TessSpacing tess_spacing{};
|
||||
|
||||
@@ -363,6 +363,7 @@ struct Info {
|
||||
bool uses_rescaling_uniform{};
|
||||
bool uses_cbuf_indirect{};
|
||||
bool uses_render_area{};
|
||||
bool captures_position{}; ///< (hookshot) RuntimeInfo::capture_position, emitted: CAPTURE_PUSH_OFFSET is read
|
||||
|
||||
IR::Type used_constant_buffer_types{};
|
||||
IR::Type used_storage_buffer_types{};
|
||||
@@ -420,13 +421,14 @@ enum class HandleOp : u32 {
|
||||
Select, ///< condition, true value, false value
|
||||
Tee, ///< slot: keeps the top value in the slot (shared subexpressions)
|
||||
Load, ///< slot: the value kept there
|
||||
Index, ///< (hookshot) the array element being evaluated (a handle table read in a loop: one texture an element)
|
||||
};
|
||||
|
||||
/// Runs a handle program; read_cbuf(index, offset) and read_storage(binding, offset) return the
|
||||
/// words it reads. Returns nothing for a malformed program.
|
||||
template <typename ReadCbuf, typename ReadStorage>
|
||||
std::optional<u32> EvaluateHandleProgram(std::span<const u32> code, ReadCbuf&& read_cbuf,
|
||||
ReadStorage&& read_storage) {
|
||||
ReadStorage&& read_storage, u32 element = 0) {
|
||||
std::array<u32, 64> stack{};
|
||||
std::array<u32, 256> slots{};
|
||||
size_t size = 0;
|
||||
@@ -461,6 +463,10 @@ std::optional<u32> EvaluateHandleProgram(std::span<const u32> code, ReadCbuf&& r
|
||||
push(op == HandleOp::Neg ? 0U - a : op == HandleOp::Not ? ~a : (a == 0 ? 1U : 0U));
|
||||
continue;
|
||||
}
|
||||
if (op == HandleOp::Index) {
|
||||
push(element);
|
||||
continue;
|
||||
}
|
||||
if (op == HandleOp::Tee) {
|
||||
const u32 slot = operand();
|
||||
if (slot < slots.size() && size > 0) slots[slot] = stack[size - 1];
|
||||
|
||||
42
gpu/vk/file_whole.h
Normal file
42
gpu/vk/file_whole.h
Normal file
@@ -0,0 +1,42 @@
|
||||
// (Triforce, handoff §8) A whole file at once, for file_writers.h: written as <path>.part and put in the old one's place, so
|
||||
// that a write cut short (the process ended in it, a full disk) leaves the old file or the new one, never part of one
|
||||
#pragma once
|
||||
#include "file_writers.h"
|
||||
#include <cstdio>
|
||||
#include <string>
|
||||
#ifdef _WIN32
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
namespace file_writers {
|
||||
/// rename over an existing file, as each platform does it
|
||||
inline bool replace_file(const std::string& from, const std::string& to) {
|
||||
#ifdef _WIN32
|
||||
return MoveFileExA(from.c_str(), to.c_str(), MOVEFILE_REPLACE_EXISTING) != 0;
|
||||
#else
|
||||
return std::rename(from.c_str(), to.c_str()) == 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
/// The whole file: <path>.part written and closed, then put in path's place; false (and no .part left) when any of it fails,
|
||||
/// and then path is as it was. Inside a Writing of its own (refused once the end has begun)
|
||||
inline bool write_whole(const std::string& path, const void* data, size_t n) {
|
||||
Writing w;
|
||||
if (!w) return false;
|
||||
const std::string part = path + ".part";
|
||||
FILE* f = std::fopen(part.c_str(), "wb");
|
||||
if (!f) return false;
|
||||
bool ok = !n || std::fwrite(data, 1, n, f) == n;
|
||||
ok = std::fclose(f) == 0 && ok;
|
||||
ok = ok && replace_file(part, path);
|
||||
if (!ok) std::remove(part.c_str());
|
||||
return ok;
|
||||
}
|
||||
inline bool write_whole(const std::string& path, const std::string& text) { return write_whole(path, text.data(), text.size()); }
|
||||
} // namespace file_writers
|
||||
96
gpu/vk/file_writers.h
Normal file
96
gpu/vk/file_writers.h
Normal file
@@ -0,0 +1,96 @@
|
||||
// (Triforce, handoff §8) The renderer's file writes made on threads of their own, and the process's end. The window's close ends
|
||||
// the game through ExitProcess (host/hos_relaunch.c), which stops every other thread wherever it is: a thread in the middle of
|
||||
// a file (a bug capture's picture, the pipeline cache's save in play, the order of the pipelines, a hang report, the prepared
|
||||
// record, the predicted pipelines' list, a debug picture or the frame log) left part of it. Now:
|
||||
// Writing one write, from its open to its close or rename, as a scope: counted while it runs, and refused once the end has
|
||||
// begun (on any thread but the one ending the process: its own last saves go on)
|
||||
// stop the process is about to end (HOS_OPT_EXITING, vk_replay.cpp option_set): no write begins from here on, and the
|
||||
// ones under way are waited for, up to a bound (2 s; RX_VK_WRITERS_WAIT_MS=<ms>, 0: no wait, as before). A write
|
||||
// that is still going then is cut by the exit as before; each such file is one write_whole makes, or one
|
||||
// whose readers take its whole records only, so it is the old file or the new one, or a list one record short
|
||||
// write_whole (file_whole.h) a whole file written as <path>.part and put in the old one's place: the old file or the new
|
||||
// one, never part of one, whenever the process ends
|
||||
// The threads themselves are not joined: they are detached and keep no state that outlives the process; what is waited for
|
||||
// is their write, the only part of them an end can damage. The standard library alone (file_whole.h has the
|
||||
// Windows part): tests/test_file_writers.py compiles it alone
|
||||
#pragma once
|
||||
#include <algorithm>
|
||||
#include <atomic>
|
||||
#include <chrono>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
|
||||
namespace file_writers {
|
||||
inline std::atomic<bool> g_stopping{false};
|
||||
inline std::atomic<int> g_busy{0}; // (writes under way on other threads than the ending one)
|
||||
inline std::atomic<int> g_refused{0}; // (writes not begun because the end had)
|
||||
inline thread_local bool t_ending = false; // (the thread that called stop: its writes are the exit's own)
|
||||
inline thread_local int t_inside = 0; // (Writings this thread holds: one inside another is part of it, never refused)
|
||||
|
||||
/// One write: `file_writers::Writing w; if (!w) return;` before the file is opened, and the scope ends after its close (and
|
||||
/// rename). The busy count goes up before the stop flag is read and stop sets the flag before it reads the count (both
|
||||
/// sequentially consistent): a write either sees the stop and does not begin, or stop sees it and waits for it. One begun
|
||||
/// inside another on the same thread (a save's own small files) goes on: the outer one is waited for whole
|
||||
class Writing {
|
||||
public:
|
||||
Writing() {
|
||||
if (t_ending || t_inside > 0) {
|
||||
on_ = true;
|
||||
t_inside++, nested_ = true;
|
||||
return;
|
||||
}
|
||||
g_busy.fetch_add(1);
|
||||
if (g_stopping.load()) {
|
||||
g_busy.fetch_sub(1);
|
||||
g_refused.fetch_add(1, std::memory_order_relaxed);
|
||||
return;
|
||||
}
|
||||
on_ = counted_ = true;
|
||||
t_inside++;
|
||||
}
|
||||
~Writing() {
|
||||
if (counted_ || nested_) t_inside--;
|
||||
if (counted_) g_busy.fetch_sub(1);
|
||||
}
|
||||
Writing(const Writing&) = delete;
|
||||
Writing& operator=(const Writing&) = delete;
|
||||
explicit operator bool() const { return on_; }
|
||||
|
||||
private:
|
||||
bool on_ = false, counted_ = false, nested_ = false;
|
||||
};
|
||||
|
||||
/// The end has begun: a loop that writes ends at its next turn
|
||||
inline bool stopping() { return g_stopping.load(std::memory_order_relaxed); }
|
||||
|
||||
/// The bound of stop's wait: 2 s, or RX_VK_WRITERS_WAIT_MS (0: no wait at all, no write refused: as before this)
|
||||
inline int exit_wait_ms() {
|
||||
const char* e = getenv("RX_VK_WRITERS_WAIT_MS");
|
||||
return e && *e ? std::max(0, atoi(e)) : 2000;
|
||||
}
|
||||
|
||||
struct Stopped {
|
||||
int left = 0; // (writes still under way when the wait ended: cut by the exit)
|
||||
double waited_ms = 0; // (how long the wait took)
|
||||
int refused = 0; // (writes not begun since the end began, so far)
|
||||
};
|
||||
|
||||
/// The process is about to end, on this thread: no write begins on another thread from here on, and the ones under way are
|
||||
/// waited for, up to ms. ms 0: nothing is stopped (the old behaviour)
|
||||
inline Stopped stop(int ms) {
|
||||
Stopped s;
|
||||
if (ms <= 0) return s;
|
||||
t_ending = true;
|
||||
g_stopping.store(true);
|
||||
const auto t0 = std::chrono::steady_clock::now();
|
||||
const auto until = t0 + std::chrono::milliseconds(ms);
|
||||
while (g_busy.load() > 0 && std::chrono::steady_clock::now() < until) std::this_thread::sleep_for(std::chrono::milliseconds(1));
|
||||
s.left = g_busy.load();
|
||||
s.waited_ms = std::chrono::duration<double, std::milli>(std::chrono::steady_clock::now() - t0).count();
|
||||
s.refused = g_refused.load();
|
||||
return s;
|
||||
}
|
||||
|
||||
} // namespace file_writers
|
||||
59
gpu/vk/foliage_shadow.h
Normal file
59
gpu/vk/foliage_shadow.h
Normal file
@@ -0,0 +1,59 @@
|
||||
// (Triforce) Foliage in the sun's far shadow cascades drawn with one face culled (vk_draw.cpp draw_cull, for dynamic_state;
|
||||
// RX_VK_FOLIAGE_SHADOW_CULL, off unless set), apart from Vulkan so that tests/test_foliage_shadow.py can run its rule.
|
||||
//
|
||||
// The game draws its foliage cards (grass, ferns, leaves) double-sided with mesh programs, into the shadow cascades too: the
|
||||
// sun's three cascades are the layers of one depth array, 1600 x 1600 in the owner's logs. Seen from the sun the stacked,
|
||||
// alpha-tested cards cover the same texels many times over: NX2navi counted about 1,000 million fragments in one such draw of
|
||||
// the far cascade. With the switch, a draw of a mesh program (native, or through the compute fallback) into a cascade from the
|
||||
// given layer on, that culls neither face, is drawn with its back faces culled (its front ones with an "f"): half the cards'
|
||||
// fragments there. Cull mode is dynamic state, so no other pipeline is made. A cascade here is Triforce's own test for one,
|
||||
// as for the cascades' depth bias in dynamic_state: depth only, square, wider than 768 (the characters' own shadow maps, 768
|
||||
// and less, are never touched).
|
||||
//
|
||||
// The behaviour of NX2navi's NX2NAVI_FOLIAGE_SHADOW_CULL (epicmeme546's, on there from layer 1), written anew. It is not the same
|
||||
// picture: a card that faces away from the sun no longer casts its shadow in those cascades. Where cards stand in crossed pairs
|
||||
// or clumps others cover the same texels, but a lone card's shadow can go, so it is off here: a switch to compare, at
|
||||
// RX_VK_FOLIAGE_SHADOW_CULL=1 as NX2navi has it.
|
||||
//
|
||||
// Not done: NX2navi's second half, NX2NAVI_FOLIAGE_SHADOW_VRS (one fragment shaded per 2 x 2 pixels in those cascades, so the
|
||||
// leaves' alpha test runs a quarter as often). It needs VK_KHR_fragment_shading_rate enabled on the device, the shading rate as
|
||||
// dynamic state in every mesh pipeline and its libraries (a change to every mesh pipeline's creation, which the driver's cache
|
||||
// then misses) and vkCmdSetFragmentShadingRateKHR, which takes pointers, carried by the recorder (vk_recorder.h, vk_work.h);
|
||||
// none of that can be checked without the game, and its picture is not the same either (a coarser cut-out of the leaves).
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
namespace mkwvk::foliage_shadow {
|
||||
|
||||
constexpr int kNone = 0, kFront = 1, kBack = 2; // (NVN's faces: NVN_FACE_NONE, _FRONT, _BACK)
|
||||
constexpr uint32_t kCascadeMin = 769; // (a cascade is wider than 768: vk_draw.cpp dynamic_state's test)
|
||||
|
||||
struct Rule {
|
||||
int from = -1; // (the first cascade layer it applies to; -1: off)
|
||||
bool front = false; // (the front faces culled, not the back ones)
|
||||
};
|
||||
|
||||
/// RX_VK_FOLIAGE_SHADOW_CULL=<layer>[f]: from that layer of the cascades on (the game has three, 0 to 2; 1 is NX2navi's), the back
|
||||
/// faces culled, the front ones with an "f" after the number. Unset, empty or not starting with a digit: off
|
||||
inline Rule parse(const char* e) {
|
||||
Rule r;
|
||||
if (!e || *e < '0' || *e > '9') return r;
|
||||
r.from = std::atoi(e);
|
||||
r.front = std::strchr(e, 'f') != nullptr;
|
||||
return r;
|
||||
}
|
||||
|
||||
/// The face a draw culls: the game's (cull, NVN's face), or under the rule the one it names, for a draw of a mesh program into a
|
||||
/// cascade (no colour target, a depth target width x height, square and wider than 768, the depth view's first layer at
|
||||
/// rule.from or past it) that culls neither face
|
||||
inline int cull(const Rule& rule, int game, bool mesh_program, int colour_targets, bool depth, uint32_t width, uint32_t height,
|
||||
uint32_t layer) {
|
||||
if (rule.from < 0 || game != kNone || !mesh_program || colour_targets != 0 || !depth) return game;
|
||||
if (width != height || width < kCascadeMin || layer < (uint32_t)rule.from) return game;
|
||||
return rule.front ? kFront : kBack;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::foliage_shadow
|
||||
23
gpu/vk/fps_cap.h
Normal file
23
gpu/vk/fps_cap.h
Normal file
@@ -0,0 +1,23 @@
|
||||
/* The Game frame rate cap row's "Monitor's rate" (vk_menu.cpp), as plain code: the cap a display's refresh rate gives.
|
||||
host/nn_vi.c fps_max asks the renderer for it at the start (HOS_OPT_DISPLAY_CAP, vk_replay.cpp's option), and the row
|
||||
says the same number beside its name. After NX2navi's fps_limit = display. No Vulkan, no menu:
|
||||
tests/test_fps_cap_monitor.py checks it. */
|
||||
#pragma once
|
||||
|
||||
namespace mkwvk::fps_cap {
|
||||
|
||||
/// The row's value for Monitor's rate (frame_rate_cap= in the options file): after 60, 90, 120, 144, 165 and 240 (0 to
|
||||
/// 5); 45, 40 and 30 are -1 to -3
|
||||
constexpr int kMonitor = 6;
|
||||
/// The caps the game's pacing and its time step take (host/nn_vi.c): a display under 30 Hz or over 240 gets the nearest
|
||||
constexpr int kLowest = 30, kHighest = 240;
|
||||
|
||||
/// The cap for a display's refresh rate in mHz (59,940 is 60, 143,856 is 144): its rate rounded to whole frames a
|
||||
/// second, kLowest to kHighest. 0 when the rate is not known (mhz 0 or less): the host then keeps the console's 60.
|
||||
inline int of_display(int mhz) {
|
||||
if (mhz <= 0) return 0;
|
||||
const int hz = (int)(((long long)mhz + 500) / 1000);
|
||||
return hz < kLowest ? kLowest : hz > kHighest ? kHighest : hz;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::fps_cap
|
||||
46
gpu/vk/frame_trace.h
Normal file
46
gpu/vk/frame_trace.h
Normal file
@@ -0,0 +1,46 @@
|
||||
// (Triforce, wp20-onepct) The per-frame trace's split of a frame (RX_VK_FRAME_TRACE=1: triforce_frames.csv beside the game, one
|
||||
// line a frame, vk_replay.cpp status_tick). Its first columns say what the replay did (the draws' parts, sampled and summed over
|
||||
// every thread that records: the parallel replay's helpers too); they could not say what made a slow frame that was not the
|
||||
// draws': the lab's Market frames over the 99th percentile were 7-21% explained by them (r37, r38, r41). These columns, after
|
||||
// the first ones, split every frame the way the stall line splits a frame of 50 ms or more (stall_watch.h): the replay's own
|
||||
// time (its submits and the present phase, on every thread that replays: on the game's threads with the synchronous replay),
|
||||
// the present's own, the dispatches and the queue submits within the replay, the replay thread's waits for its helpers'
|
||||
// segments, and what is left: outside the replay and the present, the game's own update. Of that, the game's threads spend
|
||||
// some in our work: their fence waits and the captures at their submits; and the waits for write-backs still on the GPU (the
|
||||
// captures' late pages, the reads and bindings put off), with the part of them after the writer's recording was done on the
|
||||
// GPU (the submissions' timeline held back by work stopped at an event wait: vk_replay.cpp vk_timeline_wait), and the queue
|
||||
// submits made while a background import ran. Plain functions: tests/test_frame_trace.py
|
||||
#pragma once
|
||||
#include <cstddef>
|
||||
#include <cstdio>
|
||||
|
||||
namespace mkwvk::frame_trace {
|
||||
|
||||
/// One frame's split, in milliseconds
|
||||
struct Split {
|
||||
double interval = 0; // (present to present)
|
||||
double replay = 0; // (the submits and the present phase, every thread that replays: the stall line's "replay")
|
||||
double present = 0; // (the present's own: the swapchain's image, its fence, the present call)
|
||||
double dispatch = 0, qsubmit = 0; // (in replay: the dispatches, the queue submits)
|
||||
double par_wait = 0; // (in replay: the replay thread's waits for the helper threads' segments)
|
||||
double game_wait = 0; // (the game's fence waits, every thread)
|
||||
double captures = 0; // (the submit-time captures on the game's threads)
|
||||
double wb_wait = 0; // (the waits for write-backs still on the GPU, wherever they were: memory sync's capture, a read)
|
||||
double wb_held = 0; // (of them, the part after the writer's recording was done: the timeline held, not the GPU)
|
||||
double qs_bg = 0; // (the queue submits made while a background import ran)
|
||||
};
|
||||
|
||||
/// Outside the replay and the present: the game's own update, its waits for the replay and the GPU among it. As the stall line's
|
||||
inline double outside(const Split& s) { return s.interval - s.replay - s.present; }
|
||||
|
||||
/// The columns, after the trace's first ones (their names; the line's values in this order: line)
|
||||
constexpr const char* kColumns =
|
||||
"replay_ms,present_ms,dispatch_ms,qsubmit_ms,par_wait_ms,outside_ms,game_wait_ms,captures_ms,wb_wait_ms,wb_held_ms,qs_bg_ms";
|
||||
|
||||
/// The values for kColumns, comma-separated, no line end: snprintf's count
|
||||
inline int line(const Split& s, char* out, size_t cap) {
|
||||
return std::snprintf(out, cap, "%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f", s.replay, s.present, s.dispatch,
|
||||
s.qsubmit, s.par_wait, outside(s), s.game_wait, s.captures, s.wb_wait, s.wb_held, s.qs_bg);
|
||||
}
|
||||
|
||||
} // namespace mkwvk::frame_trace
|
||||
139
gpu/vk/framegen_rows.h
Normal file
139
gpu/vk/framegen_rows.h
Normal file
@@ -0,0 +1,139 @@
|
||||
/* (Triforce) The Insert menu's Frame generation row (vk_menu.cpp, opts.framegen) with its last choice, AMD FSR 4, and what
|
||||
AMD FSR 4's frame generation (vk_fsr4.cpp, fsr4fg) decides without a GPU: where the choice is offered, which of the
|
||||
versions AMD's library lists is taken, when a frame is a camera cut, when a context still fits and when it is let go,
|
||||
and the order it is taken down in. Plain functions, no Vulkan, no menu: tests/test_framegen_fsr4.py checks them. */
|
||||
#pragma once
|
||||
|
||||
#include <cmath>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
|
||||
namespace mkwvk::framegen_rows {
|
||||
|
||||
/// opts.framegen (saved as frame_generation): 0 Off, 1 Auto, 2 to 8 the multiplier, as before (an options file from before
|
||||
/// keeps its meaning), then 9: AMD FSR 4, one frame made by AMD's library between each two of the game's
|
||||
enum { OFF = 0, AUTO = 1, kMaxMult = 8, FSR4 = 9, kRowMax = FSR4 };
|
||||
|
||||
/// Why AMD FSR 4 cannot make the frames here (the row says it); FG_OK when it can. FG_NOT_YET: not asked, the device is not
|
||||
/// made yet
|
||||
enum Why { FG_OK, FG_NOT_BUILT, FG_ENV_OFF, FG_NOT_YET, FG_NO_LIBRARY, FG_NO_FILE, FG_NO_MODEL, FG_FAILED, FG_WHY_COUNT };
|
||||
|
||||
/// The row's last value on this PC: AMD FSR 4 where it is offered, 8x elsewhere (the row as it was)
|
||||
constexpr int row_hi(bool fsr4_offered) { return fsr4_offered ? (int)FSR4 : (int)kMaxMult; }
|
||||
/// What the row shows, and what runs, for a value: itself, or 2x for a saved AMD FSR 4 on a PC where it is not offered
|
||||
/// (one made frame a frame either way, there by the renderer's own interpolation). The saved value stays for a PC where it is
|
||||
constexpr int shown(int v, bool fsr4_offered) { return v == FSR4 && !fsr4_offered ? 2 : v; }
|
||||
/// The frames shown for each of the game's: 1 at Off, auto_most with Auto (the display's refresh over 30 fps), the
|
||||
/// multiplier, and 2 with AMD FSR 4 (its library makes the one frame between two)
|
||||
constexpr int multiplier(int v, int auto_most) {
|
||||
return v == FSR4 ? 2 : v == AUTO ? auto_most : v < 1 ? 1 : v > kMaxMult ? (int)kMaxMult : v;
|
||||
}
|
||||
/// Whether AMD's library is asked for the made frame: the row at AMD FSR 4, where it can, and not beside NVIDIA DLSS frame
|
||||
/// generation, whose frames go in at the present itself (dlssg: vk_dlssg.cpp says it runs in this session)
|
||||
constexpr bool fsr4_asked(int v, Why why, bool dlssg) { return v == FSR4 && why == FG_OK && !dlssg; }
|
||||
|
||||
/// A version as AMD's library names it ("4.0.2"; one the graphics driver brings carries a star, "4.0.2*"): false when the
|
||||
/// name does not start with three numbers
|
||||
inline bool parse_version(const char* name, unsigned v[3]) {
|
||||
v[0] = v[1] = v[2] = 0;
|
||||
return name && std::sscanf(name, "%u.%u.%u", &v[0], &v[1], &v[2]) == 3;
|
||||
}
|
||||
/// Of the frame generation versions AMD's library lists for this GPU, the one contexts are made with: the newest FSR 4, the
|
||||
/// first of equal ones; -1 when it lists none. An FSR 3.1 frame generation alone is not FSR 4: it never stands in under
|
||||
/// FSR 4's name, as vk_fsr4.cpp's upscaler takes no FSR 3.1 either. any (RX_VK_FSR4_FG=1, for trying the path on a card
|
||||
/// without FSR 4): the newest of whatever is listed
|
||||
inline int pick_version(const char* const* names, int n, bool any) {
|
||||
int best = -1;
|
||||
unsigned bv[3] = {0, 0, 0};
|
||||
for (int i = 0; i < n; i++) {
|
||||
unsigned v[3];
|
||||
if (!parse_version(names[i], v) || (!any && v[0] != 4)) continue;
|
||||
const bool newer = v[0] != bv[0] ? v[0] > bv[0] : v[1] != bv[1] ? v[1] > bv[1] : v[2] > bv[2];
|
||||
if (best < 0 || newer) best = i, bv[0] = v[0], bv[1] = v[1], bv[2] = v[2];
|
||||
}
|
||||
return best;
|
||||
}
|
||||
|
||||
/// The camera in the world, from the view matrix's three rows as the game has them (row major, view = R * world + t: the
|
||||
/// rows are its right, up and back axes, the last column the translation). The position is -R^T t
|
||||
struct Pose {
|
||||
float pos[3]{}, right[3]{}, up[3]{}, fwd[3]{};
|
||||
};
|
||||
inline Pose pose_of(const float v[12]) {
|
||||
Pose p;
|
||||
for (int i = 0; i < 3; i++) {
|
||||
p.right[i] = v[i], p.up[i] = v[4 + i], p.fwd[i] = -v[8 + i];
|
||||
p.pos[i] = -(v[i] * v[3] + v[4 + i] * v[7] + v[8 + i] * v[11]);
|
||||
}
|
||||
return p;
|
||||
}
|
||||
/// A camera cut between two frames frame_ms apart: the camera moved over 5 units, or turned over 10 degrees while it
|
||||
/// moved over half a unit, for each 60th of a second (a slower frame may move in proportion, up to four times; the game's
|
||||
/// world is in metres, its near plane at 0.1). A made frame between the two pictures of a cut would blend two views that
|
||||
/// have nothing to do with each other: such a frame starts a new history and none is made. The thresholds are NX2navi's,
|
||||
/// from its camera traces of the same game (a median of 0.05 m and 0.08 degrees a frame in play, area loads of 5 to
|
||||
/// 180 m in one frame)
|
||||
inline bool camera_cut(const Pose& before, const Pose& now, float frame_ms) {
|
||||
const float scale = !(frame_ms > 0.0f) ? 1.0f : frame_ms < 16.667f ? 1.0f : frame_ms > 66.667f ? 4.0f : frame_ms / 16.667f;
|
||||
float move2 = 0.0f, dot = 0.0f, la = 0.0f, lb = 0.0f;
|
||||
for (int i = 0; i < 3; i++) {
|
||||
const float d = now.pos[i] - before.pos[i];
|
||||
move2 += d * d, dot += before.fwd[i] * now.fwd[i], la += before.fwd[i] * before.fwd[i], lb += now.fwd[i] * now.fwd[i];
|
||||
}
|
||||
if (!std::isfinite(move2) || !std::isfinite(dot) || !(la > 0.0f) || !(lb > 0.0f)) return true; // (no camera to compare)
|
||||
const float move = std::sqrt(move2);
|
||||
const float cosine = dot / std::sqrt(la * lb);
|
||||
const float turn = std::acos(cosine < -1.0f ? -1.0f : cosine > 1.0f ? 1.0f : cosine); // (radians)
|
||||
constexpr float kTenDegrees = 0.17453293f;
|
||||
return move > 5.0f * scale || (turn > kTenDegrees * scale && move > 0.5f * scale);
|
||||
}
|
||||
|
||||
/// What a present with the row at AMD FSR 4 shows between the game's last frame and this one
|
||||
enum Made {
|
||||
MADE, ///< AMD's library made the frame
|
||||
OWN, ///< it did not take this present (no scene's depth and motion: a menu, a movie; not available; failed): the
|
||||
///< renderer's own interpolation makes the frame, as at 2x
|
||||
SKIP ///< a new history (the first frame, a gap, a camera cut): AMD's library was given the frame and no frame is made
|
||||
};
|
||||
|
||||
/// A frame generation context as it was made: the presented picture's size, the largest scene it takes, and whether the
|
||||
/// scene's far plane is at infinity (a context is made for one kind of depth)
|
||||
struct ContextKey {
|
||||
uint32_t width = 0, height = 0, max_render_width = 0, max_render_height = 0;
|
||||
bool infinite_depth = false;
|
||||
};
|
||||
/// Whether a context made as c takes a frame of w x h with a scene of rw x rh: else it is made again
|
||||
constexpr bool context_fits(const ContextKey& c, uint32_t w, uint32_t h, uint32_t rw, uint32_t rh, bool infinite_depth) {
|
||||
return c.width == w && c.height == h && rw <= c.max_render_width && rh <= c.max_render_height &&
|
||||
c.infinite_depth == infinite_depth;
|
||||
}
|
||||
/// The context for such a frame: the scene is never larger than the picture in play, and a larger one still gets a context
|
||||
constexpr ContextKey context_for(uint32_t w, uint32_t h, uint32_t rw, uint32_t rh, bool infinite_depth) {
|
||||
return ContextKey{w, h, rw > w ? rw : w, rh > h ? rh : h, infinite_depth};
|
||||
}
|
||||
|
||||
/// The presents a context is kept after its last frame: 120 once the row has left AMD FSR 4 (stepping through the row's
|
||||
/// choices passes it: nothing is made and let go again within two seconds), 2 after a failure. Never at the present of
|
||||
/// its last frame: that frame's commands are recorded and not yet on the queue
|
||||
constexpr uint64_t kIdlePresents = 120, kFailedPresents = 2;
|
||||
constexpr bool release_due(bool have, bool failed, uint64_t presents, uint64_t used_at) {
|
||||
return have && presents >= used_at && presents - used_at >= (failed ? kFailedPresents : kIdlePresents);
|
||||
}
|
||||
|
||||
/// Taking AMD's frame generation down, in the order that is safe, as one function the real code (vk_fsr4.cpp) and
|
||||
/// tests/test_framegen_fsr4.py both run. ops.stop: no call into AMD's library starts after it (the lock a call holds is
|
||||
/// taken, so one in progress has returned). At the process's exit (HOS_OPT_EXITING, host/hos_relaunch.c) that is all:
|
||||
/// there is no swapchain or thread of AMD's to stop (the renderer presents the made frames itself), and what the context
|
||||
/// holds goes with the process, as the upscaler's does; AMD's library is not called again, so nothing of it runs under
|
||||
/// ExitProcess. In play (the row left AMD FSR 4, another size, a failure): the GPU is past every command buffer that
|
||||
/// used the context (ops.wait_gpu), then AMD's context goes (ops.destroy_context) before the image it wrote into
|
||||
/// (ops.destroy_images), never the other way round
|
||||
template <class Ops> void teardown(Ops& ops, bool exiting) {
|
||||
ops.stop();
|
||||
if (exiting) return;
|
||||
ops.wait_gpu();
|
||||
ops.destroy_context();
|
||||
ops.destroy_images();
|
||||
}
|
||||
|
||||
} // namespace mkwvk::framegen_rows
|
||||
132
gpu/vk/game_language.h
Normal file
132
gpu/vk/game_language.h
Normal file
@@ -0,0 +1,132 @@
|
||||
/* The Insert menu's Game language row (vk_menu.cpp), as plain code: what language.txt in the game folder chooses and offers,
|
||||
and the file's text with another language chosen. No Vulkan, no menu: tests/test_game_language.py checks it.
|
||||
|
||||
The game's language is the host's to read, at the start (host/nn_applet.c desired_language): HOS_LANGUAGE, else the
|
||||
file's first line that is not blank or a comment and whose first word is one of the game's codes, in any case; English
|
||||
(US) when there is none. Setup's update keeps a folder's choice by the same line, and takes it only when the line is the
|
||||
code alone, spelled as the game spells it (nx2/make_game.py folder_language). The file lists the codes in its comments
|
||||
("# pt-BR Portuguese (Brazil)"), as the host and Setup write it.
|
||||
|
||||
The row offers the languages the file itself names, as its choice or in that list, that the game has; it writes the
|
||||
choice as the code alone on the choice's line, and no code the file does not name. */
|
||||
#pragma once
|
||||
|
||||
#include <cstddef>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
|
||||
namespace mkwvk::game_language {
|
||||
|
||||
struct Language {
|
||||
const char* code;
|
||||
const char* name;
|
||||
};
|
||||
/// The game's languages: host/nn_applet.c's table and nx2/make_game.py's LANGUAGES, in their order (the test holds the
|
||||
/// three together)
|
||||
constexpr Language kLanguages[] = {
|
||||
{"en-US", "English (US)"}, {"en-GB", "English (UK)"}, {"fr", "French (France)"}, {"fr-CA", "French (Canada)"},
|
||||
{"de", "German"}, {"it", "Italian"}, {"es", "Spanish (Spain)"}, {"es-419", "Spanish (Latin America)"},
|
||||
{"pt-BR", "Portuguese (Brazil)"}, {"nl", "Dutch"}, {"pl", "Polish"}, {"ru", "Russian"},
|
||||
{"ja", "Japanese"}, {"ko", "Korean"}, {"zh-Hans", "Chinese (Simplified)"}, {"zh-Hant", "Chinese (Traditional)"},
|
||||
};
|
||||
constexpr int kCount = sizeof kLanguages / sizeof kLanguages[0];
|
||||
constexpr int kDefault = 0; // (English (US): the host's answer when the file chooses nothing)
|
||||
inline unsigned bit(int language) { return 1u << language; }
|
||||
|
||||
/// A code's place in kLanguages, in any case (the host compares so: "pt-br" is pt-BR); -1 when the game has no such code
|
||||
inline int find(std::string_view code) {
|
||||
for (int i = 0; i < kCount; i++) {
|
||||
const std::string_view k = kLanguages[i].code;
|
||||
if (k.size() != code.size()) continue;
|
||||
bool same = true;
|
||||
for (size_t c = 0; c < k.size() && same; c++) {
|
||||
const auto lower = [](char x) { return x >= 'A' && x <= 'Z' ? (char)(x - 'A' + 'a') : x; };
|
||||
same = lower(k[c]) == lower(code[c]);
|
||||
}
|
||||
if (same) return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/// What a language.txt says
|
||||
struct File {
|
||||
int chosen = -1; ///< the language its choice line names (kLanguages' index); -1: it has no such line
|
||||
unsigned offered = 0; ///< a bit a language the file names: its choice, and each "# <code> ..." line
|
||||
size_t at = 0, len = 0; ///< the choice line's text to replace: after a byte order mark, without its line ending
|
||||
bool crlf = false; ///< its lines end with CR LF
|
||||
};
|
||||
|
||||
/// The first word of s (after spaces and tabs), up to a space, a tab or a line's end
|
||||
inline std::string_view word(std::string_view s) {
|
||||
size_t a = 0;
|
||||
while (a < s.size() && (s[a] == ' ' || s[a] == '\t')) a++;
|
||||
size_t b = a;
|
||||
while (b < s.size() && s[b] != ' ' && s[b] != '\t' && s[b] != '\r' && s[b] != '\n') b++;
|
||||
return s.substr(a, b - a);
|
||||
}
|
||||
|
||||
/// The file as the host reads it, line by line: what a line longer than its 79 bytes holds past them is not a line's start,
|
||||
/// a byte order mark may open any line, and the choice is the first line that is neither blank nor a comment and names a
|
||||
/// language of the game (a line that names none is passed over, as there)
|
||||
inline File read(std::string_view text) {
|
||||
File f;
|
||||
f.crlf = text.find("\r\n") != std::string_view::npos;
|
||||
for (size_t start = 0; start < text.size();) {
|
||||
size_t end = text.find('\n', start);
|
||||
if (end == std::string_view::npos) end = text.size();
|
||||
size_t stop = end; // (the line without its ending)
|
||||
if (stop > start && text[stop - 1] == '\r') stop--;
|
||||
std::string_view line = text.substr(start, stop - start);
|
||||
size_t lead = 0; // (bytes of the line before what the host looks at)
|
||||
if (line.size() >= 3 && (unsigned char)line[0] == 0xEF && (unsigned char)line[1] == 0xBB && (unsigned char)line[2] == 0xBF) lead = 3;
|
||||
// (the host's buffer: 79 bytes of the line, cut at a zero byte. It keeps 31 bytes of the word, more than any code has: a
|
||||
// longer word names no language there or here)
|
||||
std::string_view seen = line.substr(0, 79);
|
||||
if (const size_t zero = seen.find('\0'); zero != std::string_view::npos) seen = seen.substr(0, zero);
|
||||
seen = seen.substr(lead < seen.size() ? lead : seen.size());
|
||||
size_t blank = 0;
|
||||
while (blank < seen.size() && (seen[blank] == ' ' || seen[blank] == '\t')) blank++;
|
||||
const std::string_view rest = seen.substr(blank);
|
||||
if (!rest.empty() && rest[0] == '#') { // (a comment: a language it lists, "# <code> <name>")
|
||||
const int listed = find(word(rest.substr(1)));
|
||||
if (listed >= 0) f.offered |= bit(listed);
|
||||
} else if (!rest.empty() && f.chosen < 0) {
|
||||
const int named = find(word(rest));
|
||||
if (named >= 0) f.chosen = named, f.offered |= bit(named), f.at = start + lead, f.len = stop - (start + lead);
|
||||
}
|
||||
start = end + 1;
|
||||
}
|
||||
return f;
|
||||
}
|
||||
|
||||
/// The file's text with `language` chosen: its choice line replaced by the code alone (as Setup's update reads it), every
|
||||
/// other byte as it was; with no choice line, the code on a line of its own at the end. The text as it is when the file
|
||||
/// does not name that language: never a code it does not list
|
||||
inline std::string write(std::string_view text, int language) {
|
||||
const File f = read(text);
|
||||
if (language < 0 || language >= kCount || !(f.offered & bit(language))) return std::string(text);
|
||||
const std::string_view code = kLanguages[language].code;
|
||||
std::string out(text);
|
||||
if (f.chosen >= 0) {
|
||||
out.replace(f.at, f.len, code);
|
||||
return out;
|
||||
}
|
||||
const char* const eol = f.crlf ? "\r\n" : "\n";
|
||||
if (!out.empty() && out.back() != '\n') out += eol;
|
||||
out += code;
|
||||
out += eol;
|
||||
return out;
|
||||
}
|
||||
|
||||
/// The languages a file offers, in kLanguages' order, into out (kCount of room): how many. None unless the language in
|
||||
/// effect (the file's choice, else the host's English (US)) is among them: the row then has nothing sound to show
|
||||
inline int offered(const File& f, int* out) {
|
||||
const int now = f.chosen >= 0 ? f.chosen : kDefault;
|
||||
if (!(f.offered & bit(now))) return 0;
|
||||
int n = 0;
|
||||
for (int i = 0; i < kCount; i++)
|
||||
if (f.offered & bit(i)) out[n++] = i;
|
||||
return n;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::game_language
|
||||
73
gpu/vk/gate_wait.h
Normal file
73
gpu/vk/gate_wait.h
Normal file
@@ -0,0 +1,73 @@
|
||||
// (Triforce) A submission whose command buffer begins with a wait for an event the game signals from the CPU: the submit waits for
|
||||
// the signal (RX_VK_GATE_WAIT_MS at most) before its capture and its replay, after NX2navi's gate_wait_ms (runtime/vk_exec.c
|
||||
// vk_exec_gate_wait and gate_first_wait).
|
||||
//
|
||||
// OoT's queues order some of their work with events the CPU signals once it has written what the work reads. A submission that
|
||||
// meets such a wait unmet is taken (its capture of the game's memory at the submit) and replayed up to the wait, where it stops; once
|
||||
// the CPU signals, the order thread (vk_replay.cpp sync_watch, a millisecond at a time) or the next submit or present lets it go on,
|
||||
// with a second capture (resume_queue, RX_VK_RESUME_CAPTURE). NX2navi found the signal 1 to 2 ms after the submit call in about
|
||||
// every other frame in Hyrule Field, and made the submit call wait for it, before its copies, as the console's GPU waits at the
|
||||
// wait itself: the capture is then taken after the game has written the frame's data, and the frame is replayed in the submit call
|
||||
// and on the submitting thread (54.5 fps instead of 53 there, the longest frame 33 ms instead of 46). Triforce meets it far less
|
||||
// often (the "captures at a CPU event's wait" of the order line: 100 to 170 in a lab run of 26,000 frames at the Market), and a gate
|
||||
// that runs out holds the submitting thread for the whole bound, so it is off unless asked for, for the lab to measure.
|
||||
// The gate waits only where the replay would stop: the first op of the submission's first command buffer that is not state the
|
||||
// replay only stores (bound programs, buffers, textures, targets, viewports...) is a wait for an event, the wait is not met in the
|
||||
// replay's order now, and the CPU has signalled that event before (vk_replay.cpp cpu_events). It takes no lock while it waits (the
|
||||
// thread that will signal may need the order lock first), and looks at the event's word in the game's memory, which the CPU's signal
|
||||
// writes. It ends at the signal, or at the bound, and the submission then goes as before. After kOuts waits that ran out, once they
|
||||
// are more than a tenth of the waits, it is off for the run (the signal is then one that comes only after the submitting thread goes
|
||||
// on, and every wait would be a stall).
|
||||
// RX_VK_GATE_WAIT_MS unset or 0: off, as before; 1 to 100: the bound in milliseconds (NX2navi's default is 10)
|
||||
// Apart from Vulkan and the stream's op numbers so that tests/test_gate_wait.py can run the rules and the gate over authored streams.
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)
|
||||
#include <immintrin.h>
|
||||
#endif
|
||||
|
||||
namespace mkwvk::gate_wait {
|
||||
|
||||
constexpr int kMaxOps = 256; // (the ops looked at before the wait, at most: NX2navi's)
|
||||
constexpr int64_t kOuts = 4; // (waits that ran out before the gate may go off for the run)
|
||||
|
||||
/// RX_VK_GATE_WAIT_MS: the bound in milliseconds, 0 (off) to 100; unset or not a number: 0
|
||||
inline int ms(const char* env) {
|
||||
if (!env || !*env) return 0;
|
||||
const int v = std::atoi(env);
|
||||
return v < 0 ? 0 : v > 100 ? 100 : v;
|
||||
}
|
||||
|
||||
/// The command buffer's first op that is not state (records {uint32 op, uint32 size}, sizes 8-aligned, from p): the wait it begins
|
||||
/// with, or null. kind(op): 1 state the replay only stores (looked past), 2 a wait for an event, 0 anything else (a draw, a copy, a
|
||||
/// signal, a barrier, the end: the gate does not wait)
|
||||
template <class K>
|
||||
const uint8_t* first_wait(const uint8_t* p, K kind) {
|
||||
for (int k = 0; k < kMaxOps; k++) {
|
||||
uint32_t h[2];
|
||||
std::memcpy(h, p, sizeof h);
|
||||
if (h[1] < 8 || (h[1] & 7)) return nullptr;
|
||||
const int what = kind(h[0]);
|
||||
if (what == 2) return p;
|
||||
if (what != 1) return nullptr;
|
||||
p += h[1];
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
/// Whether the gate goes off for the run, after `gates` waits of which `outs` ran out
|
||||
inline bool off_after(int64_t gates, int64_t outs) {
|
||||
return outs >= kOuts && outs * 10 > gates;
|
||||
}
|
||||
|
||||
/// A pause of the host core while it looks (the waiting thread holds no virtual core: the signaller runs)
|
||||
inline void pause() {
|
||||
#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)
|
||||
_mm_pause();
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace mkwvk::gate_wait
|
||||
242
gpu/vk/gpl_rules.h
Normal file
242
gpu/vk/gpl_rules.h
Normal file
@@ -0,0 +1,242 @@
|
||||
// (Triforce) The rules of the fast pipeline link (VK_EXT_graphics_pipeline_library; vk_draw.cpp graphics_pipeline,
|
||||
// warm_libraries, prepare_run), apart from Vulkan so that tests/test_gpl_rules.py runs them. Off unless the hidden Debug
|
||||
// tab's Fast pipeline link row or RX_VK_GPL=1 switches it on: nobody has run the game with it.
|
||||
//
|
||||
// What "the driver step" was, and why the link stayed off "until the driver step is safe". A draw can only be linked from
|
||||
// its program's two shader libraries if the driver has them compiled; compiled in the draw they stall it for a compile
|
||||
// (0.2 to 1.1 s measured on NX2navi), so a draw asks for them under VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED
|
||||
// and goes without when they are cold. They are warm only if the start's "driver's part" made them: the step between the
|
||||
// translation and the pipelines (the start-up screen's "Compiling shaders", vk_draw.cpp warm_libraries), where every
|
||||
// kept program variant's two libraries are compiled once, on every processor, into the pipeline cache. That step was not
|
||||
// safe to leave on:
|
||||
// - it hands every shader of the game to the driver's compiler, and a driver's compiler faults on some of them (amdvlk64
|
||||
// on a mesh program, NVIDIA 615.78 on one vertex library at the same point of every preparation, NX2navi's issue 30;
|
||||
// the lab's start of 11-13 that hung with the driver's own lock held after such a fault);
|
||||
// - what it kept of a start that died in it was one empty file, <prepared>.warming: "this step began and did not end".
|
||||
// The next start then left the whole step out and wrote it down as done for that driver, for good. One shader the
|
||||
// driver cannot compile, a start closed from the task manager, a power cut: each left every library cold, and with
|
||||
// cold libraries no draw is linked, while each new pipeline still has two libraries built behind it on the workers
|
||||
// its whole build waits for. The link then costs and gives nothing;
|
||||
// - a fault the guard catches in that step starts the game again (driver_fault_restart), into exactly that.
|
||||
// NX2navi's equivalent step is its library warm (runtime/vk_pipeline.c lw_worker, lb_warm_prepared). What makes it safe
|
||||
// there, and here now: while a worker has a variant in the driver's hands, a journal on disk names it. A start that finds
|
||||
// a journal left over puts the variants it names on a skip list for this driver, which the step leaves out from then on
|
||||
// (each is built at its first draw, as without libraries), and goes on with the step: what the last start compiled comes
|
||||
// back from the driver's own cache in a moment. Only after kTries starts in a row that began the step and did not end it
|
||||
// is the step left out, as it was after the first. NX2navi's journal and skip list are not its owner's lines alone, so
|
||||
// nothing of them is copied: this is written from what they do.
|
||||
//
|
||||
// And the rules of the link itself, which were in graphics_pipeline's lines:
|
||||
// - a draw is linked only from libraries that are all there; a cold or failed library, or a link the driver refuses,
|
||||
// leaves the entry not ready and the whole build to finish it: what a draw does with an entry that is not ready is
|
||||
// what it does without libraries, nothing more is drawn with it;
|
||||
// - the worker's whole (optimised) build always follows a link, and takes its place when it is made; if it fails, the
|
||||
// linked pipeline stays, as before;
|
||||
// - the linked pipeline a whole build replaced is given back to the driver (it was kept for the run: NX2navi measured
|
||||
// 491 MiB of driver memory a session for its replaced links), but only kRetirePresents presents and kRetireMs later:
|
||||
// a draw recorded with it may still be on its way to the GPU. RX_VK_GPL_KEEP_LINKS=1: kept, as before.
|
||||
#pragma once
|
||||
|
||||
#include <atomic>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <deque>
|
||||
#include <mutex>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace gpl_rules {
|
||||
|
||||
// ---- an entry: linked first, then the whole build over it
|
||||
|
||||
/// The draw's thread, for a new entry: link is what the libraries linked to, "none" when a library was cold or failed or
|
||||
/// the driver refused the link. True: the entry is ready with it. False: nothing changed, the whole build makes it ready
|
||||
template <class Entry, class Pipeline>
|
||||
bool linked(Entry& e, Pipeline link) {
|
||||
if (link == Pipeline{}) return false;
|
||||
e.fast.store(link, std::memory_order_relaxed);
|
||||
e.pipeline.store(link, std::memory_order_relaxed);
|
||||
e.ready.store(true, std::memory_order_release);
|
||||
return true;
|
||||
}
|
||||
|
||||
/// The worker, the whole build over: whole is "none" when it failed. The entry is ready from here on: with the whole
|
||||
/// build, or with the link it had (the build failed), or with nothing (it failed and there was no link: the draws are left
|
||||
/// out, as before). Returns the link the whole build replaced, for retire(); "none" when there is nothing to give back
|
||||
template <class Entry, class Pipeline>
|
||||
Pipeline built(Entry& e, Pipeline whole) {
|
||||
Pipeline replaced{};
|
||||
if (!(whole == Pipeline{})) {
|
||||
e.pipeline.store(whole, std::memory_order_release);
|
||||
replaced = e.fast.exchange(Pipeline{}, std::memory_order_acq_rel);
|
||||
}
|
||||
e.ready.store(true, std::memory_order_release);
|
||||
return replaced;
|
||||
}
|
||||
|
||||
// ---- the replaced links, given back later
|
||||
|
||||
inline constexpr uint64_t kRetirePresents = 600;
|
||||
inline constexpr uint64_t kRetireMs = 10000;
|
||||
|
||||
/// The links whole builds replaced, until both waits are over (any thread adds, the present's thread takes)
|
||||
template <class Pipeline>
|
||||
class Retired {
|
||||
public:
|
||||
void add(Pipeline p, uint64_t present, uint64_t ms) {
|
||||
std::lock_guard lk(mu_);
|
||||
q_.push_back({p, present, ms});
|
||||
}
|
||||
/// Those replaced kRetirePresents presents and kRetireMs before now, the oldest first: the caller destroys them
|
||||
std::vector<Pipeline> due(uint64_t present, uint64_t ms) {
|
||||
std::vector<Pipeline> out;
|
||||
std::lock_guard lk(mu_);
|
||||
while (!q_.empty() && present >= q_.front().present + kRetirePresents && ms >= q_.front().ms + kRetireMs) {
|
||||
out.push_back(q_.front().p);
|
||||
q_.pop_front();
|
||||
}
|
||||
return out;
|
||||
}
|
||||
size_t waiting() {
|
||||
std::lock_guard lk(mu_);
|
||||
return q_.size();
|
||||
}
|
||||
|
||||
private:
|
||||
struct One {
|
||||
Pipeline p;
|
||||
uint64_t present, ms;
|
||||
};
|
||||
std::mutex mu_;
|
||||
std::deque<One> q_;
|
||||
};
|
||||
|
||||
// ---- the driver's part of the preparation: its journal and its skip list
|
||||
|
||||
/// A program variant (Program::key, Program::variant)
|
||||
struct Id {
|
||||
uint64_t key = 0, variant = 0;
|
||||
bool operator==(const Id& o) const { return key == o.key && variant == o.variant; }
|
||||
};
|
||||
|
||||
inline constexpr uint32_t kJournalMagic = 0x4A574654; // ("TFWJ")
|
||||
inline constexpr uint32_t kSkipMagic = 0x53574654; // ("TFWS")
|
||||
inline constexpr int kSlots = 64; // (the workers of the preparation at most: prepare_threads.h)
|
||||
inline constexpr uint32_t kTries = 3; // (starts in a row that may begin the step and not end it)
|
||||
|
||||
/// What a start found of the last one's journal
|
||||
struct Left {
|
||||
bool found = false; // (a journal was there: the last start began the step and did not end it)
|
||||
uint32_t tries = 0; // (the starts in a row that did so, the last one counted; 0: none, or another driver's)
|
||||
std::vector<Id> in_hand; // (the variants its workers had in the driver's hands when it ended)
|
||||
};
|
||||
|
||||
/// The journal at path as the last start left it. stamp: what the driver's part is made for now (vk_draw.cpp warmed_stamp).
|
||||
/// A file of another stamp is another driver's or other shaders': found, with nothing to count and no variant to blame. A
|
||||
/// file without the header is an older build's empty marker: one start, no variant named
|
||||
inline Left journal_left(const std::string& path, uint64_t stamp) {
|
||||
Left l;
|
||||
FILE* f = fopen(path.c_str(), "rb");
|
||||
if (!f) return l;
|
||||
l.found = true;
|
||||
uint32_t head[2]{};
|
||||
uint64_t was = 0;
|
||||
if (fread(head, 4, 2, f) != 2 || fread(&was, 8, 1, f) != 1 || head[0] != kJournalMagic) {
|
||||
l.tries = 1;
|
||||
} else if (was == stamp) {
|
||||
l.tries = head[1] ? head[1] : 1;
|
||||
for (int i = 0; i < kSlots; i++) {
|
||||
uint64_t r[2];
|
||||
if (fread(r, 8, 2, f) != 2) break;
|
||||
if (r[0] || r[1]) l.in_hand.push_back({r[0], r[1]});
|
||||
}
|
||||
}
|
||||
fclose(f);
|
||||
return l;
|
||||
}
|
||||
|
||||
/// Whether a start that found l goes on with the step (true) or leaves it out for this driver, as every start did before
|
||||
inline bool goes_on(const Left& l) { return !l.found || l.tries < kTries; }
|
||||
|
||||
/// The journal of a step under way. Every mark is on its way to the disk before the driver is called
|
||||
class Journal {
|
||||
public:
|
||||
Journal() = default;
|
||||
Journal(const Journal&) = delete;
|
||||
Journal& operator=(const Journal&) = delete;
|
||||
~Journal() { close(); }
|
||||
/// tries: the starts in a row that began the step, this one counted
|
||||
bool open(const std::string& path, uint64_t stamp, uint32_t tries) {
|
||||
std::lock_guard lk(mu_);
|
||||
if (f_) fclose(f_);
|
||||
f_ = fopen(path.c_str(), "wb");
|
||||
if (!f_) return false;
|
||||
const uint32_t head[2] = {kJournalMagic, tries};
|
||||
const uint64_t zero[2 * kSlots]{};
|
||||
const bool ok = fwrite(head, 4, 2, f_) == 2 && fwrite(&stamp, 8, 1, f_) == 1 &&
|
||||
fwrite(zero, 8, (size_t)(2 * kSlots), f_) == (size_t)(2 * kSlots) && fflush(f_) == 0;
|
||||
if (!ok) fclose(f_), f_ = nullptr;
|
||||
return ok;
|
||||
}
|
||||
/// Worker slot's variant, about to go to the driver ({0, 0}: it came back). A slot past the last has no line
|
||||
void mark(int slot, Id id) {
|
||||
if (slot < 0 || slot >= kSlots) return;
|
||||
std::lock_guard lk(mu_);
|
||||
if (!f_) return;
|
||||
const uint64_t r[2] = {id.key, id.variant};
|
||||
if (fseek(f_, 16 + 16 * slot, SEEK_SET) == 0 && fwrite(r, 8, 2, f_) == 2) fflush(f_);
|
||||
}
|
||||
void close() {
|
||||
std::lock_guard lk(mu_);
|
||||
if (f_) fclose(f_), f_ = nullptr;
|
||||
}
|
||||
|
||||
private:
|
||||
std::mutex mu_;
|
||||
FILE* f_ = nullptr;
|
||||
};
|
||||
|
||||
/// The skip list at path for this stamp (another stamp's, or no file: empty)
|
||||
inline std::vector<Id> skip_read(const std::string& path, uint64_t stamp) {
|
||||
std::vector<Id> ids;
|
||||
FILE* f = fopen(path.c_str(), "rb");
|
||||
if (!f) return ids;
|
||||
uint32_t head[2]{};
|
||||
uint64_t was = 0;
|
||||
if (fread(head, 4, 2, f) == 2 && fread(&was, 8, 1, f) == 1 && head[0] == kSkipMagic && was == stamp) {
|
||||
uint64_t r[2];
|
||||
while (ids.size() < 65536 && fread(r, 8, 2, f) == 2) ids.push_back({r[0], r[1]});
|
||||
}
|
||||
fclose(f);
|
||||
return ids;
|
||||
}
|
||||
|
||||
/// The skip list at path with more added (each variant once), written whole. Returns the list, as skip_read would give it
|
||||
inline std::vector<Id> skip_add(const std::string& path, uint64_t stamp, const std::vector<Id>& more) {
|
||||
std::vector<Id> ids = skip_read(path, stamp);
|
||||
bool grew = false;
|
||||
for (const Id& id : more) {
|
||||
bool have = false;
|
||||
for (const Id& o : ids) have = have || o == id;
|
||||
if (!have) ids.push_back(id), grew = true;
|
||||
}
|
||||
if (!grew) return ids;
|
||||
const std::string tmp = path + ".tmp";
|
||||
FILE* f = fopen(tmp.c_str(), "wb");
|
||||
if (!f) return ids;
|
||||
const uint32_t head[2] = {kSkipMagic, 0};
|
||||
bool ok = fwrite(head, 4, 2, f) == 2 && fwrite(&stamp, 8, 1, f) == 1;
|
||||
for (const Id& id : ids) {
|
||||
const uint64_t r[2] = {id.key, id.variant};
|
||||
ok = ok && fwrite(r, 8, 2, f) == 2;
|
||||
}
|
||||
ok = fclose(f) == 0 && ok;
|
||||
if (ok) {
|
||||
remove(path.c_str()); // (rename does not replace on Windows)
|
||||
ok = rename(tmp.c_str(), path.c_str()) == 0;
|
||||
}
|
||||
if (!ok) remove(tmp.c_str());
|
||||
return ids;
|
||||
}
|
||||
|
||||
} // namespace gpl_rules
|
||||
34
gpu/vk/hang_watch.h
Normal file
34
gpu/vk/hang_watch.h
Normal file
@@ -0,0 +1,34 @@
|
||||
// The hang watch's judgement, apart from its thread, the clock and the stacks (vk_hangdump.cpp). After NX2navi's hang
|
||||
// watch (its runtime/hang_watch.c hw_step): a report when no frame is shown for some seconds, once a stall, a few a run.
|
||||
// tests/test_hang_watch.py
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace mkwvk::hangwatch {
|
||||
|
||||
constexpr int kReports = 3; // (at most this many a run: a game that stalls again and again says so three times)
|
||||
|
||||
struct Watch {
|
||||
int64_t presents = -1; // the presents counted at the last look
|
||||
int still = 0; // judged seconds running without one
|
||||
bool told = false; // this stall has its report
|
||||
int reports = 0;
|
||||
};
|
||||
|
||||
/// One second's look. presents: the frames shown so far. judged: whether a second without one counts (the game's window
|
||||
/// in front and not minimized: the game may stop showing frames behind another window, and a watch asked for by name
|
||||
/// judges always). True when a report is due now: `limit` judged seconds running without a present, once per stall (a
|
||||
/// new one needs a present first), at most kReports a run.
|
||||
inline bool step(Watch& w, int64_t presents, bool judged, int limit) {
|
||||
if (presents != w.presents || !judged) {
|
||||
w.presents = presents, w.still = 0, w.told = false;
|
||||
return false;
|
||||
}
|
||||
if (++w.still < limit || w.told || w.reports >= kReports) return false;
|
||||
w.told = true;
|
||||
w.reports++;
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::hangwatch
|
||||
59
gpu/vk/helper_spin.h
Normal file
59
gpu/vk/helper_spin.h
Normal file
@@ -0,0 +1,59 @@
|
||||
// (Triforce, the third performance audit's P6, after NX2navi's replay workers: runtime/vk_exec.c rw_main's idle spin and the
|
||||
// submitting thread's spin for its chunks, epicmeme546, 3010a637, 7534193b, 7eee4817, ffa599ef) A bounded spin before a sleep
|
||||
// on a condition variable, for the parallel replay (vk_replay.cpp): a helper thread with no segment to record spins for the
|
||||
// next before it sleeps (par_worker_main), and the replay thread spins for a segment a helper records before it sleeps for it
|
||||
// (replay_handle). What each waits for is published where the spin can read it without the lock (ParPool::queued, Job::done),
|
||||
// and the condition variable's wait with its predicate follows the spin as before: the spin only makes the wait shorter when
|
||||
// what it waits for comes within it, it never decides anything. The audit's trace: the helpers began a segment 0.262 ms after
|
||||
// they were given it, and the replay thread waited 1.74 ms a frame for them (r22-trace). tests/test_helper_spin.py
|
||||
//
|
||||
// RX_VK_HELPER_SPIN_US=<us>: the spin's bound (100, NX2navi's; at most 1000000); 0: no spin, straight to the wait as before
|
||||
#pragma once
|
||||
#include <chrono>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)
|
||||
#include <immintrin.h>
|
||||
#endif
|
||||
|
||||
namespace helper_spin {
|
||||
|
||||
/// The bound in nanoseconds that RX_VK_HELPER_SPIN_US's text gives (null: unset)
|
||||
inline int64_t bound_ns(const char* text) {
|
||||
if (!text || !*text) return 100000;
|
||||
const long long us = std::atoll(text);
|
||||
return us <= 0 ? 0 : us >= 1000000 ? 1000000000LL : us * 1000;
|
||||
}
|
||||
/// RX_VK_HELPER_SPIN_US, read once
|
||||
inline int64_t spin_ns() {
|
||||
static const int64_t v = bound_ns(std::getenv("RX_VK_HELPER_SPIN_US"));
|
||||
return v;
|
||||
}
|
||||
inline void pause() {
|
||||
#if defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)
|
||||
_mm_pause();
|
||||
#endif
|
||||
}
|
||||
/// Spins until done() holds or ns have passed; whether done() held. ns <= 0: done() once, no spin. *spent (when given): the
|
||||
/// time spun
|
||||
template <class Done>
|
||||
bool until(Done&& done, int64_t ns, int64_t* spent = nullptr) {
|
||||
if (spent) *spent = 0;
|
||||
if (done()) return true;
|
||||
if (ns <= 0) return false;
|
||||
const auto t0 = std::chrono::steady_clock::now();
|
||||
const auto end = t0 + std::chrono::nanoseconds(ns);
|
||||
bool held = false;
|
||||
for (unsigned i = 1;; i++) {
|
||||
pause();
|
||||
if ((held = done())) break;
|
||||
if (!(i & 7) && std::chrono::steady_clock::now() >= end) {
|
||||
held = done();
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (spent) *spent = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now() - t0).count();
|
||||
return held;
|
||||
}
|
||||
|
||||
} // namespace helper_spin
|
||||
125
gpu/vk/import_ahead.h
Normal file
125
gpu/vk/import_ahead.h
Normal file
@@ -0,0 +1,125 @@
|
||||
/* (Triforce) The game's memory imported ahead of its first binding (vk_memory.cpp import_ahead_*). A pool's memory is imported
|
||||
into Vulkan (VK_EXT_external_memory_host) at the first binding that reaches it, by 16 MB chunk; the import is the driver's
|
||||
page locking, 8 to 17 ms a chunk on the owner's RTX 5090, and a binding the GPU writes, or a texture's storage read by the
|
||||
GPU's unswizzle, is imported there and then on the replay's thread: seven in one dispatch made a submit of 79 ms in the
|
||||
owner's test4 log, and the "unswizzled on the GPU" uploads of 22 to 32 ms were imports of their storage. The game's pools sit
|
||||
at the same addresses from run to run (triforce_mirror_keep.txt relies on that too), so the ranges a run imported on its
|
||||
own thread are kept in triforce_imports_ahead.txt beside the game, and in the next runs each is imported by the background
|
||||
import thread as soon as the game's pool table holds memory there, before a binding wants it. A binding that comes while it is
|
||||
under way waits for it, as for any import in the background. Plain functions: tests/test_import_ahead.cpp checks them.
|
||||
RX_VK_IMPORT_AHEAD=1 or 0: on or off on any card; unset: on with NVIDIA's driver only, as the background imports of a
|
||||
binding's reads are (RX_VK_ASYNC_IMPORT: background imports slowed an AMD card's own, vk_memory.cpp gpu_buffer_bind). */
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <vector>
|
||||
|
||||
namespace mkwvk::import_ahead {
|
||||
|
||||
constexpr size_t kMax = 256; // (ranges kept in the file at most)
|
||||
constexpr size_t kPerLook = 4; // (ranges sent to the background thread at one look, 16 under way at most: a look comes every 8
|
||||
// submissions too, and the test9 session's queue submits stalled beside batches of 16, made
|
||||
// one after the other; each range is sent once a session, vk_memory.cpp)
|
||||
|
||||
/// RX_VK_IMPORT_AHEAD: 1 on, 0 off, unset (or anything else): on for NVIDIA's driver (vendor 0x10de) only, as before test12.
|
||||
/// ((Triforce, 11-15) Off by default since test12: in the lab, at the title, with test12's binaries, the GPU hung after the
|
||||
/// write-back of pool 0x1072000000 (a mirror in pieces) in 6 of 12 runs with the imports ahead on and in 0 of 10 with
|
||||
/// RX_VK_IMPORT_AHEAD=0 (lazy write-back, GPL, BC1, Reflex, the sampler cache and the helper threads cleared, one by one);
|
||||
/// the ahead list held 0x1072000000..0x1077000000, imported on the background thread while that pool's mirror was in use.
|
||||
/// The owner's test10 never hung: its RAM was low all session, which pauses the imports ahead. Back on once the race is
|
||||
/// found and closed. vendor: kept for that, unused)
|
||||
/// ((Triforce, 11-15, later) A race that fits is closed: the host decommitted the game's freed pages under an import the background
|
||||
/// thread had locked and not yet put in the table (vk_memory.cpp bg_held, memory_guest_imported; tests/test_bg_import_held.py), and
|
||||
/// the imports ahead make that window wide where the game frees pages. Still off until a lab A/B with RX_VK_IMPORT_AHEAD=1 at the
|
||||
/// title on a build with that fix hangs no more; the log's "freed under a background import" lines say whether the window was hit)
|
||||
/// ((Triforce, 11-15, the lab A/B) On again: with that fix, 10 of 10 lab runs at the title with the imports ahead on were clean
|
||||
/// and each hit the window 2 to 16 times ("freed under a background import"); with the fix undone (RX_VK_BG_IMPORT_HOLD=0)
|
||||
/// 4 of 10 hung and others showed the title's video garbled. Runs E:\TriforceDev\lab-runs\holdA*, holdB*)
|
||||
inline bool on(const char* env, uint32_t vendor) {
|
||||
if (env && env[0] == '1' && !env[1]) return true;
|
||||
if (env && env[0] == '0' && !env[1]) return false;
|
||||
return vendor == 0x10DE;
|
||||
}
|
||||
|
||||
/// (Triforce, test8) A range imported ahead, [lo, hi), on chunk bounds: what an import on a binding's own thread took, its
|
||||
/// span over the game's pools across chunk ends included (vk_memory.cpp span_game_pools). The first version kept 16 MB chunks
|
||||
/// and imported each on its own: a binding across their ends then made them one import again on its own thread ("not in the
|
||||
/// background: an import beside it grows", 6 of the 13 still made so in the owner's test8 session, and the 64 MB imports that
|
||||
/// took in four of them)
|
||||
struct Range {
|
||||
uint64_t lo = 0, hi = 0;
|
||||
bool operator==(const Range& o) const { return lo == o.lo && hi == o.hi; }
|
||||
};
|
||||
|
||||
/// The file's lines: "lo hi" in hex (a range), or "lo" alone (a chunk, as the first version wrote them); lines that are no such
|
||||
/// numbers, and ranges not on chunk bounds, are left out. Sorted, none inside another, at most kMax
|
||||
inline std::vector<Range> parse(const char* text, uint64_t chunk) {
|
||||
std::vector<Range> out;
|
||||
if (!chunk) return out;
|
||||
for (const char* p = text; p && *p;) {
|
||||
char* end = nullptr;
|
||||
const unsigned long long lo = std::strtoull(p, &end, 16);
|
||||
unsigned long long hi = 0;
|
||||
bool ok = end != p && lo && lo % chunk == 0;
|
||||
if (ok && *end == ' ') {
|
||||
const char* q = end + 1;
|
||||
hi = std::strtoull(q, &end, 16);
|
||||
ok = end != q && hi > lo && hi % chunk == 0 && hi - lo <= (1ull << 30);
|
||||
} else {
|
||||
hi = lo + chunk;
|
||||
}
|
||||
ok = ok && (*end == '\n' || *end == '\r' || !*end);
|
||||
if (ok) out.push_back({lo, hi});
|
||||
while (*p && *p != '\n') p++;
|
||||
if (*p) p++;
|
||||
}
|
||||
std::sort(out.begin(), out.end(), [](const Range& a, const Range& b) { return a.lo != b.lo ? a.lo < b.lo : a.hi > b.hi; });
|
||||
std::vector<Range> kept; // (none inside another)
|
||||
for (const Range& r : out)
|
||||
if (kept.empty() || r.hi > kept.back().hi) kept.push_back(r);
|
||||
if (kept.size() > kMax) kept.resize(kMax);
|
||||
return kept;
|
||||
}
|
||||
|
||||
/// [lo, hi) into the list (sorted, none inside another): true when the list changed (the caller writes the file again). Ranges
|
||||
/// inside the new one go; a new one inside a kept one changes nothing; a full list takes nothing new
|
||||
inline bool add(std::vector<Range>& list, uint64_t lo, uint64_t hi) {
|
||||
if (hi <= lo) return false;
|
||||
for (const Range& r : list)
|
||||
if (r.lo <= lo && hi <= r.hi) return false;
|
||||
const size_t before = list.size();
|
||||
std::erase_if(list, [&](const Range& r) { return lo <= r.lo && r.hi <= hi; });
|
||||
if (list.size() == before && list.size() >= kMax) return false;
|
||||
list.insert(std::lower_bound(list.begin(), list.end(), lo, [](const Range& r, uint64_t v) { return r.lo < v; }), Range{lo, hi});
|
||||
return true;
|
||||
}
|
||||
|
||||
/// The file's text for list
|
||||
inline std::vector<char> text(const std::vector<Range>& list) {
|
||||
std::vector<char> out;
|
||||
char line[48];
|
||||
for (const Range& r : list) {
|
||||
const int n = std::snprintf(line, sizeof line, "%llx %llx\n", (unsigned long long)r.lo, (unsigned long long)r.hi);
|
||||
out.insert(out.end(), line, line + n);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
/// The ranges of list that the game's pools (sorted by lo) reach now and wanted(range) allows (nothing imported over it,
|
||||
/// nothing under way in it), at most n of them
|
||||
template <class Pools, class Wanted>
|
||||
std::vector<Range> due(const std::vector<Range>& list, const Pools& pools, size_t n, Wanted wanted) {
|
||||
std::vector<Range> out;
|
||||
for (const Range& r : list) {
|
||||
if (out.size() >= n) break;
|
||||
auto g = std::lower_bound(pools.begin(), pools.end(), r.hi, [](const auto& p, uint64_t v) { return p.lo < v; });
|
||||
if (g == pools.begin() || std::prev(g)->hi <= r.lo) continue; // (no pool starting below its end reaches into it)
|
||||
if (wanted(r)) out.push_back(r);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::import_ahead
|
||||
42
gpu/vk/ini_merge.h
Normal file
42
gpu/vk/ini_merge.h
Normal file
@@ -0,0 +1,42 @@
|
||||
// (Triforce, handoff §9) triforce_options.ini has more than one writer: the game's Insert menu (vk_menu.cpp save, the whole
|
||||
// file at every change) and whoever else changes it while the game runs (the owner in a text editor, a tool, a launcher of
|
||||
// another make). The menu wrote the values it held, so a line changed outside since the game read the file was put back as the
|
||||
// game had it at its next save: that change was lost, however long before the save it came. Now each line the game writes is
|
||||
// merged by its key: the game's value where the game changed it since it last read or wrote the file (its base), else what the
|
||||
// file has now. Two changes made within a second, one in the game and one outside, both stay; one row changed on both sides is
|
||||
// the game's (the later writer). The game itself takes an outside change at its next start, as a file read at the start is.
|
||||
// Plain logic: tests/test_options_writers.py compiles it alone
|
||||
#pragma once
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
namespace ini_merge {
|
||||
using Map = std::map<std::string, std::string>;
|
||||
|
||||
/// A value as lines are compared: without its line end and the spaces around it
|
||||
inline std::string trim(const std::string& v) {
|
||||
size_t a = 0, b = v.size();
|
||||
while (a < b && (v[a] == ' ' || v[a] == '\t')) a++;
|
||||
while (b > a && (v[b - 1] == '\n' || v[b - 1] == '\r' || v[b - 1] == ' ' || v[b - 1] == '\t')) b--;
|
||||
return v.substr(a, b - a);
|
||||
}
|
||||
|
||||
/// One line of the file into the map, when it is key=value (a key of something before the '=')
|
||||
inline void add_line(Map& m, const std::string& line) {
|
||||
const size_t eq = line.find('=');
|
||||
if (eq == std::string::npos || eq == 0) return;
|
||||
m[line.substr(0, eq)] = trim(line.substr(eq + 1));
|
||||
}
|
||||
|
||||
/// The value the game writes for key: its own (game) where it changed it since base was taken (base: the game's values as of
|
||||
/// its last read or write of the file; a key not in base is the game's), else the file's as it is now (disk), and the game's
|
||||
/// where the file has no such line. *taken: set when the file's was taken over the game's
|
||||
inline std::string pick(const std::string& key, const std::string& game, const Map& base, const Map& disk, bool* taken) {
|
||||
const auto b = base.find(key);
|
||||
if (b == base.end() || b->second != trim(game)) return game; // (changed in the game, or new to the file)
|
||||
const auto d = disk.find(key);
|
||||
if (d == disk.end() || d->second == b->second) return game;
|
||||
if (taken) *taken = true;
|
||||
return d->second;
|
||||
}
|
||||
} // namespace ini_merge
|
||||
99
gpu/vk/lab_ab.h
Normal file
99
gpu/vk/lab_ab.h
Normal file
@@ -0,0 +1,99 @@
|
||||
/* (Triforce, lab) In-run A/B. Two runs of one build differ by more than most changes are worth (the other programs on the GPU,
|
||||
which cores the threads landed on, the scene's state), so a change's effect is measured inside ONE run: the frames go in
|
||||
phases of RX_VK_LAB_AB_FRAMES presents (300): none, knob 1, none, knob 2, ... and around again, and the frame trace
|
||||
(RX_VK_FRAME_TRACE, vk_replay.cpp status_tick) carries the phase's knob in its last column (0: none, k: the k-th knob;
|
||||
negative for a phase's first RX_VK_LAB_AB_SKIP frames (30), which a reader leaves out). perf\lowend\lab_ab.py compares each
|
||||
knob's phases with the none-phases on both sides of them.
|
||||
|
||||
RX_VK_LAB_AB=<name>[:<value>],<name>[:<value>],... (at most 16)
|
||||
Knobs joined by '+' are one knob that turns each of them on ("reclast+tlrec+rbsettle").
|
||||
A knob named d_<site> is a delay: a busy wait of <value> microseconds at that site, at most once a frame (delay(), below):
|
||||
what the frame's time answers to a part of it taking longer, which is whether that part is on the frame's critical path
|
||||
(1 ms in for 1 ms of delay) or has slack (nothing). Any other name is a switch the code reads with on("<name>").
|
||||
Not for players: nothing reads these without the variable. */
|
||||
#pragma once
|
||||
|
||||
#include <atomic>
|
||||
#include <chrono>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
namespace mkwvk::lab_ab {
|
||||
|
||||
struct Knob {
|
||||
char name[64];
|
||||
int64_t value;
|
||||
};
|
||||
inline Knob knobs[16];
|
||||
inline int n_knobs = -1; // (-1: the variable not read yet)
|
||||
inline std::atomic<int> active{0}; // (0: none; k: knobs[k - 1])
|
||||
inline std::atomic<uint64_t> frame_no{0}; // (presents counted here)
|
||||
inline std::atomic<uint64_t> fired[16]; // (the frame each delay last waited in)
|
||||
inline std::atomic<uint32_t> pres_thread{0}; // (the thread that presents: the game's Presentation thread, in the plain mode)
|
||||
inline int64_t phase_frames = 300, skip_frames = 30;
|
||||
|
||||
inline void init() {
|
||||
if (n_knobs >= 0) return;
|
||||
int n = 0;
|
||||
const char* e = getenv("RX_VK_LAB_AB");
|
||||
while (e && *e && n < 16) {
|
||||
const char* end = strchr(e, ',');
|
||||
const size_t len = end ? (size_t)(end - e) : strlen(e);
|
||||
char item[96] = {};
|
||||
memcpy(item, e, len < sizeof item - 1 ? len : sizeof item - 1);
|
||||
char* colon = strchr(item, ':');
|
||||
knobs[n].value = colon ? atoll(colon + 1) : 1;
|
||||
if (colon) *colon = 0;
|
||||
strncpy(knobs[n].name, item, sizeof knobs[n].name - 1);
|
||||
if (knobs[n].name[0]) n++;
|
||||
e = end ? end + 1 : nullptr;
|
||||
}
|
||||
if (const char* f = getenv("RX_VK_LAB_AB_FRAMES")) phase_frames = atoll(f) > 0 ? atoll(f) : 300;
|
||||
if (const char* s = getenv("RX_VK_LAB_AB_SKIP")) skip_frames = atoll(s);
|
||||
n_knobs = n;
|
||||
}
|
||||
/// Once a present, on the presenting thread: the phase this frame belongs to (the trace's column)
|
||||
inline int phase_tick() {
|
||||
init();
|
||||
if (!n_knobs) return 0;
|
||||
const uint64_t f = frame_no.fetch_add(1) + 1;
|
||||
const uint64_t phase = f / (uint64_t)phase_frames; // (0 none, 1 knob 1, 2 none, 3 knob 2, ...)
|
||||
const int k = (phase & 1) ? (int)((phase / 2) % (uint64_t)n_knobs) + 1 : 0;
|
||||
active.store(k, std::memory_order_relaxed);
|
||||
const bool settling = (int64_t)(f % (uint64_t)phase_frames) < skip_frames;
|
||||
return settling ? -(k + 1) : k; // (-1: none, settling; -(k + 1): knob k, settling)
|
||||
}
|
||||
/// Is this switch on in this phase: the phase's knob is it, or names it among several joined by '+' ("reclast+tlrec":
|
||||
/// both on in that knob's phases, so a combination is one knob)
|
||||
inline bool on(const char* name) {
|
||||
if (n_knobs <= 0) return false;
|
||||
const int k = active.load(std::memory_order_relaxed);
|
||||
if (k <= 0) return false;
|
||||
const size_t len = strlen(name);
|
||||
for (const char* p = knobs[k - 1].name; p && *p;) {
|
||||
const char* plus = strchr(p, '+');
|
||||
const size_t n = plus ? (size_t)(plus - p) : strlen(p);
|
||||
if (n == len && !strncmp(p, name, len)) return true;
|
||||
p = plus ? plus + 1 : nullptr;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
inline int64_t value_of(const char* name, int64_t otherwise) {
|
||||
if (n_knobs <= 0) return otherwise;
|
||||
const int k = active.load(std::memory_order_relaxed);
|
||||
return k > 0 && !strcmp(knobs[k - 1].name, name) ? knobs[k - 1].value : otherwise;
|
||||
}
|
||||
/// The delay site <site> (knob "d_<site>"): a busy wait of its microseconds, once a frame
|
||||
inline void delay(const char* site) {
|
||||
if (n_knobs <= 0) return;
|
||||
const int k = active.load(std::memory_order_relaxed);
|
||||
if (k <= 0 || knobs[k - 1].name[0] != 'd' || knobs[k - 1].name[1] != '_' || strcmp(knobs[k - 1].name + 2, site)) return;
|
||||
const uint64_t f = frame_no.load(std::memory_order_relaxed);
|
||||
if (fired[k - 1].exchange(f, std::memory_order_relaxed) == f) return;
|
||||
const auto until = std::chrono::steady_clock::now() + std::chrono::microseconds(knobs[k - 1].value);
|
||||
while (std::chrono::steady_clock::now() < until) {
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace mkwvk::lab_ab
|
||||
70
gpu/vk/layer_split.h
Normal file
70
gpu/vk/layer_split.h
Normal file
@@ -0,0 +1,70 @@
|
||||
/* (Triforce) A new layered ASTC texture's first upload spread over a few frames, some of its layers each (vk_texture.cpp
|
||||
texture_touch, split_take). The GPU decodes an ASTC texture (and encodes it again as BC3 or BC1 where the renderer keeps it
|
||||
so) in the upload command buffer of the recording that first draws it. In the owner's test7 session one such texture,
|
||||
1365 x 1365 x 90 layers with 11 levels (57 MB of ASTC, some 890 MB of texels), was the upload of an area change's frame
|
||||
("slow upload 35.0 ms ... ASTC (BC3)"), that frame's upload command buffer took the GPU 114.8 ms, and the next frame's
|
||||
capture waited 117.2 ms for it. The frame's upload budget (new_texture_later) counts bytes of storage, and always lets a
|
||||
frame's first upload through: one texture alone made the backlog. Now such a texture, while the hold of the last picture may
|
||||
leave textures for later, is uploaded a part of its layers a frame: its draws sample the dummy and its frames are held until
|
||||
the last part is in, as for a new texture left whole for the next frame. At the hold's bound, or for a dispatch, what is left
|
||||
goes at once. Plain functions: tests/test_layer_split.cpp checks them. RX_VK_UPLOAD_SPLIT_MB=<MB of texels a frame> (128),
|
||||
0: whole, as before. */
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
namespace mkwvk::layer_split {
|
||||
|
||||
using Ranges = std::vector<std::pair<uint64_t, uint64_t>>;
|
||||
|
||||
constexpr uint32_t kMaxParts = 6; // (frames at most: upload_owed::kLaterMax is 8, and a part is a frame)
|
||||
|
||||
/// RX_VK_UPLOAD_SPLIT_MB: the texels' MB a part may decode, 0: no split (unset or no number: 128)
|
||||
inline uint64_t budget(const char* env) {
|
||||
if (!env || !*env) return 128ull << 20;
|
||||
char* end = nullptr;
|
||||
const double v = std::strtod(env, &end);
|
||||
if (end == env || *end || v < 0) return 128ull << 20;
|
||||
return (uint64_t)(v * 1048576.0);
|
||||
}
|
||||
|
||||
/// The texels an ASTC texture decodes to (RGBA8, every level and layer)
|
||||
inline uint64_t texel_bytes(uint32_t w, uint32_t h, uint32_t levels, uint32_t layers) {
|
||||
uint64_t n = 0;
|
||||
for (uint32_t l = 0; l < std::max(1u, levels); l++) n += (uint64_t)std::max(1u, w >> l) * std::max(1u, h >> l) * 4;
|
||||
return n * std::max(1u, layers);
|
||||
}
|
||||
|
||||
/// The parts a texture of these texels and layers is uploaded in (1: whole)
|
||||
inline uint32_t parts(uint64_t texels, uint32_t layers, uint64_t per_part) {
|
||||
if (!per_part || layers < 2 || texels <= per_part) return 1;
|
||||
const uint64_t p = (texels + per_part - 1) / per_part;
|
||||
return (uint32_t)std::min<uint64_t>({p, (uint64_t)kMaxParts, (uint64_t)layers});
|
||||
}
|
||||
|
||||
/// The layers of `remaining` (ranges of the storage, whole layers of layer_size bytes, in order) split into this frame's part,
|
||||
/// the first `per_frame` layers of them, and the rest
|
||||
inline void take(const Ranges& remaining, uint64_t layer_size, uint32_t per_frame, Ranges& part, Ranges& rest) {
|
||||
part.clear(), rest.clear();
|
||||
if (!layer_size) return;
|
||||
uint64_t left = (uint64_t)std::max(1u, per_frame) * layer_size;
|
||||
for (const auto& [lo, hi] : remaining) {
|
||||
if (hi <= lo) continue;
|
||||
if (!left) { rest.push_back({lo, hi}); continue; }
|
||||
const uint64_t n = std::min(left, hi - lo);
|
||||
part.push_back({lo, lo + n});
|
||||
left -= n;
|
||||
if (lo + n < hi) rest.push_back({lo + n, hi});
|
||||
}
|
||||
}
|
||||
|
||||
/// The layers a part takes: the texture's layers over its parts, rounded up
|
||||
inline uint32_t per_frame(uint32_t layers, uint32_t n_parts) {
|
||||
return n_parts ? (layers + n_parts - 1) / n_parts : layers;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::layer_split
|
||||
214
gpu/vk/mem_parts.h
Normal file
214
gpu/vk/mem_parts.h
Normal file
@@ -0,0 +1,214 @@
|
||||
// (Triforce) What the process holds in RAM, in parts, for the log's "vk: memory, the parts" line (vk_memory.cpp
|
||||
// memory_parts_tick, every 600 presents) and the rules that react to the PC's RAM running short. Apart from Vulkan and
|
||||
// Windows so that tests/test_mem_parts.py runs it alone.
|
||||
//
|
||||
// Why: a 32 GB PC ran out of RAM in play (v0.4.0-test7: "RAM short (525 to 850 of 32069 MB available)" 40 times, the
|
||||
// working set 20.9 GB, frames of 102 and 245 ms outside the replay and the present while Windows paged), and the log
|
||||
// said only the process's totals. Its private bytes are no guide to the RAM (they grew with the VRAM, 29.7 -> 42.5 GB
|
||||
// while the device's blocks grew 1.4 -> 11.3 GB: the driver's video memory is charged there), the working set is. The
|
||||
// working set is the game's own memory (the guest window: its heap and regions, committed at once, in RAM as the game
|
||||
// touches it) and the rest: the driver's shader modules, pipelines and pipeline cache, the allocator's blocks in system
|
||||
// memory, the heap. The line gives each part that is known, and the game's share of the working set by a sample of
|
||||
// its pages (sample_plan, below): one page in every so many of the committed window asked whether it is in RAM.
|
||||
// (11-16) The rest is split the same way, by what the address space says each run is (Kind): the program's code, the
|
||||
// driver's, other code, mapped files and views, write-combined or uncached memory (what a driver maps for the GPU), and
|
||||
// the heaps and other private memory. A session of v0.4.0-test9 had 9.9 GB of working set outside the game's memory
|
||||
// all through play, with the RAM short, and nothing in the line said what it was.
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace mem_parts {
|
||||
|
||||
/// What a run of the address space is (kNone: not counted: free, reserved, or no access)
|
||||
enum Kind : uint8_t { kNone = 0, kGuest, kExe, kDriverCode, kOtherCode, kMapped, kGpuVisible, kPrivate, kKinds };
|
||||
/// A committed run, [lo, hi), and what it is
|
||||
struct Span {
|
||||
uint64_t lo = 0, hi = 0;
|
||||
uint8_t kind = kGuest;
|
||||
};
|
||||
|
||||
/// The runs between lo and hi that query(at, &base, &size, &kind) counts, which answers for the region that holds at
|
||||
/// (VirtualQuery's answer: its base, its size from there, and what it is, kNone for what is not counted); false ends the
|
||||
/// walk. [skip_lo, skip_hi) is stepped over without a query (the guest window, which has a walk of its own). At most
|
||||
/// max_queries regions are asked (the walk is a system call a region), and runs of one kind that touch are joined.
|
||||
/// *queries: how many were asked; *whole: false when max_queries stopped the walk before hi
|
||||
template <class Query>
|
||||
std::vector<Span> kind_spans(uint64_t lo, uint64_t hi, Query&& query, size_t max_queries, uint64_t skip_lo = 0,
|
||||
uint64_t skip_hi = 0, size_t* queries = nullptr, bool* whole = nullptr) {
|
||||
std::vector<Span> out;
|
||||
uint64_t at = lo;
|
||||
size_t n = 0;
|
||||
while (at < hi && n < max_queries) {
|
||||
if (at >= skip_lo && at < skip_hi) { // (no query spent on it)
|
||||
at = skip_hi;
|
||||
continue;
|
||||
}
|
||||
n++;
|
||||
uint64_t base = 0, size = 0;
|
||||
uint8_t kind = kNone;
|
||||
if (!query(at, &base, &size, &kind) || !size) {
|
||||
at = hi; // (the end of the walk: whole as far as anything answers)
|
||||
break;
|
||||
}
|
||||
uint64_t end = base + size > base ? base + size : hi; // (no wrap past the top)
|
||||
if (end <= at) {
|
||||
at = hi;
|
||||
break;
|
||||
}
|
||||
if (skip_hi > skip_lo && at < skip_lo && end > skip_lo) end = skip_lo; // (the skipped window is not counted)
|
||||
const uint64_t a = base > at ? base : at, b = end < hi ? end : hi;
|
||||
if (kind != kNone && a < b) {
|
||||
if (!out.empty() && out.back().hi == a && out.back().kind == kind) out.back().hi = b;
|
||||
else out.push_back({a, b, kind});
|
||||
}
|
||||
at = end;
|
||||
}
|
||||
if (queries) *queries = n;
|
||||
if (whole) *whole = at >= hi;
|
||||
return out;
|
||||
}
|
||||
/// The committed runs between lo and hi, from query(at, &base, &size, &committed) (the guest window's walk)
|
||||
template <class Query>
|
||||
std::vector<Span> committed_spans(uint64_t lo, uint64_t hi, Query&& query, size_t max_queries, size_t* queries = nullptr,
|
||||
bool* whole = nullptr) {
|
||||
return kind_spans(
|
||||
lo, hi,
|
||||
[&](uint64_t at, uint64_t* base, uint64_t* size, uint8_t* kind) {
|
||||
bool committed = false;
|
||||
if (!query(at, base, size, &committed)) return false;
|
||||
*kind = committed ? kGuest : kNone;
|
||||
return true;
|
||||
},
|
||||
max_queries, 0, 0, queries, whole);
|
||||
}
|
||||
|
||||
/// Pages to ask about: one every stride bytes of each committed run (stride a whole number of pages, at least one, made
|
||||
/// larger until the runs' pages are at most max_samples strides), each standing for the bytes up to the next (the run's
|
||||
/// last for what is left). Each run has its first page asked, so there are at most max_samples + spans.size() of them
|
||||
struct Plan {
|
||||
uint64_t committed = 0, stride = 0;
|
||||
std::vector<uint64_t> at, bytes;
|
||||
std::vector<uint8_t> kind; // (each sample's run's)
|
||||
};
|
||||
inline Plan sample_plan(const std::vector<Span>& spans, uint64_t page, size_t max_samples) {
|
||||
Plan p;
|
||||
if (!page) page = 4096;
|
||||
for (const Span& s : spans) p.committed += s.hi - s.lo;
|
||||
if (!max_samples) max_samples = 1;
|
||||
const uint64_t pages = (p.committed + page - 1) / page;
|
||||
const uint64_t every = pages > max_samples ? (pages + max_samples - 1) / max_samples : 1;
|
||||
p.stride = every * page;
|
||||
for (const Span& s : spans) // (a run shorter than the stride counts all of itself by its first page)
|
||||
for (uint64_t a = s.lo; a < s.hi; a += p.stride) {
|
||||
p.at.push_back(a);
|
||||
p.bytes.push_back(s.hi - a < p.stride ? s.hi - a : p.stride);
|
||||
p.kind.push_back(s.kind);
|
||||
if (s.hi - a <= p.stride) break; // (and no step past the top of the address space)
|
||||
}
|
||||
return p;
|
||||
}
|
||||
/// What the pages found in RAM stand for, in bytes (resident[i] answers for plan.at[i])
|
||||
inline uint64_t resident_bytes(const Plan& p, const std::vector<bool>& resident) {
|
||||
uint64_t r = 0;
|
||||
for (size_t i = 0; i < p.at.size() && i < resident.size(); i++)
|
||||
if (resident[i]) r += p.bytes[i];
|
||||
return r;
|
||||
}
|
||||
/// The same, by the samples' kinds, into out[kKinds] (added to what is there)
|
||||
inline void resident_by_kind(const Plan& p, const std::vector<bool>& resident, uint64_t out[kKinds]) {
|
||||
for (size_t i = 0; i < p.at.size() && i < resident.size(); i++)
|
||||
if (resident[i] && p.kind[i] < kKinds) out[p.kind[i]] += p.bytes[i];
|
||||
}
|
||||
|
||||
/// The parts the line gives, in bytes (-1: not known on this platform or in this run)
|
||||
struct Parts {
|
||||
int64_t working_set = -1, private_bytes = -1;
|
||||
int64_t guest_committed = -1, guest_resident = -1;
|
||||
int64_t by_kind[kKinds] = {-1, -1, -1, -1, -1, -1, -1, -1}; // (the rest in RAM by what it is; -1: not sampled)
|
||||
int64_t modules = 0, module_bytes = 0; // (program variants' shader modules alive, and their SPIR-V)
|
||||
int64_t packed_stages = 0, packed_bytes = 0; // (stages kept packed instead, and what that takes)
|
||||
int64_t pcache_bytes = -1; // (the pipeline cache as last read or saved; -1: let go)
|
||||
int64_t pipelines = 0, libraries = 0; // (graphics pipelines and stage libraries kept)
|
||||
int64_t drawn = -1; // (of those pipelines, how many a draw has looked up; -1: not known)
|
||||
int64_t released = 0; // (kept pipelines no draw used, given back for the RAM)
|
||||
int64_t system_blocks = -1; // (the allocator's blocks in system memory)
|
||||
int64_t ram_avail = -1, ram_total = -1;
|
||||
};
|
||||
inline std::string mb(int64_t b) {
|
||||
if (b < 0) return "?";
|
||||
char t[32];
|
||||
std::snprintf(t, sizeof t, "%lld", (long long)(b >> 20));
|
||||
return t;
|
||||
}
|
||||
/// The line, without its "vk: " head
|
||||
inline std::string line(const Parts& p) {
|
||||
std::string s = "memory, the parts (MB): working set " + mb(p.working_set) + " (private " + mb(p.private_bytes) + ")";
|
||||
s += "; the game's own memory " + mb(p.guest_committed) + " committed, " + mb(p.guest_resident) + " of it in RAM";
|
||||
if (p.working_set >= 0 && p.guest_resident >= 0)
|
||||
s += "; the rest of the working set " + mb(p.working_set > p.guest_resident ? p.working_set - p.guest_resident : 0);
|
||||
if (p.by_kind[kPrivate] >= 0) {
|
||||
static const char* const names[kKinds] = {"", "", "the program's code", "the driver's code", "other code",
|
||||
"mapped files and views", "write-combined or uncached memory",
|
||||
"the heaps and other private memory"};
|
||||
s += " (sampled:";
|
||||
for (int k = kExe; k < kKinds; k++) s += std::string(k == kExe ? " " : ", ") + names[k] + " " + mb(p.by_kind[k]);
|
||||
s += ")";
|
||||
}
|
||||
char t[160];
|
||||
std::snprintf(t, sizeof t, " (%lld modules", (long long)p.modules);
|
||||
s += ": shader modules " + mb(p.module_bytes) + t;
|
||||
std::snprintf(t, sizeof t, "; %lld stages packed in ", (long long)p.packed_stages);
|
||||
s += t + mb(p.packed_bytes) + ")";
|
||||
s += p.pcache_bytes < 0 ? ", the pipeline cache let go" : ", the pipeline cache " + mb(p.pcache_bytes);
|
||||
std::snprintf(t, sizeof t, ", %lld pipelines and %lld stage libraries kept", (long long)p.pipelines, (long long)p.libraries);
|
||||
s += t;
|
||||
if (p.drawn >= 0) {
|
||||
std::snprintf(t, sizeof t, " (%lld of the pipelines drawn; %lld no draw used given back)", (long long)p.drawn,
|
||||
(long long)p.released);
|
||||
s += t;
|
||||
}
|
||||
s += ", the allocator's blocks in system memory " + mb(p.system_blocks);
|
||||
s += "; RAM " + mb(p.ram_avail) + " of " + mb(p.ram_total) + " available";
|
||||
return s;
|
||||
}
|
||||
|
||||
// ---- The PC's RAM running short: what the back end does about it that costs play nothing (vk_memory.cpp ram_watch) ----
|
||||
/// Short: under 1.5 GB available, the imports' rule (vk_memory.cpp imports_give_back), whatever the PC has
|
||||
constexpr uint64_t kShortBytes = 1536ull << 20;
|
||||
inline bool short_now(uint64_t avail) { return avail < kShortBytes; }
|
||||
/// Low: under 3 GB available, or a tenth of the RAM on a PC of more than 30 GB. The pipeline builder behind the game
|
||||
/// (vk_draw.cpp predict_background) rests then: what the driver keeps of each pipeline it builds is RAM
|
||||
inline bool low_now(uint64_t avail, uint64_t total) {
|
||||
const uint64_t tenth = total / 10;
|
||||
return avail < (tenth > (3ull << 30) ? tenth : (3ull << 30));
|
||||
}
|
||||
/// Whether a copy of bytes fits in RAM now with 2 GB to spare: the pipeline cache's save in play fetches the whole cache into
|
||||
/// memory (2 to 3 GB with the stage libraries in it), and with less than that available it is what Windows pages out
|
||||
inline bool copy_fits(uint64_t avail, uint64_t bytes) { return avail > bytes && avail - bytes > (2ull << 30); }
|
||||
/// (11-16) Whether the precompile keeps every pipeline it builds for the session (vk_draw.cpp precompile_keeps_all): only where
|
||||
/// the RAM the game can have, what is available plus what the process holds already (own), is 22 GB or more, on a PC of
|
||||
/// 20 GB or more. The figure is v0.4.0-test9's, a 32 GB PC that started with 18.4 GB free: the game's own memory reached
|
||||
/// 9.7 GB in RAM, the rest of the working set 9.9 GB, of which the precompile's 14,535 graphics and 1,033 compute
|
||||
/// pipelines took about 3.3 GB (the working set before and after it); 9.7 + 6.6 + 3.3 GB, and 2 GB for Windows to page
|
||||
/// with. The PC's total alone says nothing of what its other programs hold
|
||||
constexpr uint64_t kKeepAllBytes = 22ull << 30;
|
||||
inline bool keep_all_pipelines(uint64_t total, uint64_t avail, uint64_t own) {
|
||||
return total >= (20ull << 30) && avail + own >= kKeepAllBytes;
|
||||
}
|
||||
/// (11-18) What the process holds that counts as the game's for keep_all_pipelines: its working set (ws) less what reading the
|
||||
/// pipeline cache added (cache_read; the driver holds that all session, so it is no room for the pipelines). Two 32 GB PCs on
|
||||
/// v0.5.1 with 2.7 and 3.0 GB cache files (4.7 and 4.9 GB of working set once read): 18.2 GB available + 7.0 held and 19.1 +
|
||||
/// 7.7, both over 22 GB, everything kept, and RAM short all session (39 times on one; the other lost the GPU after the save
|
||||
/// loaded). Without the cache: 20.5 and 21.9 GB, kept by none. Not on AMD's driver (amd: the vendor 0x1002), which the rule
|
||||
/// keeps as it was: there a pipeline left to its first draw cost ~100 ms (an RX 6650 XT: 152 of them in one 15.7 s frame),
|
||||
/// worse than the RAM
|
||||
inline uint64_t own_for_keep(uint64_t ws, uint64_t cache_read, bool amd) {
|
||||
if (amd) return ws;
|
||||
return ws > cache_read ? ws - cache_read : 0;
|
||||
}
|
||||
|
||||
} // namespace mem_parts
|
||||
@@ -7,7 +7,9 @@
|
||||
|
||||
namespace mkwvk::menu_restart {
|
||||
|
||||
constexpr int kMax = 16; // (rows that take a restart: the menu has ten; a row past kMax would have no slot)
|
||||
// (rows that take a restart: the menu has about twenty; a row past kMax would have no slot. At most the bits of pending()'s
|
||||
// mask: 32)
|
||||
constexpr int kMax = 32;
|
||||
|
||||
struct State {
|
||||
int n = 0;
|
||||
|
||||
127
gpu/vk/menu_sound_events.h
Normal file
127
gpu/vk/menu_sound_events.h
Normal file
@@ -0,0 +1,127 @@
|
||||
// (Triforce) The options' own sounds, the game's interface sounds, after NX2navi's menu sounds: which sound a tick of the
|
||||
// menu asks for, and where the sounds wait until the host's sound thread takes them (vk_api.h HOS_OPT_MENU_SOUND;
|
||||
// host/menu_sound.c reads the game's files and plays them).
|
||||
//
|
||||
// Which sound, as NX2navi has it: the options opening and closing; another tab; the cursor on another row, card or button,
|
||||
// and a value changed with Left and Right; a press on something (confirm, or a click); a step back. The menu's input is
|
||||
// one long function (vk_menu.cpp menu_tick) that changes its state in many places, so the sound is told from what the
|
||||
// tick changed: the state is taken before and after it (State), and with the keys the tick saw (Input) it names one
|
||||
// sound at most (sound_of). The mouse resting on a row moves the cursor without a sound, as NX2navi's does.
|
||||
//
|
||||
// Inside the game's own Options screen the options are tabs beside the game's own list (vk_menu.cpp game_options_shown):
|
||||
// going between that list and our tabs with L and R is a tab's move, not an opening; and Back on one of our tabs is the
|
||||
// game's Back too (host/nn_hid.c), which leaves the screen with the game's own sound, so ours is not played over it.
|
||||
// While the game's own list is shown the input and the sounds are the game's.
|
||||
//
|
||||
// The queue: the menu's thread puts, the host's sound thread takes, no lock (one of each). It holds kQueue sounds; one
|
||||
// more is dropped. A sound older than kStaleNs when it is taken is not played: with no sound thread to take them
|
||||
// (the game has not opened its sound yet, or stopped it) the presses of a while ago would otherwise all sound at once.
|
||||
//
|
||||
// No ImGui and no Vulkan: tests/test_menu_sound_events.py compiles it alone.
|
||||
#pragma once
|
||||
#include <atomic>
|
||||
#include <cstdint>
|
||||
|
||||
namespace menu_sound {
|
||||
// (vk_api.h HOS_MENU_SOUND_*: vk_menu.cpp holds them against these)
|
||||
constexpr int kNone = 0, kOpen = 1, kClose = 2, kCursor = 3, kDecide = 4, kCancel = 5, kTabLeft = 6, kTabRight = 7;
|
||||
|
||||
// (State::page: the tabs' rows, a page over them, and the restart question, whose two buttons L and R choose between)
|
||||
constexpr int kPageRows = 0, kPageAsk = 5;
|
||||
// (State::mode: what the chosen row or card waits for)
|
||||
constexpr int kModeNone = 0,
|
||||
kModeListen = 1, // the Controls page: the new input of a binding
|
||||
kModeEdit = 2, // Left and Right act on it each press: an item's amount, a flag's On and Off
|
||||
kModeConfirm = 3; // Restart or Quit: its second press
|
||||
|
||||
/// What the options show, as far as their sounds go
|
||||
struct State {
|
||||
bool open = false; // the options are open
|
||||
bool embedded = false; // ...as tabs inside the game's own Options screen
|
||||
int page = kPageRows; // what is shown: the tabs' rows, or a page over them (vk_menu.cpp page; the Motion page is one too)
|
||||
int tab = 0; // the tab, of the tabs' rows
|
||||
int group = 0; // a page's section, which L and R turn: the inventory's, the teleport list's, a name page's
|
||||
int cursor = 0; // the row, card, cell or button chosen
|
||||
int mode = kModeNone;
|
||||
int64_t value = 0; // what the chosen row is set to
|
||||
bool operator==(const State&) const = default;
|
||||
};
|
||||
|
||||
/// What a tick's input was, after the mouse's clicks were made the keys they stand for
|
||||
struct Input {
|
||||
bool toggle = false; // the keys that open and close the options over the game (Insert, F1, a gamepad's Home)
|
||||
bool back = false; // Esc, the button B is bound to, a right click
|
||||
bool confirm = false; // Enter, the button A is bound to, a click on what acts by one
|
||||
bool tab_left = false, tab_right = false; // L and R, Q and E, Tab, the tab strip's arrows
|
||||
bool left = false, right = false; // Left and Right, a click on a value's left or right half
|
||||
bool move = false; // Up, Down, Page Up, Page Down, Home, End
|
||||
bool clear = false; // Delete, Backspace (a binding taken away)
|
||||
bool click = false; // the left mouse button went down
|
||||
bool drag = false; // the left mouse button is held on a slider
|
||||
};
|
||||
|
||||
/// The sound of a tick that found the options as `b` and left them as `a`: kNone, or one of the seven
|
||||
inline int sound_of(const State& b, const State& a, const Input& in) {
|
||||
if (!b.open && !a.open) return kNone; // (closed: the keys are the game's)
|
||||
if (!b.open) // (opened: over the game by its keys, or from the game's own list by L or R, which is a tab's move)
|
||||
return in.toggle ? kOpen : a.tab == 0 ? kTabRight : kTabLeft;
|
||||
if (!a.open) {
|
||||
// (closed by a press that acted: a map to travel to, an event, Restart now, an age switched, the question's Later)
|
||||
if (in.confirm || in.left || in.right) return kDecide;
|
||||
if (!b.embedded || in.toggle) return kClose;
|
||||
// (our tabs inside the game's screen: on to the game's own list with L or R, or by a click on its tab, the first)
|
||||
if (in.tab_left || in.tab_right) return in.tab_left ? kTabLeft : kTabRight;
|
||||
// (Back is the game's Back too and has the game's sound; and the game's screen may have gone by itself)
|
||||
return in.click && !in.back ? kTabLeft : kNone;
|
||||
}
|
||||
const bool changed = !(a == b);
|
||||
if (b.mode == kModeListen) { // (a binding waited for its input: a key pressed meanwhile is that input, not the menu's)
|
||||
if (a.mode == kModeListen) return kNone;
|
||||
return a.value != b.value ? kDecide : in.back ? kCancel : kNone; // (bound; given up; or nothing came in time)
|
||||
}
|
||||
if ((in.back || in.toggle) && changed) return kCancel; // (out of a page, a mode, or to the restart question)
|
||||
const bool tabs = in.tab_left || in.tab_right;
|
||||
if (tabs && changed && b.page != kPageAsk) return in.tab_left ? kTabLeft : kTabRight;
|
||||
// (a click on a tab, or on a page's section: by where it is from the one before)
|
||||
if (in.click && a.page == b.page && a.tab != b.tab) return a.tab > b.tab ? kTabRight : kTabLeft;
|
||||
if (in.click && a.page == b.page && a.group != b.group) return a.group > b.group ? kTabRight : kTabLeft;
|
||||
// (a page opened, by a row that may have taken the press for itself; a page left, by a Back its tab took for itself)
|
||||
if (a.page != b.page) return a.page == kPageRows ? kCancel : kDecide;
|
||||
if (in.confirm) return kDecide;
|
||||
if (in.click && (changed || in.left || in.right)) return kDecide;
|
||||
const bool arrows = in.move || in.left || in.right || in.clear || tabs;
|
||||
if (arrows && changed) return kCursor;
|
||||
if ((in.left || in.right) && a.mode == kModeEdit && b.mode == kModeEdit) return kCursor; // (acts each press)
|
||||
if (in.drag && a.value != b.value) return kCursor; // (a slider drawn along)
|
||||
return kNone;
|
||||
}
|
||||
|
||||
constexpr int kQueue = 16;
|
||||
constexpr int64_t kStaleNs = 250000000; // (a quarter second)
|
||||
|
||||
struct Queue {
|
||||
struct Entry { int sound; int64_t ns; };
|
||||
Entry entries[kQueue] = {};
|
||||
std::atomic<unsigned> head{0}, tail{0}; // (taken up to head, put up to tail)
|
||||
|
||||
/// The menu's thread: a sound asked for at now_ns. false when it is none of the seven, or the queue is full
|
||||
bool put(int sound, int64_t now_ns) {
|
||||
if (sound <= kNone || sound > kTabRight) return false;
|
||||
const unsigned t = tail.load(std::memory_order_relaxed);
|
||||
if (t - head.load(std::memory_order_acquire) >= kQueue) return false;
|
||||
entries[t % kQueue] = {sound, now_ns};
|
||||
tail.store(t + 1, std::memory_order_release);
|
||||
return true;
|
||||
}
|
||||
/// The host's sound thread: the oldest sound waiting that is not stale, 0 when there is none
|
||||
int take(int64_t now_ns) {
|
||||
for (;;) {
|
||||
const unsigned h = head.load(std::memory_order_relaxed);
|
||||
if (h == tail.load(std::memory_order_acquire)) return kNone;
|
||||
const Entry e = entries[h % kQueue];
|
||||
head.store(h + 1, std::memory_order_release);
|
||||
if (now_ns - e.ns <= kStaleNs) return e.sound;
|
||||
}
|
||||
}
|
||||
};
|
||||
} // namespace menu_sound
|
||||
135
gpu/vk/mesh_ahead.h
Normal file
135
gpu/vk/mesh_ahead.h
Normal file
@@ -0,0 +1,135 @@
|
||||
// (Triforce) The indirect mesh draws of a pass with their records prepared at the first of them, after NX2navi's mesh_ahead
|
||||
// (runtime/vk_exec_draw.c mesh_ring_entry, runtime/vk_exec.c op_linear and vk_exec_mesh_run).
|
||||
//
|
||||
// NVN's indirect mesh draw reads {count, first} and Vulkan's {x, y, z}: each one's records are copied into a ring as {count, 1, 1}
|
||||
// before it (vk_draw.cpp mesh_indirect_convert). A copy cannot be recorded inside a pass, so every indirect mesh draw ended its pass
|
||||
// and the next draw began it again behind a barrier, three barriers and a fill and a copy between (OoT's foliage, grass and leaves:
|
||||
// about 16 a frame at the Market, 45 in NX2navi's village). Now the first indirect mesh draw of a run copies the records of the ones
|
||||
// after it as well, in the same barriers; those find their entry and stay in the pass. A run is the indirect mesh draws after it with
|
||||
// only ops between that store state, draw, or reach the CPU alone (the counter reports, which the replay writes as it records, and the
|
||||
// render conditions, which it reads): nothing between runs outside a pass or writes memory where the GPU could, so no work of the
|
||||
// game's between can write the records after they were copied (the culling compute that writes them is a dispatch, which ends the run;
|
||||
// a draw's shader writes a later draw's records only with the game's barrier between, which ends it too, as on the console, where the
|
||||
// GPU's front end reads them early). An entry is taken only by the draw it was copied for: its op, the same record address, count,
|
||||
// stride and word; the replay clears the table at any other op (and at each command buffer's start), and a draw the replay did not
|
||||
// draw (its render condition) leaves its entry unused. At most kMax draws and kMaxBytes of ring a run, so the ring (4 MB) never comes
|
||||
// round inside one. RX_VK_MESH_AHEAD=0: each draw copies its own, as before.
|
||||
//
|
||||
// Apart from Vulkan and the stream's op numbers so that tests/test_mesh_ahead.py can run the scan and the table over authored streams.
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
|
||||
namespace mkwvk::mesh_ahead {
|
||||
|
||||
constexpr int kMax = 32; // (the draws after the first whose records it copies, at most)
|
||||
constexpr int kMaxOps = 2048; // (the ops looked at after it, at most: NX2navi's MESH_RUN_OPS)
|
||||
constexpr uint64_t kMaxBytes = 1ull << 20; // (a run's ring bytes, at most: a quarter of vk_draw.cpp's kMeshRing)
|
||||
|
||||
/// RX_VK_MESH_AHEAD: on unless "0"
|
||||
inline bool on(const char* env) {
|
||||
return !(env && env[0] == '0' && !env[1]);
|
||||
}
|
||||
|
||||
/// What an indirect mesh draw's conversion copies: its op in the stream (where the replay meets it), its records' address, how many,
|
||||
/// their stride and the word that holds the count
|
||||
struct Draw {
|
||||
const uint8_t* op = nullptr;
|
||||
uint64_t indirect = 0;
|
||||
uint32_t n = 0, stride = 0, word = 0;
|
||||
};
|
||||
inline bool same(const Draw& a, const Draw& b) {
|
||||
return a.op == b.op && a.indirect == b.indirect && a.n == b.n && a.stride == b.stride && a.word == b.word;
|
||||
}
|
||||
/// What the conversion copies for an indirect mesh draw of the stream's max and stride (the game's ints): its records, 1 to 4096 of
|
||||
/// them (as many as the draw may draw), 8 bytes apart when the stride is not given
|
||||
inline Draw draw_of(const uint8_t* op, uint64_t indirect, int32_t max, int32_t stride, uint32_t word) {
|
||||
Draw d;
|
||||
d.op = op, d.indirect = indirect, d.word = word;
|
||||
d.n = (uint32_t)(max < 1 ? 1 : max > 4096 ? 4096 : max);
|
||||
d.stride = stride > 0 ? (uint32_t)stride : 8u;
|
||||
return d;
|
||||
}
|
||||
/// A draw's ring bytes (vk_draw.cpp's: {count, 1, 1} a record, 16-aligned)
|
||||
inline uint64_t ring_bytes(uint32_t n) {
|
||||
return ((uint64_t)n * 12 + 15) & ~15ull;
|
||||
}
|
||||
|
||||
/// The ops after the one at `at` (records {uint32 op, uint32 size}, sizes 8-aligned), up to `end` (null: none): the indirect mesh draws
|
||||
/// among them while every op between belongs in a run, into out, at most max; at most kMaxOps ops looked at. kind(op, record): 0 the
|
||||
/// run ends there (the stream's end too), 1 it may be in a run, 2 an indirect mesh draw (in the run, and collected)
|
||||
template <class K>
|
||||
int scan(const uint8_t* at, const uint8_t* end, const uint8_t** out, int max, K kind) {
|
||||
uint32_t h[2];
|
||||
std::memcpy(h, at, sizeof h);
|
||||
if (h[1] < 8 || (h[1] & 7)) return 0;
|
||||
const uint8_t* p = at + h[1];
|
||||
int n = 0;
|
||||
for (int ops = 0; ops < kMaxOps && n < max && p != end; ops++) {
|
||||
std::memcpy(h, p, sizeof h);
|
||||
if (h[1] < 8 || (h[1] & 7)) break;
|
||||
const int k = kind(h[0], p);
|
||||
if (!k) break;
|
||||
if (k == 2) out[n++] = p;
|
||||
p += h[1];
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
/// How many of the run's draws after the first get entries: in order, while the ring bytes of the first and theirs stay within kMaxBytes
|
||||
/// (and no more than the table holds)
|
||||
inline int fit(const Draw* next, int n, uint32_t first_n) {
|
||||
if (n > kMax) n = kMax;
|
||||
uint64_t bytes = ring_bytes(first_n);
|
||||
int k = 0;
|
||||
while (k < n && bytes + ring_bytes(next[k].n) <= kMaxBytes) bytes += ring_bytes(next[k].n), k++;
|
||||
return k;
|
||||
}
|
||||
|
||||
/// What the replay knows of the indirect mesh draw it is about to draw (set before draw(), vk_replay.cpp; taken by the conversion):
|
||||
/// its op, and the draws after it in its run (none when they are in the table already)
|
||||
struct Pending {
|
||||
struct Next { // (as the stream has it: draw_of makes the conversion's numbers)
|
||||
const uint8_t* op;
|
||||
uint64_t indirect;
|
||||
int32_t max, stride;
|
||||
};
|
||||
const uint8_t* op = nullptr;
|
||||
Next next[kMax];
|
||||
int n = 0;
|
||||
};
|
||||
|
||||
/// The records copied ahead: the run's draws after its first, in order, each with its ring entry
|
||||
struct Table {
|
||||
struct Entry {
|
||||
Draw d;
|
||||
uint64_t at = 0;
|
||||
};
|
||||
Entry e[kMax];
|
||||
int n = 0, i = 0; // (entries, and the first not taken)
|
||||
void clear() { n = i = 0; }
|
||||
bool holds(const uint8_t* op) const {
|
||||
for (int k = i; k < n; k++)
|
||||
if (e[k].d.op == op) return true;
|
||||
return false;
|
||||
}
|
||||
/// The ring entry copied for d (its op, and the same records): true, and the entries before it are let go (draws the replay did not
|
||||
/// draw); false when there is none or it does not match, and the table is cleared
|
||||
bool take(const Draw& d, uint64_t* at) {
|
||||
for (int k = i; k < n; k++)
|
||||
if (e[k].d.op == d.op) {
|
||||
if (!same(e[k].d, d)) break;
|
||||
*at = e[k].at;
|
||||
i = k + 1;
|
||||
return true;
|
||||
}
|
||||
clear();
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
inline thread_local Pending t_pending;
|
||||
inline thread_local Table t_table;
|
||||
|
||||
} // namespace mkwvk::mesh_ahead
|
||||
112
gpu/vk/mod_cheat_rows.h
Normal file
112
gpu/vk/mod_cheat_rows.h
Normal file
@@ -0,0 +1,112 @@
|
||||
// (Triforce) The System tab's rows for the cheats of the mods' cheat files: what the host names (host/mod_cheats.c), what
|
||||
// the rows show, and what goes back to the host when the player switches one (vk_api.h HOS_OPT_MODCHEAT_*).
|
||||
//
|
||||
// The cheats are the host's: it reads the files at the start and runs the ones that are on, once a game frame. The menu
|
||||
// has a row for each, with the file's own name: the row table is fixed, so it holds kSlots rows for them that are not
|
||||
// shown until the host has named its cheats, and a file's cheats past kSlots have no row (the host's log says so). A
|
||||
// name arrives a byte a call, as the save rows' lines do, with the line the row shows under its help after a line feed.
|
||||
// A row is On | Off like the menu's toggles; a master code and a cheat that cannot run here have a row that cannot be
|
||||
// changed. Which cheats are on is kept by the host (triforce_cheats.txt), not in the options file.
|
||||
//
|
||||
// The host's calls (text, add, done, take) come on the game's thread, the rows are drawn and pressed on the renderer's:
|
||||
// names and lines are written before count says the rows are there and never after; the switches are atomics.
|
||||
//
|
||||
// No ImGui and no Vulkan: tests/test_mod_cheat_rows.py compiles it alone.
|
||||
#pragma once
|
||||
#include <atomic>
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
|
||||
namespace mod_cheat_rows {
|
||||
constexpr int kSlots = 96;
|
||||
constexpr int kName = 80; // (a cheat's name is at most 63 bytes; " (cheat)" after one that is a row's of the menu's own)
|
||||
constexpr int kLine = 200; // (the line under the row's help)
|
||||
constexpr int kOn = 1, kAlways = 2, kRefused = 4; // (vk_api.h HOS_MODCHEAT_*)
|
||||
|
||||
struct List {
|
||||
char names[kSlots][kName] = {};
|
||||
char lines[kSlots][kLine] = {};
|
||||
unsigned char bits[kSlots] = {};
|
||||
std::atomic<int> on[kSlots] = {};
|
||||
std::atomic<int> count{0}; // (the rows shown: 0 until the host's list is whole)
|
||||
// the host's side
|
||||
char in[kName + kLine] = {};
|
||||
int in_n = 0, added = 0;
|
||||
int told[kSlots] = {}; // (what the host knows of each switch)
|
||||
|
||||
/// HOS_OPT_MODCHEAT_TEXT: the next byte of the row being named
|
||||
void text(int byte) {
|
||||
if (byte > 0 && byte < 256 && in_n + 1 < (int)sizeof in) in[in_n++] = (char)byte;
|
||||
}
|
||||
/// HOS_OPT_MODCHEAT_ADD: the bytes so far are the next row's name and, after a line feed, its line. taken: names a
|
||||
/// row may not have (rows of the menu's own that act by their name): such a cheat is shown with " (cheat)" after it
|
||||
void add(int row_bits, const char* const* taken = nullptr, int n_taken = 0) {
|
||||
in[in_n] = 0;
|
||||
in_n = 0;
|
||||
if (count.load(std::memory_order_acquire) || added >= kSlots) return; // (shown already, or no row left)
|
||||
const int slot = added++;
|
||||
char* feed = strchr(in, '\n');
|
||||
if (feed) *feed = 0;
|
||||
int n = (int)strlen(in);
|
||||
if (n > 63) { // (not in the middle of a letter)
|
||||
n = 63;
|
||||
while (n && ((unsigned char)in[n] & 0xC0) == 0x80) n--;
|
||||
}
|
||||
memcpy(names[slot], in, (size_t)n);
|
||||
names[slot][n] = 0;
|
||||
if (!n) strcpy(names[slot], "(no name)");
|
||||
for (int i = 0; i < n_taken; i++)
|
||||
if (!strcmp(names[slot], taken[i])) strcat(names[slot], " (cheat)");
|
||||
if (feed) {
|
||||
size_t ln = strlen(feed + 1);
|
||||
if (ln > kLine - 1) ln = kLine - 1;
|
||||
memcpy(lines[slot], feed + 1, ln);
|
||||
lines[slot][ln] = 0;
|
||||
for (char* p = lines[slot]; *p; p++)
|
||||
if (*p == '\n') *p = ' ';
|
||||
}
|
||||
bits[slot] = (unsigned char)(row_bits & (kOn | kAlways | kRefused));
|
||||
const int is_on = (row_bits & kAlways) || ((row_bits & kOn) && !(row_bits & kRefused));
|
||||
on[slot].store(is_on, std::memory_order_relaxed);
|
||||
told[slot] = is_on;
|
||||
}
|
||||
/// HOS_OPT_MODCHEAT_COUNT: the list is whole: the rows are shown from now on
|
||||
void done(int n) {
|
||||
in_n = 0;
|
||||
if (count.load(std::memory_order_acquire)) return;
|
||||
count.store(n < 0 ? 0 : n < added ? n : added, std::memory_order_release);
|
||||
}
|
||||
int shown() const { return count.load(std::memory_order_acquire); }
|
||||
/// A row that cannot be changed: a master code, or a cheat that cannot run here
|
||||
bool fixed(int slot) const { return slot < 0 || slot >= kSlots || (bits[slot] & (kAlways | kRefused)); }
|
||||
bool is_on(int slot) const { return slot >= 0 && slot < kSlots && on[slot].load(std::memory_order_relaxed); }
|
||||
/// What a row that cannot be changed shows in its value's place
|
||||
const char* fixed_text(int slot) const { return slot >= 0 && slot < kSlots && (bits[slot] & kRefused) ? "Not supported" : "Always on"; }
|
||||
const char* line(int slot) const { return slot >= 0 && slot < kSlots ? lines[slot] : ""; }
|
||||
/// The slot of a row by its name's address (the rows' names are this list's own), -1 for any other row
|
||||
int slot_of(const char* name) const {
|
||||
const uintptr_t first = (uintptr_t)names[0], at = (uintptr_t)name;
|
||||
return at >= first && at - first < sizeof names ? (int)((at - first) / kName) : -1;
|
||||
}
|
||||
/// A press on a row: Left is On and Right is Off, as they are drawn; confirm flips. true when the switch changed
|
||||
bool press(int slot, bool left, bool right, bool confirm) {
|
||||
if (slot < 0 || slot >= shown() || fixed(slot)) return false;
|
||||
const int was = on[slot].load(std::memory_order_relaxed);
|
||||
const int now = confirm ? !was : left ? 1 : right ? 0 : was;
|
||||
if (now == was) return false;
|
||||
on[slot].store(now, std::memory_order_relaxed);
|
||||
return true;
|
||||
}
|
||||
/// HOS_OPT_MODCHEAT_ASK: the next switch that is not as the host knows it, (slot + 1) * 2 + its state; 0 none
|
||||
int take() {
|
||||
const int n = shown();
|
||||
for (int slot = 0; slot < n; slot++) {
|
||||
const int now = on[slot].load(std::memory_order_relaxed);
|
||||
if (fixed(slot) || now == told[slot]) continue;
|
||||
told[slot] = now;
|
||||
return (slot + 1) * 2 + (now ? 1 : 0);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
} // namespace mod_cheat_rows
|
||||
454
gpu/vk/occ_answer.h
Normal file
454
gpu/vk/occ_answer.h
Normal file
@@ -0,0 +1,454 @@
|
||||
// (Triforce, 11-17) Samples-passed reports answered from occlusion queries (RX_VK_OCC_QUERY=1, vk_replay.cpp "occlusion
|
||||
// queries"): the bookkeeping, header only so that tests/test_occ_answer.py checks it without a device.
|
||||
//
|
||||
// The game resets NVN's samples-passed counter, draws an object's proxy and reports the count (its render job f_80084de0,
|
||||
// the report from near lr 0x800876dc); its CPU reads the count back once it has waited for the frame, and does not draw an
|
||||
// object whose count is 0. The replay writes every report as it passes it, in stream order, long before the GPU has run
|
||||
// the draws it counts, and has always written 4096 there (everything visible). It still does: that placeholder is what
|
||||
// anything reading the record early sees, as before. With RX_VK_OCC_QUERY=1 the draws between a reset and its report are
|
||||
// also counted by a Vulkan occlusion query, and once the recording that holds them is done on the GPU the count is
|
||||
// written into the same record, over the placeholder, as NX2navi writes it at completion. The game's report records
|
||||
// rotate (a ring of them: an address stands for another object at its next report), so a count is written only into the
|
||||
// record of the report it counted, and only while no later report has been written there (Writers), and only over the
|
||||
// value the replay left in the word (a compare-and-write: the game's CPU re-arms its records between frames). A wrong 0
|
||||
// hides an object the player should see, so a count goes in only when it is whole; otherwise the record keeps its 4096.
|
||||
// The game also predicates draws on these words (render conditions, NOP_RENDER_COND): as NX2navi decides them
|
||||
// (runtime/vk_exec_xfer.c cond_enabled), a word whose newest report is a samples-passed one with its count still to come is
|
||||
// unknown, and the condition renders; a word whose count was written is read from memory, where a real 0 can skip the draw.
|
||||
//
|
||||
// Counter one counting, from a reset to its report, over the queries its draws began: the replay's (one per NVN
|
||||
// queue's state, under replay_mu) or a parallel replay's segment's (the helper thread's: a segment starts with
|
||||
// none, what came before it is another thread's). Matched to its recording by the recording's serial (each
|
||||
// begin of a slot takes a new one), never by the command buffer's handle, which a slot reuses
|
||||
// Writers per report address, the newest report written there (its place in the stream, the value it left, whether its
|
||||
// count is pending, written or not to come): what a count read back may be written over, what a condition reads
|
||||
// Cond a render condition's answer from its two words' sources (cond_decide)
|
||||
// complete a done recording's counts into their records (through the caller's compare-and-write), or why not
|
||||
// Stats what happened, for the line every 600 presents
|
||||
// Sites the first 64 report addresses with their counts, for the lab to find the one RX_VK_OCC_QUERY_SKIP keeps at 4096
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
namespace mkwvk::occ {
|
||||
|
||||
constexpr uint64_t kVisible = 4096; // (the placeholder every report gets at replay; it stays unless its whole count comes)
|
||||
constexpr int64_t kLateAge = 8; // (presents: a count read back this long after its report is not written)
|
||||
constexpr int64_t kKeepAge = 16; // (presents: a report address not reported again for longer leaves Writers)
|
||||
|
||||
/// RX_VK_OCC_QUERY_SKIP=<addr>[,<addr>...]: report addresses (hex with 0x, or decimal) that keep the fixed answer.
|
||||
/// Separated by ',', ';' or spaces; anything else ends the list
|
||||
inline std::vector<uint64_t> parse_addrs(const char* e) {
|
||||
std::vector<uint64_t> v;
|
||||
while (e && *e) {
|
||||
while (*e == ',' || *e == ';' || *e == ' ') e++;
|
||||
if (!*e) break;
|
||||
char* end = nullptr;
|
||||
const unsigned long long a = strtoull(e, &end, 0);
|
||||
if (end == e) break;
|
||||
v.push_back((uint64_t)a);
|
||||
e = end;
|
||||
}
|
||||
std::sort(v.begin(), v.end());
|
||||
v.erase(std::unique(v.begin(), v.end()), v.end());
|
||||
return v;
|
||||
}
|
||||
inline bool listed(const std::vector<uint64_t>& sorted, uint64_t addr) {
|
||||
return std::binary_search(sorted.begin(), sorted.end(), addr);
|
||||
}
|
||||
|
||||
/// Whether a knob list (RX_VK_LAB_AB's knobs, each maybe several names joined by '+') names this switch anywhere
|
||||
inline bool knob_names(const char* knob, const char* name) {
|
||||
const size_t len = strlen(name);
|
||||
for (const char* p = knob; p && *p;) {
|
||||
const char* plus = strchr(p, '+');
|
||||
const size_t n = plus ? (size_t)(plus - p) : strlen(p);
|
||||
if (n == len && !strncmp(p, name, len)) return true;
|
||||
p = plus ? plus + 1 : nullptr;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// The samples of the queries [first, first + n) of a block read with VK_QUERY_RESULT_64_BIT |
|
||||
/// VK_QUERY_RESULT_WITH_AVAILABILITY_BIT ({samples, available} per query). False when one is not available
|
||||
inline bool sum_range(const uint64_t* pairs, uint32_t first, uint32_t n, uint64_t* out) {
|
||||
uint64_t sum = 0;
|
||||
for (uint32_t i = first; i < first + n; i++) {
|
||||
if (!pairs[2 * i + 1]) return false;
|
||||
sum += pairs[2 * i];
|
||||
}
|
||||
*out = sum;
|
||||
return true;
|
||||
}
|
||||
|
||||
/// A measured report: its address, its queries in its recording's block, its place in the stream (the same in the dry pass
|
||||
/// that wrote its placeholder and on the thread that recorded its draws) and the present it was recorded at
|
||||
struct Rep {
|
||||
uint64_t addr = 0;
|
||||
uint32_t first = 0, n = 0;
|
||||
uint64_t pos = 0;
|
||||
int64_t present = 0;
|
||||
};
|
||||
|
||||
/// One samples-passed counting. The replay calls reset() at a SAMPLES_PASSED reset, draw_enter() as a draw goes into draw(),
|
||||
/// begin() where a query may begin (the draw's pass open; may_begin() first, cheaply), draw_issued() for each draw recorded,
|
||||
/// report() at the report. A query is begun inside a pass and ended at the pass's end or the report, so the queries of one
|
||||
/// count follow one another in the block of the recording that holds them (first.. the block's next). The recording is
|
||||
/// known by its serial (a new one each time a slot is begun): a draw or report in another recording, or in the same slot
|
||||
/// begun again, loses the count
|
||||
struct Counter {
|
||||
enum State { kUnknown, kCounting, kReported };
|
||||
enum Outcome { kMeasured, kNoReset, kIncomplete, kDouble };
|
||||
State state = kUnknown;
|
||||
int slot = -1; // (the recording slot whose block the queries are in; -1: none, the count is lost)
|
||||
uint64_t serial = 0; // (that slot's recording: occ_slot_begin's serial; 0: none)
|
||||
uint32_t first = 0; // (the count's first query in the block)
|
||||
int open = -1; // (the query begun and not ended, its index in the block)
|
||||
bool lost = false; // (a draw in another recording, or the block full)
|
||||
uint32_t ops = 0, issued = 0; // (draws that went into draw() while counting, and those it recorded)
|
||||
enum Why { kNone, kSkipped, kOtherCmd, kFull };
|
||||
Why why = kNone;
|
||||
|
||||
/// A parallel replay's segment starts (or ends), or the replay's counting is given up: nothing is counting
|
||||
void segment() { *this = Counter{}; }
|
||||
bool counting(bool keep) const { return state == kCounting || (state == kReported && keep); }
|
||||
/// A reset: counting from the block's next query of slot's recording serial_ (slot -1 or serial 0: the command buffer
|
||||
/// is no recording's, the count is lost)
|
||||
void reset(int slot_, uint64_t serial_, uint32_t next) {
|
||||
const bool none = slot_ < 0 || !serial_;
|
||||
state = kCounting, slot = none ? -1 : slot_, serial = none ? 0 : serial_, first = next, open = -1, lost = none;
|
||||
ops = issued = 0;
|
||||
why = none ? kOtherCmd : kNone;
|
||||
}
|
||||
void draw_enter(bool keep) {
|
||||
if (counting(keep)) ops++;
|
||||
}
|
||||
void draw_issued(bool keep) {
|
||||
if (counting(keep)) issued++;
|
||||
}
|
||||
/// Whether a query might begin at a draw (before the recording's serial is looked up)
|
||||
bool may_begin(bool keep) const { return counting(keep) && open < 0 && !lost; }
|
||||
/// A draw in an open pass of the recording serial_: true when a query is to begin (the caller takes the block's next
|
||||
/// index and sets open); a draw in another recording loses the count
|
||||
bool begin(bool keep, uint64_t serial_) {
|
||||
if (!may_begin(keep)) return false;
|
||||
if (serial_ != serial) {
|
||||
lost = true, why = kOtherCmd;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
void full() { lost = true, why = kFull; }
|
||||
/// The report, in the recording serial_ (the open query already ended by the caller): what it measured. *keep_now: the
|
||||
/// game reported twice without a reset, which NVN counts on from the reset (cumulative): from then on the counting goes
|
||||
/// on past a report. A report in another recording than the reset's is incomplete
|
||||
Outcome report(bool keep, uint64_t serial_, uint32_t next, Rep* rep, bool* keep_now) {
|
||||
*keep_now = false;
|
||||
if (state == kUnknown) return kNoReset;
|
||||
if (state == kReported && !keep) { // (the draws since the first report went uncounted: none of this count is whole)
|
||||
*keep_now = true;
|
||||
lost = true, why = kSkipped;
|
||||
return kDouble;
|
||||
}
|
||||
if (!lost && serial_ != serial) lost = true, why = kOtherCmd;
|
||||
const bool complete = !lost && ops == issued;
|
||||
if (!complete && !lost) why = kSkipped;
|
||||
state = kReported;
|
||||
if (!complete) return kIncomplete;
|
||||
rep->first = first, rep->n = next - first;
|
||||
return kMeasured;
|
||||
}
|
||||
};
|
||||
|
||||
/// Per report address, the newest samples-passed report the replay wrote there (in stream order: placed) and where its
|
||||
/// count stands: NX2navi's Pending table (runtime/vk_exec_xfer.c: seq, written, unknown, "the last report to addr
|
||||
/// decides"). A count read back goes into its record only while its report is the newest there (the game's records rotate,
|
||||
/// and a later report at the same address is another object's, whose placeholder stays), and a render condition reads a
|
||||
/// word whose newest report's count is still to come as unknown (Src kPendingSrc: renders, NX2navi's cond_enabled "rx ==
|
||||
/// 2"). A record rewritten in the stream after its report (a small buffer clear the replay applies in stream order, or a
|
||||
/// report of another counter type) leaves the table: its count is not written there, and a condition reads memory, as before
|
||||
class Writers {
|
||||
public:
|
||||
enum Verdict { kWrite, kSuperseded, kUnknown, kFixed };
|
||||
enum State : uint8_t {
|
||||
kPending, // (its count is to be written and has not been yet)
|
||||
kWritten, // (its count is in the record: completion wrote it)
|
||||
kFinal // (no count comes: skip list, knob off, a clear flag, not counted whole, lost, late, the CPU wrote it)
|
||||
};
|
||||
enum Src { kNone, kPendingSrc, kWrittenSrc, kFinalSrc }; // (what a render condition reading the word finds)
|
||||
struct Placed {
|
||||
uint64_t pos = 0;
|
||||
int64_t present = 0;
|
||||
uint64_t value = 0; // (what the replay, or a count written since, put in the word: a count is written only over it)
|
||||
State state = kFinal;
|
||||
};
|
||||
/// A report's placeholder `value` written at the replay, at pos in the stream (the newest there from now on). write:
|
||||
/// its count is to be written once read back (not on RX_VK_OCC_QUERY_SKIP, the lab knob on, not a clear flag)
|
||||
void placed(uint64_t addr, uint64_t pos, int64_t present, bool write, uint64_t value) {
|
||||
m_[addr] = Placed{pos, present, value, write ? kPending : kFinal};
|
||||
page_[page(addr)] = 1, page_[page(addr + 7)] = 1;
|
||||
}
|
||||
bool is_report(uint64_t addr) const { return m_.count(addr) != 0; }
|
||||
/// What a count read back for the report at (addr, pos) may do. (Two reports at one address with no draw between share
|
||||
/// a place; in stream order the last one's count is written last, over the first one's)
|
||||
Verdict verdict(uint64_t addr, uint64_t pos) const {
|
||||
auto it = m_.find(addr);
|
||||
if (it == m_.end()) return kUnknown; // (not reported for kKeepAge presents, or rewritten in the stream)
|
||||
if (it->second.pos > pos) return kSuperseded; // (reported again since: another object's record now)
|
||||
if (it->second.pos != pos) return kUnknown;
|
||||
return it->second.state == kFinal ? kFixed : kWrite;
|
||||
}
|
||||
/// The value the report at addr left in its word (the placeholder, or the count written since)
|
||||
uint64_t value(uint64_t addr) const {
|
||||
auto it = m_.find(addr);
|
||||
return it == m_.end() ? 0 : it->second.value;
|
||||
}
|
||||
/// The count of the report at (addr, pos) is in its record now
|
||||
void wrote(uint64_t addr, uint64_t pos, uint64_t count) {
|
||||
auto it = m_.find(addr);
|
||||
if (it != m_.end() && it->second.pos == pos) it->second.state = kWritten, it->second.value = count;
|
||||
}
|
||||
/// No count comes for the report at (addr, pos) (not counted whole, lost, late, never sent, the CPU wrote the record):
|
||||
/// a condition reads its word from memory from now on, as before
|
||||
void settle(uint64_t addr, uint64_t pos) {
|
||||
auto it = m_.find(addr);
|
||||
if (it != m_.end() && it->second.pos == pos && it->second.state == kPending) it->second.state = kFinal;
|
||||
}
|
||||
/// A report of another counter type at addr (a timestamp: base behaviour) is the newest there now
|
||||
bool erase(uint64_t addr) { return m_.erase(addr) != 0; }
|
||||
/// A small buffer clear of [lo, hi) applied in stream order (NOP_CLEAR_BUF): the records whose count word it reaches leave
|
||||
/// the table (NX2navi's clear_small and clr_mask, by whole records: memory holds the clear's value from now on, and the
|
||||
/// count of a report before it is not written over it). Report addresses are 4-byte aligned at least. Returns how many
|
||||
int cleared(uint64_t lo, uint64_t hi) {
|
||||
if (hi <= lo || m_.empty() || (!page_[page(lo)] && !page_[page(hi - 1)])) return 0;
|
||||
int n = 0;
|
||||
for (uint64_t k = ((lo >= 7 ? lo - 7 : 0) + 3) & ~3ull; k < hi; k += 4) n += (int)m_.erase(k);
|
||||
return n;
|
||||
}
|
||||
/// What a render condition finds in the word at addr: no samples-passed report (memory, as before), its count pending
|
||||
/// (unknown: renders), written (memory holds it), or none to come (memory). A count pending longer than kLateAge
|
||||
/// presents is not written any more (complete: late): memory
|
||||
Src word(uint64_t addr, int64_t now) const {
|
||||
auto it = m_.find(addr);
|
||||
if (it == m_.end()) return kNone;
|
||||
switch (it->second.state) {
|
||||
case kPending: return now - it->second.present > kLateAge ? kFinalSrc : kPendingSrc;
|
||||
case kWritten: return kWrittenSrc;
|
||||
case kFinal: break;
|
||||
}
|
||||
return kFinalSrc;
|
||||
}
|
||||
/// The addresses not reported for more than `age` presents go (a count still to come for them is not written)
|
||||
void prune(int64_t now, int64_t age) {
|
||||
for (auto it = m_.begin(); it != m_.end();)
|
||||
it = now - it->second.present > age ? m_.erase(it) : std::next(it);
|
||||
}
|
||||
size_t size() const { return m_.size(); }
|
||||
|
||||
private:
|
||||
// (the pages a report went into, by a hash of the page, as NX2navi's rep_pages: a clear elsewhere looks nothing up)
|
||||
static uint32_t page(uint64_t a) { return (uint32_t)(((a >> 12) * 0x9E3779B97F4A7C15ull) >> 48); }
|
||||
std::unordered_map<uint64_t, Placed> m_;
|
||||
std::vector<uint8_t> page_ = std::vector<uint8_t>(1u << 16);
|
||||
};
|
||||
|
||||
/// A render condition (NOP_RENDER_COND: mode 0 renders when the counter words at addr and addr + 16 are equal, mode 1 when
|
||||
/// they differ) over the words' sources (Writers::word), after NX2navi's cond_enabled: a samples-passed count not done yet
|
||||
/// renders; a written one, as any other word, is read from memory (base_enabled: the replay's answer from memory). active:
|
||||
/// RX_VK_OCC_QUERY=1 or the lab knob's phase (else the answer is the base one, whatever the table says); cond_on: false
|
||||
/// with RX_VK_OCC_COND=0, every condition on a samples-passed word renders
|
||||
struct Cond {
|
||||
enum Kind { kNotSamples, kBase, kUnknown, kForced, kWrittenOn, kWrittenOff, kMemory };
|
||||
bool enabled;
|
||||
Kind kind;
|
||||
};
|
||||
inline Cond cond_decide(bool base_enabled, Writers::Src sx, Writers::Src sy, bool active, bool cond_on) {
|
||||
if (sx == Writers::kNone && sy == Writers::kNone) return {base_enabled, Cond::kNotSamples};
|
||||
if (!active) return {base_enabled, Cond::kBase};
|
||||
if (!cond_on) return {true, Cond::kForced};
|
||||
if (sx == Writers::kPendingSrc || sy == Writers::kPendingSrc) return {true, Cond::kUnknown};
|
||||
if (sx == Writers::kWrittenSrc || sy == Writers::kWrittenSrc)
|
||||
return {base_enabled, base_enabled ? Cond::kWrittenOn : Cond::kWrittenOff};
|
||||
return {base_enabled, Cond::kMemory};
|
||||
}
|
||||
inline const char* src_name(Writers::Src s) {
|
||||
return s == Writers::kPendingSrc ? "pending" : s == Writers::kWrittenSrc ? "written" : s == Writers::kFinalSrc ? "memory, no count to come" : "memory";
|
||||
}
|
||||
|
||||
/// What happened since the last line (under the caller's lock)
|
||||
struct Stats {
|
||||
enum At { kAtWait, kAtBegin, kAtPresent, kAtReuse };
|
||||
// at the replay
|
||||
int64_t reports = 0; // samples-passed reports written (the placeholder, 4096 as before)
|
||||
int64_t in_segments = 0; // of them by the dry pass of a parallel replay
|
||||
int64_t skipped = 0; // on RX_VK_OCC_QUERY_SKIP: no count to be written
|
||||
int64_t fixed = 0; // the lab knob occq off in this phase: no count to be written
|
||||
int64_t flagged = 0; // the count word a clear flag (NVN_COUNTER_WRITTEN): left alone
|
||||
int64_t rewritten = 0; // records rewritten in the stream after their report (a small clear, another counter type)
|
||||
int64_t measured = 0, no_reset = 0, incomplete = 0, doubles = 0; // counted whole by queries, and those not
|
||||
int64_t inc_skipped = 0, inc_other_cmd = 0, inc_full = 0; // why not whole
|
||||
// render conditions that read a samples-passed report's word (Cond::Kind), and the work they skipped
|
||||
int64_t conds = 0, cond_base = 0, cond_unknown = 0, cond_forced = 0, cond_written_on = 0, cond_written_off = 0, cond_memory = 0;
|
||||
int64_t draws_skipped = 0, clears_skipped = 0;
|
||||
// at completion
|
||||
int64_t written = 0, zeros = 0; // counts written into their records (of them 0: the object hidden)
|
||||
int64_t lost = 0; // a query not available once its recording was done: 4096 stays
|
||||
int64_t dropped = 0; // their recording never went to the GPU
|
||||
int64_t late = 0; // read back more than kLateAge presents after the report: not written
|
||||
int64_t superseded = 0; // the record reported again first (the ring came round): not written
|
||||
int64_t unknown = 0; // the record no longer known (pruned, or rewritten in the stream): not written
|
||||
int64_t kept_fixed = 0; // its report placed with no count to be written (skip list, knob off)
|
||||
int64_t rearmed = 0; // the word no longer held the replay's value (the CPU wrote the record since): not written
|
||||
int64_t lat_sum = 0, lat_ge1 = 0, lat_ge2 = 0; // presents from the report to the write, over written
|
||||
int64_t at[4] = {}; // recordings read: at a game's fence wait, a recording's begin, a present, the slot's reuse
|
||||
int64_t addrs = 0; // distinct report addresses since the last line
|
||||
void cond(Cond::Kind k) {
|
||||
if (k == Cond::kNotSamples) return;
|
||||
conds++;
|
||||
(k == Cond::kBase ? cond_base : k == Cond::kUnknown ? cond_unknown : k == Cond::kForced ? cond_forced
|
||||
: k == Cond::kWrittenOn ? cond_written_on : k == Cond::kWrittenOff ? cond_written_off : cond_memory)++;
|
||||
}
|
||||
/// The line, into out
|
||||
int line(char* out, size_t size, int64_t presents, size_t tracked) const {
|
||||
return snprintf(out, size,
|
||||
"vk: occlusion queries (RX_VK_OCC_QUERY), %lld presents: %lld samples-passed reports, 4096 written at "
|
||||
"the replay as before (%lld by a parallel replay's dry pass; %lld skipped (RX_VK_OCC_QUERY_SKIP), %lld "
|
||||
"lab knob occq off, %lld a clear flag; %lld records rewritten in the stream after their report); %lld "
|
||||
"counted whole, %lld without their reset on the recording thread, %lld incomplete (%lld draws left out, "
|
||||
"%lld over two recordings, %lld block full), %lld reported twice without a reset. At completion: %lld "
|
||||
"counts written (%lld of them 0), %lld lost (not available), %lld never sent, %lld late, %lld superseded "
|
||||
"(the record reported again first), %lld no longer known, %lld kept 4096 (skip list or knob off), %lld "
|
||||
"not written: the record no longer held the replay's value; mean latency %.2f presents, %lld written "
|
||||
"after the next present, %lld after two; recordings read at: %lld a game's fence wait, %lld a "
|
||||
"recording's begin, %lld a present, %lld the slot's reuse. Render conditions on samples-passed words: "
|
||||
"%lld (%lld as before: knob occq off; %lld rendered: a count pending (unknown); %lld rendered: "
|
||||
"RX_VK_OCC_COND=0; %lld rendered from a written count; %lld skipped from a written count; %lld from "
|
||||
"memory, no count to come); skipped by them: %lld draws and dispatches, %lld clears; %lld addresses "
|
||||
"this period, %zu tracked",
|
||||
(long long)presents, (long long)reports, (long long)in_segments, (long long)skipped, (long long)fixed,
|
||||
(long long)flagged, (long long)rewritten, (long long)measured, (long long)no_reset,
|
||||
(long long)incomplete, (long long)inc_skipped, (long long)inc_other_cmd, (long long)inc_full,
|
||||
(long long)doubles, (long long)written, (long long)zeros, (long long)lost, (long long)dropped,
|
||||
(long long)late, (long long)superseded, (long long)unknown, (long long)kept_fixed, (long long)rearmed,
|
||||
written ? (double)lat_sum / (double)written : 0.0, (long long)lat_ge1, (long long)lat_ge2,
|
||||
(long long)at[kAtWait], (long long)at[kAtBegin], (long long)at[kAtPresent], (long long)at[kAtReuse],
|
||||
(long long)conds, (long long)cond_base, (long long)cond_unknown, (long long)cond_forced,
|
||||
(long long)cond_written_on, (long long)cond_written_off, (long long)cond_memory,
|
||||
(long long)draws_skipped, (long long)clears_skipped, (long long)addrs, tracked);
|
||||
}
|
||||
};
|
||||
|
||||
/// A done recording's reports (in stream order) into their records. pairs: its block read with VK_QUERY_RESULT_64_BIT |
|
||||
/// VK_QUERY_RESULT_WITH_AVAILABILITY_BIT over the `used` queries it took (readable false: the read failed). A count is
|
||||
/// written only when every query of it is available, it is read back at most kLateAge presents after its report, and its
|
||||
/// report is still the newest at its address with a count to be written there (Writers::verdict); then write(addr, expect,
|
||||
/// count) puts it in the record only while the word still holds expect, what the replay (or an earlier count of the same
|
||||
/// place) left there, and says whether it did: the game's CPU re-arms its records between frames, and a count read back
|
||||
/// late must not land over that (NX2navi treats a report as pending until its value is written; here the write itself is
|
||||
/// a compare-and-write). Anything else leaves the record as it is, and the report's count is settled (no count comes: a
|
||||
/// condition reads memory). measured(addr, count): each whole count read back (the sites)
|
||||
template <class Write, class Measured>
|
||||
void complete(const std::vector<Rep>& reps, const uint64_t* pairs, uint32_t used, bool readable, Writers& w, int64_t now,
|
||||
Stats& st, Write&& write, Measured&& measured) {
|
||||
for (const Rep& p : reps) {
|
||||
uint64_t sum = 0;
|
||||
const bool inside = p.n <= used && p.first <= used - p.n; // (its queries in the block the recording took)
|
||||
if (!readable || !inside || !sum_range(pairs, p.first, p.n, &sum)) {
|
||||
st.lost++;
|
||||
w.settle(p.addr, p.pos);
|
||||
continue;
|
||||
}
|
||||
measured(p.addr, sum);
|
||||
if (now - p.present > kLateAge) {
|
||||
st.late++;
|
||||
w.settle(p.addr, p.pos);
|
||||
continue;
|
||||
}
|
||||
switch (w.verdict(p.addr, p.pos)) {
|
||||
case Writers::kSuperseded: st.superseded++; continue;
|
||||
case Writers::kUnknown: st.unknown++; continue;
|
||||
case Writers::kFixed: st.kept_fixed++; continue;
|
||||
case Writers::kWrite: break;
|
||||
}
|
||||
if (!write(p.addr, w.value(p.addr), sum)) {
|
||||
st.rearmed++;
|
||||
w.settle(p.addr, p.pos);
|
||||
continue;
|
||||
}
|
||||
w.wrote(p.addr, p.pos, sum);
|
||||
const int64_t lat = std::max<int64_t>(0, now - p.present);
|
||||
st.written++, st.zeros += sum ? 0 : 1, st.lat_sum += lat, st.lat_ge1 += lat >= 1, st.lat_ge2 += lat >= 2;
|
||||
}
|
||||
}
|
||||
/// A recording's reports that never went to the GPU: no count comes for them
|
||||
inline void dropped(const std::vector<Rep>& reps, Writers& w, Stats& st) {
|
||||
for (const Rep& p : reps) w.settle(p.addr, p.pos);
|
||||
st.dropped += (int64_t)reps.size();
|
||||
}
|
||||
|
||||
/// The first 64 report addresses the replay saw, with how often each was reported, what its queries counted and how many
|
||||
/// counts went into it
|
||||
struct Sites {
|
||||
struct Site {
|
||||
uint64_t addr = 0;
|
||||
int64_t reports = 0, measured = 0, written = 0;
|
||||
uint64_t last = 0, lo = UINT64_MAX, hi = 0;
|
||||
};
|
||||
static constexpr int kMost = 64;
|
||||
Site s[kMost];
|
||||
int n = 0;
|
||||
Site* at(uint64_t addr, bool add) {
|
||||
for (int i = 0; i < n; i++)
|
||||
if (s[i].addr == addr) return &s[i];
|
||||
if (!add || n == kMost) return nullptr;
|
||||
s[n].addr = addr;
|
||||
return &s[n++];
|
||||
}
|
||||
void reported(uint64_t addr) {
|
||||
if (Site* x = at(addr, true)) x->reports++;
|
||||
}
|
||||
void measured(uint64_t addr, uint64_t count) {
|
||||
if (Site* x = at(addr, false)) x->measured++, x->last = count, x->lo = std::min(x->lo, count), x->hi = std::max(x->hi, count);
|
||||
}
|
||||
void wrote(uint64_t addr) {
|
||||
if (Site* x = at(addr, false)) x->written++;
|
||||
}
|
||||
/// Lines of eight sites each: "addr reports/measured last [lo..hi] written"
|
||||
template <class Log>
|
||||
void log(Log&& out) const {
|
||||
for (int b = 0; b < n; b += 8) {
|
||||
char line[1024];
|
||||
int k = snprintf(line, sizeof line, "vk: occlusion query sites %d-%d of %d (address: reports/measured, last count "
|
||||
"[lowest..highest], counts written):", b + 1, std::min(n, b + 8), n);
|
||||
for (int i = b; i < std::min(n, b + 8) && k < (int)sizeof line - 96; i++) {
|
||||
const Site& x = s[i];
|
||||
k += snprintf(line + k, sizeof line - k, " %#llx: %lld/%lld %llu [%llu..%llu] %lld;", (unsigned long long)x.addr,
|
||||
(long long)x.reports, (long long)x.measured, (unsigned long long)x.last,
|
||||
(unsigned long long)(x.measured ? x.lo : 0), (unsigned long long)x.hi, (long long)x.written);
|
||||
}
|
||||
out(line);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/// The distinct addresses reported since the last line (bounded)
|
||||
struct Distinct {
|
||||
std::unordered_set<uint64_t> seen;
|
||||
void note(uint64_t addr) {
|
||||
if (seen.size() < 65536) seen.insert(addr);
|
||||
}
|
||||
int64_t take() {
|
||||
const int64_t n = (int64_t)seen.size();
|
||||
seen.clear();
|
||||
return n;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace mkwvk::occ
|
||||
@@ -37,10 +37,9 @@
|
||||
OOT_ITEM("Hookshot", "Item_Hookshot", 0) \
|
||||
OOT_ITEM("Longshot", "Item_Longshot", 0) \
|
||||
OOT_ITEM("Boomerang", "Item_Boomerang", 0) \
|
||||
OOT_ITEM("Lens of Truth", "Item_GlassTruth", 0) \
|
||||
OOT_ITEM("Lens of Truth", "Armor_GlassTruth", 0) \
|
||||
OOT_ITEM("Magic Beans", "Item_MagicBean", 1) \
|
||||
OOT_ITEM("Megaton Hammer", "Item_Hammer", 0) \
|
||||
OOT_ITEM("Empty Bottle", "Item_Bottle", 1) \
|
||||
OOT_SECTION("Masks") \
|
||||
OOT_ITEM("Keaton Mask", "Armor_Child_Mask_Keaton", 0) \
|
||||
OOT_ITEM("Skull Mask", "Armor_Child_Mask_Skull", 0) \
|
||||
@@ -51,7 +50,7 @@
|
||||
OOT_ITEM("Gerudo Mask", "Armor_Child_Mask_Gerudo", 0) \
|
||||
OOT_ITEM("Mask of Truth", "Armor_Child_Mask_Truth", 0) \
|
||||
OOT_SECTION("Upgrades") \
|
||||
OOT_ITEM("Goron's Bracelet", "Item_Gauntlet_Goron", 0) \
|
||||
OOT_ITEM("Goron's Bracelet", "Armor_Child_Gauntlet_Goron", 0) \
|
||||
OOT_ITEM("Silver Gauntlets", "Armor_Adult_Gauntlet_Silver", 0) \
|
||||
OOT_ITEM("Golden Gauntlets", "Armor_Adult_Gauntlet_Gold", 0) \
|
||||
OOT_ITEM("Silver Scale", "Item_Scale_Silver", 0) \
|
||||
|
||||
138
gpu/vk/oot_debug_link.h
Normal file
138
gpu/vk/oot_debug_link.h
Normal file
@@ -0,0 +1,138 @@
|
||||
/* (Triforce, OoT debug tools) The Debug tab's Game flags and Cutscenes pages (gpu/vk/vk_menu.cpp, gpu/vk/debug_names.h) and
|
||||
the game's side (host/hos_main.c): the lines that go between them, a byte a call (HOS_OPT_DEBUG_ASK one way,
|
||||
HOS_OPT_DEBUG_TEXT and HOS_OPT_DEBUG_SAID the other: gpu/vk/vk_api.h). C and C++; tests/test_debug_link.py runs it.
|
||||
|
||||
The game knows a flag (a Bool of its GameData) by the MurmurHash3 of its name alone, and an event by the name of its
|
||||
file. Neither list is in this repository: the pages read the names from the player's own game files, in memory.
|
||||
|
||||
The pages ask:
|
||||
W <hash> <hash> ... the flags the page shows now, at most OOT_WATCH_MAX, eight hex digits each: their states are
|
||||
sent twice a second from then on (a W with none: no more)
|
||||
F <hash> <0|1> the flag cleared or set, through the game's own setter
|
||||
E <name> the event of that name started, as one of the game's actors starts it
|
||||
The game's side says:
|
||||
OOT_SAID_FLAGS "<sum> <states>": the watch list's oot_watch_sum, then a character a flag in the list's order:
|
||||
1 set, 0 not, - the save data has no such flag, ? no save is loaded
|
||||
OOT_SAID_STATUS what became of an F or an E, in words, for the page's foot */
|
||||
#ifndef OOT_DEBUG_LINK_H
|
||||
#define OOT_DEBUG_LINK_H
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
enum { OOT_WATCH_MAX = 64, OOT_NAME_MAX = 95, OOT_LINE_MAX = 4 + 9 * OOT_WATCH_MAX };
|
||||
enum { OOT_SAID_FLAGS = 1, OOT_SAID_STATUS = 2 };
|
||||
|
||||
/* MurmurHash3 (32-bit, seed 0) of a name's bytes, as the game's GameData getters and setters take it */
|
||||
static inline uint32_t oot_name_hash(const char *text, size_t n) {
|
||||
uint32_t h = 0;
|
||||
size_t i = 0;
|
||||
for (; i + 4 <= n; i += 4) {
|
||||
uint32_t k = (uint32_t)(uint8_t)text[i] | (uint32_t)(uint8_t)text[i + 1] << 8 | (uint32_t)(uint8_t)text[i + 2] << 16 |
|
||||
(uint32_t)(uint8_t)text[i + 3] << 24;
|
||||
k *= 0xcc9e2d51u, k = k << 15 | k >> 17, k *= 0x1b873593u;
|
||||
h ^= k, h = h << 13 | h >> 19, h = h * 5 + 0xe6546b64u;
|
||||
}
|
||||
uint32_t k = 0;
|
||||
if ((n & 3) == 3) k ^= (uint32_t)(uint8_t)text[i + 2] << 16;
|
||||
if ((n & 3) >= 2) k ^= (uint32_t)(uint8_t)text[i + 1] << 8;
|
||||
if (n & 3) k ^= (uint8_t)text[i], k *= 0xcc9e2d51u, k = k << 15 | k >> 17, k *= 0x1b873593u, h ^= k;
|
||||
h ^= (uint32_t)n;
|
||||
h ^= h >> 16, h *= 0x85ebca6bu, h ^= h >> 13, h *= 0xc2b2ae35u, h ^= h >> 16;
|
||||
return h;
|
||||
}
|
||||
|
||||
/* a character of a flag's or an event's name: the game's names are letters, digits, _ . and - */
|
||||
static inline int oot_name_char(int ch) {
|
||||
return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch >= '0' && ch <= '9') || ch == '_' || ch == '.' || ch == '-';
|
||||
}
|
||||
/* a name of 1 to OOT_NAME_MAX such characters */
|
||||
static inline int oot_name_ok(const char *name) {
|
||||
size_t n = 0;
|
||||
while (name[n] && n <= OOT_NAME_MAX && oot_name_char((unsigned char)name[n])) n++;
|
||||
return n > 0 && n <= OOT_NAME_MAX && !name[n];
|
||||
}
|
||||
|
||||
/* what pairs a line of states with the list it answers: the flags' hashes in their order */
|
||||
static inline uint32_t oot_watch_sum(const uint32_t *hashes, int n) {
|
||||
uint32_t sum = 0x9e3779b9u + (uint32_t)n;
|
||||
for (int i = 0; i < n; i++) sum = (sum << 5 | sum >> 27) ^ hashes[i];
|
||||
return sum;
|
||||
}
|
||||
|
||||
/* eight hex digits at *at, which moves past them: 1 when there were eight */
|
||||
static inline int oot_hex8(const char **at, uint32_t *value) {
|
||||
uint32_t v = 0;
|
||||
for (int i = 0; i < 8; i++) {
|
||||
const int ch = (unsigned char)(*at)[i];
|
||||
const int digit = ch >= '0' && ch <= '9' ? ch - '0' : ch >= 'a' && ch <= 'f' ? ch - 'a' + 10 : -1;
|
||||
if (digit < 0) return 0;
|
||||
v = v << 4 | (uint32_t)digit;
|
||||
}
|
||||
*at += 8, *value = v;
|
||||
return 1;
|
||||
}
|
||||
|
||||
typedef struct OotAsk {
|
||||
int kind; /* 'W', 'F' or 'E' */
|
||||
uint32_t hash; /* F: the flag */
|
||||
int value; /* F: 0 or 1 */
|
||||
int count; /* W: how many */
|
||||
uint32_t watch[OOT_WATCH_MAX]; /* W: the flags */
|
||||
char name[OOT_NAME_MAX + 1]; /* E: the event */
|
||||
} OotAsk;
|
||||
|
||||
/* A line of the pages taken apart: 1 when it is one of the three, whole and well formed (anything else is dropped) */
|
||||
static inline int oot_ask_parse(const char *line, OotAsk *ask) {
|
||||
memset(ask, 0, sizeof *ask);
|
||||
const char *at = line + 1;
|
||||
if (line[0] == 'W') {
|
||||
while (*at) {
|
||||
if (*at++ != ' ' || ask->count == OOT_WATCH_MAX || !oot_hex8(&at, &ask->watch[ask->count])) return 0;
|
||||
ask->count++;
|
||||
}
|
||||
ask->kind = 'W';
|
||||
return 1;
|
||||
}
|
||||
if (line[0] == 'F') {
|
||||
if (*at++ != ' ' || !oot_hex8(&at, &ask->hash) || !ask->hash || *at++ != ' ' || (*at != '0' && *at != '1') || at[1]) return 0;
|
||||
ask->value = *at == '1';
|
||||
ask->kind = 'F';
|
||||
return 1;
|
||||
}
|
||||
if (line[0] == 'E') {
|
||||
if (*at++ != ' ' || !oot_name_ok(at)) return 0;
|
||||
memcpy(ask->name, at, strlen(at) + 1);
|
||||
ask->kind = 'E';
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* The pages' lines written (out of OOT_LINE_MAX at least): their length, 0 when the line cannot be made */
|
||||
static inline int oot_ask_watch(char *out, size_t cap, const uint32_t *hashes, int n) {
|
||||
if (n < 0 || n > OOT_WATCH_MAX || cap < 2 + 9 * (size_t)n) return 0;
|
||||
int used = snprintf(out, cap, "W");
|
||||
for (int i = 0; i < n; i++) used += snprintf(out + used, cap - (size_t)used, " %08x", (unsigned)hashes[i]);
|
||||
return used;
|
||||
}
|
||||
static inline int oot_ask_flag(char *out, size_t cap, uint32_t hash, int value) {
|
||||
return hash && cap >= 13 ? snprintf(out, cap, "F %08x %d", (unsigned)hash, value ? 1 : 0) : 0;
|
||||
}
|
||||
static inline int oot_ask_event(char *out, size_t cap, const char *name) {
|
||||
return oot_name_ok(name) && cap >= strlen(name) + 3 ? snprintf(out, cap, "E %s", name) : 0;
|
||||
}
|
||||
|
||||
/* A line of states read: 1 when it answers the list of that sum and has n states of the four characters; they are in
|
||||
states then */
|
||||
static inline int oot_states_parse(const char *line, uint32_t sum, int n, char *states) {
|
||||
uint32_t said;
|
||||
const char *at = line;
|
||||
if (!oot_hex8(&at, &said) || said != sum || *at++ != ' ' || (int)strlen(at) != n) return 0;
|
||||
for (int i = 0; i < n; i++)
|
||||
if (at[i] != '0' && at[i] != '1' && at[i] != '-' && at[i] != '?') return 0;
|
||||
memcpy(states, at, (size_t)n);
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
60
gpu/vk/pace_rule.h
Normal file
60
gpu/vk/pace_rule.h
Normal file
@@ -0,0 +1,60 @@
|
||||
// (Triforce) Who holds a frame of the game to the Game frame rate cap: RivaTuner Statistics Server, NVIDIA Reflex or
|
||||
// the game's own wait, and what RivaTuner is asked to hold (gpu/vk/vk_pace.cpp, where the game's frame starts). Plain
|
||||
// C with no system call, so that tests/test_rtss_limit.py runs every combination of rows through it.
|
||||
//
|
||||
// The owner's rule: RivaTuner is the game's limiter whenever it can hold the game. It holds presents, and it counts
|
||||
// every one, the frames frame generation makes too. So what it can hold depends on where the presents come from:
|
||||
//
|
||||
// No frame generation: one present for each of the game's frames, on the replay's thread. RivaTuner's limit is the
|
||||
// cap, and holding the presents holds the game through the present queue.
|
||||
//
|
||||
// The Frame generation row's fixed multipliers (2x to 8x, AMD FSR 3.1's 2x and AMD FSR 4's frame): the display thread
|
||||
// (vk_framegen.cpp display_main) presents every frame of every set, the multiplier's number for each of the game's.
|
||||
// RivaTuner's limit is the cap times the multiplier, and holding those presents holds the game: the display thread
|
||||
// then takes the game's frames at the cap, and the replay's thread waits for it (framegen_record) as the game waits
|
||||
// for the replay. The display thread's own pacing of the made frames has to yield meanwhile (pace_display_yields):
|
||||
// it spaces the presents by the game's measured frame time, which under RivaTuner's hold is RivaTuner's own spacing
|
||||
// read back; it can only ever fall behind that, never catch up, and each hitch would leave the game slower for good.
|
||||
//
|
||||
// The Frame generation row's Auto: a frame for each refresh of the screen, at that refresh's time, however many the
|
||||
// game makes (a game frame is given none, one or several). The presents follow the screen, not the game, so no limit
|
||||
// on them holds the game to its cap: RivaTuner is kept out (RTSS_OUT_AUTO) and the game's own wait holds the frames.
|
||||
//
|
||||
// NVIDIA DLSS frame generation: the game's one present goes into NVIDIA's Streamline, which shows the made frames
|
||||
// and the game's own from inside its closed library, on a pace of its own that cannot be told to yield, and shows
|
||||
// one frame for each of the game's while it holds generation back (a menu, a load, a window not in front). What a
|
||||
// hold on each of its presents does to that pacing cannot be worked out from this code, so RivaTuner is kept out
|
||||
// (RTSS_OUT_DLSSG) and the game's own wait, or Reflex with its row, holds the frames. HOS_RTSS_DLSSG=1 lets RivaTuner
|
||||
// try there all the same, with the cap times the multiplier in effect and every safeguard of rtss_decide.h.
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
|
||||
#include "rtss_decide.h"
|
||||
|
||||
enum { PACE_GAME = 0, PACE_REFLEX = 1, PACE_RTSS = 2 };
|
||||
enum {
|
||||
PACE_FG_OFF, // no frame generation: a present for each of the game's frames
|
||||
PACE_FG_FIXED, // the display thread shows mult frames for each of the game's
|
||||
PACE_FG_AUTO, // the display thread shows a frame for each refresh of the screen
|
||||
PACE_FG_DLSSG, // NVIDIA's Streamline shows mult frames for each of the game's (1 while it holds generation back)
|
||||
};
|
||||
|
||||
// What RivaTuner is asked to hold where the game's frame starts: the limit on the frames it counts, every frame
|
||||
// presented, in millihertz; or why it is kept out (RTSS_OUT_*); RTSS_UNSET while the host has told no period yet.
|
||||
// period_ns: the period the host paces the game's frames by (the cap in effect). fg, mult: where the presents come
|
||||
// from and how many for each of the game's frames now. dlssg_try: HOS_RTSS_DLSSG=1.
|
||||
static inline int64_t pace_rtss_want(uint64_t period_ns, int fg, int mult, int dlssg_try) {
|
||||
if (!period_ns) return RTSS_UNSET;
|
||||
if (fg == PACE_FG_AUTO) return RTSS_OUT_AUTO;
|
||||
if (fg == PACE_FG_DLSSG && !dlssg_try) return RTSS_OUT_DLSSG;
|
||||
return rtss_cap_mhz(period_ns) * (fg == PACE_FG_OFF || mult < 1 ? 1 : mult);
|
||||
}
|
||||
|
||||
// Who holds this frame. rtss: RivaTuner holds it (rtss_frame_holds of the worker's word, with no movie playing and the
|
||||
// frames' own check passed). reflex: Reflex would hold it (vk_dlssg.cpp pace), which is asked only when RivaTuner does
|
||||
// not: with RivaTuner as the limiter Reflex is given no frame limit, whatever the Reflex frame limit row says. Exactly
|
||||
// one of the three for every frame: the host waits when, and only when, the answer is PACE_GAME.
|
||||
static inline int pace_owner(int rtss, int reflex) { return rtss ? PACE_RTSS : reflex ? PACE_REFLEX : PACE_GAME; }
|
||||
|
||||
// The display thread's own pacing of made frames stands aside: RivaTuner holds the frames it presents.
|
||||
static inline int pace_display_yields(int owner, int fg) { return owner == PACE_RTSS && fg == PACE_FG_FIXED; }
|
||||
54
gpu/vk/pass_barrier.h
Normal file
54
gpu/vk/pass_barrier.h
Normal file
@@ -0,0 +1,54 @@
|
||||
// (Triforce) The barrier a draw pass starts with (vk_texture.cpp pass_start_barrier), apart from Vulkan so that
|
||||
// tests/test_pass_barrier.py can run its rule.
|
||||
//
|
||||
// Before every draw pass the replay records a barrier: what the work before it wrote is made visible to it. A full one (all
|
||||
// commands, all memory) makes the GPU drain: the new pass's vertex, task and mesh work waits until the pass before has drawn its
|
||||
// last fragment. The game mode (RX_VK_PASS_BARRIER=game) keeps that wait for the new pass's fragment stages only (its fragment
|
||||
// shaders, depth and stencil tests and colour output), where a draw pass comes right after another with nothing recorded
|
||||
// between into its command buffer: no barrier of the game's (nvnCommandBufferBarrier is a full barrier and ends the pass), no copy,
|
||||
// clear, uniform update or dispatch. ((Triforce, P4) by the command buffer's own count, cmd_work.h: what other command buffers get
|
||||
// meanwhile is not between the two passes on the queue; a recording's uploads go before its commands, behind full barriers of their
|
||||
// own.) The new pass's vertex, task and mesh work may then overlap the earlier pass's fragments, as on the
|
||||
// console's GPU, where NVN asks for a barrier before rendering results are read. What changes order is only a vertex, task or
|
||||
// mesh stage that reads or writes what the pass before touched with no barrier from the game between; every fragment-side access
|
||||
// stays ordered after all earlier work, the writes and the reads (so a clear or a draw that writes a target an earlier pass
|
||||
// sampled waits for that pass).
|
||||
//
|
||||
// Not where the replay itself ended the pass to keep a draw or a clear apart from its own pass's work (vk_draw.cpp draw_hazards,
|
||||
// clear_after_draws, note_pass_split): those passes start with a full barrier, as before, since the draw that follows may read the
|
||||
// pass's targets in its vertex or mesh stage. Not with RX_VK_BARRIER_EVERY_DRAW (an experiment that ends the pass at each draw for a
|
||||
// full barrier there). ((Triforce, P4) With the parallel replay too: a segment is a command buffer of its own, begun with a full
|
||||
// barrier, so its first pass start is a full one; RX_VK_BARRIER_CONTEXT=0, the one count of every thread's commands: not while the
|
||||
// helper threads record, as before.)
|
||||
//
|
||||
// On by default with NVIDIA's driver only, where NX2navi turned its own game-only barriers on (its barrier_game, "about a tenth off
|
||||
// the graphics card's time for a frame", 34 screenshots the same on an RTX 5090); nothing in Triforce's notes records a fault of
|
||||
// this one, and none of the owner's runs had it on. NX2navi's rule is broader: between two passes it orders the attachments alone
|
||||
// (no shader reads), and between two dispatches nothing. An attachment-only barrier leaves a target's write unordered with the
|
||||
// shader reads of it before: across two passes, the fault Triforce's notes record within one (vk_draw.cpp clear_after_draws: a
|
||||
// clear while draws before it still sampled its target, a band of the picture for a frame). So it is not taken; the dispatches'
|
||||
// barriers are vk_draw.cpp dispatch's, not this rule's.
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
|
||||
namespace mkwvk::pass_barrier {
|
||||
|
||||
/// RX_VK_PASS_BARRIER: "game" the game mode on any card; "full" (or any other value) a full barrier at every pass start, as
|
||||
/// before; unset or empty: the game mode with NVIDIA's driver (vendor 0x10de), full on every other card. every_draw:
|
||||
/// RX_VK_BARRIER_EVERY_DRAW is set, which keeps every pass start full
|
||||
inline bool game(const char* env, uint32_t vendor, bool every_draw) {
|
||||
if (every_draw) return false;
|
||||
if (env && *env) return std::strcmp(env, "game") == 0;
|
||||
return vendor == 0x10DE;
|
||||
}
|
||||
|
||||
/// Whether a pass start gets the fragment-stage barrier: the game mode, and a draw pass the last thing on the command buffer (the
|
||||
/// pass ended on this command buffer, its count as it was then, and not a pass the replay split). ((Triforce, P4) no parallel
|
||||
/// replay's argument: vk_texture.cpp folds RX_VK_BARRIER_CONTEXT=0's standing aside into game)
|
||||
inline bool relaxed(bool game, bool after_pass) {
|
||||
return game && after_pass;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::pass_barrier
|
||||
144
gpu/vk/pcache_bound.h
Normal file
144
gpu/vk/pcache_bound.h
Normal file
@@ -0,0 +1,144 @@
|
||||
// (Triforce) The bound on the pipeline cache's file (mkw_vk_pipelines.bin; vk_draw.cpp pcache_init, pipeline_cache_save),
|
||||
// apart from Vulkan so that tests/test_pcache_bound.py can run it. As NX2navi's (runtime/vk_cache_file.h and its cache_cap).
|
||||
//
|
||||
// The file is read into memory whole at every start and handed to the driver, which keeps its own copy for the session, and
|
||||
// every save fetches all of it again. Nothing bounded it: a player's file reached 4.1 GB on a 32 GB PC whose log said "RAM
|
||||
// short" all session, the lab's 3.9 GB. The rule of 11-14 (the file is kept for one set of translated shaders) stops the
|
||||
// growth from update to update; what one set of shaders can reach on some driver, nothing stops. So:
|
||||
// - a file over the bound is not read at all: its size is asked before a byte of it is, so it never takes its size in
|
||||
// memory. The cache starts empty, the driver's own cache serves the pipelines, and the first save writes a new file
|
||||
// over the old one;
|
||||
// - data over the bound is not written: the file keeps its last save, which is under the bound and is read at the next
|
||||
// start; what was built after that save is compiled again then (from the driver's own cache, where it has one). A file
|
||||
// the next start would refuse is never made;
|
||||
// - a file at or under the bound is read and written as before, byte for byte (in pieces now: no single read call has
|
||||
// to take gigabytes), and one whose read ends early is no cache at all, never part of one.
|
||||
// The bound: RX_VK_PCACHE_MAX_MB megabytes when set (0: none, as before); unset, an eighth of the PC's RAM, 2048 MB at
|
||||
// least and 8192 MB at most (16 GB: 2048, 32 GB: 4096, 64 GB and more: 8192). Files measured: 647 MB fresh and 1146 MB
|
||||
// with the precompile's 13,000 pipelines (vk_draw.cpp's notes), 1631 MB in an install on the lab's PC: all under the
|
||||
// least of them. Never below 2048: a bound under what one run builds would have the data refused at every save, and every
|
||||
// start compile again (NX2navi's 512 MB did that on an RTX 2080 Ti). The RAM, not what is free of it at the start: the
|
||||
// same file is not read at one start and refused at the next.
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <new>
|
||||
#include <stdexcept>
|
||||
#include <vector>
|
||||
|
||||
namespace pcache_bound {
|
||||
|
||||
inline constexpr uint64_t kLeastMb = 2048, kMostMb = 8192;
|
||||
/// A read asks the C library for this much at a time
|
||||
inline constexpr size_t kPiece = (size_t)64 << 20;
|
||||
|
||||
/// The bound in bytes, 0: none. env: RX_VK_PCACHE_MAX_MB (null: unset); ram_bytes: the PC's RAM, 0 when it is not known
|
||||
/// (the least then). A value that is no number counts as unset, never as "no bound"
|
||||
inline uint64_t bytes(const char* env, uint64_t ram_bytes) {
|
||||
if (env && *env) {
|
||||
char* end = nullptr;
|
||||
const unsigned long long mb = strtoull(env, &end, 10);
|
||||
if (end != env && !*end && env[0] != '-') return mb > (UINT64_MAX >> 20) ? 0 : (uint64_t)mb << 20;
|
||||
}
|
||||
return std::clamp<uint64_t>((ram_bytes >> 20) / 8, kLeastMb, kMostMb) << 20;
|
||||
}
|
||||
|
||||
/// Whether a file or data of that size is within the bound (0: none)
|
||||
inline bool within(uint64_t size, uint64_t bound) { return !bound || size <= bound; }
|
||||
|
||||
// ((Triforce, 11-18) The carry over an update. The rule of 11-14 left a file made for other shaders (an update that changed the
|
||||
// translation) unread: right for the growth, but on AMD's driver, which keeps no cache of its own for these, it meant every
|
||||
// pipeline and stage library compiled again after each such update: 87 minutes before the title on an RX 7900 XT (32 of them
|
||||
// the 14,467 noted pipelines, 53 the 88,742 stage libraries). What the update did not change still matches the old file: of
|
||||
// two caches a translator apart on the lab's PC, 39.6 % of the SPIR-V modules were the same (12.3 % of their bytes). So a file
|
||||
// for other shaders is read all the same when it is no larger than the carry limit: the driver finds again what it compiled for
|
||||
// the shaders that did not change, and the save writes old and new together for the new shaders. The limit stops the growth:
|
||||
// a fresh file is 650-860 MB, one carried and saved again is over 1536 MB, and the next update's start leaves it unread, as
|
||||
// before. RX_VK_PCACHE_CARRY_MB=<MB> sets the limit, 0: never carried (the rule of 11-14 alone))
|
||||
inline constexpr uint64_t kCarryMb = 1536;
|
||||
/// The carry limit in bytes (0: none carried). env: RX_VK_PCACHE_CARRY_MB (null or no number: the default)
|
||||
inline uint64_t carry_limit(const char* env) {
|
||||
if (env && *env) {
|
||||
char* end = nullptr;
|
||||
const unsigned long long mb = strtoull(env, &end, 10);
|
||||
if (end != env && !*end && env[0] != '-') return mb > (UINT64_MAX >> 20) ? kCarryMb << 20 : (uint64_t)mb << 20;
|
||||
}
|
||||
return kCarryMb << 20;
|
||||
}
|
||||
/// Whether a file for other shaders (not same) of size bytes is read all the same: carried over the update. And only when it
|
||||
/// leaves room under the bound (bound, 0: none) for as much again: the update's own pipelines go into the same file, and a save
|
||||
/// over the bound is not written, so a carried file that left no room would have them compiled again at every start
|
||||
/// And only on a PC with the RAM for it (ram_bytes, 0: not known, then never): the driver holds the carried data for the whole
|
||||
/// session, up to 1-1.5 GB more than a fresh file, and on 16 GB PCs that already run short of RAM (logs that say so dozens of
|
||||
/// times a session) that is paging and hitches in play. 31 GB and more: a 32 GB PC reports a little under 32
|
||||
inline constexpr uint64_t kCarryRamGb = 31;
|
||||
inline bool carried(bool same, uint64_t size, uint64_t limit, uint64_t bound, uint64_t ram_bytes) {
|
||||
return !same && limit && size > 32 && size <= limit && (!bound || size <= bound / 2) && ram_bytes >= (kCarryRamGb << 30);
|
||||
}
|
||||
|
||||
enum class Read {
|
||||
Ok,
|
||||
None, // (no such file: a first start)
|
||||
Unsized, // (its length could not be asked)
|
||||
Short, // (not longer than a pipeline cache's header)
|
||||
OverBound, // (longer than the bound: not a byte of it read)
|
||||
NoMemory, // (no block of its size)
|
||||
Cut, // (the read ended early: nothing of it is used)
|
||||
};
|
||||
|
||||
inline const char* why(Read r) {
|
||||
switch (r) {
|
||||
case Read::Unsized: return "its size cannot be asked";
|
||||
case Read::Short: return "it is shorter than a pipeline cache's header";
|
||||
case Read::OverBound: return "it is over the bound";
|
||||
case Read::NoMemory: return "there is no memory for a block of its size";
|
||||
case Read::Cut: return "reading it ended early";
|
||||
default: return "";
|
||||
}
|
||||
}
|
||||
|
||||
/// The whole file into out, or nothing: out is empty unless the answer is Ok. *len: the file's length whenever it could be
|
||||
/// asked, read or not. least: a file of at most this many bytes is refused; bound: one longer than this too (0: none)
|
||||
inline Read read(const char* path, uint64_t least, uint64_t bound, std::vector<uint8_t>& out, uint64_t* len) {
|
||||
out.clear();
|
||||
*len = 0;
|
||||
FILE* f = fopen(path, "rb");
|
||||
if (!f) return Read::None;
|
||||
#ifdef _WIN32
|
||||
int64_t n = _fseeki64(f, 0, SEEK_END) ? -1 : _ftelli64(f);
|
||||
if (n >= 0 && _fseeki64(f, 0, SEEK_SET)) n = -1;
|
||||
#else
|
||||
int64_t n = fseeko(f, 0, SEEK_END) ? -1 : (int64_t)ftello(f);
|
||||
if (n >= 0 && fseeko(f, 0, SEEK_SET)) n = -1;
|
||||
#endif
|
||||
Read r = Read::Ok;
|
||||
if (n >= 0) *len = (uint64_t)n;
|
||||
if (n < 0) r = Read::Unsized;
|
||||
else if ((uint64_t)n <= least) r = Read::Short;
|
||||
else if (!within((uint64_t)n, bound)) r = Read::OverBound;
|
||||
else if ((uint64_t)n > SIZE_MAX) r = Read::NoMemory;
|
||||
else {
|
||||
try {
|
||||
out.resize((size_t)n);
|
||||
} catch (const std::bad_alloc&) {
|
||||
r = Read::NoMemory;
|
||||
} catch (const std::length_error&) {
|
||||
r = Read::NoMemory;
|
||||
}
|
||||
size_t got = 0;
|
||||
while (r == Read::Ok && got < out.size()) {
|
||||
const size_t piece = std::min(out.size() - got, kPiece);
|
||||
const size_t had = fread(out.data() + got, 1, piece, f);
|
||||
got += had;
|
||||
if (had != piece) r = Read::Cut;
|
||||
}
|
||||
}
|
||||
fclose(f);
|
||||
if (r != Read::Ok) out.clear(), out.shrink_to_fit();
|
||||
return r;
|
||||
}
|
||||
|
||||
} // namespace pcache_bound
|
||||
67
gpu/vk/pcache_gate.h
Normal file
67
gpu/vk/pcache_gate.h
Normal file
@@ -0,0 +1,67 @@
|
||||
// (Triforce) The pipeline cache let go in play when the PC's RAM runs short (vk_draw.cpp pcache_let_go): the gate every
|
||||
// pipeline creation with the cache passes, so that the cache is destroyed only once no creation is using it. Apart from
|
||||
// Vulkan so that tests/test_pcache_gate.py runs it alone, with threads. (11-16: the letting go is off by default,
|
||||
// RX_VK_PCACHE_RAM=1: in v0.4.0-test9 it gave back nothing the working set showed; the gate stays, passed as ever)
|
||||
//
|
||||
// Why: the driver holds the whole cache in RAM for the run, as it was read from mkw_vk_pipelines.bin (2.6 to 2.7 GB on a
|
||||
// 32 GB PC with the stage libraries in it, v0.4.0-test5 to test7; the lab measured as much more RAM in use at the title
|
||||
// with a 3.9 GB file than with a fresh one). In play it serves the pipelines built there, and the driver's own cache on
|
||||
// disk serves most of those too (NVIDIA's: ~460 of ~12,900 precompiled pipelines found in ours). When the PC has under
|
||||
// 1.5 GB of RAM available, Windows pages, and a frame waits 100-250 ms for it; the cache is then worth less than the RAM.
|
||||
// Vulkan's rule: a cache may be destroyed once no command that takes it runs (pipelines made with it do not depend on it).
|
||||
// Every creation that may run in play takes the cache through Gate::Use; Gate::close turns new ones away (they create
|
||||
// without a cache) and waits for those inside. Sequentially consistent atomics: a Use that entered before close saw no
|
||||
// creation inside has either left or sees the gate closed.
|
||||
#pragma once
|
||||
|
||||
#include <atomic>
|
||||
#include <cstdint>
|
||||
|
||||
namespace pcache_gate {
|
||||
|
||||
class Gate {
|
||||
public:
|
||||
/// In: true, the caller may use the cache until leave(); false, the gate is closed (the caller goes without a cache)
|
||||
bool enter() {
|
||||
users_.fetch_add(1);
|
||||
if (closed_.load()) {
|
||||
users_.fetch_sub(1);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
void leave() { users_.fetch_sub(1); }
|
||||
/// Closed from now on, and returns once nobody is inside; wait() is called while somebody is (a sleep). Once only:
|
||||
/// false when it was closed already
|
||||
template <class Wait>
|
||||
bool close(Wait&& wait) {
|
||||
if (closed_.exchange(true)) return false;
|
||||
while (users_.load()) wait();
|
||||
return true;
|
||||
}
|
||||
bool closed() const { return closed_.load(); }
|
||||
int64_t inside() const { return users_.load(); }
|
||||
|
||||
private:
|
||||
std::atomic<int64_t> users_{0};
|
||||
std::atomic<bool> closed_{false};
|
||||
};
|
||||
|
||||
/// The cache for one creation: cache itself while the gate is open, none once it is closed (or when none was asked for).
|
||||
/// Held for as long as the creation runs: a temporary in the call's full expression does (Use(gate, pcache).cache)
|
||||
template <class Cache>
|
||||
struct Use {
|
||||
Gate& gate;
|
||||
Cache cache;
|
||||
bool in;
|
||||
Use(Gate& g, Cache want) : gate(g), cache(want), in(want != Cache{} && g.enter()) {
|
||||
if (!in) cache = Cache{};
|
||||
}
|
||||
~Use() {
|
||||
if (in) gate.leave();
|
||||
}
|
||||
Use(const Use&) = delete;
|
||||
Use& operator=(const Use&) = delete;
|
||||
};
|
||||
|
||||
} // namespace pcache_gate
|
||||
69
gpu/vk/pcache_play.h
Normal file
69
gpu/vk/pcache_play.h
Normal file
@@ -0,0 +1,69 @@
|
||||
// (Triforce) The pipeline cache's play file (vk_draw.cpp pcache_init, cached_graphics, cached_compute, pipeline_cache_save),
|
||||
// apart from Vulkan so that tests/test_pcache_play.py runs its rules. NX2navi's play cache (NX2NAVI_PIPELINE_CACHE_PLAY,
|
||||
// runtime/vk_pipeline.c pipe_create_in, cache_load, cache_save; chrg6, at 62cc3b13), written for Triforce's cache.
|
||||
//
|
||||
// Why. mkw_vk_pipelines.bin holds what the preparation built and what earlier runs made: 2.6 GB on the owner's PC with the
|
||||
// stage libraries. A file can only be written whole, so a save after a few new pipelines fetched all of it from the driver
|
||||
// into memory and wrote it again: the owner's test18 start wrote 2,683,916 KB right after its precompile, for 116 KB new,
|
||||
// on the start-up's own thread. In play the 64 MB growth rule (pipeline_cache_save, 11-14) already waits for more; the start's
|
||||
// precompile and the game's close did not.
|
||||
//
|
||||
// What. Once the preparation is done, what a run compiles goes into a second cache with a file of its own,
|
||||
// mkw_vk_pipelines_play.bin beside the first (with its own .for, the same shaders' stamp): a creation with the main cache asks
|
||||
// it first with VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT (the main cache or the driver's own gives the
|
||||
// pipeline at once), and only when that answers VK_PIPELINE_COMPILE_REQUIRED goes to the play cache with the creation's own
|
||||
// flags: one there from an earlier run comes back, one asked of the caches only is answered by it too, the rest is compiled
|
||||
// into it (create). A save writes the play file when it changed, and the main file only when something was compiled into the
|
||||
// main cache since its last save (the preparation, which builds into it as before) (save_what). The play file is read back at
|
||||
// the next start; once it has reached kFoldMb (RX_VK_PCACHE_FOLD_MB) it is merged into the main cache at that start, the
|
||||
// session builds into the main cache as before, its first save writes the main file and the play file is removed (fold_due).
|
||||
// Without pipelineCreationCacheControl, or RX_VK_PCACHE_PLAY_FILE=0, there is no play cache: everything as before.
|
||||
// A cache changes how long a pipeline takes to make, never the pipeline: nothing of this can change a picture.
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
namespace pcache_play {
|
||||
|
||||
inline constexpr uint64_t kFoldMb = 64; // (NX2navi's NX2NAVI_PIPELINE_CACHE_PLAY_MB default)
|
||||
|
||||
/// Whether a creation goes through the play cache: with the main cache (not none, not the gate's none), a play cache there,
|
||||
/// and no preparation under way (it builds into the main cache)
|
||||
inline bool routes(bool main_cache, bool play_cache, bool preparing) {
|
||||
return main_cache && play_cache && !preparing;
|
||||
}
|
||||
|
||||
/// At the start, the play file read: whether it is folded into the main cache now (fold_bytes 0: never)
|
||||
inline bool fold_due(uint64_t play_bytes, uint64_t fold_bytes) {
|
||||
return fold_bytes && play_bytes >= fold_bytes;
|
||||
}
|
||||
|
||||
/// What a save writes: the play file (there is a play cache, its data's size changed since its last write) and the main
|
||||
/// file (there is no play cache, or pipelines were compiled into the main cache since its last save)
|
||||
struct SaveWhat {
|
||||
bool play = false, main = false;
|
||||
};
|
||||
inline SaveWhat save_what(bool play_cache, uint64_t play_now, uint64_t play_saved, int64_t main_built) {
|
||||
SaveWhat w;
|
||||
w.play = play_cache && play_now && play_now != play_saved;
|
||||
w.main = !play_cache || main_built > 0;
|
||||
return w;
|
||||
}
|
||||
|
||||
/// One creation (create(cache, info, out) makes it, as vkCreate*Pipelines with one info). route: routes(). fail_bit:
|
||||
/// VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT, compile_required: VK_PIPELINE_COMPILE_REQUIRED. *into_play is set
|
||||
/// when the play cache was asked (it made or answered the creation)
|
||||
template <class Info, class Cache, class Pipeline, class Result, class Create>
|
||||
Result create(bool route, Cache main, Cache play, const Info* ci, Pipeline* out, uint32_t fail_bit, Result compile_required,
|
||||
Create make, bool* into_play) {
|
||||
if (!route) return make(main, ci, out);
|
||||
Info asked = *ci;
|
||||
asked.flags |= fail_bit;
|
||||
Result r = make(main, &asked, out);
|
||||
if (r != compile_required) return r;
|
||||
*out = Pipeline{};
|
||||
if (into_play) *into_play = true;
|
||||
return make(play, ci, out);
|
||||
}
|
||||
|
||||
} // namespace pcache_play
|
||||
542
gpu/vk/perf_machine.cpp
Normal file
542
gpu/vk/perf_machine.cpp
Normal file
@@ -0,0 +1,542 @@
|
||||
// (Triforce) The performance overlay's machine numbers (perf_machine.h): a thread that samples them twice a second while
|
||||
// the FPS counter row is on Full, and stops when it leaves Full. The OS's counters for the CPU, the memory and the GPU's
|
||||
// load (Windows: GetSystemTimes, GetProcessTimes, GlobalMemoryStatusEx, K32GetProcessMemoryInfo, and PDH for the thermal
|
||||
// zones and the GPU's engines and memory, as Task Manager reads them; Linux: /proc), and the GPU vendor's driver library
|
||||
// for its temperature: NVML on NVIDIA, ADL's PM log on AMD, both loaded at run time from the system's folders
|
||||
// and kept for the process while they have the GPU. Nothing of it is linked: on a PC without them (an Intel GPU, an old driver) their numbers stay
|
||||
// -1 and the overlay shows "-"; a vendor library with no device of the rendering GPU is shut down and let go at once.
|
||||
// Nothing here runs on the presenting thread but start, stop and latest, which only take the lock (start makes the
|
||||
// thread); the thread runs at the lowest priority.
|
||||
//
|
||||
// (Triforce: from NX2navi runtime/perfmon.c (nvml_open, nvml_sample, adl_open, adl_sample, sampler, perfmon_mode),
|
||||
// runtime/platform/win32.c (pdh_load, pdh_query, pdh_items, plat_load_open, plat_cpu_load, plat_gpu_load, plat_mem_info),
|
||||
// runtime/platform/linux.c (plat_cpu_load, plat_mem_info) and runtime/sysinfo.c (sysinfo_cpu_name), at 62cc3b13.) Contains
|
||||
// code Copyright (c) 2026 Revivedx and the Savage Wind Recomp contributors, Copyright (c) 2026 Peiikai (MIT), and AMD
|
||||
// Display Library declarations (AdapterInfo, ADLSingleSensorData, ADLPMLogDataOutput, the ADL_PMLOG_* sensor numbers and
|
||||
// the ADL2_* signatures) Copyright (c) 2016 - 2022 Advanced Micro Devices, Inc. (MIT): the notice is in perf_machine.h.
|
||||
#include "perf_machine.h"
|
||||
|
||||
#include <chrono>
|
||||
#include <condition_variable>
|
||||
#include <cstdlib>
|
||||
#include <mutex>
|
||||
#include <string>
|
||||
#include <system_error>
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
#ifndef NOMINMAX
|
||||
#define NOMINMAX
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#include <pdh.h>
|
||||
#include <pdhmsg.h>
|
||||
#include <psapi.h>
|
||||
#if defined(_M_X64) || defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)
|
||||
#include <intrin.h>
|
||||
#define PERF_CPUID_MS 1
|
||||
#endif
|
||||
#else
|
||||
#include <dlfcn.h>
|
||||
#include <sys/resource.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
#ifdef __linux__
|
||||
#include <sys/syscall.h>
|
||||
#endif
|
||||
#if defined(__x86_64__) || defined(__i386__)
|
||||
#include <cpuid.h>
|
||||
#define PERF_CPUID_GNU 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
namespace mkwvk::perf_machine {
|
||||
namespace {
|
||||
|
||||
void (*g_log)(const char*) = nullptr;
|
||||
void note(const char* line) {
|
||||
if (g_log) g_log(line);
|
||||
}
|
||||
|
||||
// ---- a library some PCs lack (a GPU vendor's): a bare name from the system's folders only
|
||||
void* lib_open(const char* name) {
|
||||
#ifdef _WIN32
|
||||
const bool bare = !std::strchr(name, '\\') && !std::strchr(name, '/');
|
||||
return (void*)LoadLibraryExA(name, nullptr, bare ? LOAD_LIBRARY_SEARCH_SYSTEM32 : 0);
|
||||
#else
|
||||
return dlopen(name, RTLD_NOW | RTLD_LOCAL);
|
||||
#endif
|
||||
}
|
||||
void* lib_sym(void* lib, const char* name) {
|
||||
#ifdef _WIN32
|
||||
return lib ? (void*)GetProcAddress((HMODULE)lib, name) : nullptr;
|
||||
#else
|
||||
return lib ? dlsym(lib, name) : nullptr;
|
||||
#endif
|
||||
}
|
||||
/// A library that has nothing for the rendering GPU, let go (NVML or ADL on a PC whose game renders on another card)
|
||||
void lib_close(void* lib) {
|
||||
#ifdef _WIN32
|
||||
if (lib) FreeLibrary((HMODULE)lib);
|
||||
#else
|
||||
if (lib) dlclose(lib);
|
||||
#endif
|
||||
}
|
||||
|
||||
// ---- the CPU's name: CPUID's brand string, without the spaces around it
|
||||
void cpu_brand(char* out, size_t n) {
|
||||
out[0] = 0;
|
||||
unsigned r[12] = {};
|
||||
#if defined(PERF_CPUID_MS)
|
||||
int top[4];
|
||||
__cpuid(top, (int)0x80000000);
|
||||
if ((unsigned)top[0] < 0x80000004u) return;
|
||||
for (int i = 0; i < 3; i++) __cpuid((int*)&r[i * 4], (int)(0x80000002u + (unsigned)i));
|
||||
#elif defined(PERF_CPUID_GNU)
|
||||
if (__get_cpuid_max(0x80000000, nullptr) < 0x80000004u) return;
|
||||
for (unsigned i = 0; i < 3; i++) __get_cpuid(0x80000002u + i, &r[i * 4], &r[i * 4 + 1], &r[i * 4 + 2], &r[i * 4 + 3]);
|
||||
#else
|
||||
(void)n;
|
||||
return;
|
||||
#endif
|
||||
char b[49];
|
||||
std::memcpy(b, r, 48);
|
||||
b[48] = 0;
|
||||
const char* p = b;
|
||||
while (*p == ' ') p++;
|
||||
snprintf(out, n, "%s", p);
|
||||
for (char* e = out + std::strlen(out); e > out && e[-1] == ' '; e--) e[-1] = 0;
|
||||
}
|
||||
|
||||
// ---- NVML (NVIDIA): its structs as the library lays them out, no NVIDIA header
|
||||
struct NvmlUtil { unsigned gpu, memory; };
|
||||
struct NvmlMem { unsigned long long total, free, used; };
|
||||
struct Nvml {
|
||||
bool tried = false, ok = false;
|
||||
void* dev = nullptr;
|
||||
int (*util)(void*, NvmlUtil*) = nullptr;
|
||||
int (*temp)(void*, int, unsigned*) = nullptr;
|
||||
int (*mem)(void*, NvmlMem*) = nullptr;
|
||||
int (*clock)(void*, int, unsigned*) = nullptr;
|
||||
} nv;
|
||||
|
||||
template <class F> F sym(void* lib, const char* name) { return (F)lib_sym(lib, name); }
|
||||
|
||||
/// Once, on the sampler's thread: the device whose name is the rendering GPU's, else none (a PC that renders on another
|
||||
/// vendor's GPU: NVML's numbers would be another card's). With none NVML is shut down and let go: it is kept only for the
|
||||
/// device it samples
|
||||
void nvml_open(const char* gpu) {
|
||||
nv.tried = true;
|
||||
#ifdef _WIN32
|
||||
static const char* const names[] = {"nvml.dll", "C:\\Program Files\\NVIDIA Corporation\\NVSMI\\nvml.dll"};
|
||||
#else
|
||||
static const char* const names[] = {"libnvidia-ml.so.1"};
|
||||
#endif
|
||||
void* lib = nullptr;
|
||||
for (const char* n : names)
|
||||
if (!lib) lib = lib_open(n);
|
||||
if (!lib) return;
|
||||
const auto init = sym<int (*)()>(lib, "nvmlInit_v2");
|
||||
const auto count = sym<int (*)(unsigned*)>(lib, "nvmlDeviceGetCount_v2");
|
||||
const auto handle = sym<int (*)(unsigned, void**)>(lib, "nvmlDeviceGetHandleByIndex_v2");
|
||||
const auto name = sym<int (*)(void*, char*, unsigned)>(lib, "nvmlDeviceGetName");
|
||||
nv.util = sym<int (*)(void*, NvmlUtil*)>(lib, "nvmlDeviceGetUtilizationRates");
|
||||
nv.temp = sym<int (*)(void*, int, unsigned*)>(lib, "nvmlDeviceGetTemperature");
|
||||
nv.mem = sym<int (*)(void*, NvmlMem*)>(lib, "nvmlDeviceGetMemoryInfo");
|
||||
// ((Triforce, 11-17) no power reading (nvmlDeviceGetPowerUsage): the owner's call, power polling is reported to cost
|
||||
// frames and stutter on some cards; the overlay's GPU row has no watts)
|
||||
nv.clock = sym<int (*)(void*, int, unsigned*)>(lib, "nvmlDeviceGetClockInfo");
|
||||
const auto shutdown = sym<int (*)()>(lib, "nvmlShutdown");
|
||||
const bool up = init && count && handle && name && init() == 0;
|
||||
unsigned n = 0;
|
||||
if (up && count(&n) == 0)
|
||||
for (unsigned i = 0; i < n && !nv.dev; i++) {
|
||||
void* d = nullptr;
|
||||
char nm[96] = "";
|
||||
if (handle(i, &d) != 0 || name(d, nm, sizeof nm) != 0) continue;
|
||||
if (name_match(gpu, nm)) nv.dev = d;
|
||||
}
|
||||
nv.ok = nv.dev != nullptr;
|
||||
if (up) note(nv.ok ? "NVML has the rendering GPU: its temperature" : "NVML has no device of the rendering GPU's name");
|
||||
if (nv.ok) return;
|
||||
if (up && shutdown) shutdown(); // (nvmlInit's own count of users given back, then the library)
|
||||
lib_close(lib);
|
||||
nv.util = nullptr, nv.temp = nullptr, nv.mem = nullptr, nv.clock = nullptr;
|
||||
}
|
||||
void nvml_sample(Machine& m) {
|
||||
if (!nv.ok) return;
|
||||
NvmlUtil u;
|
||||
NvmlMem mem;
|
||||
unsigned v;
|
||||
if (m.gpu_pct < 0 && nv.util && nv.util(nv.dev, &u) == 0) m.gpu_pct = (float)u.gpu; // (the system's counters first)
|
||||
if (nv.mem && nv.mem(nv.dev, &mem) == 0) {
|
||||
if (m.vram_used_mb < 0) m.vram_used_mb = (float)(mem.used >> 20);
|
||||
m.vram_total_mb = (float)(mem.total >> 20);
|
||||
}
|
||||
if (nv.temp && nv.temp(nv.dev, 0 /* NVML_TEMPERATURE_GPU */, &v) == 0) m.gpu_temp_c = (float)v;
|
||||
if (nv.clock && nv.clock(nv.dev, 0 /* NVML_CLOCK_GRAPHICS */, &v) == 0) m.gpu_clock_mhz = (float)v;
|
||||
}
|
||||
|
||||
// ---- ADL (AMD): the PM log the driver keeps for Radeon RX 5000 and later (the numbers Adrenalin's overlay shows); an
|
||||
// older GPU answers with an error and its numbers stay -1. Windows only
|
||||
#ifdef _WIN32
|
||||
constexpr int kAdlMaxPath = 256, kAdlSensors = 256;
|
||||
enum {
|
||||
ADL_PMLOG_CLK_GFXCLK = 1,
|
||||
ADL_PMLOG_TEMPERATURE_EDGE = 8,
|
||||
ADL_PMLOG_INFO_ACTIVITY_GFX = 19,
|
||||
ADL_PMLOG_TEMPERATURE_HOTSPOT = 27,
|
||||
};
|
||||
struct AdlAdapterInfo { // (AdapterInfo, the Windows layout)
|
||||
int iSize, iAdapterIndex;
|
||||
char strUDID[kAdlMaxPath];
|
||||
int iBusNumber, iDeviceNumber, iFunctionNumber, iVendorID;
|
||||
char strAdapterName[kAdlMaxPath], strDisplayName[kAdlMaxPath];
|
||||
int iPresent, iExist;
|
||||
char strDriverPath[kAdlMaxPath], strDriverPathExt[kAdlMaxPath], strPNPString[kAdlMaxPath];
|
||||
int iOSDisplayIndex;
|
||||
};
|
||||
struct AdlSensor { int supported, value; };
|
||||
struct AdlPmLog { int size; AdlSensor sensors[kAdlSensors]; };
|
||||
typedef void*(__stdcall* AdlAlloc)(int);
|
||||
struct Adl {
|
||||
bool tried = false, ok = false;
|
||||
int index = 0;
|
||||
void* ctx = nullptr;
|
||||
int (*pmlog)(void*, int, AdlPmLog*) = nullptr;
|
||||
AdlPmLog log; // (the sampler's buffer)
|
||||
} adl;
|
||||
void* __stdcall adl_alloc(int n) { return std::malloc((size_t)n); }
|
||||
|
||||
/// Once, on the sampler's thread, when NVML has not the GPU: the adapter of the rendering GPU's name whose PM log answers
|
||||
/// (ADL lists one index per display output of a GPU). With none ADL's context is destroyed and the library let go
|
||||
void adl_open(const char* gpu) {
|
||||
adl.tried = true;
|
||||
void* lib = lib_open("atiadlxx.dll");
|
||||
if (!lib) return;
|
||||
const auto create = sym<int (*)(AdlAlloc, int, void**)>(lib, "ADL2_Main_Control_Create");
|
||||
const auto destroy = sym<int (*)(void*)>(lib, "ADL2_Main_Control_Destroy");
|
||||
const auto count = sym<int (*)(void*, int*)>(lib, "ADL2_Adapter_NumberOfAdapters_Get");
|
||||
const auto info = sym<int (*)(void*, AdlAdapterInfo*, int)>(lib, "ADL2_Adapter_AdapterInfo_Get");
|
||||
adl.pmlog = sym<int (*)(void*, int, AdlPmLog*)>(lib, "ADL2_New_QueryPMLogData_Get");
|
||||
int n = 0;
|
||||
const bool up = create && count && info && adl.pmlog && create(adl_alloc, 1, &adl.ctx) == 0;
|
||||
AdlAdapterInfo* a = up && count(adl.ctx, &n) == 0 && n > 0 && n <= 256 ? (AdlAdapterInfo*)std::calloc((size_t)n, sizeof *a) : nullptr;
|
||||
if (a) {
|
||||
for (int i = 0; i < n; i++) a[i].iSize = sizeof *a;
|
||||
if (info(adl.ctx, a, n * (int)sizeof *a) == 0) {
|
||||
for (int i = 0; i < n && !adl.ok; i++) {
|
||||
if (a[i].iVendorID != 1002 || !name_match(gpu, a[i].strAdapterName)) continue; // (ADL writes 0x1002 as decimal 1002)
|
||||
std::memset(&adl.log, 0, sizeof adl.log);
|
||||
adl.log.size = sizeof adl.log;
|
||||
if (adl.pmlog(adl.ctx, a[i].iAdapterIndex, &adl.log) != 0) continue;
|
||||
adl.index = a[i].iAdapterIndex;
|
||||
adl.ok = true;
|
||||
}
|
||||
}
|
||||
std::free(a);
|
||||
}
|
||||
if (up) note(adl.ok ? "ADL has the rendering GPU's PM log: its temperature" : "ADL has no PM log for the rendering GPU");
|
||||
if (adl.ok) return;
|
||||
if (up && destroy) destroy(adl.ctx); // (the context ADL2_Main_Control_Create made, then the library)
|
||||
adl.ctx = nullptr, adl.pmlog = nullptr;
|
||||
lib_close(lib);
|
||||
}
|
||||
void adl_sample(Machine& m) {
|
||||
if (!adl.ok) return;
|
||||
std::memset(&adl.log, 0, sizeof adl.log);
|
||||
adl.log.size = sizeof adl.log;
|
||||
if (adl.pmlog(adl.ctx, adl.index, &adl.log) != 0) return;
|
||||
const AdlSensor* v = adl.log.sensors;
|
||||
if (m.gpu_pct < 0 && v[ADL_PMLOG_INFO_ACTIVITY_GFX].supported) m.gpu_pct = (float)v[ADL_PMLOG_INFO_ACTIVITY_GFX].value;
|
||||
if (v[ADL_PMLOG_TEMPERATURE_EDGE].supported) m.gpu_temp_c = (float)v[ADL_PMLOG_TEMPERATURE_EDGE].value;
|
||||
else if (v[ADL_PMLOG_TEMPERATURE_HOTSPOT].supported) m.gpu_temp_c = (float)v[ADL_PMLOG_TEMPERATURE_HOTSPOT].value;
|
||||
// ((Triforce, 11-17) the card's power draw is not read: see nvml_open)
|
||||
if (v[ADL_PMLOG_CLK_GFXCLK].supported) m.gpu_clock_mhz = (float)v[ADL_PMLOG_CLK_GFXCLK].value;
|
||||
}
|
||||
#else
|
||||
struct Adl { bool tried = false, ok = false; } adl;
|
||||
void adl_open(const char*) { adl.tried = true; }
|
||||
void adl_sample(Machine&) {}
|
||||
#endif
|
||||
|
||||
// ---- the OS's counters
|
||||
#ifdef _WIN32
|
||||
typedef PDH_STATUS(WINAPI* PdhOpenQueryW_t)(LPCWSTR, DWORD_PTR, PDH_HQUERY*);
|
||||
typedef PDH_STATUS(WINAPI* PdhAddEnglishCounterW_t)(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOUNTER*);
|
||||
typedef PDH_STATUS(WINAPI* PdhCollectQueryData_t)(PDH_HQUERY);
|
||||
typedef PDH_STATUS(WINAPI* PdhGetFormattedCounterArrayW_t)(PDH_HCOUNTER, DWORD, LPDWORD, LPDWORD, PPDH_FMT_COUNTERVALUE_ITEM_W);
|
||||
typedef PDH_STATUS(WINAPI* PdhCloseQuery_t)(PDH_HQUERY);
|
||||
struct Pdh {
|
||||
PdhOpenQueryW_t open = nullptr; // (set only when every one of them is there)
|
||||
PdhAddEnglishCounterW_t add = nullptr;
|
||||
PdhCollectQueryData_t collect = nullptr;
|
||||
PdhGetFormattedCounterArrayW_t get = nullptr;
|
||||
PdhCloseQuery_t close = nullptr;
|
||||
};
|
||||
const Pdh& pdh() { // (pdh.dll, loaded at the first use, kept)
|
||||
static const Pdh p = [] {
|
||||
Pdh r;
|
||||
void* l = lib_open("pdh.dll");
|
||||
if (!l) return r;
|
||||
r.add = sym<PdhAddEnglishCounterW_t>(l, "PdhAddEnglishCounterW");
|
||||
r.collect = sym<PdhCollectQueryData_t>(l, "PdhCollectQueryData");
|
||||
r.get = sym<PdhGetFormattedCounterArrayW_t>(l, "PdhGetFormattedCounterArrayW");
|
||||
r.close = sym<PdhCloseQuery_t>(l, "PdhCloseQuery");
|
||||
const auto open = sym<PdhOpenQueryW_t>(l, "PdhOpenQueryW");
|
||||
if (r.add && r.collect && r.get && r.close) r.open = open;
|
||||
return r;
|
||||
}();
|
||||
return p;
|
||||
}
|
||||
/// A PDH query with its wildcard counters ("\Object(*)\Counter"); q null when it could not be opened
|
||||
struct PdhQuery {
|
||||
PDH_HQUERY q = nullptr;
|
||||
PDH_HCOUNTER c[2] = {nullptr, nullptr};
|
||||
void open(const wchar_t* c0, const wchar_t* c1) {
|
||||
const Pdh& p = pdh();
|
||||
if (!p.open || p.open(nullptr, 0, &q) != ERROR_SUCCESS) {
|
||||
q = nullptr;
|
||||
return;
|
||||
}
|
||||
if (p.add(q, c0, 0, &c[0]) != ERROR_SUCCESS) c[0] = nullptr;
|
||||
if (!c1 || p.add(q, c1, 0, &c[1]) != ERROR_SUCCESS) c[1] = nullptr;
|
||||
if (!c[0] && !c[1]) close();
|
||||
}
|
||||
void close() {
|
||||
if (q) pdh().close(q);
|
||||
q = nullptr;
|
||||
}
|
||||
};
|
||||
/// A counter's valid instances: their names (narrowed: the instance names are ASCII) and values. False when there is no
|
||||
/// valid data yet (a rate counter needs two collections)
|
||||
struct Items {
|
||||
std::vector<std::string> names;
|
||||
std::vector<const char*> ptrs;
|
||||
std::vector<double> values;
|
||||
};
|
||||
bool pdh_items(PDH_HCOUNTER c, Items& out) {
|
||||
out.names.clear(), out.ptrs.clear(), out.values.clear();
|
||||
DWORD size = 0, count = 0;
|
||||
const Pdh& p = pdh();
|
||||
if (!c || p.get(c, PDH_FMT_DOUBLE | PDH_FMT_NOCAP100, &size, &count, nullptr) != (PDH_STATUS)PDH_MORE_DATA || !size) return false;
|
||||
std::vector<unsigned char> buf(size);
|
||||
auto* items = (PDH_FMT_COUNTERVALUE_ITEM_W*)buf.data();
|
||||
if (p.get(c, PDH_FMT_DOUBLE | PDH_FMT_NOCAP100, &size, &count, items) != ERROR_SUCCESS) return false;
|
||||
for (DWORD i = 0; i < count; i++) {
|
||||
if (items[i].FmtValue.CStatus != PDH_CSTATUS_VALID_DATA) continue;
|
||||
std::string n;
|
||||
for (const wchar_t* w = items[i].szName; w && *w; w++) n += (char)(*w < 128 ? *w : '?');
|
||||
out.names.push_back(std::move(n));
|
||||
out.values.push_back(items[i].FmtValue.doubleValue);
|
||||
}
|
||||
for (const std::string& n : out.names) out.ptrs.push_back(n.c_str());
|
||||
return true;
|
||||
}
|
||||
uint64_t ft64(FILETIME f) { return (uint64_t)f.dwHighDateTime << 32 | f.dwLowDateTime; }
|
||||
|
||||
struct Sources {
|
||||
CpuTimes cpu; // (the sample before's)
|
||||
PdhQuery thermal, gpu; // (gpu: the engines' utilisation, the adapters' dedicated memory)
|
||||
char luid[32] = ""; // (the rendering GPU's, luid_name; empty: any)
|
||||
Items items;
|
||||
};
|
||||
void sources_open(Sources& s, const Gpu& g) {
|
||||
if (g.has_luid) luid_name(g.luid, s.luid, sizeof s.luid);
|
||||
s.thermal.open(L"\\Thermal Zone Information(*)\\Temperature", nullptr);
|
||||
s.gpu.open(L"\\GPU Engine(*)\\Utilization Percentage", L"\\GPU Adapter Memory(*)\\Dedicated Usage");
|
||||
char line[160];
|
||||
snprintf(line, sizeof line, "Windows' counters: GPU engines %s (%s), thermal zones %s", s.gpu.q ? "open" : "not there",
|
||||
s.luid[0] ? s.luid : "any adapter", s.thermal.q ? "open" : "not there");
|
||||
note(line);
|
||||
}
|
||||
void sources_close(Sources& s) { s.thermal.close(), s.gpu.close(); }
|
||||
void sample_os(Sources& s, Machine& m) {
|
||||
FILETIME idle, kern, user, cr, ex, pk, pu;
|
||||
if (GetSystemTimes(&idle, &kern, &user) && GetProcessTimes(GetCurrentProcess(), &cr, &ex, &pk, &pu)) {
|
||||
CpuTimes now;
|
||||
now.idle = ft64(idle), now.kernel = ft64(kern), now.user = ft64(user), now.proc = ft64(pk) + ft64(pu);
|
||||
cpu_load(s.cpu, now, &m.cpu_pct, &m.cpu_game_pct);
|
||||
s.cpu = now;
|
||||
}
|
||||
const Pdh& p = pdh();
|
||||
// (the firmware's ACPI zones, near the CPU on most boards: the hottest under 150 degrees, from kelvin)
|
||||
if (s.thermal.q && p.collect(s.thermal.q) == ERROR_SUCCESS && pdh_items(s.thermal.c[0], s.items))
|
||||
for (double k : s.items.values) {
|
||||
const double c = k - 273.15;
|
||||
if (c > m.cpu_temp_c && c < 150) m.cpu_temp_c = (float)c;
|
||||
}
|
||||
if (s.gpu.q && p.collect(s.gpu.q) == ERROR_SUCCESS) {
|
||||
if (pdh_items(s.gpu.c[0], s.items))
|
||||
m.gpu_pct = engine_load(s.items.ptrs.data(), s.items.values.data(), (int)s.items.values.size(), s.luid);
|
||||
if (pdh_items(s.gpu.c[1], s.items))
|
||||
m.vram_used_mb = adapter_memory_mb(s.items.ptrs.data(), s.items.values.data(), (int)s.items.values.size(), s.luid);
|
||||
}
|
||||
MEMORYSTATUSEX ms{};
|
||||
ms.dwLength = sizeof ms;
|
||||
if (GlobalMemoryStatusEx(&ms) && ms.ullTotalPhys) {
|
||||
m.ram_total_mb = (float)(ms.ullTotalPhys >> 20);
|
||||
m.ram_used_mb = (float)((ms.ullTotalPhys - ms.ullAvailPhys) >> 20);
|
||||
}
|
||||
PROCESS_MEMORY_COUNTERS pmc{};
|
||||
pmc.cb = sizeof pmc;
|
||||
if (K32GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof pmc)) m.ram_game_mb = (float)(pmc.WorkingSetSize >> 20);
|
||||
}
|
||||
#else
|
||||
struct Sources {
|
||||
CpuTimes cpu; // (/proc/stat's busy jiffies in kernel's place with idle 0, its total in user's; the process's in jiffies)
|
||||
};
|
||||
void sources_open(Sources&, const Gpu&) {}
|
||||
void sources_close(Sources&) {}
|
||||
void sample_os(Sources& s, Machine& m) {
|
||||
unsigned long long v[10] = {};
|
||||
int n = 0;
|
||||
if (FILE* f = std::fopen("/proc/stat", "r")) {
|
||||
n = std::fscanf(f, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu %llu", &v[0], &v[1], &v[2], &v[3], &v[4], &v[5],
|
||||
&v[6], &v[7], &v[8], &v[9]);
|
||||
std::fclose(f);
|
||||
}
|
||||
timespec ts{};
|
||||
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts);
|
||||
const long tick = sysconf(_SC_CLK_TCK);
|
||||
if (n >= 8 && tick > 0) {
|
||||
uint64_t total = 0;
|
||||
for (int i = 0; i < 8; i++) total += v[i]; // (guest time is already inside user time)
|
||||
const uint64_t idle = v[3] + v[4];
|
||||
CpuTimes now; // (cpu_load's terms: kernel + user the total, idle the idle)
|
||||
now.kernel = total, now.user = 0, now.idle = idle;
|
||||
now.proc = (uint64_t)(((double)ts.tv_sec + ts.tv_nsec / 1e9) * (double)tick);
|
||||
cpu_load(s.cpu, now, &m.cpu_pct, &m.cpu_game_pct);
|
||||
s.cpu = now;
|
||||
}
|
||||
if (FILE* f = std::fopen("/proc/meminfo", "r")) {
|
||||
char line[128];
|
||||
unsigned long long total = 0, avail = 0, k;
|
||||
while (std::fgets(line, sizeof line, f)) {
|
||||
if (std::sscanf(line, "MemTotal: %llu kB", &k) == 1) total = k;
|
||||
else if (std::sscanf(line, "MemAvailable: %llu kB", &k) == 1) avail = k;
|
||||
}
|
||||
std::fclose(f);
|
||||
if (total) m.ram_total_mb = (float)(total >> 10), m.ram_used_mb = (float)((total - std::min(total, avail)) >> 10);
|
||||
}
|
||||
if (FILE* f = std::fopen("/proc/self/statm", "r")) {
|
||||
unsigned long long size, resident;
|
||||
if (std::fscanf(f, "%llu %llu", &size, &resident) == 2)
|
||||
m.ram_game_mb = (float)((resident * (uint64_t)sysconf(_SC_PAGESIZE)) >> 20);
|
||||
std::fclose(f);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// ---- the sampler: runs while want is set, twice a second
|
||||
struct State {
|
||||
std::mutex mu; // (everything here)
|
||||
std::condition_variable cv;
|
||||
bool want = false, alive = false;
|
||||
int live = 0; // (the sampler threads made and not yet ended: live_samplers)
|
||||
Gpu gpu;
|
||||
Machine latest;
|
||||
};
|
||||
State& st() { // (never destroyed: a sampler still asleep at the process's end holds its lock)
|
||||
static State* s = new State;
|
||||
return *s;
|
||||
}
|
||||
void clear(Machine& m) { // (the numbers, not the names)
|
||||
Machine e;
|
||||
std::memcpy(e.gpu_name, m.gpu_name, sizeof e.gpu_name);
|
||||
std::memcpy(e.cpu_name, m.cpu_name, sizeof e.cpu_name);
|
||||
e.samples = m.samples;
|
||||
m = e;
|
||||
}
|
||||
|
||||
/// The sampler's thread below the game's own (the replay's and the presenting threads): its counters can wait in the driver
|
||||
void lowest_priority() {
|
||||
#ifdef _WIN32
|
||||
SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_LOWEST);
|
||||
#elif defined(__linux__)
|
||||
setpriority(PRIO_PROCESS, (id_t)syscall(SYS_gettid), 19); // (Linux: a nice of a thread's own, by its id)
|
||||
#endif
|
||||
}
|
||||
|
||||
void sampler() {
|
||||
lowest_priority();
|
||||
State& s = st();
|
||||
Gpu gpu;
|
||||
{
|
||||
std::lock_guard lk(s.mu);
|
||||
gpu = s.gpu;
|
||||
}
|
||||
Machine m;
|
||||
snprintf(m.gpu_name, sizeof m.gpu_name, "%s", gpu.name);
|
||||
cpu_brand(m.cpu_name, sizeof m.cpu_name);
|
||||
if (!nv.tried) nvml_open(gpu.name);
|
||||
if (!nv.ok && !adl.tried) adl_open(gpu.name);
|
||||
Sources src;
|
||||
sources_open(src, gpu);
|
||||
std::unique_lock lk(s.mu);
|
||||
while (s.want) {
|
||||
lk.unlock();
|
||||
clear(m);
|
||||
sample_os(src, m);
|
||||
if (gpu.vram_total_mb > 0) m.vram_total_mb = gpu.vram_total_mb;
|
||||
nvml_sample(m);
|
||||
adl_sample(m);
|
||||
m.samples++;
|
||||
lk.lock();
|
||||
s.latest = m;
|
||||
if (s.want) s.cv.wait_for(lk, std::chrono::milliseconds(500), [&] { return !s.want; });
|
||||
}
|
||||
s.alive = false; // (in the same locked part as the last look at want: a start after it makes a new thread)
|
||||
lk.unlock();
|
||||
sources_close(src);
|
||||
lk.lock();
|
||||
s.live--; // (this thread's last step: live_samplers)
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void start(const Gpu& gpu, void (*log)(const char* line)) {
|
||||
State& s = st();
|
||||
std::lock_guard lk(s.mu);
|
||||
s.want = true;
|
||||
if (s.alive) return;
|
||||
g_log = log;
|
||||
s.gpu = gpu;
|
||||
s.latest = Machine{}; // ("-" until the first sample, not the numbers of the time before)
|
||||
s.alive = true;
|
||||
s.live++;
|
||||
// (a thread the system will not make: no sampler, and the panel's machine numbers stay "-" (latest, emptied above). Never
|
||||
// the exception, which would reach menu_tick on the game's thread; the next start tries again)
|
||||
try {
|
||||
std::thread(sampler).detach();
|
||||
} catch (const std::system_error&) {
|
||||
s.alive = false;
|
||||
s.live--;
|
||||
note("its sampler's thread could not be made: the machine's numbers stay \"-\"");
|
||||
}
|
||||
}
|
||||
|
||||
void stop() {
|
||||
State& s = st();
|
||||
std::lock_guard lk(s.mu);
|
||||
s.want = false;
|
||||
s.cv.notify_all();
|
||||
}
|
||||
|
||||
Machine latest() {
|
||||
State& s = st();
|
||||
std::lock_guard lk(s.mu);
|
||||
return s.latest;
|
||||
}
|
||||
|
||||
int live_samplers() {
|
||||
State& s = st();
|
||||
std::lock_guard lk(s.mu);
|
||||
return s.live;
|
||||
}
|
||||
|
||||
} // namespace mkwvk::perf_machine
|
||||
177
gpu/vk/perf_machine.h
Normal file
177
gpu/vk/perf_machine.h
Normal file
@@ -0,0 +1,177 @@
|
||||
// (Triforce) The performance overlay's machine numbers (vk_menu.cpp draw_perf, the FPS counter row on Full): the GPU's
|
||||
// load and temperature (no power: removed 11-17, the owner's call), the video memory the card has in use and in all, the CPU's load, temperature and this
|
||||
// game's share of it, the system memory in use, in all and the game's, and the GPU's and the CPU's names. Sampled twice a
|
||||
// second on a thread of their own (perf_machine.cpp) while the row is on Full, since some of the calls take milliseconds:
|
||||
// the presenting thread only reads the latest sample. A number the machine does not give is -1, and the overlay shows "-"
|
||||
// (an AMD or Intel card has no NVIDIA library, an old Radeon no PM log, a board no thermal zone, Linux no temperatures).
|
||||
//
|
||||
// (Triforce: from NX2navi runtime/perfmon.c, runtime/perfmon.h, runtime/platform/win32.c plat_cpu_load, plat_gpu_load and
|
||||
// plat_mem_info, runtime/platform/linux.c and runtime/sysinfo.c sysinfo_cpu_name, at 62cc3b13.) That code contains code
|
||||
// Copyright (c) 2026 Revivedx and the Savage Wind Recomp contributors, Copyright (c) 2026 Peiikai (MIT: the performance
|
||||
// overlay of github.com/Revivedx/SavageWindRecomp, its NVML calls and sampling loop), and its AMD Display Library
|
||||
// declarations Copyright (c) 2016 - 2022 Advanced Micro Devices, Inc. (MIT: github.com/GPUOpen-LibrariesAndSDKs/display-library).
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
|
||||
// documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
|
||||
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
|
||||
// persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and
|
||||
// this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS
|
||||
// PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
// The parts below with no clock and no system call of their own (cpu_load, luid_name, engine_load, adapter_memory_mb,
|
||||
// cell_text, local_heap_mb, name_match) are what tests/test_perf_overlay.cpp runs; it runs the sampler too, for a GPU of no
|
||||
// vendor's name.
|
||||
#pragma once
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
|
||||
namespace mkwvk::perf_machine {
|
||||
|
||||
struct Machine {
|
||||
char gpu_name[96] = ""; // (the GPU the game renders on, as Vulkan names it)
|
||||
char cpu_name[64] = ""; // (the CPU's brand string, CPUID)
|
||||
float gpu_pct = -1; // (the busiest engine type of the rendering GPU, as Task Manager shows it; else NVML's or ADL's)
|
||||
float gpu_temp_c = -1; // (NVML; ADL's edge temperature, else its hotspot)
|
||||
float vram_used_mb = -1; // (the card's dedicated memory in use by every program: Windows' adapter counter, else NVML)
|
||||
float vram_total_mb = -1; // (the card's: NVML, else the device-local heaps Vulkan reports, added up)
|
||||
float gpu_clock_mhz = -1; // (the graphics clock: NVML, else ADL's; the VRAM row's third cell when the game's figure is unknown)
|
||||
float cpu_pct = -1; // (the whole machine, percent of all logical processors, since the sample before)
|
||||
float cpu_game_pct = -1; // (this process, the same percent)
|
||||
float cpu_temp_c = -1; // (the hottest ACPI thermal zone: a zone near the CPU on most boards, not the package itself)
|
||||
float ram_used_mb = -1, ram_total_mb = -1, ram_game_mb = -1; // (in use, installed, this process's working set)
|
||||
int samples = 0; // (made since the sampler started: 0 until the first)
|
||||
};
|
||||
|
||||
/// The GPU the game renders on, given when the sampler starts
|
||||
struct Gpu {
|
||||
char name[96] = "";
|
||||
uint8_t luid[8] = {}; // (Vulkan's deviceLUID: Windows' counters name an adapter by it)
|
||||
bool has_luid = false;
|
||||
float vram_total_mb = -1;
|
||||
};
|
||||
|
||||
/// Starts the sampler (the row went to Full) unless it runs; gpu is read then. log, or null: a line on what was found
|
||||
/// (NVML, ADL, the counters), once a run
|
||||
void start(const Gpu& gpu, void (*log)(const char* line));
|
||||
/// Stops it (the row left Full): its thread ends at its next wake, within a moment
|
||||
void stop();
|
||||
/// The latest sample (all -1 before the first): a copy, under the sampler's lock for as long as the copy takes
|
||||
Machine latest();
|
||||
/// (for tests/test_perf_overlay.cpp) The sampler threads alive now: 1 while it runs, 0 once it has ended (a second start
|
||||
/// while one runs makes no second)
|
||||
int live_samplers();
|
||||
|
||||
// ---- the parts with no clock and no system call ----
|
||||
|
||||
/// The CPU's times as GetSystemTimes and GetProcessTimes give them (100 ns units; kernel includes idle), or /proc/stat's
|
||||
/// (busy and total jiffies in kernel and idle's place) with the process's in the same unit
|
||||
struct CpuTimes {
|
||||
uint64_t idle = 0, kernel = 0, user = 0, proc = 0;
|
||||
};
|
||||
/// The machine's and this process's share of all logical processors between two readings, percent; -1 when there is no
|
||||
/// reading before (before.kernel 0) or no time went by
|
||||
inline void cpu_load(const CpuTimes& before, const CpuTimes& now, float* total_pct, float* game_pct) {
|
||||
*total_pct = *game_pct = -1;
|
||||
const uint64_t total = (now.kernel - before.kernel) + (now.user - before.user); // (kernel time includes idle time)
|
||||
if (!before.kernel || !total || now.kernel < before.kernel || now.user < before.user) return;
|
||||
const uint64_t idle = now.idle >= before.idle ? now.idle - before.idle : 0;
|
||||
*total_pct = 100.0f * (float)(total - std::min(total, idle)) / (float)total;
|
||||
*game_pct = 100.0f * (float)(now.proc >= before.proc ? now.proc - before.proc : 0) / (float)total;
|
||||
}
|
||||
|
||||
/// The adapter's part of a counter's instance names, from Vulkan's deviceLUID (the LUID struct's memory: LowPart, then
|
||||
/// HighPart): "luid_0x<high>_0x<low>", lower case
|
||||
inline void luid_name(const uint8_t luid[8], char* out, size_t n) {
|
||||
uint32_t lo, hi;
|
||||
std::memcpy(&lo, luid, 4);
|
||||
std::memcpy(&hi, luid + 4, 4);
|
||||
snprintf(out, n, "luid_0x%08x_0x%08x", hi, lo);
|
||||
}
|
||||
/// The "luid_0x..._0x..." part of an instance name, lower case, into out (27 bytes at least); empty when it has none
|
||||
inline void instance_luid(const char* name, char* out) {
|
||||
const char* p = std::strstr(name, "luid_");
|
||||
size_t n = 0;
|
||||
while (p && p[n] && n < 26) out[n] = (char)(p[n] >= 'A' && p[n] <= 'Z' ? p[n] + 32 : p[n]), n++; // (luid_0x%08x_0x%08x: 26)
|
||||
out[n] = 0;
|
||||
}
|
||||
|
||||
/// The GPU's load from "\GPU Engine(*)\Utilization Percentage": instances "pid_<n>_luid_0x.._0x.._phys_<n>_eng_<n>_engtype_<type>"
|
||||
/// with each process's share of an engine. Per adapter and engine type the shares add up; the load is the busiest type,
|
||||
/// 100 at most. luid: the adapter's (luid_name), or empty for any. -1 when no instance counts
|
||||
inline float engine_load(const char* const* names, const double* values, int n, const char* luid) {
|
||||
enum { kTypes = 32 };
|
||||
struct { char luid[32], type[32]; double sum; } t[kTypes];
|
||||
int nt = 0;
|
||||
for (int i = 0; i < n; i++) {
|
||||
char lu[32];
|
||||
instance_luid(names[i], lu);
|
||||
if (luid[0] && std::strcmp(lu, luid)) continue;
|
||||
const char* ty = std::strstr(names[i], "engtype_");
|
||||
ty = ty ? ty + 8 : "";
|
||||
int k = 0;
|
||||
while (k < nt && (std::strcmp(t[k].luid, lu) || std::strncmp(t[k].type, ty, 31))) k++;
|
||||
if (k == nt) {
|
||||
if (nt == kTypes) continue;
|
||||
std::memcpy(t[k].luid, lu, sizeof lu);
|
||||
std::strncpy(t[k].type, ty, 31);
|
||||
t[k].type[31] = 0;
|
||||
t[k].sum = 0;
|
||||
nt++;
|
||||
}
|
||||
t[k].sum += values[i];
|
||||
}
|
||||
float load = -1;
|
||||
for (int k = 0; k < nt; k++)
|
||||
if (t[k].sum > load) load = (float)(t[k].sum > 100 ? 100 : t[k].sum);
|
||||
return load;
|
||||
}
|
||||
/// The adapter's dedicated memory in use from "\GPU Adapter Memory(*)\Dedicated Usage" (instances
|
||||
/// "luid_0x.._0x.._phys_<n>", bytes), MB: the instances of luid added up (-1 when they come to nothing), or with luid
|
||||
/// empty the adapter that uses the most (-1 when there is none)
|
||||
inline float adapter_memory_mb(const char* const* names, const double* values, int n, const char* luid) {
|
||||
double sum = 0, best = -1;
|
||||
for (int i = 0; i < n; i++) {
|
||||
char lu[32];
|
||||
instance_luid(names[i], lu);
|
||||
if (luid[0] && !std::strcmp(lu, luid)) sum += values[i];
|
||||
if (values[i] > best) best = values[i];
|
||||
}
|
||||
if (luid[0] ? sum <= 0 : best < 0) return -1;
|
||||
return (float)((luid[0] ? sum : best) / 1048576.0);
|
||||
}
|
||||
|
||||
/// A number of the overlay's as its panel writes it: fmt with x, or "-" when x is under 0 (the machine, its driver or the game
|
||||
/// gives none: no NVIDIA or AMD library for this GPU, no thermal zone, no sample yet); true for "-", which the panel dims
|
||||
/// (NX2navi's perf_panel.cpp cell)
|
||||
inline bool cell_text(char* out, size_t n, const char* fmt, double x) {
|
||||
if (x < 0) {
|
||||
snprintf(out, n, "-");
|
||||
return true;
|
||||
}
|
||||
snprintf(out, n, fmt, x);
|
||||
return false;
|
||||
}
|
||||
|
||||
/// The card's memory as Vulkan reports it, MB: the heaps with local_bit (VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) added up, the
|
||||
/// system memory a card can also reach left out; -1 when there is none (NX2navi's perf_gpu_once). Heap: Vulkan's
|
||||
/// VkMemoryHeap, or any struct with its size and flags
|
||||
template <class Heap> float local_heap_mb(const Heap* heaps, uint32_t n, uint32_t local_bit) {
|
||||
uint64_t bytes = 0;
|
||||
for (uint32_t i = 0; i < n; i++)
|
||||
if (heaps[i].flags & local_bit) bytes += heaps[i].size;
|
||||
return bytes ? (float)(bytes >> 20) : -1.0f;
|
||||
}
|
||||
|
||||
/// Whether a vendor library's device name is the rendering GPU's: either within the other (NVIDIA's names match NVIDIA's
|
||||
/// GPUs only), both not empty
|
||||
inline bool name_match(const char* vulkan, const char* vendor) {
|
||||
return vulkan[0] && vendor[0] && (std::strstr(vulkan, vendor) || std::strstr(vendor, vulkan));
|
||||
}
|
||||
|
||||
} // namespace mkwvk::perf_machine
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user