WIP: fix(build): a direct lift removes an earlier lift's split parts before it writes its own #1176
No reviewers
Labels
No labels
area/accessibility
area/audio
area/input
area/install
area/menu
area/renderer
area/saves
area/tooling
area/upscaling
beanstalk: approved
beanstalk: failed
beanstalk: needs approval
beanstalk: running
beanstalk: tested
ci: approved
good first issue
gpu/amd
gpu/igpu
gpu/intel
gpu/nvidia
help wanted
kind
bug
kind
chore
kind
docs
kind
feature
kind
performance
kind
question
needs measurements
platform/linux
platform/macos
platform/steam-deck
platform/windows
preview
priority
critical
priority
high
priority
low
regression
risk
high
risk
low
risk
medium
status
blocked
status
confirmed
status
duplicate
status
invalid
status
needs-info
status
wontfix
ci: approved
No milestone
No project
No assignees
2 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set
Reference
MagicBeanDev/Longshot!1176
Loading…
Reference in a new issue
No description provided.
Delete branch "TrashPanda/Longshot:fix/relift-split-cleanup"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Type: fix · Risk: low · Tested on: Linux, RTX 4070 Ti (game-free checks) · Needs: none
Why
For developers: running
nx2/lift.py --writeagain over a gen folder, after a saved chunk boundary moved, kept the earlier lift's split parts beside the new chunk with the same functions, and the link failed on duplicate definitions. Players' builds clear the folder first and are not affected.Restored from Hookshot 2953, by jarynclouatre, and split out of #286 so it can be reviewed and merged on its own.
What changed
chunks.writeremoves an earlier lift's split parts together with its hot pieces, beforesplit_big, so only this lift's parts are kept.Commits, each with its original author and message:
8d034aabfix(build): a direct lift removes an earlier lift's split parts before it writes its own (jarynclouatre)Developers only.
nx2/lift.py --writerun again over a gen folder,after a saved boundary in chunks.txt moved to where the earlier lift had
cut a big chunk, kept that lift's split parts (
code_NNN_M.c) besidethe new numbered chunk holding the same functions, and the link failed
on duplicate definitions.
chunks.writeremoved an earlier lift's stale numbered chunks and hotpieces, but left its split parts for
split_big. After the boundarymove the new chunk is the old first part byte for byte, so
_cut_already(meant for a worker that finished a cut whose result waslost) found the old parts consistent with it and kept them as this
lift's. This needs the old first part to call none of the functions that
moved out: with such a call its declarations differ from the new
chunk's, and the old parts are rejected and removed, as before. The
packaged builder clears
code_*before a translation and is notaffected.
Change
write()removes an earlier lift's split parts together with its hotpieces, before
split_big, so_cut_alreadyonly sees parts made inthis lift.
split_bigis called only fromwrite(), and nothingbetween the removal and
split_bigreads the parts.Testing
tests/test_chunk_split.py, new case: two lifts throughchunks.writewith stand-in functions, the first with one chunk thatsplit_bigcuts, the second with a saved boundary at the first part'send. Each function is defined once and none of the first lift's parts is
left. On main it fails with 333 of the 400 functions defined twice.
run_all.py chunk hot spawn lift: 11 passed.(
test_bake_portability:zstandard;nx2/test_texture_init_barrier.py:clang++); both fail the same onmain.
Restored-from: https://github.com/NotRexed/Hookshot/pull/2953
Measurements
Verdict: nothing to measure: a correctness fix off the frame path, covered by game-free checks.
Flags and settings
None.
Testing
Tested: On Linux (kernel 7.0), RTX 4070 Ti,
main@71b1edd8, this PR @8d034aab:tests/test_chunk_split.pypass. The full suite (tests/run_all.py) has not been run on this branch yet; a comment will follow when it has.Not tested: A full lift of the game twice over one gen folder. Opened as work in progress until it runs in the game.
Must be tested:
Risks
What could break: a developer's direct lift.
Turning it off: revert the commit.
Compatibility: Nothing changes.
Checklist
Everyone
type(scope): description) of the status line's type.can't be run by hand is in Testing's Not testable by hand, with why.
in Risks.
main.third_party/untouched (a new folder with aPROVENANCE.mdinstead).python -I -B tests/run_all.pypasses (any failure that also fails onmainis named).When it applies
mainand passing here.Tested in game: Linux (Ubuntu 26.04.1, kernel 7.0.0-43), RTX 4070 Ti 12 GB, NVIDIA 595.99.02, Ryzen 7 9800X3D: this branch built together with the other 18 split from #218 and #284-#288, merged onto main @
71b1edd8(make_game.py --update, build v3.0.0-rc.5-82-g5952bb3d), then played by a scripted tour through the control bridge (scripts/memtour.py: a save loaded, Zora's Domain, the Market, Hyrule Field and Death Mountain Trail, 40 s each with walking and camera swings). All 4 stops reached, a clean quit, and no device loss or Vulkan error in the log. The build's lift split its big chunks ("lift: big chunks split") and the game ran from the result.Brought up to the ready-for-review standard (#1454): the checklist's Everyone list has two new boxes, added here from what this PR's description and comments show (please check they match what you know).
View command line instructions
Checkout
From your project repository, check out a new branch and test the changes.