Skip to content

Commit 0c22cb0

Browse files
fhahnfhahn
committed
Temporarily revert "[Attributor] Unify testing (=updates,...)"
This patch reverts the 2 patches below, as on most systems the disabled tests actually pass and that causes most bots to be red, including http://green.lab.llvm.org/green/job/clang-stage1-RA/8541/ http://green.lab.llvm.org/green/job/clang-stage1-cmake-RA-expensive/15646/ http://lab.llvm.org:8011/builders/clang-ppc64le-linux-lnt/builds/23690 http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/16751 * [Attributor] Disable three tests until the SCC update bug was fixed commit 2ae1a76. * [Attributor] Unify testing (=updates,prefixes,run configurations,...) 2bcf579.
1 parent ebb0713 commit 0c22cb0

File tree

87 files changed

+5509
-9517
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+5509
-9517
lines changed

‎llvm/test/Transforms/Attributor/ArgumentPromotion/2008-02-01-ReturnAttrs.ll

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,29 @@
11
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
2-
; RUN: opt -attributor -attributor-manifest-internal -attributor-disable=false -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=6 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_NPM,NOT_CGSCC_OPM,NOT_TUNIT_NPM,IS__TUNIT____,IS________OPM,IS__TUNIT_OPM
3-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-disable=false -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=6 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_OPM,NOT_CGSCC_NPM,NOT_TUNIT_OPM,IS__TUNIT____,IS________NPM,IS__TUNIT_NPM
4-
; RUN: opt -attributor-cgscc -attributor-manifest-internal -attributor-disable=false -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_NPM,IS__CGSCC____,IS________OPM,IS__CGSCC_OPM
5-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor-cgscc -attributor-manifest-internal -attributor-disable=false -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_OPM,IS__CGSCC____,IS________NPM,IS__CGSCC_NPM
2+
; RUN: opt -passes=attributor -aa-pipeline='basic-aa' -attributor-disable=false -attributor-max-iterations-verify -attributor-max-iterations=6 -S < %s | FileCheck %s
63

74
define internal i32 @deref(i32* %x) nounwind {
8-
; IS__TUNIT_OPM-LABEL: define {{[^@]+}}@deref
9-
; IS__TUNIT_OPM-SAME: (i32* noalias nocapture nofree nonnull readonly align 4 dereferenceable(4) [[X:%.*]])
10-
; IS__TUNIT_OPM-NEXT: entry:
11-
; IS__TUNIT_OPM-NEXT: [[TMP2:%.*]] = load i32, i32* [[X]], align 4
12-
; IS__TUNIT_OPM-NEXT: ret i32 [[TMP2]]
13-
;
14-
; IS__TUNIT_NPM-LABEL: define {{[^@]+}}@deref
15-
; IS__TUNIT_NPM-SAME: (i32 [[TMP0:%.*]])
16-
; IS__TUNIT_NPM-NEXT: entry:
17-
; IS__TUNIT_NPM-NEXT: [[X_PRIV:%.*]] = alloca i32
18-
; IS__TUNIT_NPM-NEXT: store i32 [[TMP0]], i32* [[X_PRIV]]
19-
; IS__TUNIT_NPM-NEXT: [[TMP2:%.*]] = load i32, i32* [[X_PRIV]], align 4
20-
; IS__TUNIT_NPM-NEXT: ret i32 [[TMP2]]
21-
;
22-
; IS__CGSCC____-LABEL: define {{[^@]+}}@deref
23-
; IS__CGSCC____-SAME: (i32* nocapture nofree nonnull readonly align 4 dereferenceable(4) [[X:%.*]])
24-
; IS__CGSCC____-NEXT: entry:
25-
; IS__CGSCC____-NEXT: [[TMP2:%.*]] = load i32, i32* [[X]], align 4
26-
; IS__CGSCC____-NEXT: ret i32 [[TMP2]]
5+
; CHECK-LABEL: define {{[^@]+}}@deref
6+
; CHECK-SAME: (i32 [[TMP0:%.*]])
7+
; CHECK-NEXT: entry:
8+
; CHECK-NEXT: [[X_PRIV:%.*]] = alloca i32
9+
; CHECK-NEXT: store i32 [[TMP0]], i32* [[X_PRIV]]
10+
; CHECK-NEXT: [[TMP2:%.*]] = load i32, i32* [[X_PRIV]], align 4
11+
; CHECK-NEXT: ret i32 [[TMP2]]
2712
;
2813
entry:
2914
%tmp2 = load i32, i32* %x, align 4
3015
ret i32 %tmp2
3116
}
3217

