Skip to content

spirv-llvm-translator: update all versions, support LLVM 20 and 21 #432015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 11 commits into from
Aug 20, 2025
Merged

spirv-llvm-translator: update all versions, support LLVM 20 and 21 #432015

merged 11 commits into from
Aug 20, 2025

Conversation

blenderfreaky
Copy link
Contributor

@blenderfreaky blenderfreaky commented Aug 8, 2025 •
edited
Loading

Builds with LLVM 14-20 pass, 21 is currently building.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. labels Aug 8, 2025
@blenderfreaky blenderfreaky marked this pull request as ready for review August 8, 2025 14:11
@nix-owners nix-owners bot requested a review from gloaming August 8, 2025 14:12
@nixpkgs-ci nixpkgs-ci bot added 9.needs: reviewer This PR currently has no reviewers requested and needs attention. and removed 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Aug 8, 2025
@blenderfreaky
Copy link
Contributor Author

LLVM 14-21 all build now.

LLVM 21 requires a small workaround, as they need a nightly version of SPIRV-Headers. I've made it a conditional, so that once a new SPIRV-Headers version is released, it'll use that instead of the nightly

@blenderfreaky blenderfreaky force-pushed the update/spirv-llvm-translator branch from 4218d16 to c0e1c95 Compare August 10, 2025 14:18
@blenderfreaky
Copy link
Contributor Author

By the way, currently this defaults to LLVM 17 for ROCm, but rocmPackages.llvm is based on LLVM 18. Should this be updated?

@LunNova
Copy link
Member

LunNova commented Aug 10, 2025

By the way, currently this defaults to LLVM 17 for ROCm, but rocmPackages.llvm is based on LLVM 18. Should this be updated?

Probably.
rocmPackages will be built using 19 after #427944, but AMD's LLVM fork it follows has a lot of backports and there's been some churn relating to amdgcnspirv.

SuperSandro2000
SuperSandro2000 reviewed Aug 10, 2025
View reviewed changes
blenderfreaky
blenderfreaky commented Aug 10, 2025
View reviewed changes
@blenderfreaky
Copy link
Contributor Author

The treefmt lint is failing for an unrelated file somehow: pkgs/development/libraries/libxmlxx/v3.nix?

@LunNova
Copy link
Member

LunNova commented Aug 12, 2025

The treefmt lint is failing for an unrelated file somehow: pkgs/development/libraries/libxmlxx/v3.nix?

A really old PR just got merged into staging without needing to pass lints.

Fix: #432956

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Aug 12, 2025
@blenderfreaky blenderfreaky force-pushed the update/spirv-llvm-translator branch from c440561 to 7456187 Compare August 12, 2025 20:33
@blenderfreaky
Copy link
Contributor Author

blenderfreaky commented Aug 12, 2025 •
edited
Loading

Rebased onto latest staging to fix the vet failure

@SuperSandro2000 SuperSandro2000 force-pushed the update/spirv-llvm-translator branch 2 times, most recently from 567488b to 5c53a10 Compare August 19, 2025 21:37
@SuperSandro2000 SuperSandro2000 force-pushed the update/spirv-llvm-translator branch from 5c53a10 to 9eaf6ae Compare August 19, 2025 21:38
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Aug 19, 2025
@SuperSandro2000 SuperSandro2000 merged commit a852284 into NixOS:staging Aug 20, 2025
27 of 29 checks passed
@LunNova
Copy link
Member

LunNova commented Aug 20, 2025

Thanks!

blenderfreaky pushed a commit to blenderfreaky/nixpkgs that referenced this pull request Aug 20, 2025
@SuperSandro2000 @blenderfreaky
spirv-llvm-translator: update all versions, support LLVM 20 and 21 (N…
8723c23 
…ixOS#432015)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@gloaming gloaming Awaiting requested review from gloaming

+1 more reviewer

@LunNova LunNova LunNova approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@blenderfreaky @LunNova @SuperSandro2000