Skip to content

Commit c84f2c7

Browse files
jmorsejmorse
authored
[DebugInfo][RemoveDIs] Delete experimental-iterator test-flags from tests (llvm#140045)
Over in 6a45fce, this flag (experimental-debuginfo-iterators) was switched to do nothing, to flush out anything that depended on the debug-intrinsics way of doing things. It's been a month and nothing's super-broken, so we'll start to rip things out. This commit deletes MergeFunc's debuginfo-iterators test: in d2942a8 it's documented that that test is specifically because of differences between intrinsic/non-intrinsic data structures, and we're deleting the possibility of that difference.
1 parent adba40e commit c84f2c7

15 files changed

+1
-131
lines changed

‎llvm/test/CodeGen/Generic/MIRDebugify/check-line-and-variables-x.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# REQUIRES: x86-registered-target
22
# RUN: llc -mtriple=x86_64-unknown-linux-gnu -run-pass=mir-check-debugify -o - %s 2>&1 | FileCheck %s
3-
# RUN: llc --experimental-debuginfo-iterators=false -mtriple=x86_64-unknown-linux-gnu -run-pass=mir-check-debugify -o - %s 2>&1 | FileCheck %s
43
--- |
54
; ModuleID = 'check-line-and-variables.mir'
65
source_filename = "check-line-and-variables.c"

‎llvm/test/CodeGen/Generic/MIRDebugify/check-line-and-variables.ll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
; RUN: llc -debugify-check-and-strip-all-safe -o - %s 2>&1 | FileCheck %s
2-
; RUN: llc --experimental-debuginfo-iterators=false -debugify-check-and-strip-all-safe -o - %s 2>&1 | FileCheck %s
32

43
; ModuleID = 'main.c'
54
source_filename = "main.c"

‎llvm/test/CodeGen/Generic/MIRDebugify/check-line-and-variables.mir

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# REQUIRES: x86-registered-target
22
# RUN: llc -mtriple=x86_64-unknown-linux-gnu -run-pass=mir-debugify,dead-mi-elimination,mir-check-debugify -o - %s 2>&1 | FileCheck %s
33
# RUN: llc -mtriple=x86_64-unknown-linux-gnu -run-pass=mir-debugify,mir-check-debugify -o - %s 2>&1 | FileCheck %s --check-prefix=CHECK-PASS
4-
# RUN: llc --experimental-debuginfo-iterators=false -mtriple=x86_64-unknown-linux-gnu -run-pass=mir-debugify,dead-mi-elimination,mir-check-debugify -o - %s 2>&1 | FileCheck %s
5-
# RUN: llc --experimental-debuginfo-iterators=false -mtriple=x86_64-unknown-linux-gnu -run-pass=mir-debugify,mir-check-debugify -o - %s 2>&1 | FileCheck %s --check-prefix=CHECK-PASS
64
--- |
75
; ModuleID = 'check-line-and-variables.mir'
86
source_filename = "check-line-and-variables.ll"

‎llvm/test/CodeGen/Generic/MIRDebugify/multifunction-module.mir

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# RUN: llc -run-pass=mir-debugify,mir-check-debugify -o - %s 2>&1 | FileCheck %s
2-
# RUN: llc --experimental-debuginfo-iterators=false -run-pass=mir-debugify,mir-check-debugify -o - %s 2>&1 | FileCheck %s
32

43
# CHECK: Machine IR debug info check: PASS
54
# CHECK-NOT: Assertion `Var <= NumVars && "Unexpected name for DILocalVariable"'

‎llvm/test/DebugInfo/debugify-bogus-dbg-value.ll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
; RUN: opt -passes=check-debugify < %s 2>&1 | FileCheck %s
2-
; RUN: opt --experimental-debuginfo-iterators=false -passes=check-debugify < %s 2>&1 | FileCheck %s
32

43
define <2 x i64> @test-fun(<2 x i64> %A) !dbg !6 {
54
%and = and <2 x i64> %A, <i64 23, i64 42>, !dbg !14

‎llvm/test/DebugInfo/debugify-each.ll

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -40,40 +40,6 @@
4040
; RUN: opt -debugify-each -passes=globalopt -S -o /dev/null < %s 2> %t
4141
; RUN: FileCheck %s -input-file=%t -check-prefix=MODULE-PASS-ONE
4242

43-
; Repeat the same checks with debug intrinsics enabled.
44-
; RUN: opt --experimental-debuginfo-iterators=false -debugify-each -O3 -S -o /dev/null < %s 2> %t
45-
; RUN: FileCheck %s -input-file=%t -check-prefix=MODULE-PASS
46-
; RUN: FileCheck %s -input-file=%t -check-prefix=FUNCTION-PASS
47-
; RUN: opt --experimental-debuginfo-iterators=false -disable-output -debugify-each -passes='default<O3>' %s 2> %t
48-
; RUN: FileCheck %s -input-file=%t -check-prefix=MODULE-PASS
49-
; RUN: FileCheck %s -input-file=%t -check-prefix=FUNCTION-PASS
50-
51-
; RUN: opt --experimental-debuginfo-iterators=false -enable-debugify -debugify-each -O3 -S -o /dev/null < %s 2> %t
52-
; RUN: FileCheck %s -input-file=%t -check-prefix=MODULE-PASS
53-
; RUN: FileCheck %s -input-file=%t -check-prefix=FUNCTION-PASS
54-
55-
; RUN: opt --experimental-debuginfo-iterators=false -debugify-each -passes='instrprof,instrprof,sroa,sccp' -S -o /dev/null < %s 2> %t
56-
; RUN: FileCheck %s -input-file=%t -check-prefix=MODULE-PASS
57-
; RUN: FileCheck %s -input-file=%t -check-prefix=FUNCTION-PASS
58-
59-
; RUN: opt --experimental-debuginfo-iterators=false -debugify-each -O1 < %s | opt -O2 -o /dev/null
60-
61-
; RUN: opt --experimental-debuginfo-iterators=false -disable-output -debugify-quiet -debugify-each -O1 < %s 2>&1 | count 0
62-
63-
; RUN: opt --experimental-debuginfo-iterators=false -O1 < %s -S -o %t.before
64-
; RUN: opt --experimental-debuginfo-iterators=false -O1 -debugify-each < %s -S -o %t.after
65-
; RUN: diff %t.before %t.after
66-
67-
; RUN: opt --experimental-debuginfo-iterators=false -O1 < %s | llvm-dis -o %t.before
68-
; RUN: opt --experimental-debuginfo-iterators=false -O1 -debugify-each < %s | llvm-dis -o %t.after
69-
; RUN: diff %t.before %t.after
70-
71-
; RUN: opt --experimental-debuginfo-iterators=false -debugify-each -passes=instsimplify -S -o /dev/null < %s 2> %t
72-
; RUN: FileCheck %s -input-file=%t -check-prefix=FUNCTION-PASS-ONE
73-
74-
; RUN: opt --experimental-debuginfo-iterators=false -debugify-each -passes=globalopt -S -o /dev/null < %s 2> %t
75-
; RUN: FileCheck %s -input-file=%t -check-prefix=MODULE-PASS-ONE
76-
7743
define void @foo(i32 %arg) {
7844
call i32 asm "bswap $0", "=r,r"(i32 %arg)
7945
ret void

‎llvm/test/DebugInfo/debugify-export.ll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
; RUN: opt %s -disable-output -debugify-each -debugify-quiet -debugify-export - -passes=globalopt | FileCheck %s
22
; RUN: opt %s -disable-output -debugify-each -debugify-quiet -debugify-export - -passes=globalopt | FileCheck %s
33

4-
; RUN: opt --experimental-debuginfo-iterators=false %s -disable-output -debugify-each -debugify-quiet -debugify-export - -passes=globalopt | FileCheck %s
5-
; RUN: opt --experimental-debuginfo-iterators=false %s -disable-output -debugify-each -debugify-quiet -debugify-export - -passes=globalopt | FileCheck %s
6-
74
; CHECK: Pass Name
85
; CHECK-SAME: # of missing debug values
96
; CHECK-SAME: # of missing locations

‎llvm/test/DebugInfo/debugify-ignore-phi.ll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
; RUN: opt -passes=check-debugify < %s -S 2>&1 | FileCheck %s
2-
; RUN: opt --experimental-debuginfo-iterators=false -passes=check-debugify < %s -S 2>&1 | FileCheck %s
32

43
define void @test_phi(i1 %cond) !dbg !6 {
54
br i1 %cond, label %1, label %2, !dbg !11

‎llvm/test/DebugInfo/debugify-original-no-dbg-info.ll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
; RUN: opt -verify-debuginfo-preserve -passes=instcombine -S -o - < %s 2>&1 | FileCheck %s
2-
; RUN: opt --experimental-debuginfo-iterators=false -verify-debuginfo-preserve -passes=instcombine -S -o - < %s 2>&1 | FileCheck %s
32

43
; CHECK: ModuleDebugify (original debuginfo): Skipping module without debug info
54
; CHECK-NEXT: CheckModuleDebugify (original debuginfo): Skipping module without debug info

‎llvm/test/DebugInfo/debugify-report-missing-locs-only.ll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
; RUN: opt -passes=check-debugify < %s -S -o - 2>&1 | FileCheck %s -implicit-check-not "WARNING: Instruction with empty DebugLoc in function bar"
2-
; RUN: opt --experimental-debuginfo-iterators=false -passes=check-debugify < %s -S -o - 2>&1 | FileCheck %s -implicit-check-not "WARNING: Instruction with empty DebugLoc in function bar"
32

43
; CHECK: WARNING: Instruction with empty DebugLoc in function foo -- ret void
54
define void @foo() !dbg !6 {

‎llvm/test/DebugInfo/debugify.ll

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,6 @@
2525
; RUN: opt -enable-debugify -O1 < %s | opt -O2 -o /dev/null
2626
; RUN: opt -passes=debugify,mem2reg,check-debugify < %s | opt -O2 -o /dev/null
2727

28-
;; Perform the same checks again for intrinsic debug info
29-
; RUN: opt --experimental-debuginfo-iterators=false -passes=debugify -S -o - < %s | FileCheck %s
30-
; RUN: opt --experimental-debuginfo-iterators=false -passes=debugify -S -o - < %s | FileCheck %s
31-
32-
; RUN: opt --experimental-debuginfo-iterators=false -passes=debugify,debugify -S -o - < %s 2>&1 | \
33-
; RUN: FileCheck %s -check-prefix=CHECK-REPEAT
34-
; RUN: opt --experimental-debuginfo-iterators=false -passes=debugify,debugify -S -o - < %s 2>&1 | \
35-
; RUN: FileCheck %s -check-prefix=CHECK-REPEAT
36-
37-
; RUN: opt --experimental-debuginfo-iterators=false -passes=debugify,check-debugify -S -o - < %s | \
38-
; RUN: FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
39-
; RUN: opt --experimental-debuginfo-iterators=false -passes=debugify,check-debugify -S -o - < %s | \
40-
; RUN: FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
41-
; RUN: opt --experimental-debuginfo-iterators=false -enable-debugify -passes=verify -S -o - < %s | \
42-
; RUN: FileCheck %s -implicit-check-not="CheckModuleDebugify: FAIL"
43-
44-
; RUN: opt --experimental-debuginfo-iterators=false -passes=debugify,strip,check-debugify -S -o - < %s 2>&1 | \
45-
; RUN: FileCheck %s -check-prefix=CHECK-WARN
46-
47-
; RUN: opt --experimental-debuginfo-iterators=false -enable-debugify -passes=strip -S -o - < %s 2>&1 | \
48-
; RUN: FileCheck %s -check-prefix=CHECK-WARN
49-
50-
; RUN: opt --experimental-debuginfo-iterators=false -enable-debugify -S -o - < %s 2>&1 | FileCheck %s -check-prefix=PASS
51-
52-
; RUN: opt --experimental-debuginfo-iterators=false -enable-debugify -O1 < %s | opt -O2 -o /dev/null
53-
; RUN: opt --experimental-debuginfo-iterators=false -passes=debugify,mem2reg,check-debugify < %s | opt -O2 -o /dev/null
54-
5528
; CHECK-LABEL: define void @foo
5629
define void @foo() {
5730
; CHECK: ret void, !dbg ![[RET1:.*]]

‎llvm/test/DebugInfo/pr37964.ll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
; RUN: opt -disable-output -debugify-each -passes=gvn < %s 2>&1 | FileCheck %s
2-
; RUN: opt --experimental-debuginfo-iterators=false -disable-output -debugify-each -passes=gvn < %s 2>&1 | FileCheck %s
32

43
; CHECK-NOT: ERROR: Instruction with empty DebugLoc in function _Z3bazv -- {{%.*}} = phi
54
; CHECK: CheckFunctionDebugify [GVNPass]: PASS

‎llvm/test/DebugInfo/verify-di-preserve.ll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
; RUN: opt %s -verify-debuginfo-preserve -passes=instcombine -disable-output 2>&1 | FileCheck --check-prefix=VERIFY %s
2-
; RUN: opt --experimental-debuginfo-iterators=false %s -verify-debuginfo-preserve -passes=instcombine -disable-output 2>&1 | FileCheck --check-prefix=VERIFY %s
32

43
; VERIFY: CheckModuleDebugify (original debuginfo):
54

65
; RUN: opt %s -verify-each-debuginfo-preserve -O2 -disable-output 2>&1 | FileCheck --check-prefix=VERIFY-EACH %s
7-
; RUN: opt %s --experimental-debuginfo-iterators=false -verify-each-debuginfo-preserve -O2 -disable-output 2>&1 | FileCheck --check-prefix=VERIFY-EACH %s
86

97
; VERIFY-EACH: DeadArgumentEliminationPass
108
; VERIFY-EACH: GlobalDCEPass

‎llvm/test/Transforms/MergeFunc/debuginfo-iterators.ll

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎llvm/test/tools/dxil-dis/debug-info.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: llc --filetype=obj %s -o - -experimental-debuginfo-iterators=false | dxil-dis -o - | FileCheck %s
1+
; RUN: llc --filetype=obj %s -o - | dxil-dis -o - | FileCheck %s
22
; Note: LLVM has soft disabled experimental-debuginfo-iterators in commit 6a45fce
33
; XFAIL: *
44

0 commit comments

Comments
 (0)