Skip to content

[SPIR-V] Fix Mesh Shader debug info source locations #8057

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
SteveUrquhart wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −9
Open

[SPIR-V] Fix Mesh Shader debug info source locations #8057

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
14 changes: 7 additions & 7 deletions tools/clang/lib/SPIRV/SpirvEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8340,9 +8340,9 @@ SpirvInstruction *SpirvEmitter::tryToAssignToMSOutAttrsOrIndices(
}

if (isMSOutAttribute) {
assignToMSOutAttribute(varDecl, rhs, indices);
assignToMSOutAttribute(varDecl, rhs, indices, lhs->getLocStart());
} else if (isMSOutIndices) {
assignToMSOutIndices(varDecl, rhs, indices);
assignToMSOutIndices(varDecl, rhs, indices, lhs->getLocStart());
} else {
assert(isMSOutAttributeBlock);
QualType type = varDecl->getType();
Expand All @@ -8357,7 +8357,7 @@ SpirvInstruction *SpirvEmitter::tryToAssignToMSOutAttrsOrIndices(
SpirvInstruction *subValue = spvBuilder.createCompositeExtract(
fieldType, rhs, {getNumBaseClasses(type) + field->getFieldIndex()},
lhs->getLocStart());
assignToMSOutAttribute(field, subValue, indices);
assignToMSOutAttribute(field, subValue, indices, lhs->getLocStart());
}
}

Expand All @@ -8369,7 +8369,8 @@ SpirvInstruction *SpirvEmitter::tryToAssignToMSOutAttrsOrIndices(

void SpirvEmitter::assignToMSOutAttribute(
const DeclaratorDecl *decl, SpirvInstruction *value,
const llvm::SmallVector<SpirvInstruction *, 4> &indices) {
const llvm::SmallVector<SpirvInstruction *, 4> &indices,
SourceLocation loc) {
assert(spvContext.isMS() && !indices.empty());

// Extract attribute index and vecComponent (if any).
Expand All @@ -8381,7 +8382,6 @@ void SpirvEmitter::assignToMSOutAttribute(

auto semanticInfo = declIdMapper.getStageVarSemantic(decl);
assert(semanticInfo.isValid());
const auto loc = decl->getLocation();
// Special handle writes to clip/cull distance attributes.
if (declIdMapper.glPerVertex.tryToAccess(
hlsl::DXIL::SigPointKind::MSOut, semanticInfo.semantic->GetKind(),
Expand Down Expand Up @@ -8409,7 +8409,8 @@ void SpirvEmitter::assignToMSOutAttribute(

void SpirvEmitter::assignToMSOutIndices(
const DeclaratorDecl *decl, SpirvInstruction *value,
const llvm::SmallVector<SpirvInstruction *, 4> &indices) {
const llvm::SmallVector<SpirvInstruction *, 4> &indices,
SourceLocation loc) {
assert(spvContext.isMS() && !indices.empty());

bool extMesh = featureManager.isExtensionEnabled(Extension::EXT_mesh_shader);
Expand Down Expand Up @@ -8437,7 +8438,6 @@ void SpirvEmitter::assignToMSOutIndices(
}
}

const auto loc = decl->getLocation();
if (numVertices == 1) {
// for "point" output topology.
assert(numValues == 1);
Expand Down
6 changes: 4 additions & 2 deletions tools/clang/lib/SPIRV/SpirvEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,12 +370,14 @@ class SpirvEmitter : public ASTConsumer {
/// Emit instructions for assigning to the given mesh out attribute.
void assignToMSOutAttribute(
const DeclaratorDecl *decl, SpirvInstruction *value,
const llvm::SmallVector<SpirvInstruction *, 4> &indices);
const llvm::SmallVector<SpirvInstruction *, 4> &indices,
SourceLocation loc);

/// Emit instructions for assigning to the given mesh out indices object.
void
assignToMSOutIndices(const DeclaratorDecl *decl, SpirvInstruction *value,
const llvm::SmallVector<SpirvInstruction *, 4> &indices);
const llvm::SmallVector<SpirvInstruction *, 4> &indices,
SourceLocation loc);

/// Processes each vector within the given matrix by calling actOnEachVector.
/// matrixVal should be the loaded value of the matrix. actOnEachVector takes
Expand Down
30 changes: 30 additions & 0 deletions tools/clang/test/CodeGenSPIRV/shader.debug.mesh.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// RUN: %dxc -Zi -O0 -T ms_6_5 %s -spirv | FileCheck %s

// CHECK: OpStore %62 %63
// CHECK: OpLine %6 22 5
// CHECK: OpLine %6 23 5
// CHECK: OpLine %6 25 5
// CHECK: OpLine %6 26 5
// CHECK: OpLine %6 28 5
// CHECK: OpLine %6 29 5

struct MeshShaderOutput {
float4 position: SV_Position;
float3 color: COLOR0;
};

[outputtopology("triangle")]
[numthreads(1, 1, 1)]
void main(out indices uint3 triangleBox[1], out vertices MeshShaderOutput triangleVertex[3]) {
SetMeshOutputCounts(3, 1);
triangleBox[0] = uint3(0, 1, 1);

triangleVertex[0].position = float4(1, 0.5, 0.0, 1.0);
triangleVertex[0].color = float3(1, 0.0, 0.0);

triangleVertex[1].position = float4(1, 0.5, 0.0, 1.0);
triangleVertex[1].color = float3(1.0, 1.0, 0.0);

triangleVertex[2].position = float4(1.0, -0.5, 0.0, 1.0);
triangleVertex[2].color = float3(1.0, 0.0, 1.0);
}