Skip to content

Commit 9234046

Browse files
author
klensy
committed
add new chunk of fixes
1 parent 8712dd9 commit 9234046

7 files changed

+25
-25
lines changed

‎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/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/Lower/OpenMP/unstructured.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ subroutine ss8() ! EXIT inside OpenMP parallel do
344344
! CHECK: omp.terminator
345345
! CHECK-NEXT: }
346346
! CHECK: omp.terminator
347-
! CHECK-NEXT }
347+
! CHECK-NEXT: }
348348
! CHECK: }
349349
subroutine ss9() ! EXIT inside OpenMP parallel (inside parallel)
350350
integer :: x

‎flang/test/Lower/components.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ subroutine issue772(a, x)
115115
! CHECK: fir.call @_QPibar()
116116
! CHECK-NOT: fir.call @_QPibar()
117117
print *, a(20)%b(1:ibar():1)
118-
! CHECK return
118+
! CHECK: return
119119
end subroutine
120120

121121
! -----------------------------------------------------------------------------

‎flang/test/Lower/module_use.f90

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ real function m1use()
1818
end function
1919

2020
! TODO: test equivalences once front-end fix in module file is pushed.
21-
!! CHECK-LABEL func @_QPmodeq1use()
21+
! COM: CHECK-LABEL: func @_QPmodeq1use()
2222
!real function modEq1use()
2323
! use modEq1
24-
! ! CHECK-DAG fir.address_of(@_QMmodeq1Ex1) : !fir.ref<tuple<!fir.array<36xi8>, !fir.array<40xi8>>>
25-
! ! CHECK-DAG fir.address_of(@_QMmodeq1Ey1) : !fir.ref<tuple<!fir.array<16xi8>, !fir.array<24xi8>>>
24+
! COM: CHECK-DAG: fir.address_of(@_QMmodeq1Ex1) : !fir.ref<tuple<!fir.array<36xi8>, !fir.array<40xi8>>>
25+
! COM: CHECK-DAG: fir.address_of(@_QMmodeq1Ey1) : !fir.ref<tuple<!fir.array<16xi8>, !fir.array<24xi8>>>
2626
! modEq1use = x2(1) + y1
2727
!end function
28-
! CHECK-DAG fir.global @_QMmodeq1Ex1 : tuple<!fir.array<36xi8>, !fir.array<40xi8>>
29-
! CHECK-DAG fir.global @_QMmodeq1Ey1 : tuple<!fir.array<16xi8>, !fir.array<24xi8>>
28+
! COM: CHECK-DAG: fir.global @_QMmodeq1Ex1 : tuple<!fir.array<36xi8>, !fir.array<40xi8>>
29+
! COM: CHECK-DAG: fir.global @_QMmodeq1Ey1 : tuple<!fir.array<16xi8>, !fir.array<24xi8>>
3030

3131
! CHECK-LABEL: func @_QPmodcommon1use()
3232
real function modCommon1Use()

