Skip to content

Commit c491cbf

Browse files
authored
[flang][test] Fix filecheck annotation typos (#92387)
1 parent 659d1fe commit c491cbf

36 files changed

+111
-138
lines changed

flang/test/Driver/dump-pft.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
! PFT: 1 Subroutine test_routine: subroutine test_routine(a, b, n)
66
! PFT-NEXT: 1 EndSubroutineStmt: end subroutine
7-
! PRF-NEXT: End Subroutine test_routine
8-
! PFT-NO: Program -> ProgramUnit -> SubroutineSubprogram
7+
! PFT-NEXT: End Subroutine test_routine
8+
! PFT-NOT: Program -> ProgramUnit -> SubroutineSubprogram
99

1010
! PARSE_TREE: Program -> ProgramUnit -> SubroutineSubprogram
1111
! PARSE_TREE-NEXT: | SubroutineStmt
@@ -17,7 +17,7 @@
1717
! PARSE_TREE-NEXT: | | ImplicitPart ->
1818
! PARSE_TREE-NEXT: | ExecutionPart -> Block
1919
! PARSE_TREE-NEXT: | EndSubroutineStmt ->
20-
! PARSE_TREE-NO: Subroutine test_routine: subroutine test_routine(a, b, n)
20+
! PARSE_TREE-NOT: Subroutine test_routine: subroutine test_routine(a, b, n)
2121

2222
subroutine test_routine(a, b, n)
2323
end subroutine

flang/test/Driver/func-attr-fast-math.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ end subroutine func
77

88
! CHECK-NOFASTMATH-LABEL: define void @func_() local_unnamed_addr
99
! CHECK-NOFASTMATH-SAME: #[[ATTRS:[0-9]+]]
10-
! CHECK-NOT fp-math"=
10+
! CHECK-NOT: fp-math"=
1111

1212
! CHECK-OFAST-LABEL: define void @func_() local_unnamed_addr
1313
! CHECK-OFAST-SAME: #[[ATTRS:[0-9]+]]

flang/test/Driver/omp-cse-region-boundary.f90

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

flang/test/Driver/omp-driver-offload.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@
130130
! RUN: %flang -### %s -o %t 2>&1 \
131131
! RUN: -fopenmp --offload-arch=gfx90a \
132132
! RUN: -fopenmp-targets=amdgcn-amd-amdhsa \
133-
! RUN: -fopenmp-target-debug -nogpulib\
134-
! RUN: | FileCheck %s --check-prefixes=CHECK-TARGET-DEBUG
133+
! RUN: -fopenmp-target-debug=111 -nogpulib\
134+
! RUN: | FileCheck %s --check-prefixes=CHECK-TARGET-DEBUG-EQ
135135
! RUN: %flang -### %s -o %t 2>&1 \
136136
! RUN: -fopenmp --offload-arch=sm_70 \
137137
! RUN: -fopenmp-targets=nvptx64-nvidia-cuda \
138-
! RUN: -fopenmp-target-debug \
139-
! RUN: | FileCheck %s --check-prefixes=CHECK-TARGET-DEBUG
138+
! RUN: -fopenmp-target-debug=111 \
139+
! RUN: | FileCheck %s --check-prefixes=CHECK-TARGET-DEBUG-EQ
140140
! CHECK-TARGET-DEBUG-EQ: "{{[^"]*}}flang" "-fc1" {{.*}} "-fopenmp" {{.*}} "-fopenmp-is-target-device" "-fopenmp-target-debug=111" {{.*}}.f90"
141141

142142
! RUN: %flang -S -### %s -o %t 2>&1 \

flang/test/Evaluate/errors01.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ subroutine s11
145145
subroutine s12(x,y)
146146
class(t), intent(in) :: x
147147
class(*), intent(in) :: y
148-
!CHERK: error: Must be a constant value
148+
!CHECK: error: Must be a constant value
149149
integer, parameter :: bad1 = storage_size(x)
150-
!CHERK: error: Must be a constant value
150+
!CHECK: error: Must be a constant value
151151
integer, parameter :: bad2 = storage_size(y)
152152
end subroutine
153153
subroutine s13

flang/test/Fir/arrexp.fir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: tco %s | FileCheck %s
22

