Skip to content

[SPIR-V] Fix LinkageAttribute emission for Vulkan #143902

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

Closed
wants to merge 1 commit into from
Closed

[SPIR-V] Fix LinkageAttribute emission for Vulkan #143902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,9 @@ Register SPIRVGlobalRegistry::buildGlobalVariable(
buildOpDecorate(Reg, MIRBuilder, SPIRV::Decoration::Alignment, {Alignment});
}

if (HasLinkageTy)
// LinkageAttributes required Linkage capability. This capability is not
// supported by Vulkan.
if (HasLinkageTy && !ST.isVulkan())
buildOpDecorate(Reg, MIRBuilder, SPIRV::Decoration::LinkageAttributes,
{static_cast<uint32_t>(LinkageType)}, Name);

Expand Down
1 change: 1 addition & 0 deletions llvm/lib/Target/SPIRV/SPIRVSubtarget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class SPIRVSubtarget : public SPIRVGenSubtargetInfo {
return TargetTriple.getArch() == Triple::spirv32 ||
TargetTriple.getArch() == Triple::spirv64;
}
bool isVulkan() const { return TargetTriple.getOS() == Triple::Vulkan; }
const std::string &getTargetTripleAsStr() const { return TargetTriple.str(); }
VersionTuple getSPIRVVersion() const { return SPIRVVersion; };
bool isAtLeastSPIRVVer(VersionTuple VerToCompareTo) const;
Expand Down
23 changes: 23 additions & 0 deletions llvm/test/CodeGen/SPIRV/linkage/link-attribute-vk.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
; RUN: llc -verify-machineinstrs -O0 -mtriple=spirv-unknown-vulkan1.3-pixel %s -o - | FileCheck %s
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-vulkan1.3-pixel %s -o - -filetype=obj | spirv-val --target-env vulkan1.3 %}

@sv_position = external thread_local local_unnamed_addr addrspace(7) externally_initialized constant <4 x float>, !spirv.Decorations !0

; CHECK-NOT: OpDecorate %[[#var]] LinkageAttributes "sv_position" Import

; CHECK-DAG: %[[#float:]] = OpTypeFloat 32
; CHECK-DAG: %[[#float4:]] = OpTypeVector %[[#float]]
; CHECK-DAG: %[[#type:]] = OpTypePointer Input %[[#float4]]
; CHECK-DAG: %[[#var:]] = OpVariable %[[#type]] Input

; CHECK-NOT: OpDecorate %[[#var]] LinkageAttributes "sv_position" Import

define void @main() #1 {
entry:
ret void
}

attributes #1 = { "hlsl.shader"="pixel" }

!0 = !{!1}
!1 = !{i32 11, i32 0}
Loading