[SPIR-V] Honor inline spir-v attributes on functions#8616
Open
mmoult wants to merge 1 commit into
Open
Conversation
The [[vk::ext_decorate]], [[vk::ext_capability]], and [[vk::ext_extension]] attributes were only applied to variables, parameters, stage variables, entry-point functions, and functions carrying [[vk::ext_instruction]]. A plain function that carried them was skipped, so the attributes were silently dropped: no OpDecorate was emitted for its OpFunction, and no OpCapability / OpExtension was added to the module. Apply them when the function is registered (getOrRegisterFn), next to the existing linkage decoration. This reuses the same helpers as the variable and parameter paths: - the decoration goes through a new SpirvFunction overload of decorateWithIntrinsicAttrs, and - the capability/extension loops are factored into registerCapabilitiesAndExtensionsForDecl, now shared with the variable path. Only the literal form of ext_decorate is supported on functions; the id and string variants have no SpirvFunction-target decoration and are now diagnosed rather than silently dropped.
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Author
Collaborator
Collaborator
dnovillo
suggested changes
Jul 17, 2026
| srcLoc, targetFunc, static_cast<spv::Decoration>(decorate), literals); | ||
| assert(decor != nullptr); | ||
| mod->addDecoration(decor); | ||
| } |
Collaborator
There was a problem hiding this comment.
addDecoration used to be used only by decorateLinkage, which always encodes the function name into params. But now two functions both carrying the same decoration will make us drop the second one. This is failing for me:
// RUN: %dxc -T cs_6_0 -E main -fcgl %s -spirv | FileCheck %s
[[vk::ext_decorate(0)]]
[noinline] uint Foo(uint x) { return x; }
[[vk::ext_decorate(0)]]
[noinline] uint Bar(uint x) { return x + 1; }
RWStructuredBuffer<uint> buf;
[numthreads(1, 1, 1)]
void main(uint3 tid : SV_DispatchThreadID) {
buf[0] = Foo(tid.x) + Bar(tid.x);
}
// CHECK-DAG: OpDecorate %Foo RelaxedPrecision
// CHECK-DAG: OpDecorate %Bar RelaxedPrecision
The second CHECK-DAG can't find the RelaxedPrecision decoration. I think adding getTargetFunc() in the hash would fix this.
| if (isa<VKDecorateIdExtAttr>(attr) || isa<VKDecorateStringExtAttr>(attr)) { | ||
| emitError("vk::ext_decorate_id and vk::ext_decorate_string are not " | ||
| "supported on functions", | ||
| decl->getLocation()); |
Collaborator
There was a problem hiding this comment.
This will produce a misleading diagnostic if only one of the predicates fails. If both fail, the diagnostic will be duplicated. Could you split this into two if() checks?
|
|
||
| [[vk::ext_decorate_string(/* UserTypeGOOGLE */ 5636, "myType")]] | ||
| [noinline] uint Identity(uint x) { return x; } | ||
|
|
Collaborator
There was a problem hiding this comment.
Could you add a second function that exercises ext_decorate_id?
| @@ -0,0 +1,28 @@ | |||
| // RUN: %dxc -T cs_6_0 -E main -fcgl -Vd %s -spirv | FileCheck %s | |||
Collaborator
There was a problem hiding this comment.
If Identity is decorated with a Kernel capability, you probably don't need to disable spirv-val here.
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
3 participants
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.
The [[vk::ext_decorate]], [[vk::ext_capability]], and [[vk::ext_extension]] attributes were only applied to variables, parameters, stage variables, entry-point functions, and functions carrying [[vk::ext_instruction]]. A plain function that carried them was skipped, so the attributes were silently dropped: no OpDecorate was emitted for its OpFunction, and no OpCapability / OpExtension was added to the module.
Apply them when the function is registered (getOrRegisterFn), next to the existing linkage decoration. This reuses the same helpers as the variable and parameter paths:
Only the literal form of ext_decorate is supported on functions; the id and string variants have no SpirvFunction-target decoration and are now diagnosed rather than silently dropped.