This is an archive of the discontinued LLVM Phabricator instance.

Differential D107953

[Flang] test_symbols.py module file fix
ClosedPublic

Authored by ijan1 on Aug 12 2021, 1:51 AM.

Details

Reviewers
Meinersbur
awarzynski
Leporacanthicus
kiranchandramohan
jdoerfert
sscalpone
tskeith
clementval
Commits
rG5a3a12661829: [Flang] test_symbols.py module file fix
Summary

Due to how the LIT deals with module files,
this change stores and runs the scripts in
their own temporary directory to prevent
interference in-between different tests.
It also makes `test_symbols.py` be more
consistent with the other scripts.

Diff Detail

Event Timeline

ijan1 requested review of this revision.Aug 12 2021, 1:51 AM
ijan1 created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptAug 12 2021, 1:51 AM
Harbormaster completed remote builds in B119212: Diff 365936.Aug 12 2021, 2:56 AM
awarzynski added a comment.Aug 12 2021, 5:22 AM

Males sense, thank you for working on this! I've made a couple of small suggestions.

flang/test/Semantics/test_symbols.py
6–8

I'm suggesting a small edit to make it clearer what the input arguments to this script are.

20

I'm suggesting a bit more descriptive variable here. tmp could mean a temporary file, directory, socket etc.

Meinersbur added a comment.Aug 12 2021, 6:30 AM

Is there a reason to use lit's suggestion for a temporary directory instead using tempfile.TemporaryDirectory or tempfile.mkdtemp?

flang/test/Semantics/test_symbols.py
44–45
Meinersbur mentioned this in D107956: [Flang] Port test_modfile.sh to Python.Aug 12 2021, 6:40 AM
ijan1 added a comment.Aug 12 2021, 7:50 AM
In D107953#2941417, @Meinersbur wrote:

Is there a reason to use lit's suggestion for a temporary directory instead using tempfile.TemporaryDirectory or tempfile.mkdtemp?

I decided to use what's already in the LIT and it also more accurately reflects the behaviour of the bash script. Besides that, I don't see a reason why I couldn't use the tempfile library.

awarzynski added a comment.Aug 12 2021, 12:34 PM
In D107953#2941417, @Meinersbur wrote:

Is there a reason to use lit's suggestion for a temporary directory instead using tempfile.TemporaryDirectory or tempfile.mkdtemp?

I like this suggestion - with tempfile.TemporaryDirectory the tests wouldn't require the extra argument (%t). Is the temporary directory name guaranteed to be unique to every test? That wasn't 100% obvious to me from the docs.

Meinersbur added a comment.Aug 13 2021, 11:21 AM
In D107953#2942187, @awarzynski wrote:

Is the temporary directory name guaranteed to be unique to every test? That wasn't 100% obvious to me from the docs.

%t expands to <builddir>/tools/flang/test/<filename>.tmp. That is, it is unique for every test file, but that same for multiple RUN lines in the file and between make check invocations. However, I think it is better to always have a fresh temporary directory, flang-new does not need to see the leftover files from the previous make check run, those should be independent.

awarzynski added a comment.Aug 16 2021, 2:31 AM
In D107953#2944145, @Meinersbur wrote:

%t expands to <builddir>/tools/flang/test/<filename>.tmp. That is, it is unique for every test file, but that same for multiple RUN lines in the file and between make check invocations. However, I think it is better to always have a fresh temporary directory, flang-new does not need to see the leftover files from the previous make check run, those should be independent.

+1 for this approach, thank you for the suggestion!

ijan1 updated this revision to Diff 366903.Aug 17 2021, 8:00 AM
ijan1 marked 2 inline comments as done.

Updated to use tempfile.TemporaryDirectory. Addressed comments by Andrzej.

Harbormaster completed remote builds in B119907: Diff 366903.Aug 17 2021, 8:36 AM
Meinersbur accepted this revision.Aug 17 2021, 8:46 AM

LGTM

This revision is now accepted and ready to land.Aug 17 2021, 8:46 AM
awarzynski accepted this revision.Aug 17 2021, 11:47 AM
Closed by commit rG5a3a12661829: [Flang] test_symbols.py module file fix (authored by ijan1). · Explain WhySep 1 2021, 7:03 AM
This revision was automatically updated to reflect the committed changes.
ijan1 added a commit: rG5a3a12661829: [Flang] test_symbols.py module file fix.

Revision Contents

Diff 365936

flang/test/Semantics/OpenACC/acc-symbols01.f90

