shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[flang][debug] Generate splitDebugFilename field in DICompileUnitAttr. (#161214)

Browse Source 
This PR builds on https://github.com/llvm/llvm-project/pull/160540 and
allows us to set the `splitDebugFilename` field in `DICompileUnitAttr`.
The changes are mostly mechanical.

I saw some spurious white space in a test that I have cleaned up.
This commit is contained in:
Abid Qadeer 2025-09-30 14:35:33 +01:00 committed by GitHub
parent e485d5e77a
commit c2188168ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flang/include/flang/Optimizer/Passes/Pipelines.h
View File

@ -158,7 +158,8 @@ void createOpenMPFIRPassPipeline(mlir::PassManager &pm,
void createDebugPasses(mlir::PassManager &pm,
llvm::codegenoptions::DebugInfoKind debugLevel,
llvm::OptimizationLevel OptLevel,
llvm::StringRef inputFilename, int32_t dwarfVersion);
llvm::StringRef inputFilename, int32_t dwarfVersion,
llvm::StringRef splitDwarfFile);
void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
MLIRToLLVMPassPipelineConfig config,

4
flang/include/flang/Optimizer/Transforms/Passes.td
View File

@ -246,6 +246,10 @@ def AddDebugInfo : Pass<"add-debug-info", "mlir::ModuleOp"> {
"int32_t",
/*default=*/"0",
"dwarf version">,
Option<"splitDwarfFile", "split-dwarf-file",
"std::string", /*default=*/"std::string{}",
"Name of the split dwarf file">
];
}

2
flang/include/flang/Tools/CrossToolHelpers.h
View File

