[llvm] f5097ed - Revert "[ADCE] Only remove debug intrinsics if non debug instructions are removed"
Mikael Holmen via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 3 04:11:37 PST 2023
Author: Mikael Holmen
Date: 2023-03-03T13:07:22+01:00
New Revision: f5097ed8469416b30d2e9e449a26079f85ccb2f1
URL: https://github.com/llvm/llvm-project/commit/f5097ed8469416b30d2e9e449a26079f85ccb2f1
DIFF: https://github.com/llvm/llvm-project/commit/f5097ed8469416b30d2e9e449a26079f85ccb2f1.diff
LOG: Revert "[ADCE] Only remove debug intrinsics if non debug instructions are removed"
This reverts commit 8aa9ab336889ae2eb8e4188036faeb151379ab7b.
Reverting due to compile-time regressions as pointed out in
https://reviews.llvm.org/D145051#4166656
E.g.
"In particular tramp3d-v4 with debuginfo regressed by 15%."
Added:
Modified:
llvm/lib/Transforms/Scalar/ADCE.cpp
llvm/test/Transforms/ADCE/debug-info-intrinsic.ll
llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll
Removed:
llvm/test/Transforms/ADCE/debug-info-intrinsic-2.ll
################################################################################
diff --git a/llvm/lib/Transforms/Scalar/ADCE.cpp b/llvm/lib/Transforms/Scalar/ADCE.cpp
index 7ae54e4bc256..d03a5033f403 100644
--- a/llvm/lib/Transforms/Scalar/ADCE.cpp
+++ b/llvm/lib/Transforms/Scalar/ADCE.cpp
@@ -540,8 +540,6 @@ ADCEChanged AggressiveDeadCodeElimination::removeDeadInstructions() {
}
});
- bool FoundNonDebugInstr = false;
-
// The inverse of the live set is the dead set. These are those instructions
// that have no side effects and do not influence the control flow or return
// value of the function, and may therefore be deleted safely.
@@ -562,9 +560,6 @@ ADCEChanged AggressiveDeadCodeElimination::removeDeadInstructions() {
continue;
// Fallthrough and drop the intrinsic.
- } else {
- // Remember that we found some non-debug instructions to delete.
- FoundNonDebugInstr = true;
}
// Prepare to delete.
@@ -572,23 +567,16 @@ ADCEChanged AggressiveDeadCodeElimination::removeDeadInstructions() {
salvageDebugInfo(I);
}
- Changed.ChangedAnything = Changed.ChangedControlFlow || FoundNonDebugInstr;
-
- // Only actually remove the dead instructions if we know we will invalidate
- // cached analysis results. If we only found debug intrinsics to remove and
- // we then invalidate analyses because of that, later passes may behave
- //
diff erently which then makes the presence of debug info affect code
- // generation.
- if (Changed.ChangedAnything) {
- for (Instruction *&I : Worklist)
- I->dropAllReferences();
+ for (Instruction *&I : Worklist)
+ I->dropAllReferences();
- for (Instruction *&I : Worklist) {
- ++NumRemoved;
- I->eraseFromParent();
- }
+ for (Instruction *&I : Worklist) {
+ ++NumRemoved;
+ I->eraseFromParent();
}
+ Changed.ChangedAnything = Changed.ChangedControlFlow || !Worklist.empty();
+
return Changed;
}
diff --git a/llvm/test/Transforms/ADCE/debug-info-intrinsic-2.ll b/llvm/test/Transforms/ADCE/debug-info-intrinsic-2.ll
deleted file mode 100644
index f5927cf44921..000000000000
--- a/llvm/test/Transforms/ADCE/debug-info-intrinsic-2.ll
+++ /dev/null
@@ -1,56 +0,0 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt -passes=adce -S < %s | FileCheck %s
-
-; ADCE can remove the dbg.declare in remove_dbg_declare_and_other as it is also
-; removing a non-debug instruction.
-
-define i16 @remove_dbg_declare_and_other() {
-; CHECK-LABEL: @remove_dbg_declare_and_other(
-; CHECK-NEXT: entry:
-; CHECK-NEXT: ret i16 0
-;
-entry:
- call void @llvm.dbg.declare(metadata ptr undef, metadata !4, metadata !DIExpression()), !dbg !16
- %dead = add i8 0, 0
- ret i16 0
-}
-
-; In dont_remove_only_dbg_declare we must leave the dbg.declare since we're not
-; removing any non-debug instructions.
-
-define i16 @dont_remove_only_dbg_declare() {
-; CHECK-LABEL: @dont_remove_only_dbg_declare(
-; CHECK-NEXT: entry:
-; CHECK-NEXT: call void @llvm.dbg.declare(metadata ptr undef, metadata [[META4:![0-9]+]], metadata !DIExpression()), !dbg [[DBG16:![0-9]+]]
-; CHECK-NEXT: ret i16 0
-;
-entry:
- call void @llvm.dbg.declare(metadata ptr undef, metadata !4, metadata !DIExpression()), !dbg !16
- ret i16 0
-}
-
-; Function Attrs: nocallback nofree nosync nounwind speculatable willreturn memory(none)
-declare void @llvm.dbg.declare(metadata, metadata, metadata) #0
-
-attributes #0 = { nocallback nofree nosync nounwind speculatable willreturn memory(none) }
-
-!llvm.dbg.cu = !{}
-!llvm.module.flags = !{!0, !1, !2, !3}
-
-!0 = !{i32 7, !"Dwarf Version", i32 4}
-!1 = !{i32 2, !"Debug Info Version", i32 3}
-!2 = !{i32 1, !"wchar_size", i32 1}
-!3 = !{i32 7, !"frame-pointer", i32 2}
-!4 = !DILocalVariable(name: "w", scope: !5, file: !6, line: 18, type: !11)
-!5 = distinct !DILexicalBlock(scope: !7, file: !6, line: 18, column: 8)
-!6 = !DIFile(filename: "foo2.c", directory: "/llvm")
-!7 = distinct !DISubprogram(name: "test1", scope: !6, file: !6, line: 14, type: !8, scopeLine: 14, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !10)
-!8 = !DISubroutineType(types: !9)
-!9 = !{}
-!10 = distinct !DICompileUnit(language: DW_LANG_C99, file: !6, producer: "clang version 16.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, globals: !9, splitDebugInlining: false, nameTableKind: None)
-!11 = !DIDerivedType(tag: DW_TAG_typedef, name: "uint64_t", file: !12, line: 60, baseType: !13)
-!12 = !DIFile(filename: "/include/sys/_stdint.h", directory: "")
-!13 = !DIDerivedType(tag: DW_TAG_typedef, name: "__uint64_t", file: !14, line: 108, baseType: !15)
-!14 = !DIFile(filename: "/include/machine/_default_types.h", directory: "")
-!15 = !DIBasicType(name: "unsigned long long", size: 64, encoding: DW_ATE_unsigned)
-!16 = !DILocation(line: 18, column: 8, scope: !5)
diff --git a/llvm/test/Transforms/ADCE/debug-info-intrinsic.ll b/llvm/test/Transforms/ADCE/debug-info-intrinsic.ll
index f23fd373e4bc..34c09e2c6f6d 100644
--- a/llvm/test/Transforms/ADCE/debug-info-intrinsic.ll
+++ b/llvm/test/Transforms/ADCE/debug-info-intrinsic.ll
@@ -26,14 +26,6 @@
;; sink();
;;}
-; Note: The instruction
-; %dead = add i8 0, 0
-; in
-; @variable_in_unused_subscope
-; and
-; @calls_empty_function_with_unused_variable_in_unused_subscope
-; is just there to let ADCE remove debug intrinsics at all. It only removes
-; debug intrinsics if it also found something else to remove.
declare void @llvm.dbg.value(metadata, metadata, metadata)
declare void @sink()
@@ -46,7 +38,6 @@ define void @variable_in_unused_subscope() !dbg !4 {
entry:
call void @llvm.dbg.value(metadata i32 0, metadata !15, metadata !17), !dbg !18
call void @sink(), !dbg !19
- %dead = add i8 0, 0
ret void, !dbg !20
}
@@ -70,7 +61,6 @@ define void @calls_empty_function_with_unused_variable_in_unused_subscope() !dbg
entry:
call void @llvm.dbg.value(metadata i32 0, metadata !26, metadata !17), !dbg !28
call void @sink(), !dbg !31
- %dead = add i8 0, 0
ret void, !dbg !32
}
diff --git a/llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll b/llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll
index 938d0f4e9038..13d94f8cf6a2 100644
--- a/llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll
+++ b/llvm/test/Transforms/MergeFunc/mergefunc-preserve-debug-info.ll
@@ -147,16 +147,6 @@ entry:
; OPTIMIZATION_LEVEL_2: define void @f()
; OPTIMIZATION_LEVEL_2-NEXT: entry:
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.value(metadata i32 3, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.value(metadata i32 4, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.declare(metadata ptr undef, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.declare(metadata ptr undef, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.value(metadata i32 4, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.value(metadata i32 1, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.value(metadata i32 9, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.declare(metadata ptr undef, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.declare(metadata ptr undef, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
-; OPTIMIZATION_LEVEL_2-NEXT: call void @llvm.dbg.value(metadata i32 9, metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg !{{[0-9]+}}
; OPTIMIZATION_LEVEL_2-NEXT: ret void, !dbg !{{[0-9]+}}
%call = call i32 @maxA(i32 3, i32 4), !dbg !60
More information about the llvm-commits
mailing list