! RUN: %python %S/../test_symbols.py %s %flang_fc1 -fopenacc ! RUN: %python %S/../test_symbols.py %s %t %flang_fc1 -fopenacc
!DEF: /mm MainProgram !DEF: /mm MainProgram
program mm program mm
!DEF: /mm/x ObjectEntity REAL(4) !DEF: /mm/x ObjectEntity REAL(4)
!DEF: /mm/y ObjectEntity REAL(4) !DEF: /mm/y ObjectEntity REAL(4)
real x, y real x, y
!DEF: /mm/a ObjectEntity INTEGER(4) !DEF: /mm/a ObjectEntity INTEGER(4)
!DEF: /mm/b ObjectEntity INTEGER(4) !DEF: /mm/b ObjectEntity INTEGER(4)
Show All 17 Lines

flang/test/Semantics/kinds01.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
!DEF: /MainProgram1/jk1 ObjectEntity INTEGER(1) !DEF: /MainProgram1/jk1 ObjectEntity INTEGER(1)
integer(kind=1) jk1 integer(kind=1) jk1
!DEF: /MainProgram1/js1 ObjectEntity INTEGER(1) !DEF: /MainProgram1/js1 ObjectEntity INTEGER(1)
integer*1 js1 integer*1 js1
!DEF: /MainProgram1/jk2 ObjectEntity INTEGER(2) !DEF: /MainProgram1/jk2 ObjectEntity INTEGER(2)
integer(kind=2) jk2 integer(kind=2) jk2
!DEF: /MainProgram1/js2 ObjectEntity INTEGER(2) !DEF: /MainProgram1/js2 ObjectEntity INTEGER(2)
integer*2 js2 integer*2 js2
▲ Show 20 Lines • Show All 73 Lines • Show Last 20 Lines

flang/test/Semantics/kinds03.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
!DEF: /MainProgram1/ipdt DerivedType !DEF: /MainProgram1/ipdt DerivedType
!DEF: /MainProgram1/ipdt/k TypeParam INTEGER(4) !DEF: /MainProgram1/ipdt/k TypeParam INTEGER(4)
type :: ipdt(k) type :: ipdt(k)
!REF: /MainProgram1/ipdt/k !REF: /MainProgram1/ipdt/k
integer, kind :: k integer, kind :: k
!REF: /MainProgram1/ipdt/k !REF: /MainProgram1/ipdt/k
!DEF: /MainProgram1/ipdt/x ObjectEntity INTEGER(int(int(k,kind=4),kind=8)) !DEF: /MainProgram1/ipdt/x ObjectEntity INTEGER(int(int(k,kind=4),kind=8))
integer(kind=k) :: x integer(kind=k) :: x
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines

flang/test/Semantics/omp-do-schedule03.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Schedule Clause ! 2.7.1 Schedule Clause
! Test that does not catch non constant integer expressions like xx - xx. ! Test that does not catch non constant integer expressions like xx - xx.
!DEF: /ompdoschedule MainProgram !DEF: /ompdoschedule MainProgram
program ompdoschedule program ompdoschedule
!DEF: /ompdoschedule/a ObjectEntity REAL(4) !DEF: /ompdoschedule/a ObjectEntity REAL(4)
!DEF: /ompdoschedule/y ObjectEntity REAL(4) !DEF: /ompdoschedule/y ObjectEntity REAL(4)
!DEF: /ompdoschedule/z ObjectEntity REAL(4) !DEF: /ompdoschedule/z ObjectEntity REAL(4)
Show All 19 Lines

flang/test/Semantics/omp-do-schedule04.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Schedule Clause ! 2.7.1 Schedule Clause
! Test that does not catch non constant integer expressions like xx - yy. ! Test that does not catch non constant integer expressions like xx - yy.
!DEF: /tds (Subroutine) Subprogram !DEF: /tds (Subroutine) Subprogram
subroutine tds subroutine tds
implicit none implicit none
!DEF: /tds/a ObjectEntity REAL(4) !DEF: /tds/a ObjectEntity REAL(4)
Show All 23 Lines

flang/test/Semantics/omp-do01-positivecase.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Loop Construct ! 2.7.1 Loop Construct
! The loop iteration variable may not appear in a firstprivate directive. ! The loop iteration variable may not appear in a firstprivate directive.
! A positive case ! A positive case
!DEF: /omp_do MainProgram !DEF: /omp_do MainProgram
program omp_do program omp_do
!DEF: /omp_do/i ObjectEntity INTEGER(4) !DEF: /omp_do/i ObjectEntity INTEGER(4)
Show All 10 Lines

flang/test/Semantics/omp-do04-positivecase.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Do Loop Constructs ! 2.7.1 Do Loop Constructs
!DEF: /omp_do1 MainProgram !DEF: /omp_do1 MainProgram
program omp_do1 program omp_do1
!DEF: /omp_do1/i ObjectEntity INTEGER(4) !DEF: /omp_do1/i ObjectEntity INTEGER(4)
!DEF: /omp_do1/j ObjectEntity INTEGER(4) !DEF: /omp_do1/j ObjectEntity INTEGER(4)
!DEF: /omp_do1/k (OmpThreadprivate) ObjectEntity INTEGER(4) !DEF: /omp_do1/k (OmpThreadprivate) ObjectEntity INTEGER(4)
Show All 13 Lines