‎flang/test/Transforms/loop-versioning.fir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ module attributes {dlti.dl_spec = #dlti.dl_spec<#dlti.dl_entry<f80, dense<128> :
6363
// CHECK: %{{.*}} = fir.load %[[COORD]] : !fir.ref<f64>
6464
// CHECK: fir.result %{{.*}}, %{{.*}}
6565
// CHECK: }
66-
// CHECK fir.result %[[LOOP_RES]]#0, %[[LOOP_RES]]#1
66+
// CHECK: fir.result %[[LOOP_RES]]#0, %[[LOOP_RES]]#1
6767
// CHECK: } else {
6868
// CHECK: %[[LOOP_RES2:.*]]:2 = fir.do_loop {{.*}}
6969
// CHECK: %[[COORD2:.*]] = fir.coordinate_of %[[REBOX]], %{{.*}} : (!fir.box<!fir.array<?xf64>>, i64) -> !fir.ref<f64>
7070
// CHECK: %{{.*}}= fir.load %[[COORD2]] : !fir.ref<f64>
7171
// CHECK: fir.result %{{.*}}, %{{.*}}
7272
// CHECK: }
73-
// CHECK fir.result %[[LOOP_RES2]]#0, %[[LOOP_RES2]]#1
73+
// CHECK: fir.result %[[LOOP_RES2]]#0, %[[LOOP_RES2]]#1
7474
// CHECK: }
7575
// CHECK: fir.store %[[IF_RES]]#1 to %{{.*}}
7676
// CHECK: return
@@ -376,14 +376,14 @@ func.func @sum1dfixed(%arg0: !fir.ref<!fir.array<?xf64>> {fir.bindc_name = "a"},
376376
// CHECK: %{{.*}} = fir.load %[[COORD]] : !fir.ref<f64>
377377
// CHECK: fir.result %{{.*}}, %{{.*}}
378378
// CHECK: }
379-
// CHECK fir.result %[[LOOP_RES]]#0, %[[LOOP_RES]]#1
379+
// CHECK: fir.result %[[LOOP_RES]]#0, %[[LOOP_RES]]#1
380380
// CHECK: } else {
381381
// CHECK: %[[LOOP_RES2:.*]]:2 = fir.do_loop {{.*}}
382382
// CHECK: %[[COORD2:.*]] = fir.coordinate_of %[[ARG0]], %{{.*}} : (!fir.box<!fir.array<?x?xf64>>, i64, i64) -> !fir.ref<f64>
383383
// CHECK: %{{.*}}= fir.load %[[COORD2]] : !fir.ref<f64>
384384
// CHECK: fir.result %{{.*}}, %{{.*}}
385385
// CHECK: }
386-
// CHECK fir.result %[[LOOP_RES2]]#0, %[[LOOP_RES2]]#1
386+
// CHECK: fir.result %[[LOOP_RES2]]#0, %[[LOOP_RES2]]#1
387387
// CHECK: }
388388
// CHECK: fir.store %[[IF_RES]]#1 to %{{.*}}
389389
// CHECK: return
@@ -508,14 +508,14 @@ func.func @sum1dfixed(%arg0: !fir.ref<!fir.array<?xf64>> {fir.bindc_name = "a"},
508508
// CHECK: %{{.*}} = fir.load %[[COORD]] : !fir.ref<f64>
509509
// CHECK: fir.result %{{.*}}, %{{.*}}
510510
// CHECK: }
511-
// CHECK fir.result %[[LOOP_RES]]#0, %[[LOOP_RES]]#1
511+
// CHECK: fir.result %[[LOOP_RES]]#0, %[[LOOP_RES]]#1
512512
// CHECK: } else {
513513
// CHECK: %[[LOOP_RES2:.*]]:2 = fir.do_loop {{.*}}
514514
// CHECK: %[[COORD2:.*]] = fir.coordinate_of %[[ARG0]], %{{.*}} : (!fir.box<!fir.array<?x?x?xf64>>, i64, i64, i64) -> !fir.ref<f64>
515515
// CHECK: %{{.*}}= fir.load %[[COORD2]] : !fir.ref<f64>
516516
// CHECK: fir.result %{{.*}}, %{{.*}}
517517
// CHECK: }
518-
// CHECK fir.result %[[LOOP_RES2]]#0, %[[LOOP_RES2]]#1
518+
// CHECK: fir.result %[[LOOP_RES2]]#0, %[[LOOP_RES2]]#1
519519
// CHECK: }
520520
// CHECK: fir.store %[[IF_RES]]#1 to %{{.*}}
521521
// CHECK: return

‎flang/test/Transforms/simplifyintrinsics.fir

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,9 +1260,9 @@ func.func private @_FortranACountDim(!fir.ref<!fir.box<none>>, !fir.box<none>, i
12601260

12611261
// CHECK-LABEL: func.func @_QMtestPcount_generate_mask(
12621262
// CHECK-SAME: %[[A:.*]]: !fir.ref<!fir.array<10x10x!fir.logical<4>>> {fir.bindc_name = "mask"}) -> !fir.array<10xi32> {
1263-
// CHECK-NOT fir.call @_FortranACountDimLogical4_simplified({{.*}})
1263+
// CHECK-NOT: fir.call @_FortranACountDimLogical4_simplified({{.*}})
12641264
// CHECK: %[[RES:.*]] = fir.call @_FortranACountDim({{.*}}) fastmath<contract> : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, i32, !fir.ref<i8>, i32) -> none
1265-
// CHECK-NOT fir.call @_FortranACountDimLogical4_simplified({{.*}})
1265+
// CHECK-NOT: fir.call @_FortranACountDimLogical4_simplified({{.*}})
12661266

12671267
// -----
12681268
// Ensure count isn't simplified for unknown dimension arrays
@@ -1285,9 +1285,9 @@ func.func private @_FortranACount(!fir.box<none>, !fir.ref<i8>, i32, i32) -> i64
12851285

12861286
// CHECK-LABEL: func.func @_QPmc(
12871287
// CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?x?x?x!fir.logical<4>>> {fir.bindc_name = "m"}) -> i32 {
1288-
// CHECK-NOT fir.call @_FortranACountLogical4_simplified({{.*}})
1288+
// CHECK-NOT: fir.call @_FortranACountLogical4_simplified({{.*}})
12891289
// CHECK: %[[RES:.*]] = fir.call @_FortranACount({{.*}}) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32) -> i64
1290-
// CHECK-NOT fir.call @_FortranACountLogical4_simplified({{.*}})
1290+
// CHECK-NOT: fir.call @_FortranACountLogical4_simplified({{.*}})
12911291

12921292
// -----
12931293
// Ensure Any is simplified in correct usage
@@ -1443,9 +1443,9 @@ func.func private @_FortranAAnyDim(!fir.ref<!fir.box<none>>, !fir.box<none>, i32
14431443

14441444
// CHECK-LABEL: func.func @_QPtestAny_DimArg(
14451445
// CHECK-SAME: %[[ARR:.*]]: !fir.ref<!fir.array<10x10x!fir.logical<4>>> {fir.bindc_name = "a"}) -> !fir.array<10x!fir.logical<4>> {
1446-
// CHECK-NOT fir.call @_FortranAAnyDimLogical4x1_simplified({{.*}})
1446+
// CHECK-NOT: fir.call @_FortranAAnyDimLogical4x1_simplified({{.*}})
14471447
// CHECK: fir.call @_FortranAAnyDim({{.*}}) fastmath<contract> : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, !fir.ref<i8>, i32) -> none
1448-
// CHECK-NOT fir.call @_FortranAAnyDimLogical4x1_simplified({{.*}})
1448+
// CHECK-NOT: fir.call @_FortranAAnyDimLogical4x1_simplified({{.*}})
14491449

14501450
// -----
14511451
// Ensure Any is not simplified for unknown dimension arrays
@@ -1468,9 +1468,9 @@ func.func private @_FortranAAny(!fir.box<none>, !fir.ref<i8>, i32, i32) -> i1 at
14681468

14691469
// CHECK-LABEL: func.func @_QPtestAny_UnknownDim(
14701470
// CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>> {fir.bindc_name = "a"}) -> !fir.logical<4> {
1471-
// CHECK-NOT fir.call @_FortranAAnyLogical4x1_simplified({{.*}})
1471+
// CHECK-NOT: fir.call @_FortranAAnyLogical4x1_simplified({{.*}})
14721472
// CHECK: fir.call @_FortranAAny({{.*}}) fastmath<contract> : (!fir.box<none>, !fir.ref<i8>, i32, i32) -> i1
1473-
// CHECK-NOT fir.call @_FortranAAnyLogical4x1_simplified({{.*}})
1473+
// CHECK-NOT: fir.call @_FortranAAnyLogical4x1_simplified({{.*}})
14741474

14751475
// -----
14761476
// Check that multi-rank Any cases are properly simplified
@@ -1682,9 +1682,9 @@ func.func private @_FortranAAllDim(!fir.ref<!fir.box<none>>, !fir.box<none>, i32
16821682

16831683
// CHECK-LABEL: func.func @_QPtestAll_DimArg(
16841684
// CHECK-SAME: %[[ARR:.*]]: !fir.ref<!fir.array<10x10x!fir.logical<4>>> {fir.bindc_name = "a"}) -> !fir.array<10x!fir.logical<4>> {
1685-
// CHECK-NOT fir.call @_FortranAAllDimLogical4x1_simplified({{.*}})
1685+
// CHECK-NOT: fir.call @_FortranAAllDimLogical4x1_simplified({{.*}})
16861686
// CHECK: fir.call @_FortranAAllDim({{.*}}) fastmath<contract> : (!fir.ref<!fir.box<none>>, !fir.box<none>, i32, !fir.ref<i8>, i32) -> none
1687-
// CHECK-NOT fir.call @_FortranAAllDimLogical4x1_simplified({{.*}})
1687+
// CHECK-NOT: fir.call @_FortranAAllDimLogical4x1_simplified({{.*}})
16881688

16891689
// -----
16901690
// Check Minloc simplifies correctly for 1D case with 1D mask, I32 input

0 commit comments

Comments
 (0)