Skip to content
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

[SPIRV] Fix NonSemanticDebugInfo to include all files #6935

Merged
merged 1 commit into from
Sep 26, 2024
+43 −15
Merged

[SPIRV] Fix NonSemanticDebugInfo to include all files #6935

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
6 changes: 0 additions & 6 deletions tools/clang/lib/SPIRV/EmitVisitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,6 @@ void EmitVisitor::emitDebugLine(spv::Op op, const SourceLocation &loc,
debugColumnEnd = columnEnd;
}

if ((emittedSource[fileId] == 0) && (spvOptions.debugInfoVulkan)) {
SpirvDebugSource *src = new (context) SpirvDebugSource(fileName, "");
visit(src);
spvInstructions.push_back(src);
}

curInst.clear();
if (!spvOptions.debugInfoVulkan) {
curInst.push_back(static_cast<uint32_t>(spv::Op::OpLine));
Expand Down
24 changes: 17 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 @@ -653,8 +653,7 @@ SpirvEmitter::SpirvEmitter(CompilerInstance &ci)

// Rich DebugInfo DebugSource
if (spirvOptions.debugInfoRich) {
auto *dbgSrc =
spvBuilder.createDebugSource(mainSourceFile->getString(), source);
auto *dbgSrc = spvBuilder.createDebugSource(mainSourceFile->getString());
// spvContext.getDebugInfo().insert() inserts {string key, RichDebugInfo}
// pair and returns {{string key, RichDebugInfo}, true /*Success*/}.
// spvContext.getDebugInfo().insert().first->second is a RichDebugInfo.
Expand Down Expand Up @@ -830,17 +829,23 @@ void SpirvEmitter::HandleTranslationUnit(ASTContext &context) {
return;

// Add source instruction(s)
if ((spirvOptions.debugInfoSource || spirvOptions.debugInfoFile) &&
!spirvOptions.debugInfoVulkan) {
if (spirvOptions.debugInfoSource || spirvOptions.debugInfoFile) {
std::vector<llvm::StringRef> fileNames;
fileNames.clear();
const auto &sm = context.getSourceManager();
// Add each include file from preprocessor output
for (unsigned int i = 0; i < sm.getNumLineTableFilenames(); i++) {
fileNames.push_back(sm.getLineTableFilename(i));
llvm::StringRef file = sm.getLineTableFilename(i);
if (spirvOptions.debugInfoVulkan) {
getOrCreateRichDebugInfoImpl(file);
} else {
fileNames.push_back(file);
}
}
if (!spirvOptions.debugInfoVulkan) {
spvBuilder.setDebugSource(spvContext.getMajorVersion(),
spvContext.getMinorVersion(), fileNames);
}
spvBuilder.setDebugSource(spvContext.getMajorVersion(),
spvContext.getMinorVersion(), fileNames);
}

if (spirvOptions.enableMaximalReconvergence) {
Expand Down Expand Up @@ -1032,6 +1037,11 @@ RichDebugInfo *
SpirvEmitter::getOrCreateRichDebugInfo(const SourceLocation &loc) {
const StringRef file =
astContext.getSourceManager().getPresumedLoc(loc).getFilename();
return getOrCreateRichDebugInfoImpl(file);
}

RichDebugInfo *
SpirvEmitter::getOrCreateRichDebugInfoImpl(llvm::StringRef file) {
auto &debugInfo = spvContext.getDebugInfo();
auto it = debugInfo.find(file);
if (it != debugInfo.end())
Expand Down
1 change: 1 addition & 0 deletions tools/clang/lib/SPIRV/SpirvEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class SpirvEmitter : public ASTConsumer {
/// created, we just return RichDebugInfo containing it. Otherwise,
/// create DebugSource and DebugCompilationUnit for loc and return it.
RichDebugInfo *getOrCreateRichDebugInfo(const SourceLocation &loc);
RichDebugInfo *getOrCreateRichDebugInfoImpl(llvm::StringRef file);

void doDecl(const Decl *decl);
void doStmt(const Stmt *stmt, llvm::ArrayRef<const Attr *> attrs = {});
Expand Down
24 changes: 24 additions & 0 deletions tools/clang/test/CodeGenSPIRV/shader.debug.opsource.include.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// RUN: %dxc -T ps_6_0 -E main -Zi %s -spirv -fspv-debug=vulkan-with-source | FileCheck %s

// CHECK: [[main:%[0-9]+]] = OpString
// CHECK-SAME: shader.debug.opsource.include.hlsl
// CHECK: [[file1:%[0-9]+]] = OpString
// CHECK-SAME: spirv.debug.opsource.include-file.hlsli
// CHECK: [[file1string:%[0-9]+]] = OpString "#define UBER_TYPE(x) x ## Type
// CHECK: [[mainstring:%[0-9]+]] = OpString "// RUN: %dxc -T ps_6_0 -E main -Zi %s -spirv -fspv-debug=vulkan-with-source | FileCheck %s

// CHECK: DebugSource [[file1]] [[file1string]]
// CHECK: DebugSource [[main]] [[mainstring]]

#include "spirv.debug.opsource.include-file.hlsli"

struct ColorType
{
float4 position : SV_POSITION;
float4 color : COLOR;
};

float4 main(UBER_TYPE(Color) input) : SV_TARGET
{
return input.color;
}
3 changes: 1 addition & 2 deletions tools/clang/tools/dxcompiler/dxcompilerobj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,7 @@ class DxcCompiler : public IDxcCompiler3,
// pre-seeding with #line directives. We invoke Preprocess() here
// first for such case. Then we invoke the compilation process over the
// preprocessed source code.
if (!isPreprocessing && opts.GenSPIRV && opts.DebugInfo &&
!opts.SpirvOptions.debugInfoVulkan) {
if (!isPreprocessing && opts.GenSPIRV && opts.DebugInfo) {
// Convert source code encoding
CComPtr<IDxcBlobUtf8> pOrigUtf8Source;
IFC(hlsl::DxcGetBlobAsUtf8(pSourceEncoding, m_pMalloc,
Expand Down
Loading