flang/test/Semantics/omp-do05-positivecase.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Loop Construct restrictions on single directive. ! 2.7.1 Loop Construct restrictions on single directive.
! A positive case ! A positive case
!DEF: /omp_do MainProgram !DEF: /omp_do MainProgram
program omp_do program omp_do
!DEF: /omp_do/i ObjectEntity INTEGER(4) !DEF: /omp_do/i ObjectEntity INTEGER(4)
!DEF: /omp_do/n ObjectEntity INTEGER(4) !DEF: /omp_do/n ObjectEntity INTEGER(4)
Show All 27 Lines

flang/test/Semantics/omp-do06-positivecases.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Loop Construct ! 2.7.1 Loop Construct
! The ordered clause must be present on the loop construct if any ordered ! The ordered clause must be present on the loop construct if any ordered
! region ever binds to a loop region arising from the loop construct. ! region ever binds to a loop region arising from the loop construct.
! A positive case ! A positive case
!DEF: /omp_do MainProgram !DEF: /omp_do MainProgram
program omp_do program omp_do
Show All 14 Lines

flang/test/Semantics/omp-do11.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Do Loop Constructs ! 2.7.1 Do Loop Constructs
!DEF: /omp_do MainProgram !DEF: /omp_do MainProgram
program omp_do program omp_do
!DEF: /omp_do/i ObjectEntity INTEGER(4) !DEF: /omp_do/i ObjectEntity INTEGER(4)
!DEF: /omp_do/j ObjectEntity INTEGER(4) !DEF: /omp_do/j ObjectEntity INTEGER(4)
!DEF: /omp_do/k ObjectEntity INTEGER(4) !DEF: /omp_do/k ObjectEntity INTEGER(4)
Show All 27 Lines

flang/test/Semantics/omp-do12.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Do Loop constructs. ! 2.7.1 Do Loop constructs.
!DEF: /omp_cycle MainProgram !DEF: /omp_cycle MainProgram
program omp_cycle program omp_cycle
!$omp do collapse(1) !$omp do collapse(1)
!DEF: /omp_cycle/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4) !DEF: /omp_cycle/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
do i=0,10 do i=0,10
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines

flang/test/Semantics/omp-do14.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Do Loop constructs. ! 2.7.1 Do Loop constructs.
!DEF: /omp_cycle MainProgram !DEF: /omp_cycle MainProgram
program omp_cycle program omp_cycle
!$omp do collapse(1) !$omp do collapse(1)
!DEF: /omp_cycle/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4) !DEF: /omp_cycle/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
do i=0,10 do i=0,10
▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines

flang/test/Semantics/omp-do17.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.7.1 Do Loop constructs. ! 2.7.1 Do Loop constructs.
!DEF: /test MainProgram !DEF: /test MainProgram
program test program test
!DEF: /test/i ObjectEntity INTEGER(4) !DEF: /test/i ObjectEntity INTEGER(4)
!DEF: /test/j ObjectEntity INTEGER(4) !DEF: /test/j ObjectEntity INTEGER(4)
!DEF: /test/k ObjectEntity INTEGER(4) !DEF: /test/k ObjectEntity INTEGER(4)
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines

flang/test/Semantics/omp-reduction08.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause Positive cases ! 2.15.3.6 Reduction Clause Positive cases
!DEF: /omp_reduction MainProgram !DEF: /omp_reduction MainProgram
program omp_reduction program omp_reduction
!DEF: /omp_reduction/i ObjectEntity INTEGER(4) !DEF: /omp_reduction/i ObjectEntity INTEGER(4)
integer i integer i
!DEF: /omp_reduction/k ObjectEntity INTEGER(4) !DEF: /omp_reduction/k ObjectEntity INTEGER(4)
▲ Show 20 Lines • Show All 54 Lines • Show Last 20 Lines

flang/test/Semantics/omp-reduction09.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! OpenMP Version 4.5 ! OpenMP Version 4.5
! 2.15.3.6 Reduction Clause Positive cases. ! 2.15.3.6 Reduction Clause Positive cases.
!DEF: /omp_reduction MainProgram !DEF: /omp_reduction MainProgram
program omp_reduction program omp_reduction
!DEF: /omp_reduction/i ObjectEntity INTEGER(4) !DEF: /omp_reduction/i ObjectEntity INTEGER(4)
integer i integer i
!DEF: /omp_reduction/k ObjectEntity INTEGER(4) !DEF: /omp_reduction/k ObjectEntity INTEGER(4)
integer :: k = 10 integer :: k = 10
▲ Show 20 Lines • Show All 77 Lines • Show Last 20 Lines