3-
// CHECK-LINE: define void @f1
3+
// CHECK-LABEL: define void @f1
44
// CHECK: (ptr captures(none) %[[A:[^,]*]], {{.*}}, float %[[F:.*]])
55
func.func @f1(%a : !fir.ref<!fir.array<?x?xf32>>, %n : index, %m : index, %o : index, %p : index, %f : f32) {
66
%c1 = arith.constant 1 : index
@@ -22,7 +22,7 @@ func.func @f1(%a : !fir.ref<!fir.array<?x?xf32>>, %n : index, %m : index, %o : i
2222
return
2323
}
2424

25-
// CHECK-LINE: define void @f2
25+
// CHECK-LABEL: define void @f2
2626
// CHECK: (ptr captures(none) %[[A:[^,]*]], {{.*}}, float %[[F:.*]])
2727
func.func @f2(%a : !fir.ref<!fir.array<?x?xf32>>, %b : !fir.ref<!fir.array<?x?xf32>>, %n : index, %m : index, %o : index, %p : index, %f : f32) {
2828
%c1 = arith.constant 1 : index
@@ -46,7 +46,7 @@ func.func @f2(%a : !fir.ref<!fir.array<?x?xf32>>, %b : !fir.ref<!fir.array<?x?xf
4646
return
4747
}
4848

49-
// CHECK-LINE: define void @f3
49+
// CHECK-LABEL: define void @f3
5050
// CHECK: (ptr captures(none) %[[A:[^,]*]], {{.*}}, float %[[F:.*]])
5151
func.func @f3(%a : !fir.ref<!fir.array<?x?xf32>>, %b : !fir.ref<!fir.array<?x?xf32>>, %n : index, %m : index, %o : index, %p : index, %f : f32) {
5252
%c1 = arith.constant 1 : index
@@ -71,7 +71,7 @@ func.func @f3(%a : !fir.ref<!fir.array<?x?xf32>>, %b : !fir.ref<!fir.array<?x?xf
7171
return
7272
}
7373

74-
// CHECK-LINE: define void @f4
74+
// CHECK-LABEL: define void @f4
7575
// CHECK: (ptr captures(none) %[[A:[^,]*]], {{.*}}, float %[[F:.*]])
7676
func.func @f4(%a : !fir.ref<!fir.array<?x?xf32>>, %b : !fir.ref<!fir.array<?x?xf32>>, %n : index, %m : index, %o : index, %p : index, %f : f32) {
7777
%c1 = arith.constant 1 : index
@@ -101,7 +101,7 @@ func.func @f4(%a : !fir.ref<!fir.array<?x?xf32>>, %b : !fir.ref<!fir.array<?x?xf
101101
// Array expression assignment with potentially non contiguous arrays (e.g.
102102
// `a = b + f`, with and v assumed shapes.
103103
// Tests that the stride from the descriptor is used.
104-
// CHECK-LINE: define void @f5
104+
// CHECK-LABEL: define void @f5
105105
// CHECK: (ptr %[[A:.*]], ptr %[[B:.*]], float %[[F:.*]])
106106
func.func @f5(%arg0: !fir.box<!fir.array<?xf32>>, %arg1: !fir.box<!fir.array<?xf32>>, %arg2: f32) {
107107
%c0 = arith.constant 0 : index
@@ -134,7 +134,7 @@ func.func @f5(%arg0: !fir.box<!fir.array<?xf32>>, %arg1: !fir.box<!fir.array<?xf
134134
// Overlapping array expression assignment with a potentially non
135135
// contiguous array (e.g. `a(2:10:1) = a(1:9:1) + f`, with a assumed shape).
136136
// Test that a temp is created.
137-
// CHECK-LINE: define void @f6
137+
// CHECK-LABEL: define void @f6
138138
// CHECK: (ptr %[[A:[^,]*]], float %[[F:.*]])
139139
func.func @f6(%arg0: !fir.box<!fir.array<?xf32>>, %arg1: f32) {
140140
%c0 = arith.constant 0 : index

flang/test/Fir/pdt.fir

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
// RUN: tco %s | FileCheck %s
22

3-
// CHECK-LINE: define i64 @_QTtP.mem.size(i32 %0, i16 %1)
3+
// CHECK-LABEL: define i64 @_QTtP.mem.size(i32 %0, i16 %1)
44
func.func @_QTtP.mem.size(%0 : i32, %1 : i16) -> index {
55
%2 = call @_QTtP.f1.size(%0, %1) : (i32, i16) -> index
66
%3 = call @_QTtP.f2.size(%0, %1) : (i32, i16) -> index
77
%4 = arith.addi %2, %3 : index
88
// CHECK: ret i64 8
99
return %4 : index
1010
}
11-
// CHECK-LINE: define i64 @_QTtP.f1.size(i32 %0, i16 %1)
11+
// CHECK-LABEL: define i64 @_QTtP.f1.size(i32 %0, i16 %1)
1212
func.func @_QTtP.f1.size(%0 : i32, %1 : i16) -> index {
1313
%2 = arith.constant 4 : index
1414
// CHECK: ret i64 4
1515
return %2 : index
1616
}
17-
// CHECK-LINE: define i64 @_QTtP.f2.size(i32 %0, i16 %1)
17+
// CHECK-LABEL: define i64 @_QTtP.f2.size(i32 %0, i16 %1)
1818
func.func @_QTtP.f2.size(%0 : i32, %1 : i16) -> index {
1919
%2 = arith.constant 4 : index
2020
// CHECK: ret i64 4
2121
return %2 : index
2222
}
23-
// CHECK-LINE: define i32 @_QTtP.f1.offset(i32 %0, i16 %1)
23+
// CHECK-LABEL: define i32 @_QTtP.f1.offset(i32 %0, i16 %1)
2424
func.func @_QTtP.f1.offset(%0 : i32, %1 : i16) -> i32 {
2525
%2 = arith.constant 0 : i32
2626
// CHECK: ret i32 0
2727
return %2 : i32
2828
}
29-
// CHECK-LINE: define i32 @_QTtP.f2.offset(i32 %0, i16 %1)
29+
// CHECK-LABEL: define i32 @_QTtP.f2.offset(i32 %0, i16 %1)
3030
func.func @_QTtP.f2.offset(%0 : i32, %1 : i16) -> i32 {
3131
%2 = arith.constant 4 : i32
3232
// CHECK: ret i32 4
@@ -44,7 +44,7 @@ func.func @_QTtP.f2.offset(%0 : i32, %1 : i16) -> i32 {
4444
// var%f1 = 4
4545
// end program p
4646

47-
// CHECK-LINE: define void @_QQmain(i32 %0, i16 %1)
47+
// CHECK-LABEL: define void @_QQmain(i32 %0, i16 %1)
4848
func.func @_QQmain(%arg0 : i32, %arg1 : i16) {
4949
// CHECK: %[[size:.*]] = call i64 @_QTtP.mem.size(i32 %0, i16 %1)
5050
// CHECK: %[[alloc:.*]] = alloca i8, i64 %[[size]]
@@ -56,7 +56,7 @@ func.func @_QQmain(%arg0 : i32, %arg1 : i16) {
5656
return
5757
}
5858

59-
// CHECK-LINE: define i64 @_QTt1P.mem.size(i32 %0, i32 %1)
59+
// CHECK-LABEL: define i64 @_QTt1P.mem.size(i32 %0, i32 %1)
6060
func.func @_QTt1P.mem.size(%0 : i32, %1 : i32) -> index {
6161
// CHECK: call i64 @_QTt1P.f1.size
6262
%2 = call @_QTt1P.f1.size(%0, %1) : (i32, i32) -> index
@@ -65,22 +65,22 @@ func.func @_QTt1P.mem.size(%0 : i32, %1 : i32) -> index {
6565
%4 = arith.addi %2, %3 : index
6666
return %4 : index
6767
}
68-
// CHECK-LINE: define i64 @_QTt1P.f1.size(i32 %0, i32 %1)
68+
// CHECK-LABEL: define i64 @_QTt1P.f1.size(i32 %0, i32 %1)
6969
func.func @_QTt1P.f1.size(%0 : i32, %1 : i32) -> index {
7070
%2 = fir.convert %0 : (i32) -> index
7171
return %2 : index
7272
}
73-
// CHECK-LINE: define i64 @_QTt1P.f2.size(i32 %0, i32 %1)
73+
// CHECK-LABEL: define i64 @_QTt1P.f2.size(i32 %0, i32 %1)
7474
func.func @_QTt1P.f2.size(%0 : i32, %1 : i32) -> index {
7575
%2 = fir.convert %1 : (i32) -> index
7676
return %2 : index
7777
}
78-
// CHECK-LINE: define i32 @_QTt1P.f1.offset(i32 %0, i32 %1)
78+
// CHECK-LABEL: define i32 @_QTt1P.f1.offset(i32 %0, i32 %1)
7979
func.func @_QTt1P.f1.offset(%0 : i32, %1 : i32) -> i32 {
8080
%2 = arith.constant 0 : i32
8181
return %2 : i32
8282
}
83-
// CHECK-LINE: define i32 @_QTt1P.f2.offset(i32 %0, i32 %1)
83+
// CHECK-LABEL: define i32 @_QTt1P.f2.offset(i32 %0, i32 %1)
8484
func.func @_QTt1P.f2.offset(%0 : i32, %1 : i32) -> i32 {
8585
return %0 : i32
8686
}
@@ -97,7 +97,7 @@ func.func @_QTt1P.f2.offset(%0 : i32, %1 : i32) -> i32 {
9797

9898
func.func private @bar(!fir.ref<!fir.char<1,?>>)
9999

100-
// CHECK-LINE: define i8* @_QPfoo(i32 %0, i32 %1)
100+
// CHECK-LABEL: define void @_QPfoo(i32 %0, i32 %1)
101101
func.func @_QPfoo(%arg0 : i32, %arg1 : i32) {
102102
// CHECK: %[[size:.*]] = call i64 @_QTt1P.mem.size(i32 %0, i32 %1)
103103
// CHECK: %[[alloc:.*]] = alloca i8, i64 %[[size]]

flang/test/Fir/simplify-region-lite-after-inliner.fir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ func.func private @foo() -> none
3333

3434

3535
// CHECK: define void @repro(i8 %0, i8 %1)
36-
// CHECK-NEXT ret void
36+
// CHECK-NEXT: ret void

flang/test/Fir/target.fir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ func.func @gen8() -> complex<f64> {
3939
%c1 = arith.constant 1 : i32
4040
%5 = fir.insert_value %4, %2, [1 : index] : (complex<f64>, f64) -> complex<f64>
4141
// I32: store { double, double } { double -4.000000e+00, double 1.000000e+00 }
42-
// I64: store { double, double } { double -4.000000e+00, double 1.000000e+00 }
43-
// I64: %[[load:.*]] = load { double, double }
44-
// I64: ret { double, double } %[[load]]
42+
// X64: store { double, double } { double -4.000000e+00, double 1.000000e+00 }
43+
// X64: %[[load:.*]] = load { double, double }
44+
// X64: ret { double, double } %[[load]]
4545
// AARCH64: ret { double, double }
4646
// PPC: ret { double, double }
4747
return %5 : complex<f64>

flang/test/Lower/CUDA/cuda-allocatable.cuf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ end subroutine
8181
! CHECK: %[[BOX_DECL:.*]]:2 = hlfir.declare %[[BOX]] {data_attr = #cuf.cuda<pinned>, fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFsub3Ea"} : (!fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>>) -> (!fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>>, !fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>>)
8282
! CHECK: %[[PLOG:.*]] = fir.alloca !fir.logical<4> {bindc_name = "plog", uniq_name = "_QFsub3Eplog"}
8383
! CHECK: %[[PLOG_DECL:.*]]:2 = hlfir.declare %{{.*}} {uniq_name = "_QFsub3Eplog"} : (!fir.ref<!fir.logical<4>>) -> (!fir.ref<!fir.logical<4>>, !fir.ref<!fir.logical<4>>)
84-
! CHECK-2: fir.call @_FortranAAllocatableSetBounds
84+
! CHECK-COUNT-2: fir.call @_FortranAAllocatableSetBounds
8585
! CHECK: %{{.*}} = cuf.allocate %[[BOX_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>> pinned(%[[PLOG_DECL]]#1 : !fir.ref<!fir.logical<4>>) {data_attr = #cuf.cuda<pinned>} -> i32
8686
! CHECK: fir.if %{{.*}} {
8787
! CHECK: %{{.*}} = cuf.deallocate %[[BOX_DECL]]#1 : !fir.ref<!fir.box<!fir.heap<!fir.array<?x?xi32>>>> {data_attr = #cuf.cuda<pinned>} -> i32

0 commit comments

Comments
 (0)