[llvm] [RemoveDIs] Enable DPLabels conversion [3b/3] (PR #82639)
Orlando Cazalet-Hyams via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 23 05:29:37 PST 2024
https://github.com/OCHyams updated https://github.com/llvm/llvm-project/pull/82639
>From f4ebc40382fb0dc63f926097d9211510f9cb0a7b Mon Sep 17 00:00:00 2001
From: OCHyams <orlando.hyams at sony.com>
Date: Tue, 16 Jan 2024 11:16:03 +0000
Subject: [PATCH 1/2] enable conversion
---
llvm/lib/IR/BasicBlock.cpp | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/IR/BasicBlock.cpp b/llvm/lib/IR/BasicBlock.cpp
index 0680754444f17f..8a5bfdb0506854 100644
--- a/llvm/lib/IR/BasicBlock.cpp
+++ b/llvm/lib/IR/BasicBlock.cpp
@@ -81,6 +81,12 @@ void BasicBlock::convertToNewDbgValues() {
continue;
}
+ if (DbgLabelInst *DLI = dyn_cast<DbgLabelInst>(&I)) {
+ DPVals.push_back(new DPLabel(DLI->getLabel(), DLI->getDebugLoc()));
+ DLI->eraseFromParent();
+ continue;
+ }
+
if (DPVals.empty())
continue;
@@ -108,15 +114,26 @@ void BasicBlock::convertFromNewDbgValues() {
DPMarker &Marker = *Inst.DbgMarker;
for (DbgRecord &DR : Marker.getDbgValueRange()) {
- if (auto *DPV = dyn_cast<DPValue>(&DR))
+ if (auto *DPV = dyn_cast<DPValue>(&DR)) {
InstList.insert(Inst.getIterator(),
DPV->createDebugIntrinsic(getModule(), nullptr));
- else
+ } else if (auto *DPL = dyn_cast<DPLabel>(&DR)) {
+ auto *LabelFn =
+ Intrinsic::getDeclaration(getModule(), Intrinsic::dbg_label);
+ Value *Args[] = {
+ MetadataAsValue::get(getModule()->getContext(), DPL->getLabel())};
+ DbgLabelInst *DbgLabel = cast<DbgLabelInst>(
+ CallInst::Create(LabelFn->getFunctionType(), LabelFn, Args));
+ DbgLabel->setTailCall();
+ DbgLabel->setDebugLoc(DPL->getDebugLoc());
+ InstList.insert(Inst.getIterator(), DbgLabel);
+ } else {
llvm_unreachable("unsupported DbgRecord kind");
+ }
}
Marker.eraseFromParent();
- };
+ }
// Assume no trailing DPValues: we could technically create them at the end
// of the block, after a terminator, but this would be non-cannonical and
>From 0a75e6ed4c163234e342159caa16251d776dba69 Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hyams at sony.com>
Date: Fri, 23 Feb 2024 13:29:04 +0000
Subject: [PATCH 2/2] dispatch createDebugIntrinsic
---
.../include/llvm/IR/DebugProgramInstruction.h | 10 ++++++++
llvm/lib/IR/BasicBlock.cpp | 21 +++-------------
llvm/lib/IR/DebugProgramInstruction.cpp | 25 +++++++++++++++++++
3 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/llvm/include/llvm/IR/DebugProgramInstruction.h b/llvm/include/llvm/IR/DebugProgramInstruction.h
index 84b0f743d3c9b9..97089098ee5352 100644
--- a/llvm/include/llvm/IR/DebugProgramInstruction.h
+++ b/llvm/include/llvm/IR/DebugProgramInstruction.h
@@ -62,6 +62,8 @@ class BasicBlock;
class MDNode;
class Module;
class DbgVariableIntrinsic;
+class DbgInfoIntrinsic;
+class DbgLabelInst;
class DIAssignID;
class DPMarker;
class DPValue;
@@ -80,6 +82,7 @@ class raw_ostream;
/// clone
/// isIdenticalToWhenDefined
/// both print methods
+/// createDebugIntrinsic
class DbgRecord : public ilist_node<DbgRecord> {
public:
/// Marker that this DbgRecord is linked into.
@@ -103,6 +106,11 @@ class DbgRecord : public ilist_node<DbgRecord> {
void print(raw_ostream &O, bool IsForDebug = false) const;
void print(raw_ostream &O, ModuleSlotTracker &MST, bool IsForDebug) const;
bool isIdenticalToWhenDefined(const DbgRecord &R) const;
+ /// Convert this DbgRecord back into an appropriate llvm.dbg.* intrinsic.
+ /// \p InsertBefore Optional position to insert this intrinsic.
+ /// \returns A new llvm.dbg.* intrinsic representiung this DbgRecord.
+ DbgInfoIntrinsic *createDebugIntrinsic(Module *M,
+ Instruction *InsertBefore) const;
///@}
/// Same as isIdenticalToWhenDefined but checks DebugLoc too.
@@ -177,6 +185,8 @@ class DPLabel : public DbgRecord {
DPLabel *clone() const;
void print(raw_ostream &O, bool IsForDebug = false) const;
void print(raw_ostream &ROS, ModuleSlotTracker &MST, bool IsForDebug) const;
+ DbgLabelInst *createDebugIntrinsic(Module *M,
+ Instruction *InsertBefore) const;
void setLabel(DILabel *NewLabel) { Label = NewLabel; }
DILabel *getLabel() const { return Label; }
diff --git a/llvm/lib/IR/BasicBlock.cpp b/llvm/lib/IR/BasicBlock.cpp
index 8a5bfdb0506854..6ea876fde5ec66 100644
--- a/llvm/lib/IR/BasicBlock.cpp
+++ b/llvm/lib/IR/BasicBlock.cpp
@@ -113,24 +113,9 @@ void BasicBlock::convertFromNewDbgValues() {
continue;
DPMarker &Marker = *Inst.DbgMarker;
- for (DbgRecord &DR : Marker.getDbgValueRange()) {
- if (auto *DPV = dyn_cast<DPValue>(&DR)) {
- InstList.insert(Inst.getIterator(),
- DPV->createDebugIntrinsic(getModule(), nullptr));
- } else if (auto *DPL = dyn_cast<DPLabel>(&DR)) {
- auto *LabelFn =
- Intrinsic::getDeclaration(getModule(), Intrinsic::dbg_label);
- Value *Args[] = {
- MetadataAsValue::get(getModule()->getContext(), DPL->getLabel())};
- DbgLabelInst *DbgLabel = cast<DbgLabelInst>(
- CallInst::Create(LabelFn->getFunctionType(), LabelFn, Args));
- DbgLabel->setTailCall();
- DbgLabel->setDebugLoc(DPL->getDebugLoc());
- InstList.insert(Inst.getIterator(), DbgLabel);
- } else {
- llvm_unreachable("unsupported DbgRecord kind");
- }
- }
+ for (DbgRecord &DR : Marker.getDbgValueRange())
+ InstList.insert(Inst.getIterator(),
+ DR.createDebugIntrinsic(getModule(), nullptr));
Marker.eraseFromParent();
}
diff --git a/llvm/lib/IR/DebugProgramInstruction.cpp b/llvm/lib/IR/DebugProgramInstruction.cpp
index 2ca4533afa96c9..389bac4de6a1cb 100644
--- a/llvm/lib/IR/DebugProgramInstruction.cpp
+++ b/llvm/lib/IR/DebugProgramInstruction.cpp
@@ -112,6 +112,17 @@ bool DbgRecord::isEquivalentTo(const DbgRecord &R) const {
return getDebugLoc() == R.getDebugLoc() && isIdenticalToWhenDefined(R);
}
+DbgInfoIntrinsic *
+DbgRecord::createDebugIntrinsic(Module *M, Instruction *InsertBefore) const {
+ switch (RecordKind) {
+ case ValueKind:
+ return cast<DPValue>(this)->createDebugIntrinsic(M, InsertBefore);
+ case LabelKind:
+ return cast<DPLabel>(this)->createDebugIntrinsic(M, InsertBefore);
+ };
+ llvm_unreachable("unsupported DbgRecord kind");
+}
+
DPValue *DPValue::createDPValue(Value *Location, DILocalVariable *DV,
DIExpression *Expr, const DILocation *DI) {
return new DPValue(ValueAsMetadata::get(Location), DV, Expr, DI,
@@ -377,6 +388,20 @@ DPValue::createDebugIntrinsic(Module *M, Instruction *InsertBefore) const {
return DVI;
}
+DbgLabelInst *DPLabel::createDebugIntrinsic(Module *M,
+ Instruction *InsertBefore) const {
+ auto *LabelFn = Intrinsic::getDeclaration(M, Intrinsic::dbg_label);
+ Value *Args[] = {
+ MetadataAsValue::get(getDebugLoc()->getContext(), getLabel())};
+ DbgLabelInst *DbgLabel = cast<DbgLabelInst>(
+ CallInst::Create(LabelFn->getFunctionType(), LabelFn, Args));
+ DbgLabel->setTailCall();
+ DbgLabel->setDebugLoc(getDebugLoc());
+ if (InsertBefore)
+ DbgLabel->insertBefore(InsertBefore);
+ return DbgLabel;
+}
+
Value *DPValue::getAddress() const {
auto *MD = getRawAddress();
if (auto *V = dyn_cast<ValueAsMetadata>(MD))
More information about the llvm-commits
mailing list