flang/test/Semantics/omp-symbol01.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! Test clauses that accept list. ! Test clauses that accept list.
! 2.1 Directive Format ! 2.1 Directive Format
! A list consists of a comma-separated collection of one or more list items. ! A list consists of a comma-separated collection of one or more list items.
! A list item is a variable, array section or common block name (enclosed in ! A list item is a variable, array section or common block name (enclosed in
! slashes). ! slashes).
!DEF: /md Module !DEF: /md Module
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines

flang/test/Semantics/omp-symbol02.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! 1.4.1 Structure of the OpenMP Memory Model ! 1.4.1 Structure of the OpenMP Memory Model
! Test implicit declaration in the OpenMP directive enclosing scope ! Test implicit declaration in the OpenMP directive enclosing scope
! through clause; also test to avoid creating multiple symbols for ! through clause; also test to avoid creating multiple symbols for
! the same variable ! the same variable
!DEF: /MainProgram1/b (Implicit) ObjectEntity REAL(4) !DEF: /MainProgram1/b (Implicit) ObjectEntity REAL(4)
Show All 16 Lines

flang/test/Semantics/omp-symbol03.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! 1.4.1 Structure of the OpenMP Memory Model ! 1.4.1 Structure of the OpenMP Memory Model
! In the inner OpenMP region, SHARED `a` refers to the `a` in the outer OpenMP ! In the inner OpenMP region, SHARED `a` refers to the `a` in the outer OpenMP
! region; PRIVATE `b` refers to the new `b` in the same OpenMP region ! region; PRIVATE `b` refers to the new `b` in the same OpenMP region
!DEF: /MainProgram1/b (Implicit) ObjectEntity REAL(4) !DEF: /MainProgram1/b (Implicit) ObjectEntity REAL(4)
b = 2 b = 2
!$omp parallel private(a) shared(b) !$omp parallel private(a) shared(b)
Show All 15 Lines

flang/test/Semantics/omp-symbol04.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! 2.15.3 Data-Sharing Attribute Clauses ! 2.15.3 Data-Sharing Attribute Clauses
! Both PARALLEL and DO (worksharing) directives need to create new scope, ! Both PARALLEL and DO (worksharing) directives need to create new scope,
! so PRIVATE `a` will have new symbol in each region ! so PRIVATE `a` will have new symbol in each region
!DEF: /MainProgram1/a ObjectEntity REAL(8) !DEF: /MainProgram1/a ObjectEntity REAL(8)
real*8 a real*8 a
!REF: /MainProgram1/a !REF: /MainProgram1/a
Show All 14 Lines

flang/test/Semantics/omp-symbol05.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! 2.15.2 threadprivate Directive ! 2.15.2 threadprivate Directive
! The threadprivate directive specifies that variables are replicated, ! The threadprivate directive specifies that variables are replicated,
! with each thread having its own copy. When threadprivate variables are ! with each thread having its own copy. When threadprivate variables are
! referenced in the OpenMP region, we know they are already private to ! referenced in the OpenMP region, we know they are already private to
! their threads, so no new symbol needs to be created. ! their threads, so no new symbol needs to be created.
!DEF: /mm Module !DEF: /mm Module
Show All 31 Lines

flang/test/Semantics/omp-symbol06.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! 2.15.3 Data-Sharing Attribute Clauses ! 2.15.3 Data-Sharing Attribute Clauses
! A list item that specifies a given variable may not appear in more than ! A list item that specifies a given variable may not appear in more than
! one clause on the same directive, except that a variable may be specified ! one clause on the same directive, except that a variable may be specified
! in both firstprivate and lastprivate clauses. ! in both firstprivate and lastprivate clauses.
!DEF: /MainProgram1/a (Implicit) ObjectEntity REAL(4) !DEF: /MainProgram1/a (Implicit) ObjectEntity REAL(4)
a = 1. a = 1.
!$omp parallel do firstprivate(a) lastprivate(a) !$omp parallel do firstprivate(a) lastprivate(a)
!DEF: /MainProgram1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4) !DEF: /MainProgram1/Block1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
do i=1,10 do i=1,10
!DEF: /MainProgram1/Block1/a (OmpFirstPrivate, OmpLastPrivate) HostAssoc REAL(4) !DEF: /MainProgram1/Block1/a (OmpFirstPrivate, OmpLastPrivate) HostAssoc REAL(4)
a = 2. a = 2.
end do end do
end program end program

flang/test/Semantics/omp-symbol07.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! Generic tests ! Generic tests
! 1. subroutine or function calls should not be fixed for DSA or DMA ! 1. subroutine or function calls should not be fixed for DSA or DMA
!DEF: /foo (Function) Subprogram REAL(4) !DEF: /foo (Function) Subprogram REAL(4)
!DEF: /foo/rnum ObjectEntity REAL(4) !DEF: /foo/rnum ObjectEntity REAL(4)
function foo(rnum) function foo(rnum)
!REF: /foo/rnum !REF: /foo/rnum
Show All 28 Lines

