This is an archive of the discontinued LLVM Phabricator instance.

Differential D82166

[flang] Port test_any.sh tests to FileCheck: Hand port getsymbols tests
ClosedPublic

Authored by richard.barton.arm on Jun 19 2020, 2:36 AM.

Details

Reviewers
tskeith
DavidTruby
jdoerfert
schweitz
Commits
rGbf57fc1c8ea3: [flang] Port test_any.sh tests to FileCheck: Hand port getsymbols tests
Summary

test_any.sh's FileCheck accepts the CHECK line matches in any order while
FileCheck checks in strict order. Re-order the CHECK lines to source code
order - they come from an ordered datastructure.

Some CHECK lines are sensitive to line number which are fixed up manually.

getsymbols02 had multiple test inputs which had their own EXEC lines.
Consolidate these together in one file.

Diff Detail

Event Timeline

richard.barton.arm created this revision.Jun 19 2020, 2:36 AM
Herald added a reviewer: DavidTruby. · View Herald TranscriptJun 19 2020, 2:36 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster failed remote builds in B60973: Diff 271966!Jun 19 2020, 3:44 AM
richard.barton.arm updated this revision to Diff 272013.Jun 19 2020, 4:47 AM

getsymbols02 was broken because I forgot the file extension on the Input/... files.
I think it was passing for me because of a dirty working dir and because
'flang <file that does not exist>' returns a 0 exit code. We should definitely fix that.

Harbormaster completed remote builds in B60993: Diff 272013.Jun 19 2020, 5:21 AM
richard.barton.arm added a project: Restricted Project.Jun 22 2020, 8:51 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptJun 22 2020, 8:51 AM
richard.barton.arm mentioned this in D82164: [flang] Port test_any.sh tests to FileCheck: Hand port tests which use regexes.Jun 26 2020, 8:01 AM
schweitz accepted this revision.Jun 26 2020, 8:56 AM
This revision is now accepted and ready to land.Jun 26 2020, 8:56 AM
Closed by commit rGbf57fc1c8ea3: [flang] Port test_any.sh tests to FileCheck: Hand port getsymbols tests (authored by richard.barton.arm). · Explain WhyJun 26 2020, 10:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 273786

flang/test/Semantics/Inputs/getsymbols02-a.f90

! EXEC: ${F18} -fparse-only %s
module mm2a module mm2a
implicit none implicit none
private private
public :: get5 public :: get5
contains contains
function get5() result(ret) function get5() result(ret)
integer :: ret integer :: ret
ret = 5 ret = 5
end function get5 end function get5
end module mm2a end module mm2a

flang/test/Semantics/Inputs/getsymbols02-b.f90

! EXEC: ${F18} -fparse-only %s
module mm2b module mm2b
use mm2a use mm2a
implicit none implicit none
private private
public :: callget5 public :: callget5
contains contains
function callget5() result(ret) function callget5() result(ret)
implicit none implicit none
INTEGER :: ret INTEGER :: ret
ret = get5() ret = get5()
end function callget5 end function callget5
end module mm2b end module mm2b

flang/test/Semantics/Inputs/getsymbols02-c.f90

  • This file was deleted.
! Tests -fget-symbols-sources with modules.
PROGRAM helloworld
use mm2b
implicit none
integer::i
i = callget5()
ENDPROGRAM
! EXEC: ${F18} -fget-symbols-sources -fparse-only %s 2>&1 | ${FileCheck} %s
! CHECK:callget5: mm2b
! CHECK:get5: mm2a

flang/test/Semantics/getsymbols01.f90

!RUN: %S/test_any.sh %s %t %f18
! Tests -fget-symbols-sources finding all symbols in file. ! Tests -fget-symbols-sources finding all symbols in file.
module mm1 module mm1
private :: f private :: f
contains contains
pure subroutine s (x, y) bind(c) pure subroutine s (x, y) bind(c)
intent(in) :: x intent(in) :: x
intent(inout) :: y intent(inout) :: y
contains contains
pure subroutine ss pure subroutine ss
end subroutine end subroutine
end subroutine end subroutine
recursive pure function f() result(x) recursive pure function f() result(x)
real, allocatable :: x real, allocatable :: x
x = 1.0 x = 1.0
end function end function
end module end module
! EXEC: ${F18} -fget-symbols-sources -fparse-only %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -fget-symbols-sources -fparse-only %s 2>&1 | FileCheck %s
! CHECK-ONCE:mm1:.*getsymbols01.f90, 3, 8-11 ! CHECK-COUNT-1:mm1:{{.*}}getsymbols01.f90, 2, 8-11
! CHECK-ONCE:f:.*getsymbols01.f90, 13, 26-27 ! CHECK-COUNT-1:s:{{.*}}getsymbols01.f90, 5, 18-19
! CHECK-ONCE:s:.*getsymbols01.f90, 6, 18-19 ! CHECK-COUNT-1:x:{{.*}}getsymbols01.f90, 5, 21-22
! CHECK-ONCE:ss:.*getsymbols01.f90, 10, 19-21 ! CHECK-COUNT-1:y:{{.*}}getsymbols01.f90, 5, 24-25
! CHECK-ONCE:x:.*getsymbols01.f90, 6, 21-22 ! CHECK-COUNT-1:ss:{{.*}}getsymbols01.f90, 9, 19-21
! CHECK-ONCE:y:.*getsymbols01.f90, 6, 24-25 ! CHECK-COUNT-1:f:{{.*}}getsymbols01.f90, 12, 26-27
! CHECK-ONCE:x:.*getsymbols01.f90, 14, 24-25 ! CHECK-COUNT-1:x:{{.*}}getsymbols01.f90, 13, 24-25

