Fix SPIRV-LLVM-Translator header file path in out-of-tree build#648
Merged
wenju-he merged 1 commit intointel:ocl-open-210from Feb 24, 2026
Merged
Conversation
Changes: * Upgrade Ubuntu version to 24.04 * Switch legacy 'apt-key add -' to /etc/apt/keyrings/llvm.gpg * Prepend SPIRV-LLVM-Translator header file path with LLVMSPIRVLib Resolves intel#646
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes out-of-tree builds that use a prebuilt LLVM plus a separately built/packaged SPIRV-LLVM-Translator by adjusting include paths to match the installed translator header layout, and refreshes the CI environment to Ubuntu 24.04 with modern APT key handling.
Changes:
- Fix SPIRV-LLVM-Translator includes for prebuilt/out-of-tree builds by prefixing with
LLVMSPIRVLib/. - Update GitHub Actions runners to
ubuntu-24.04. - Replace deprecated
apt-keyusage with/etc/apt/keyrings/llvm.gpgand update the workflow env var name used forSPIRV_TRANSLATOR_DIR.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
options_compile.cpp |
Include LLVMSPIRVExtensions.inc from LLVMSPIRVLib/ when building with prebuilt LLVM. |
options.h |
Include LLVMSPIRVOpts.h from LLVMSPIRVLib/ when building with prebuilt LLVM. |
.github/workflows/on-push-verification-out-of-tree.yml |
Move CI to Ubuntu 24.04, modernize LLVM APT key setup, and fix the exported env var name for the translator install dir. |
.github/workflows/codeql.yml |
Same CI updates as above for CodeQL builds. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
cdai2
approved these changes
Feb 24, 2026
This file contains hidden or 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
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.
Changes:
Resolves #646