flang/test/Semantics/omp-symbol08.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 -fopenmp ! RUN: %python %S/test_symbols.py %s %t %flang_fc1 -fopenmp
! 2.15.1.1 Predetermined rules for associated do-loops index variable ! 2.15.1.1 Predetermined rules for associated do-loops index variable
! a) The loop iteration variable(s) in the associated do-loop(s) of a do, ! a) The loop iteration variable(s) in the associated do-loop(s) of a do,
! parallel do, taskloop, or distribute construct is (are) private. ! parallel do, taskloop, or distribute construct is (are) private.
! b) The loop iteration variable in the associated do-loop of a simd construct ! b) The loop iteration variable in the associated do-loop of a simd construct
! with just one associated do-loop is linear with a linear-step that is the ! with just one associated do-loop is linear with a linear-step that is the
! increment of the associated do-loop. ! increment of the associated do-loop.
! c) The loop iteration variables in the associated do-loops of a simd ! c) The loop iteration variables in the associated do-loops of a simd
▲ Show 20 Lines • Show All 242 Lines • Show Last 20 Lines

flang/test/Semantics/procinterface01.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Tests for "proc-interface" semantics. ! Tests for "proc-interface" semantics.
! These cases are all valid. ! These cases are all valid.
!DEF: /module1 Module !DEF: /module1 Module
module module1 module module1
abstract interface abstract interface
!DEF: /module1/abstract1 ABSTRACT, PUBLIC (Function) Subprogram REAL(4) !DEF: /module1/abstract1 ABSTRACT, PUBLIC (Function) Subprogram REAL(4)
!DEF: /module1/abstract1/x INTENT(IN) ObjectEntity REAL(4) !DEF: /module1/abstract1/x INTENT(IN) ObjectEntity REAL(4)
▲ Show 20 Lines • Show All 175 Lines • Show Last 20 Lines

flang/test/Semantics/symbol01.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Test that intent-stmt and subprogram prefix and suffix are resolved. ! Test that intent-stmt and subprogram prefix and suffix are resolved.
!DEF: /m Module !DEF: /m Module
module m module m
!DEF: /m/f PRIVATE, PURE, RECURSIVE (Function) Subprogram REAL(4) !DEF: /m/f PRIVATE, PURE, RECURSIVE (Function) Subprogram REAL(4)
private :: f private :: f
contains contains
!DEF: /m/s BIND(C), PUBLIC, PURE (Subroutine) Subprogram !DEF: /m/s BIND(C), PUBLIC, PURE (Subroutine) Subprogram
Show All 21 Lines

flang/test/Semantics/symbol02.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Test host association in module subroutine and internal subroutine. ! Test host association in module subroutine and internal subroutine.
!DEF: /m Module !DEF: /m Module
module m module m
!DEF: /m/t PUBLIC DerivedType !DEF: /m/t PUBLIC DerivedType
type :: t type :: t
end type end type
!REF: /m/t !REF: /m/t
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines

flang/test/Semantics/symbol03.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Test host association in internal subroutine of main program. ! Test host association in internal subroutine of main program.
!DEF: /main MainProgram !DEF: /main MainProgram
program main program main
!DEF: /main/x ObjectEntity INTEGER(4) !DEF: /main/x ObjectEntity INTEGER(4)
integer x integer x
!DEF: /main/s (Subroutine) Subprogram !DEF: /main/s (Subroutine) Subprogram
call s call s
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

flang/test/Semantics/symbol05.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Explicit and implicit entities in blocks ! Explicit and implicit entities in blocks
!DEF: /s1 (Subroutine) Subprogram !DEF: /s1 (Subroutine) Subprogram
subroutine s1 subroutine s1
!DEF: /s1/x ObjectEntity INTEGER(4) !DEF: /s1/x ObjectEntity INTEGER(4)
integer x integer x
block block
!DEF: /s1/Block1/y ObjectEntity INTEGER(4) !DEF: /s1/Block1/y ObjectEntity INTEGER(4)
▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines

flang/test/Semantics/symbol06.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
!DEF: /main MainProgram !DEF: /main MainProgram
program main program main
!DEF: /main/t1 DerivedType !DEF: /main/t1 DerivedType
type :: t1 type :: t1
!DEF: /main/t1/a1 ObjectEntity INTEGER(4) !DEF: /main/t1/a1 ObjectEntity INTEGER(4)
integer :: a1 integer :: a1
end type end type
!REF: /main/t1 !REF: /main/t1
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines

flang/test/Semantics/symbol07.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
!DEF: /main MainProgram !DEF: /main MainProgram
program main program main
implicit complex(z) implicit complex(z)
!DEF: /main/t DerivedType !DEF: /main/t DerivedType
type :: t type :: t
!DEF: /main/t/re ObjectEntity REAL(4) !DEF: /main/t/re ObjectEntity REAL(4)
real :: re real :: re
!DEF: /main/t/im ObjectEntity REAL(4) !DEF: /main/t/im ObjectEntity REAL(4)
Show All 31 Lines

flang/test/Semantics/symbol08.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
!DEF: /main MainProgram !DEF: /main MainProgram
program main program main
!DEF: /main/x POINTER ObjectEntity REAL(4) !DEF: /main/x POINTER ObjectEntity REAL(4)
pointer :: x pointer :: x
!REF: /main/x !REF: /main/x
real x real x
!DEF: /main/y EXTERNAL, POINTER (Function) ProcEntity REAL(4) !DEF: /main/y EXTERNAL, POINTER (Function) ProcEntity REAL(4)
pointer :: y pointer :: y
!REF: /main/y !REF: /main/y
procedure (real) :: y procedure (real) :: y
!DEF: /main/z (Implicit) ObjectEntity REAL(4) !DEF: /main/z (Implicit) ObjectEntity REAL(4)
!REF: /main/y !REF: /main/y
z = y() z = y()
end program end program

flang/test/Semantics/symbol09.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
!DEF: /s1 (Subroutine) Subprogram !DEF: /s1 (Subroutine) Subprogram
subroutine s1 subroutine s1
!DEF: /s1/a ObjectEntity REAL(4) !DEF: /s1/a ObjectEntity REAL(4)
!DEF: /s1/b ObjectEntity REAL(4) !DEF: /s1/b ObjectEntity REAL(4)
real a(10), b(10) real a(10), b(10)
!DEF: /s1/i ObjectEntity INTEGER(8) !DEF: /s1/i ObjectEntity INTEGER(8)
integer(kind=8) i integer(kind=8) i
!DEF: /s1/Forall1/i ObjectEntity INTEGER(8) !DEF: /s1/Forall1/i ObjectEntity INTEGER(8)
▲ Show 20 Lines • Show All 133 Lines • Show Last 20 Lines

flang/test/Semantics/symbol10.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
!DEF: /m1 Module !DEF: /m1 Module
module m1 module m1
contains contains
!DEF: /m1/foo_complex PUBLIC (Subroutine) Subprogram !DEF: /m1/foo_complex PUBLIC (Subroutine) Subprogram
!DEF: /m1/foo_complex/z ObjectEntity COMPLEX(4) !DEF: /m1/foo_complex/z ObjectEntity COMPLEX(4)
subroutine foo_complex (z) subroutine foo_complex (z)
!REF: /m1/foo_complex/z !REF: /m1/foo_complex/z
complex z complex z
Show All 31 Lines

flang/test/Semantics/symbol11.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
!DEF: /s1 (Subroutine) Subprogram !DEF: /s1 (Subroutine) Subprogram
subroutine s1 subroutine s1
implicit none implicit none
!DEF: /s1/x ObjectEntity REAL(8) !DEF: /s1/x ObjectEntity REAL(8)
real(kind=8) :: x = 2.0 real(kind=8) :: x = 2.0
!DEF: /s1/a ObjectEntity INTEGER(4) !DEF: /s1/a ObjectEntity INTEGER(4)
integer a integer a
!DEF: /s1/t DerivedType !DEF: /s1/t DerivedType
▲ Show 20 Lines • Show All 127 Lines • Show Last 20 Lines

flang/test/Semantics/symbol12.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Verify that SAVE attribute is propagated by EQUIVALENCE ! Verify that SAVE attribute is propagated by EQUIVALENCE
!DEF: /s1 (Subroutine) Subprogram !DEF: /s1 (Subroutine) Subprogram
subroutine s1 subroutine s1
!DEF: /s1/a SAVE ObjectEntity REAL(4) !DEF: /s1/a SAVE ObjectEntity REAL(4)
!DEF: /s1/b SAVE ObjectEntity REAL(4) !DEF: /s1/b SAVE ObjectEntity REAL(4)
!DEF: /s1/c SAVE ObjectEntity REAL(4) !DEF: /s1/c SAVE ObjectEntity REAL(4)
!DEF: /s1/d SAVE ObjectEntity REAL(4) !DEF: /s1/d SAVE ObjectEntity REAL(4)
Show All 19 Lines