flang/test/Semantics/getsymbols02.f90

!RUN: %S/test_any.sh '%S/Inputs/getsymbols02-*' %t %f18 ! Tests -fget-symbols-sources with modules.
PROGRAM helloworld
use mm2b
implicit none
integer::i
i = callget5()
ENDPROGRAM
! RUN: %f18 -fparse-only %S/Inputs/getsymbols02-a.f90
! RUN: %f18 -fparse-only %S/Inputs/getsymbols02-b.f90
! RUN: %f18 -fget-symbols-sources -fparse-only %s 2>&1 | FileCheck %s
! CHECK: get5: mm2a
! CHECK: callget5: mm2b

flang/test/Semantics/getsymbols03-a.f90

! Tests -fget-symbols with INCLUDE ! Tests -fget-symbols with INCLUDE
!RUN: %S/test_any.sh %s %t %f18
INCLUDE "Inputs/getsymbols03-b.f90" INCLUDE "Inputs/getsymbols03-b.f90"
program main program main
use mm3 use mm3
integer :: x integer :: x
x = f x = f
end program end program
! EXEC: ${F18} -fget-symbols-sources -fparse-only %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -fget-symbols-sources -fparse-only %s 2>&1 | FileCheck %s
! CHECK:mm3:.*getsymbols03-b.f90, 1, 8-11 ! CHECK:mm3:{{.*}}getsymbols03-b.f90, 1, 8-11
! CHECK:f:.*getsymbols03-b.f90, 2, 12-13 ! CHECK:f:{{.*}}getsymbols03-b.f90, 2, 12-13
! CHECK:main:.*getsymbols03-a.f90, 5, 9-13 ! CHECK:main:{{.*}}getsymbols03-a.f90, 4, 9-13
! CHECK:x:.*getsymbols03-a.f90, 7, 13-14 ! CHECK:x:{{.*}}getsymbols03-a.f90, 6, 13-14

flang/test/Semantics/getsymbols04.f90

!RUN: %S/test_any.sh %s %t %f18
! Tests -fget-symbols-sources with COMMON. ! Tests -fget-symbols-sources with COMMON.
program main program main
integer :: x integer :: x
integer :: y integer :: y
common /x/ y common /x/ y
x = y x = y
end program end program
! EXEC: ${F18} -fget-symbols-sources -fparse-only %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -fget-symbols-sources -fparse-only %s 2>&1 | FileCheck %s
! CHECK:x:.*getsymbols04.f90, 4, 14-15 ! CHECK:x:{{.*}}getsymbols04.f90, 3, 14-15
! CHECK:y:.*getsymbols04.f90, 5, 14-15 ! CHECK:y:{{.*}}getsymbols04.f90, 4, 14-15
! CHECK:x:.*getsymbols04.f90, 6, 11-12 ! CHECK:x:{{.*}}getsymbols04.f90, 5, 11-12

flang/test/Semantics/getsymbols05.f90

!RUN: %S/test_any.sh %s %t %f18
! Tests -fget-symbols-sources with COMMON. ! Tests -fget-symbols-sources with COMMON.
program main program main
integer :: x integer :: x
integer :: y integer :: y
block block
integer :: x integer :: x
x = y x = y
end block end block
x = y x = y
end program end program
! EXEC: ${F18} -fget-symbols-sources -fparse-only %s 2>&1 | ${FileCheck} %s ! RUN: %f18 -fget-symbols-sources -fparse-only %s 2>&1 | FileCheck %s
! CHECK:x:.*getsymbols05.f90, 4, 14-15 ! CHECK:x:{{.*}}getsymbols05.f90, 3, 14-15
! CHECK:y:.*getsymbols05.f90, 5, 14-15 ! CHECK:y:{{.*}}getsymbols05.f90, 4, 14-15
! CHECK:x:.*getsymbols05.f90, 7, 16-17 ! CHECK:x:{{.*}}getsymbols05.f90, 6, 16-17
flang/test/Semantics/Inputs/getsymbols02-a.f90