3318
define i32 @f(i32 %x) {
34-
; IS__TUNIT_OPM-LABEL: define {{[^@]+}}@f
35-
; IS__TUNIT_OPM-SAME: (i32 [[X:%.*]])
36-
; IS__TUNIT_OPM-NEXT: entry:
37-
; IS__TUNIT_OPM-NEXT: [[X_ADDR:%.*]] = alloca i32
38-
; IS__TUNIT_OPM-NEXT: store i32 [[X]], i32* [[X_ADDR]], align 4
39-
; IS__TUNIT_OPM-NEXT: [[TMP1:%.*]] = call i32 @deref(i32* noalias nocapture nofree nonnull readonly align 4 dereferenceable(4) [[X_ADDR]])
40-
; IS__TUNIT_OPM-NEXT: ret i32 [[TMP1]]
41-
;
42-
; IS__TUNIT_NPM-LABEL: define {{[^@]+}}@f
43-
; IS__TUNIT_NPM-SAME: (i32 [[X:%.*]])
44-
; IS__TUNIT_NPM-NEXT: entry:
45-
; IS__TUNIT_NPM-NEXT: [[X_ADDR:%.*]] = alloca i32
46-
; IS__TUNIT_NPM-NEXT: store i32 [[X]], i32* [[X_ADDR]], align 4
47-
; IS__TUNIT_NPM-NEXT: [[TMP0:%.*]] = load i32, i32* [[X_ADDR]], align 1
48-
; IS__TUNIT_NPM-NEXT: [[TMP1:%.*]] = call i32 @deref(i32 [[TMP0]])
49-
; IS__TUNIT_NPM-NEXT: ret i32 [[TMP1]]
50-
;
51-
; IS__CGSCC____-LABEL: define {{[^@]+}}@f
52-
; IS__CGSCC____-SAME: (i32 [[X:%.*]])
53-
; IS__CGSCC____-NEXT: entry:
54-
; IS__CGSCC____-NEXT: [[X_ADDR:%.*]] = alloca i32
55-
; IS__CGSCC____-NEXT: store i32 [[X]], i32* [[X_ADDR]], align 4
56-
; IS__CGSCC____-NEXT: [[TMP1:%.*]] = call i32 @deref(i32* noalias nofree nonnull readonly align 4 dereferenceable(4) [[X_ADDR]])
57-
; IS__CGSCC____-NEXT: ret i32 [[TMP1]]
19+
; CHECK-LABEL: define {{[^@]+}}@f
20+
; CHECK-SAME: (i32 [[X:%.*]])
21+
; CHECK-NEXT: entry:
22+
; CHECK-NEXT: [[X_ADDR:%.*]] = alloca i32
23+
; CHECK-NEXT: store i32 [[X]], i32* [[X_ADDR]], align 4
24+
; CHECK-NEXT: [[TMP0:%.*]] = load i32, i32* [[X_ADDR]], align 1
25+
; CHECK-NEXT: [[TMP1:%.*]] = call i32 @deref(i32 [[TMP0]])
26+
; CHECK-NEXT: ret i32 [[TMP1]]
5827
;
5928
entry:
6029
%x_addr = alloca i32

‎llvm/test/Transforms/Attributor/ArgumentPromotion/2008-07-02-array-indexing.ll

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
2-
; RUN: opt -attributor -attributor-manifest-internal -attributor-disable=false -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=3 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_NPM,NOT_CGSCC_OPM,NOT_TUNIT_NPM,IS__TUNIT____,IS________OPM,IS__TUNIT_OPM
3-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-disable=false -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=3 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_OPM,NOT_CGSCC_NPM,NOT_TUNIT_OPM,IS__TUNIT____,IS________NPM,IS__TUNIT_NPM
4-
; RUN: opt -attributor-cgscc -attributor-manifest-internal -attributor-disable=false -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_NPM,IS__CGSCC____,IS________OPM,IS__CGSCC_OPM
5-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor-cgscc -attributor-manifest-internal -attributor-disable=false -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_OPM,IS__CGSCC____,IS________NPM,IS__CGSCC_NPM
2+
; RUN: opt -passes=attributor -aa-pipeline='basic-aa' -attributor-disable=false -attributor-max-iterations-verify -attributor-max-iterations=3 -S < %s | FileCheck %s
63
; PR2498
74

85
; This test tries to convince CHECK about promoting the load from %A + 2,
96
; because there is a load of %A in the entry block
107
define internal i32 @callee(i1 %C, i32* %A) {
11-
;
128
; CHECK-LABEL: define {{[^@]+}}@callee
139
; CHECK-SAME: (i32* nocapture nofree nonnull readonly align 4 dereferenceable(4) [[A:%.*]])
1410
; CHECK-NEXT: entry:
15-
; CHECK-NEXT: [[A_0:%.*]] = load i32, i32* [[A]], align 4
11+
; CHECK-NEXT: [[A_0:%.*]] = load i32, i32* %A
1612
; CHECK-NEXT: br label [[F:%.*]]
1713
; CHECK: T:
1814
; CHECK-NEXT: unreachable
1915
; CHECK: F:
20-
; CHECK-NEXT: [[A_2:%.*]] = getelementptr i32, i32* [[A]], i32 2
21-
; CHECK-NEXT: [[R:%.*]] = load i32, i32* [[A_2]], align 4
16+
; CHECK-NEXT: [[A_2:%.*]] = getelementptr i32, i32* %A, i32 2
17+
; CHECK-NEXT: [[R:%.*]] = load i32, i32* [[A_2]]
2218
; CHECK-NEXT: ret i32 [[R]]
2319
;
2420
entry:
@@ -37,15 +33,9 @@ F:
3733
}
3834

3935
define i32 @foo(i32* %A) {
40-
; IS__TUNIT____-LABEL: define {{[^@]+}}@foo
41-
; IS__TUNIT____-SAME: (i32* nocapture nofree readonly [[A:%.*]])
42-
; IS__TUNIT____-NEXT: [[X:%.*]] = call i32 @callee(i32* nocapture nofree readonly align 4 [[A]])
43-
; IS__TUNIT____-NEXT: ret i32 [[X]]
44-
;
45-
; IS__CGSCC____-LABEL: define {{[^@]+}}@foo
46-
; IS__CGSCC____-SAME: (i32* nocapture nofree nonnull readonly align 4 dereferenceable(4) [[A:%.*]])
47-
; IS__CGSCC____-NEXT: [[X:%.*]] = call i32 @callee(i32* nocapture nofree nonnull readonly align 4 dereferenceable(4) [[A]])
48-
; IS__CGSCC____-NEXT: ret i32 [[X]]
36+
; CHECK-LABEL: define {{[^@]+}}@foo(
37+
; CHECK-NEXT: [[X:%.*]] = call i32 @callee(i32* nocapture nofree readonly align 4 %A)
38+
; CHECK-NEXT: ret i32 [[X]]
4939
;
5040
%X = call i32 @callee(i1 false, i32* %A) ; <i32> [#uses=1]
5141
ret i32 %X

‎llvm/test/Transforms/Attributor/ArgumentPromotion/2008-09-07-CGUpdate.ll

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,12 @@
11
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
2-
; RUN: opt -attributor -attributor-manifest-internal -attributor-disable=false -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=1 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_NPM,NOT_CGSCC_OPM,NOT_TUNIT_NPM,IS__TUNIT____,IS________OPM,IS__TUNIT_OPM
3-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-disable=false -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=1 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_OPM,NOT_CGSCC_NPM,NOT_TUNIT_OPM,IS__TUNIT____,IS________NPM,IS__TUNIT_NPM
4-
; RUN: opt -attributor-cgscc -attributor-manifest-internal -attributor-disable=false -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_NPM,IS__CGSCC____,IS________OPM,IS__CGSCC_OPM
5-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor-cgscc -attributor-manifest-internal -attributor-disable=false -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_OPM,IS__CGSCC____,IS________NPM,IS__CGSCC_NPM
2+
; RUN: opt -disable-output -passes=attributor -aa-pipeline='basic-aa' -attributor-disable=false -attributor-max-iterations-verify -attributor-max-iterations=1 < %s
63

74
define internal fastcc i32 @hash(i32* %ts, i32 %mod) nounwind {
8-
; IS__CGSCC____-LABEL: define {{[^@]+}}@hash()
9-
; IS__CGSCC____-NEXT: entry:
10-
; IS__CGSCC____-NEXT: unreachable
11-
;
125
entry:
136
unreachable
147
}
158

169
define void @encode(i32* %m, i32* %ts, i32* %new) nounwind {
17-
; CHECK-LABEL: define {{[^@]+}}@encode
18-
; CHECK-SAME: (i32* nocapture nofree readnone [[M:%.*]], i32* nocapture nofree readnone [[TS:%.*]], i32* nocapture nofree readnone [[NEW:%.*]])
19-
; CHECK-NEXT: entry:
20-
; CHECK-NEXT: unreachable
21-
;
2210
entry:
2311
%0 = call fastcc i32 @hash( i32* %ts, i32 0 ) nounwind ; <i32> [#uses=0]
2412
unreachable

‎llvm/test/Transforms/Attributor/ArgumentPromotion/2008-09-08-CGUpdateSelfEdge.ll

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --function-signature --scrub-attributes
2-
; RUN: opt -attributor -attributor-manifest-internal -attributor-disable=false -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=1 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_NPM,NOT_CGSCC_OPM,NOT_TUNIT_NPM,IS__TUNIT____,IS________OPM,IS__TUNIT_OPM
3-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-disable=false -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=1 -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_OPM,NOT_CGSCC_NPM,NOT_TUNIT_OPM,IS__TUNIT____,IS________NPM,IS__TUNIT_NPM
4-
; RUN: opt -attributor-cgscc -attributor-manifest-internal -attributor-disable=false -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_NPM,IS__CGSCC____,IS________OPM,IS__CGSCC_OPM
5-
; RUN: opt -aa-pipeline=basic-aa -passes=attributor-cgscc -attributor-manifest-internal -attributor-disable=false -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_TUNIT_NPM,NOT_TUNIT_OPM,NOT_CGSCC_OPM,IS__CGSCC____,IS________NPM,IS__CGSCC_NPM
2+
; RUN: opt -disable-output -passes=attributor -aa-pipeline='basic-aa' -attributor-disable=false -attributor-max-iterations-verify -attributor-max-iterations=1 < %s
63

74
define internal fastcc i32 @term_SharingList(i32* %Term, i32* %List) nounwind {
8-
; IS__CGSCC____-LABEL: define {{[^@]+}}@term_SharingList()
9-
; IS__CGSCC____-NEXT: entry:
10-
; IS__CGSCC____-NEXT: br i1 false, label [[BB:%.*]], label [[BB5:%.*]]
11-
; IS__CGSCC____: bb:
12-
; IS__CGSCC____-NEXT: unreachable
13-
; IS__CGSCC____: bb5:
14-
; IS__CGSCC____-NEXT: ret i32 undef
15-
;
165
entry:
176
br i1 false, label %bb, label %bb5
187

@@ -25,15 +14,6 @@ bb5: ; preds = %entry
2514
}
2615

2716
define i32 @term_Sharing(i32* %Term) nounwind {
28-
; CHECK-LABEL: define {{[^@]+}}@term_Sharing
29-
; CHECK-SAME: (i32* nocapture nofree readnone [[TERM:%.*]])
30-
; CHECK-NEXT: entry:
31-
; CHECK-NEXT: br i1 false, label [[BB_I:%.*]], label [[BB14:%.*]]
32-
; CHECK: bb.i:
33-
; CHECK-NEXT: unreachable
34-
; CHECK: bb14:
35-
; CHECK-NEXT: ret i32 0
36-
;
3717
entry:
3818
br i1 false, label %bb.i, label %bb14
3919

0 commit comments

Comments
 (0)