flang/test/Semantics/symbol13.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Old-style "*length" specifiers (R723) ! Old-style "*length" specifiers (R723)
!DEF: /f1 (Function) Subprogram CHARACTER(1_8,1) !DEF: /f1 (Function) Subprogram CHARACTER(1_8,1)
!DEF: /f1/x1 INTENT(IN) ObjectEntity CHARACTER(2_4,1) !DEF: /f1/x1 INTENT(IN) ObjectEntity CHARACTER(2_4,1)
!DEF: /f1/x2 INTENT(IN) ObjectEntity CHARACTER(3_4,1) !DEF: /f1/x2 INTENT(IN) ObjectEntity CHARACTER(3_4,1)
character*1 function f1(x1, x2) character*1 function f1(x1, x2)
!DEF: /f1/n PARAMETER ObjectEntity INTEGER(4) !DEF: /f1/n PARAMETER ObjectEntity INTEGER(4)
integer, parameter :: n = 2 integer, parameter :: n = 2
Show All 14 Lines

flang/test/Semantics/symbol14.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! "Bare" uses of type parameters and components ! "Bare" uses of type parameters and components
!DEF: /MainProgram1/t1 DerivedType !DEF: /MainProgram1/t1 DerivedType
!DEF: /MainProgram1/t1/k TypeParam INTEGER(4) !DEF: /MainProgram1/t1/k TypeParam INTEGER(4)
type :: t1(k) type :: t1(k)
!REF: /MainProgram1/t1/k !REF: /MainProgram1/t1/k
integer, kind :: k=666 integer, kind :: k=666
!DEF: /MainProgram1/t1/a ObjectEntity REAL(4) !DEF: /MainProgram1/t1/a ObjectEntity REAL(4)
Show All 18 Lines

flang/test/Semantics/symbol15.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Forward references in pointer initializers and TBP bindings. ! Forward references in pointer initializers and TBP bindings.
!DEF: /m Module !DEF: /m Module
module m module m
implicit none implicit none
abstract interface abstract interface
!DEF: /m/iface ABSTRACT, PUBLIC (Subroutine) Subprogram !DEF: /m/iface ABSTRACT, PUBLIC (Subroutine) Subprogram
subroutine iface subroutine iface
▲ Show 20 Lines • Show All 251 Lines • Show Last 20 Lines

flang/test/Semantics/symbol16.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Statement functions ! Statement functions
!DEF: /p1 MainProgram !DEF: /p1 MainProgram
program p1 program p1
!DEF: /p1/f (Function, StmtFunction) Subprogram INTEGER(4) !DEF: /p1/f (Function, StmtFunction) Subprogram INTEGER(4)
!DEF: /p1/i ObjectEntity INTEGER(4) !DEF: /p1/i ObjectEntity INTEGER(4)
!DEF: /p1/j ObjectEntity INTEGER(4) !DEF: /p1/j ObjectEntity INTEGER(4)
integer f, i, j integer f, i, j
Show All 18 Lines

flang/test/Semantics/symbol17.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Forward references to derived types (non-error cases) ! Forward references to derived types (non-error cases)
!DEF: /main MainProgram !DEF: /main MainProgram
program main program main
!DEF: /main/t1 DerivedType !DEF: /main/t1 DerivedType
type :: t1 type :: t1
!DEF: /main/t2 DerivedType !DEF: /main/t2 DerivedType
!DEF: /main/t1/t1a ALLOCATABLE ObjectEntity TYPE(t2) !DEF: /main/t1/t1a ALLOCATABLE ObjectEntity TYPE(t2)
▲ Show 20 Lines • Show All 131 Lines • Show Last 20 Lines

flang/test/Semantics/symbol18.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Intrinsic function in type declaration statement: type is ignored ! Intrinsic function in type declaration statement: type is ignored
!DEF: /p1 MainProgram !DEF: /p1 MainProgram
program p1 program p1
!DEF: /p1/cos ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity INTEGER(4) !DEF: /p1/cos ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity INTEGER(4)
integer cos integer cos
!DEF: /p1/y (Implicit) ObjectEntity REAL(4) !DEF: /p1/y (Implicit) ObjectEntity REAL(4)
Show All 22 Lines

flang/test/Semantics/symbol19.f90

! RUN: %python %S/test_symbols.py %s %flang_fc1 ! RUN: %python %S/test_symbols.py %s %t %flang_fc1
! Test that a procedure is only implicitly resolved as an intrinsic function ! Test that a procedure is only implicitly resolved as an intrinsic function
! (resp. subroutine) if this is a function (resp. subroutine) ! (resp. subroutine) if this is a function (resp. subroutine)
!DEF: /expect_external (Subroutine) Subprogram !DEF: /expect_external (Subroutine) Subprogram
subroutine expect_external subroutine expect_external
!DEF: /acos EXTERNAL (Subroutine) ProcEntity !DEF: /acos EXTERNAL (Subroutine) ProcEntity
!DEF: /expect_external/x (Implicit) ObjectEntity REAL(4) !DEF: /expect_external/x (Implicit) ObjectEntity REAL(4)
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines

flang/test/Semantics/test_symbols.py

