[Mlir-commits] [mlir] a44ce1b - [mlir][debug] Convert DbgIntrOp to DebugRecords directly. (#154926)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Fri Aug 29 10:45:32 PDT 2025
Author: Abid Qadeer
Date: 2025-08-29T18:45:28+01:00
New Revision: a44ce1b949e0f51d65306fdb9dcf5e9f042a8b58
URL: https://github.com/llvm/llvm-project/commit/a44ce1b949e0f51d65306fdb9dcf5e9f042a8b58
DIFF: https://github.com/llvm/llvm-project/commit/a44ce1b949e0f51d65306fdb9dcf5e9f042a8b58.diff
LOG: [mlir][debug] Convert DbgIntrOp to DebugRecords directly. (#154926)
Currently the `DbgDeclareOP/DbgValueOP/DbgLabelOp` are first converted
to llvm debug intrinsics which are later translated to debug records by
a call of `convertToNewDbgValues`. This is not only inefficient but also
makes the code that works on intermediate IR unnecessarily complicated.
The debug intrinsics are also being phased out. This PR converts these
Ops directly to debug records.
The conversion is relatively simple but there is a bit of code
repetition due to how the APIs in the `DIBuilders` are named. There are
few `cast<>` which I would like to do without but could not see a good
way around them. Any suggestions welcome here. Also noticed that
`DISubprogramAttr` is inherited from `DIScopeAttr` while in llvm, the
`DISubprogram` inherits from `DILocalScope`. I am going to fix this
separately and then we could use `FusedLocWith<LLVM::DILocalScopeAttr>`
and cast to `DILocalScope` will be much safer.
As the output remains the same, the existing tests cover this change. I
also ran the `GDB` tests with flang and there was no regression.
---------
Co-authored-by: Tobias Gysi <tobias.gysi at nextsilicon.com>
Added:
Modified:
mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td
mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp
mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
Removed:
################################################################################
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td
index 5e2461b4508e4..fa2e10c9cdee5 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td
@@ -673,22 +673,6 @@ def LLVM_CoroPromiseOp : LLVM_IntrOp<"coro.promise", [], [], [], 1> {
class LLVM_DbgIntrOp<string name, string argName, list<Trait> traits = []>
: LLVM_IntrOp<name, [], [], traits, 0> {
- let llvmBuilder = [{
- // Debug intrinsics without debug locations are invalid.
- if(!builder.getCurrentDebugLocation())
- return success();
- llvm::Module *module = builder.GetInsertBlock()->getModule();
- llvm::LLVMContext &ctx = module->getContext();
- llvm::Function *fn =
- llvm::Intrinsic::getOrInsertDeclaration(module, llvm::Intrinsic::}]
- # !subst(".", "_", name) # [{);
- builder.CreateCall(fn, {
- llvm::MetadataAsValue::get(ctx,
- llvm::ValueAsMetadata::get(moduleTranslation.lookupValue(opInst.getOperand(0)))),
- llvm::MetadataAsValue::get(ctx, moduleTranslation.translateDebugInfo($varInfo)),
- llvm::MetadataAsValue::get(ctx, moduleTranslation.translateExpression($locationExpr)),
- });
- }];
let mlirBuilder = [{
// Add debug intrindic to the list of intrinsics that need to be converted once the
// full function was converted.
@@ -711,6 +695,22 @@ def LLVM_DbgDeclareOp : LLVM_DbgIntrOp<"dbg.declare", "addr", [
LLVM_DILocalVariableAttr:$varInfo,
DefaultValuedAttr<LLVM_DIExpressionAttr, "{}">:$locationExpr
);
+ let llvmBuilder = [{
+ // Debug records without debug locations are invalid.
+ if(!builder.getCurrentDebugLocation())
+ return success();
+ llvm::DILocalScope *scope = getLocalScopeFromLoc(builder, opInst.getLoc(),
+ moduleTranslation);
+
+ llvm::Module *module = builder.GetInsertBlock()->getModule();
+ llvm::DIBuilder debugInfoBuilder(*module);
+ debugInfoBuilder.insertDeclare(moduleTranslation.lookupValue(opInst.getOperand(0)),
+ llvm::cast<llvm::DILocalVariable>(
+ moduleTranslation.translateDebugInfo($varInfo)),
+ moduleTranslation.translateExpression($locationExpr),
+ moduleTranslation.translateLoc(opInst.getLoc(), scope),
+ builder.GetInsertPoint());
+ }];
}
def LLVM_DbgValueOp : LLVM_DbgIntrOp<"dbg.value", "value",
@@ -721,22 +721,41 @@ def LLVM_DbgValueOp : LLVM_DbgIntrOp<"dbg.value", "value",
LLVM_DILocalVariableAttr:$varInfo,
DefaultValuedAttr<LLVM_DIExpressionAttr, "{}">:$locationExpr
);
+ let llvmBuilder = [{
+ // Debug records without debug locations are invalid.
+ if(!builder.getCurrentDebugLocation())
+ return success();
+ llvm::DILocalScope *scope = getLocalScopeFromLoc(builder, opInst.getLoc(),
+ moduleTranslation);
+
+ llvm::Module *module = builder.GetInsertBlock()->getModule();
+ llvm::DIBuilder debugInfoBuilder(*module);
+ debugInfoBuilder.insertDbgValueIntrinsic(
+ moduleTranslation.lookupValue(opInst.getOperand(0)),
+ llvm::cast<llvm::DILocalVariable>(
+ moduleTranslation.translateDebugInfo($varInfo)),
+ moduleTranslation.translateExpression($locationExpr),
+ moduleTranslation.translateLoc(opInst.getLoc(), scope),
+ builder.GetInsertPoint());
+ }];
}
def LLVM_DbgLabelOp : LLVM_IntrOp<"dbg.label", [], [], [], 0> {
let summary = "Relates the program to a debug information label.";
let arguments = (ins LLVM_DILabelAttr:$label);
let llvmBuilder = [{
- // Debug intrinsics without debug locations are invalid.
+ // Debug records without debug locations are invalid.
if(!builder.getCurrentDebugLocation())
return success();
+ llvm::DILocalScope *scope = getLocalScopeFromLoc(builder, opInst.getLoc(),
+ moduleTranslation);
+
llvm::Module *module = builder.GetInsertBlock()->getModule();
- llvm::LLVMContext &ctx = module->getContext();
- llvm::Function *fn =
- llvm::Intrinsic::getOrInsertDeclaration(module, llvm::Intrinsic::dbg_label);
- builder.CreateCall(fn, {
- llvm::MetadataAsValue::get(ctx, moduleTranslation.translateDebugInfo($label))
- });
+ llvm::DIBuilder debugInfoBuilder(*module);
+ debugInfoBuilder.insertLabel(
+ llvm::cast<llvm::DILabel>(moduleTranslation.translateDebugInfo($label)),
+ moduleTranslation.translateLoc(opInst.getLoc(), scope),
+ builder.GetInsertPoint());
}];
let mlirBuilder = [{
DILabelAttr labelAttr = $_label_attr($label);
diff --git a/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp
index 0f675a0a5df5d..3b7e6eda0841d 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.cpp
@@ -18,6 +18,7 @@
#include "mlir/Target/LLVMIR/ModuleTranslation.h"
#include "llvm/ADT/TypeSwitch.h"
+#include "llvm/IR/DIBuilder.h"
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/InlineAsm.h"
#include "llvm/IR/Instructions.h"
@@ -358,6 +359,16 @@ static void convertModuleFlagsOp(ArrayAttr flags, llvm::IRBuilderBase &builder,
}
}
+static llvm::DILocalScope *
+getLocalScopeFromLoc(llvm::IRBuilderBase &builder, Location loc,
+ LLVM::ModuleTranslation &moduleTranslation) {
+ if (auto scopeLoc = loc->findInstanceOf<FusedLocWith<LLVM::DIScopeAttr>>())
+ if (auto *localScope = llvm::dyn_cast<llvm::DILocalScope>(
+ moduleTranslation.translateDebugInfo(scopeLoc.getMetadata())))
+ return localScope;
+ return builder.GetInsertBlock()->getParent()->getSubprogram();
+}
+
static LogicalResult
convertOperationImpl(Operation &opInst, llvm::IRBuilderBase &builder,
LLVM::ModuleTranslation &moduleTranslation) {
diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
index 8adfaf85335df..5e3d7e544d4e1 100644
--- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
@@ -2403,11 +2403,6 @@ mlir::translateModuleToLLVMIR(Operation *module, llvm::LLVMContext &llvmContext,
if (failed(translator.convertUnresolvedBlockAddress()))
return nullptr;
- // Once we've finished constructing elements in the module, we should convert
- // it to use the debug info format desired by LLVM.
- // See https://llvm.org/docs/RemoveDIsDebugInfo.html
- translator.llvmModule->convertToNewDbgValues();
-
// Add the necessary debug info module flags, if they were not encoded in MLIR
// beforehand.
translator.debugTranslation->addModuleFlagsIfNotPresent();
More information about the Mlir-commits
mailing list