@ -109,6 +109,7 @@ struct MLIRToLLVMPassPipelineConfig : public FlangEPCallBacks {
InstrumentFunctionExit = "__cyg_profile_func_exit";
}
DwarfVersion = opts.DwarfVersion;
SplitDwarfFile = opts.SplitDwarfFile;
}
llvm::OptimizationLevel OptLevel; ///< optimisation level
@ -146,6 +147,7 @@ struct MLIRToLLVMPassPipelineConfig : public FlangEPCallBacks {
Fortran::frontend::CodeGenOptions::ComplexRangeKind::
CX_Full; ///< Method for calculating complex number division
int32_t DwarfVersion = 0; ///< Version of DWARF debug info to generate
std::string SplitDwarfFile = ""; ///< File name for the split debug info
};
struct OffloadModuleOpts {

12
flang/lib/Optimizer/Passes/Pipelines.cpp
View File

@ -95,12 +95,14 @@ getEmissionKind(llvm::codegenoptions::DebugInfoKind kind) {
void addDebugInfoPass(mlir::PassManager &pm,
llvm::codegenoptions::DebugInfoKind debugLevel,
llvm::OptimizationLevel optLevel,
llvm::StringRef inputFilename, int32_t dwarfVersion) {
llvm::StringRef inputFilename, int32_t dwarfVersion,
llvm::StringRef splitDwarfFile) {
fir::AddDebugInfoOptions options;
options.debugLevel = getEmissionKind(debugLevel);
options.isOptimized = optLevel != llvm::OptimizationLevel::O0;
options.inputFilename = inputFilename;
options.dwarfVersion = dwarfVersion;
options.splitDwarfFile = splitDwarfFile;
addPassConditionally(pm, disableDebugInfo,
[&]() { return fir::createAddDebugInfoPass(options); });
}
@ -340,9 +342,11 @@ void createOpenMPFIRPassPipeline(mlir::PassManager &pm,
void createDebugPasses(mlir::PassManager &pm,
llvm::codegenoptions::DebugInfoKind debugLevel,
llvm::OptimizationLevel OptLevel,
llvm::StringRef inputFilename, int32_t dwarfVersion) {
llvm::StringRef inputFilename, int32_t dwarfVersion,
llvm::StringRef splitDwarfFile) {
if (debugLevel != llvm::codegenoptions::NoDebugInfo)
addDebugInfoPass(pm, debugLevel, OptLevel, inputFilename, dwarfVersion);
addDebugInfoPass(pm, debugLevel, OptLevel, inputFilename, dwarfVersion,
splitDwarfFile);
}
void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
@ -360,7 +364,7 @@ void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
pm, (config.DebugInfo != llvm::codegenoptions::NoDebugInfo));
fir::addExternalNameConversionPass(pm, config.Underscoring);
fir::createDebugPasses(pm, config.DebugInfo, config.OptLevel, inputFilename,
config.DwarfVersion);
config.DwarfVersion, config.SplitDwarfFile);
fir::addTargetRewritePass(pm);
fir::addCompilerGeneratedNamesConversionPass(pm);

3
flang/lib/Optimizer/Transforms/AddDebugInfo.cpp
View File

@ -696,7 +696,8 @@ void AddDebugInfoPass::runOnOperation() {
llvm::dwarf::getLanguage("DW_LANG_Fortran95"), fileAttr, producer,
isOptimized, debugLevel,
/*nameTableKind=*/mlir::LLVM::DINameTableKind::Default,
/*splitDebugFilename=*/mlir::StringAttr());
splitDwarfFile.empty() ? mlir::StringAttr()
: mlir::StringAttr::get(context, splitDwarfFile));
module.walk([&](mlir::func::FuncOp funcOp) {
handleFuncOp(funcOp, fileAttr, cuAttr, typeGen, &symbolTable);

26
flang/test/Integration/debug-split-dwarf.f90
View File

@ -2,20 +2,28 @@
! Testing to ensure that setting only -split-dwarf-file allows to place
! .dwo sections into regular output object.
! RUN: %flang_fc1 -debug-info-kind=standalone -triple x86_64-unknown-linux \
! RUN: -split-dwarf-file %t.o -emit-obj -o %t.o %s
! RUN: llvm-readobj -S %t.o | FileCheck --check-prefix=DWO %s
! RUN: %flang_fc1 -debug-info-kind=standalone -triple x86_64-unknown-linux \
! RUN: -split-dwarf-file %t.o -emit-obj -o %t.o %s
! RUN: llvm-readobj -S %t.o | FileCheck --check-prefix=DWO %s
! Testing to ensure that setting both -split-dwarf-file and -split-dwarf-output
! does not place .dwo sections into regular output object but in a separate
! file.
! RUN: %flang_fc1 -debug-info-kind=standalone -triple x86_64-unknown-linux \
! RUN: -split-dwarf-file %t.dwo -split-dwarf-output %t.dwo -emit-obj -o %t.o %s
! RUN: llvm-readobj -S %t.dwo | FileCheck --check-prefix=DWO %s
! RUN: llvm-readobj -S %t.o | FileCheck --check-prefix=SPLIT %s
! RUN: %flang_fc1 -debug-info-kind=standalone -triple x86_64-unknown-linux \
! RUN: -split-dwarf-file %t.dwo -split-dwarf-output %t.dwo -emit-obj -o %t.o %s
! RUN: llvm-readobj -S %t.dwo | FileCheck --check-prefix=DWO %s
! RUN: llvm-readobj -S %t.o | FileCheck --check-prefix=SPLIT %s
! DWO: .dwo
! SPLIT-NOT: .dwo
! Test that splitDebugFilename field of the DICompileUnit get correctly
! generated.
! RUN: %flang_fc1 -debug-info-kind=standalone -triple x86_64-unknown-linux \
! RUN: -split-dwarf-file %t.test_dwo -split-dwarf-output %t.test_dwo \
! RUN: -emit-llvm %s -o - | FileCheck --check-prefix=CU %s
! DWO: .dwo
! SPLIT-NOT: .dwo
! CU: !DICompileUnit
! CU-SAME: splitDebugFilename: "{{.*}}test_dwo"
program test
end program test

12
flang/test/Transforms/debug-split-dwarf.fir Normal file
View File

@ -0,0 +1,12 @@
// RUN: fir-opt --add-debug-info="split-dwarf-file=test.dwo" \
// RUN: --mlir-print-debuginfo %s -o - | FileCheck %s
module {
func.func @test() {
return
} loc(#loc1)
}
#loc1 = loc("test.f90":15:1)
// CHECK: llvm.di_compile_unit
// CHECK-SAME: splitDebugFilename = "test.dwo"