#!/usr/bin/env python3 #!/usr/bin/env python3
"""Compiles a source file with "-fdebug-unparse-with-symbols' and verifies """Compiles a source file with "-fdebug-unparse-with-symbols' and verifies
we get the right symbols in the output, i.e. the output should be we get the right symbols in the output, i.e. the output should be
the same as the input, except for the copyright comment. the same as the input, except for the copyright comment.
Expects a source file passed as the first argument; Expects a source file passed as the first argument;
Expects the Flang frontdriver with options as second argument.""" Expects a temporary directory as the second argument;
Expects the Flang frontend driver with options as third argument."""
awarzynskiUnsubmitted
Done
ReplyInline Actions
the same as the input, except for the copyright comment.
- Expects a source file passed as the first argument;
- Expects a temporary directory as the second argument;
- Expects the Flang frontend driver with options as third argument."""
-
+ INPUTS:
+ * argv[1] - a source file that contains the input and the expected output
+ * argv[2] - a temporary directory in which to run the test
+ * argv[3] - Flang frontend driver with options
import sys

I'm suggesting a small edit to make it clearer what the input arguments to this script are.

awarzynski: I'm suggesting a small edit to make it clearer what the input arguments to this script are.
import sys import sys
import os
import re import re
import subprocess import subprocess
import common as cm import common as cm
from difflib import unified_diff from difflib import unified_diff
cm.check_args(sys.argv) cm.check_args_long(sys.argv)
src = cm.set_source(sys.argv[1]) src = cm.set_source(sys.argv[1])
tmp = cm.set_temp(sys.argv[2])
awarzynskiUnsubmitted
Not Done
ReplyInline Actions
src = cm.set_source(sys.argv[1])
tmp = cm.set_temp(sys.argv[2])
- cwd = os.getcwd()
+ temp_test_dir = cm.set_temp(sys.argv[2])cwd = os.getcwd()

I'm suggesting a bit more descriptive variable here. tmp could mean a temporary file, directory, socket etc.

awarzynski: I'm suggesting a bit more descriptive variable here. `tmp` could mean a temporary file…
cwd = os.getcwd()
diff1 = "" diff1 = ""
diff2 = "" diff2 = ""
flang_fc1 = cm.set_executable(sys.argv[2]) flang_fc1 = cm.set_executable(sys.argv[3])
flang_fc1_args = sys.argv[3:] flang_fc1_args = sys.argv[4:]
flang_fc1_options = "-fdebug-unparse-with-symbols" flang_fc1_options = "-fdebug-unparse-with-symbols"
# Strips out blank lines and all comments except for "!DEF:", "!REF:", "!$acc" and "!$omp" # Strips out blank lines and all comments except for "!DEF:", "!REF:", "!$acc" and "!$omp"
with open(src, 'r') as text_in: with open(src, 'r') as text_in:
for line in text_in: for line in text_in:
text = re.sub(r"!(?![DR]EF:|\$omp|\$acc).*", "", line) text = re.sub(r"!(?![DR]EF:|\$omp|\$acc).*", "", line)
text = re.sub(r"^\s*$", "", text) text = re.sub(r"^\s*$", "", text)
diff1 += text diff1 += text
# Strips out "!DEF:" and "!REF:" comments # Strips out "!DEF:" and "!REF:" comments
for line in diff1: for line in diff1:
text = re.sub(r"![DR]EF:.*", "", line) text = re.sub(r"![DR]EF:.*", "", line)
diff2 += text diff2 += text
# Compiles, inserting comments for symbols: # Compiles, inserting comments for symbols:
cmd = [flang_fc1, *flang_fc1_args, flang_fc1_options] cmd = [flang_fc1, *flang_fc1_args, flang_fc1_options]
try:
os.chdir(tmp)
diff3 = subprocess.check_output(cmd, input=diff2, universal_newlines=True) diff3 = subprocess.check_output(cmd, input=diff2, universal_newlines=True)
MeinersburUnsubmitted
Done
ReplyInline Actions
try:
- os.chdir(tmp)
- diff3 = subprocess.check_output(cmd, input=diff2, universal_newlines=True)
+ diff3 = subprocess.check_output(cmd, input=diff2, universal_newlines=True, cwd=tmp)
except subprocess.CalledProcessError as e:
Meinersbur:
except subprocess.CalledProcessError as e:
print(e.stderr)
sys.exit(1)
except OSError as e:
print(e)
sys.exit(1)
finally:
os.chdir(cwd)
# Removes all whitespace to compare differences in files # Removes all whitespace to compare differences in files
diff1 = diff1.replace(" ", "") diff1 = diff1.replace(" ", "")
diff3 = diff3.replace(" ", "") diff3 = diff3.replace(" ", "")
diff_check = "" diff_check = ""
# Compares the input with the output # Compares the input with the output
for line in unified_diff(diff1, diff3, n=999999, for line in unified_diff(diff1, diff3, n=999999,
Show All 12 Lines