Skip to content

[SPIR-V] Fix void on extented inst sets #8020

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

Open
Keenuts wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −5
Open

[SPIR-V] Fix void on extented inst sets #8020

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
2 changes: 1 addition & 1 deletion tools/clang/lib/SPIRV/SpirvBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,7 +1346,7 @@ SpirvInstruction *SpirvBuilder::createSpirvIntrInstExt(
SpirvExtInstImport *set =
(instSet.size() == 0) ? nullptr : getExtInstSet(instSet);

if (retType != QualType() && retType->isVoidType()) {
if (!set && retType != QualType() && retType->isVoidType()) {
retType = QualType();
}

Expand Down
19 changes: 15 additions & 4 deletions tools/clang/test/CodeGenSPIRV/inline-spirv/spv.intrinsicInstruction.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
// RUN: %dxc -T vs_6_0 -E main -fspv-target-env=vulkan1.1 -fcgl %s -spirv | FileCheck %s

// CHECK: OpCapability ShaderClockKHR
// CHECK: {{%[0-9]+}} = OpExtInstImport "GLSL.std.450"
// CHECK: {{%[0-9]+}} = OpExtInstImport "SPV_AMD_shader_trinary_minmax"

// CHECK: OpExtension "SPV_KHR_non_semantic_info"

// CHECK-DAG: [[glsl_set:%[0-9]+]] = OpExtInstImport "GLSL.std.450"
// CHECK-DAG: [[debug_set:%[0-9]+]] = OpExtInstImport "NonSemantic.DebugBreak"
// CHECK-DAG: [[minmax_set:%[0-9]+]] = OpExtInstImport "SPV_AMD_shader_trinary_minmax"

struct SInstanceData {
float4x3 VisualToWorld;
Expand All @@ -25,15 +29,22 @@ float4 spv_sin(float4 v);
[[vk::ext_instruction(/* FMin3AMD */ 1, "SPV_AMD_shader_trinary_minmax")]]
float FMin3AMD(float x, float y, float z);

[[vk::ext_extension("SPV_KHR_non_semantic_info")]]
[[vk::ext_instruction(1, "NonSemantic.DebugBreak")]]
void debugBreak();

float4 main(const VS_INPUT v) : SV_Position {
SInstanceData I = v.InstanceData;
uint64_t clock;
// CHECK: {{%[0-9]+}} = OpExtInst %v4float {{%[0-9]+}} Sin {{%[0-9]+}}
// CHECK: {{%[0-9]+}} = OpExtInst %v4float [[glsl_set]] Sin {{%[0-9]+}}
I.Output = spv_sin(v.InstanceData.Output);
// CHECK: {{%[0-9]+}} = OpReadClockKHR %ulong %uint_1
clock = ReadClock(vk::DeviceScope);
// CHECK: {{%[0-9]+}} = OpExtInst %float {{%[0-9]+}} FMin3AMD {{%[0-9]+}} {{%[0-9]+}} {{%[0-9]+}}
// CHECK: {{%[0-9]+}} = OpExtInst %float [[minmax_set]] FMin3AMD {{%[0-9]+}} {{%[0-9]+}} {{%[0-9]+}}
I.Output.w = FMin3AMD(I.Output.z, I.Output.y, I.Output.z);

debugBreak();
// CHECK: {{.*}} = OpExtInst %void [[debug_set]] 1

return I.Output;
}