[Mlir-commits] [mlir] [MLIR][LLVM] Add extraData field to the DIDerivedType attribute (PR #85935)
Christian Ulmann
llvmlistbot at llvm.org
Wed Mar 20 07:12:55 PDT 2024
https://github.com/Dinistro created https://github.com/llvm/llvm-project/pull/85935
This commit extends the DIDerivedTypeAttr with the `extraData` field. For now, the type of of is limited to be a `DINodeAttr`, as extending the debug metadata handling to support arbitrary metadata nodes does not seem to be necessary so far.
>From cf547e31c9df7207e21745fe6154d9e402a7affb Mon Sep 17 00:00:00 2001
From: Christian Ulmann <christian.ulmann at nextsilicon.com>
Date: Wed, 20 Mar 2024 13:40:32 +0000
Subject: [PATCH] [MLIR][LLVM] Add extraData field to the DIDerivedType
attribute
This commit extends the DIDerivedTypeAttr with the `extraData` field.
For now, the type of of is limited to be a `DINodeAttr`, as extending
the debug metadata handling to support arbitrary metadata nodes does not
seem to be necessary so far.
---
mlir/include/mlir-c/Dialect/LLVM.h | 2 +-
.../mlir/Dialect/LLVMIR/LLVMAttrDefs.td | 3 ++-
mlir/lib/CAPI/Dialect/LLVM.cpp | 19 +++++++++----------
mlir/lib/Target/LLVMIR/DebugImporter.cpp | 7 ++++++-
mlir/lib/Target/LLVMIR/DebugTranslation.cpp | 2 +-
mlir/test/CAPI/llvm.c | 2 +-
mlir/test/Dialect/LLVMIR/debuginfo.mlir | 5 +++--
mlir/test/Target/LLVMIR/Import/debug-info.ll | 4 ++--
mlir/test/Target/LLVMIR/llvmir-debug.mlir | 5 +++--
9 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/mlir/include/mlir-c/Dialect/LLVM.h b/mlir/include/mlir-c/Dialect/LLVM.h
index b3d7a788ccbba3..4f1d646f5bc831 100644
--- a/mlir/include/mlir-c/Dialect/LLVM.h
+++ b/mlir/include/mlir-c/Dialect/LLVM.h
@@ -238,7 +238,7 @@ MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDICompositeTypeAttrGet(
MLIR_CAPI_EXPORTED MlirAttribute mlirLLVMDIDerivedTypeAttrGet(
MlirContext ctx, unsigned int tag, MlirAttribute name,
MlirAttribute baseType, uint64_t sizeInBits, uint32_t alignInBits,
- uint64_t offsetInBits);
+ uint64_t offsetInBits, MlirAttribute extraData);
/// Gets the base type from a LLVM DIDerivedType attribute.
MLIR_CAPI_EXPORTED MlirAttribute
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
index d4d56ae0f762bc..1b1824a28e99dd 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
@@ -405,7 +405,8 @@ def LLVM_DIDerivedTypeAttr : LLVM_Attr<"DIDerivedType", "di_derived_type",
OptionalParameter<"DITypeAttr">:$baseType,
OptionalParameter<"uint64_t">:$sizeInBits,
OptionalParameter<"uint32_t">:$alignInBits,
- OptionalParameter<"uint64_t">:$offsetInBits
+ OptionalParameter<"uint64_t">:$offsetInBits,
+ OptionalParameter<"DINodeAttr">:$extraData
);
let assemblyFormat = "`<` struct(params) `>`";
}
diff --git a/mlir/lib/CAPI/Dialect/LLVM.cpp b/mlir/lib/CAPI/Dialect/LLVM.cpp
index d0fd5ceecfff5f..71f2b73dd73bca 100644
--- a/mlir/lib/CAPI/Dialect/LLVM.cpp
+++ b/mlir/lib/CAPI/Dialect/LLVM.cpp
@@ -168,16 +168,15 @@ MlirAttribute mlirLLVMDICompositeTypeAttrGet(
[](Attribute a) { return a.cast<DINodeAttr>(); })));
}
-MlirAttribute mlirLLVMDIDerivedTypeAttrGet(MlirContext ctx, unsigned int tag,
- MlirAttribute name,
- MlirAttribute baseType,
- uint64_t sizeInBits,
- uint32_t alignInBits,
- uint64_t offsetInBits) {
- return wrap(DIDerivedTypeAttr::get(unwrap(ctx), tag,
- cast<StringAttr>(unwrap(name)),
- cast<DITypeAttr>(unwrap(baseType)),
- sizeInBits, alignInBits, offsetInBits));
+MlirAttribute
+mlirLLVMDIDerivedTypeAttrGet(MlirContext ctx, unsigned int tag,
+ MlirAttribute name, MlirAttribute baseType,
+ uint64_t sizeInBits, uint32_t alignInBits,
+ uint64_t offsetInBits, MlirAttribute extraData) {
+ return wrap(DIDerivedTypeAttr::get(
+ unwrap(ctx), tag, cast<StringAttr>(unwrap(name)),
+ cast<DITypeAttr>(unwrap(baseType)), sizeInBits, alignInBits, offsetInBits,
+ cast<DINodeAttr>(unwrap(extraData))));
}
MlirAttribute
diff --git a/mlir/lib/Target/LLVMIR/DebugImporter.cpp b/mlir/lib/Target/LLVMIR/DebugImporter.cpp
index 5ba90bba18b197..72316141ba0cca 100644
--- a/mlir/lib/Target/LLVMIR/DebugImporter.cpp
+++ b/mlir/lib/Target/LLVMIR/DebugImporter.cpp
@@ -85,10 +85,15 @@ DIDerivedTypeAttr DebugImporter::translateImpl(llvm::DIDerivedType *node) {
DITypeAttr baseType = translate(node->getBaseType());
if (node->getBaseType() && !baseType)
return nullptr;
+ DINodeAttr extraData =
+ translate(llvm::dyn_cast_or_null<llvm::DINode>(node->getExtraData()));
+ if (node->getExtraData() && !extraData)
+ mlirModule.emitWarning(
+ "dropped DIDerivedType's extra data due to having an unsupported type");
return DIDerivedTypeAttr::get(
context, node->getTag(), getStringAttrOrNull(node->getRawName()),
baseType, node->getSizeInBits(), node->getAlignInBits(),
- node->getOffsetInBits());
+ node->getOffsetInBits(), extraData);
}
DIFileAttr DebugImporter::translateImpl(llvm::DIFile *node) {
diff --git a/mlir/lib/Target/LLVMIR/DebugTranslation.cpp b/mlir/lib/Target/LLVMIR/DebugTranslation.cpp
index 126a671a58e808..642359a23756af 100644
--- a/mlir/lib/Target/LLVMIR/DebugTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/DebugTranslation.cpp
@@ -163,7 +163,7 @@ llvm::DIDerivedType *DebugTranslation::translateImpl(DIDerivedTypeAttr attr) {
/*Scope=*/nullptr, translate(attr.getBaseType()), attr.getSizeInBits(),
attr.getAlignInBits(), attr.getOffsetInBits(),
/*DWARFAddressSpace=*/std::nullopt, /*PtrAuthData=*/std::nullopt,
- /*Flags=*/llvm::DINode::FlagZero);
+ /*Flags=*/llvm::DINode::FlagZero, translate(attr.getExtraData()));
}
llvm::DIFile *DebugTranslation::translateImpl(DIFileAttr attr) {
diff --git a/mlir/test/CAPI/llvm.c b/mlir/test/CAPI/llvm.c
index 48b887ee4a954c..9c3c7da46c4cd8 100644
--- a/mlir/test/CAPI/llvm.c
+++ b/mlir/test/CAPI/llvm.c
@@ -297,7 +297,7 @@ static void testDebugInfoAttributes(MlirContext ctx) {
1, 0, 8, di_type));
// CHECK: #llvm.di_derived_type<{{.*}}>
mlirAttributeDump(
- mlirLLVMDIDerivedTypeAttrGet(ctx, 0, bar, di_type, 64, 8, 0));
+ mlirLLVMDIDerivedTypeAttrGet(ctx, 0, bar, di_type, 64, 8, 0, di_type));
// CHECK: #llvm.di_composite_type<{{.*}}>
mlirAttributeDump(mlirLLVMDICompositeTypeAttrGet(
diff --git a/mlir/test/Dialect/LLVMIR/debuginfo.mlir b/mlir/test/Dialect/LLVMIR/debuginfo.mlir
index cef2ced391d676..4c2de0aa4c2293 100644
--- a/mlir/test/Dialect/LLVMIR/debuginfo.mlir
+++ b/mlir/test/Dialect/LLVMIR/debuginfo.mlir
@@ -24,10 +24,11 @@
sizeInBits = 32, encoding = DW_ATE_signed
>
-// CHECK-DAG: #[[PTR0:.*]] = #llvm.di_derived_type<tag = DW_TAG_pointer_type, baseType = #[[INT0]], sizeInBits = 64, alignInBits = 32, offsetInBits = 4>
+// CHECK-DAG: #[[PTR0:.*]] = #llvm.di_derived_type<tag = DW_TAG_pointer_type, baseType = #[[INT0]], sizeInBits = 64, alignInBits = 32, offsetInBits = 4, extraData = #[[INT1]]>
#ptr0 = #llvm.di_derived_type<
tag = DW_TAG_pointer_type, baseType = #int0,
- sizeInBits = 64, alignInBits = 32, offsetInBits = 4
+ sizeInBits = 64, alignInBits = 32, offsetInBits = 4,
+ extraData = #int1
>
// CHECK-DAG: #[[PTR1:.*]] = #llvm.di_derived_type<tag = DW_TAG_pointer_type, name = "ptr1">
diff --git a/mlir/test/Target/LLVMIR/Import/debug-info.ll b/mlir/test/Target/LLVMIR/Import/debug-info.ll
index 9af40d8c8d3ee6..a7947eb0d4447b 100644
--- a/mlir/test/Target/LLVMIR/Import/debug-info.ll
+++ b/mlir/test/Target/LLVMIR/Import/debug-info.ll
@@ -136,7 +136,7 @@ define void @basic_type() !dbg !3 {
; CHECK: #[[INT:.+]] = #llvm.di_basic_type<tag = DW_TAG_base_type, name = "int">
; CHECK: #[[PTR1:.+]] = #llvm.di_derived_type<tag = DW_TAG_pointer_type, baseType = #[[INT]]>
-; CHECK: #[[PTR2:.+]] = #llvm.di_derived_type<tag = DW_TAG_pointer_type, name = "mypointer", baseType = #[[INT]], sizeInBits = 64, alignInBits = 32, offsetInBits = 4>
+; CHECK: #[[PTR2:.+]] = #llvm.di_derived_type<tag = DW_TAG_pointer_type, name = "mypointer", baseType = #[[INT]], sizeInBits = 64, alignInBits = 32, offsetInBits = 4, extraData = #[[INT]]>
; CHECK: #llvm.di_subroutine_type<types = #[[PTR1]], #[[PTR2]]>
define void @derived_type() !dbg !3 {
@@ -153,7 +153,7 @@ define void @derived_type() !dbg !3 {
!5 = !{!7, !8}
!6 = !DIBasicType(name: "int")
!7 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !6)
-!8 = !DIDerivedType(name: "mypointer", tag: DW_TAG_pointer_type, baseType: !6, size: 64, align: 32, offset: 4)
+!8 = !DIDerivedType(name: "mypointer", tag: DW_TAG_pointer_type, baseType: !6, size: 64, align: 32, offset: 4, extraData: !6)
; // -----
diff --git a/mlir/test/Target/LLVMIR/llvmir-debug.mlir b/mlir/test/Target/LLVMIR/llvmir-debug.mlir
index c042628334d4c5..c34f9187d4df08 100644
--- a/mlir/test/Target/LLVMIR/llvmir-debug.mlir
+++ b/mlir/test/Target/LLVMIR/llvmir-debug.mlir
@@ -28,7 +28,8 @@ llvm.func @func_no_debug() {
>
#ptr = #llvm.di_derived_type<
tag = DW_TAG_pointer_type, baseType = #si32,
- sizeInBits = 64, alignInBits = 32, offsetInBits = 8
+ sizeInBits = 64, alignInBits = 32, offsetInBits = 8,
+ extraData = #si32
>
#named = #llvm.di_derived_type<
// Specify the name parameter.
@@ -135,7 +136,7 @@ llvm.func @empty_types() {
// CHECK: ![[FUNC_TYPE]] = !DISubroutineType(cc: DW_CC_normal, types: ![[FUNC_ARGS:.*]])
// CHECK: ![[FUNC_ARGS]] = !{null, ![[ARG_TYPE:.*]], ![[PTR_TYPE:.*]], ![[NAMED_TYPE:.*]], ![[COMPOSITE_TYPE:.*]], ![[VECTOR_TYPE:.*]]}
// CHECK: ![[ARG_TYPE]] = !DIBasicType(name: "si64")
-// CHECK: ![[PTR_TYPE]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[BASE_TYPE:.*]], size: 64, align: 32, offset: 8)
+// CHECK: ![[PTR_TYPE]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[BASE_TYPE:.*]], size: 64, align: 32, offset: 8, extraData: ![[BASE_TYPE]])
// CHECK: ![[BASE_TYPE]] = !DIBasicType(name: "si32", size: 32, encoding: DW_ATE_signed)
// CHECK: ![[NAMED_TYPE]] = !DIDerivedType(tag: DW_TAG_pointer_type, name: "named", baseType: ![[BASE_TYPE:.*]])
// CHECK: ![[COMPOSITE_TYPE]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "composite", file: ![[CU_FILE_LOC]], line: 42, size: 64, align: 32, elements: ![[COMPOSITE_ELEMENTS:.*]])
More information about the Mlir-commits
mailing list