mesa: add patch to include driver path in cache key #44575
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mesa usually uses the timestamps of the llvm and driver shared libraries as a cache key. In /nix/store these are all zero, so we'll include $(drivers) in the cache key, which should be unique for all combinations of mesa and llvm versions.
9 tasks
vcunat
approved these changes
Aug 9, 2018
vcunat
added a commit
that referenced
this pull request
Aug 9, 2018
|
It's a shame that these things are mass rebuilds; plan for future: #44831 |
Wouldn't an autoconf option that eventually sets the |
|
@dezgeg Yeah, that's probably the way to go. I was thinking it would be nice to change the function->timestamp helper to return a blob containing the absolute path and timestamp, but that's probably more trouble than it's worth. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Fixes #44183. Also see #44383.
Mesa uses shared library mtimes as a key to its shader cache, however everything in /nix/store has the same timestamp, so it may incorrectly use shaders from the wrong version of mesa/llvm. This has manifested itself as a complete system hang when booting a system on mesa 18.1 after previously using 18.0, or vice-versa.
This change adds the mesa driver store path to the cache key, which should make it sufficiently unique. I've tried to keep the patch as simple as possible for ease of maintenance, and I've tested it with 18.0 and 18.1.
I also tested booting with mesa 18.0 on my system which is currently using 18.1. It hangs without the patch, and works normally with it.
I have some ideas about how to upstream this, but it will probably require more intrusive changes which wouldn't be suitable for a nixpkgs patch.
@vcunat
edit: merged to staging because of mesa dependencies
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)