Skip to content

Commit 6922a60

Browse files
committed
Tidy up of tests
- remove a lot of whitespace - add end of file lines - remove no longer required comments or messages
1 parent 931c849 commit 6922a60

File tree

140 files changed

+878
-1393
lines changed

Some content is hidden

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

140 files changed

+878
-1393
lines changed

test/fortran-map-tests/SWDEV-564425-simple.f90

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,3 @@ program udt_release
6363

6464
print*, "======= FORTRAN Test Passed! ======="
6565
end program
66-
67-
! $BUILD_DIR/bin/flang -fopenmp-version=60 -I$FORTRAN_OMP_MOD_FILES --offload-arch=gfx90a -fopenmp SWDEV-564425-simple.f90 -o SWDEV-564425-simple.out
68-
! /COD/2025-10-25/aomp/llvm/bin/flang -I$FORTRAN_OMP_MOD_FILES --offload-arch=gfx90a -fopenmp SWDEV-564425.f90 -o SWDEV-564425.out

test/fortran-map-tests/SWDEV-564425-v2-alloca-parent-and-children.f90

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ program udt_release
4040
allocate(obj%dtype_nest%dtype_nest%arr3(n))
4141
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
4242

43-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
44-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
45-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
46-
! OpenMP behaviour.
47-
4843
!$omp target enter data map(ref_ptr, to: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
4944
!$omp target enter data map(ref_ptr, present, storage: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
5045

@@ -103,9 +98,6 @@ program udt_release
10398
stop 1
10499
endif
105100

106-
! NOTE: We currently need to map the derived type descriptor + data when mapping this type of
107-
! construct, we might be able to tweak things to skip this part of the mapping in the future.
108-
! But for simplicities sake I've left it as-is for the first iteration.
109101
if(omp_target_is_present(C_LOC(obj), omp_get_default_device()) == 0) then
110102
print *, "After enter: obj parent structure NOT on device"
111103
else
@@ -175,9 +167,6 @@ program udt_release
175167

176168
!$omp target update from(obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
177169

178-
! ! to make sure this can be used and ref counts correctly we might have to opt out of mapping the intermediate bits for exit/enter
179-
! ! ! !!$omp target exit data map(ref_ptee, from: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
180-
181170
print *, obj%arr
182171
print *, obj%dtype_nest2%arr3
183172
print *, obj%dtype_nest%dtype_nest%arr3

test/fortran-map-tests/SWDEV-564425-v2-alloca-parent.f90

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ program udt_release
3737
allocate(obj%dtype_nest%dtype_nest%arr3(n))
3838
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
3939

40-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
41-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
42-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
43-
! OpenMP behaviour.
44-
4540
!$omp target enter data map(ref_ptr, to: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
4641
!$omp target enter data map(ref_ptr, present, storage: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
4742

@@ -52,7 +47,6 @@ program udt_release
5247
print *, "obj%dtype_nest%dtype_nest%arr3 ref_ptr on device"
5348
print *, "obj%dtype_nest%dtype_nest%scalar_ptr ref_ptr on device"
5449

55-
5650
if(omp_target_is_present(C_LOC(obj%arr), omp_get_default_device()) == 0) then
5751
print *, "After enter: obj%arr ref_ptee NOT on device"
5852
else

test/fortran-map-tests/SWDEV-564425-v2.f90

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ program udt_release
3636
allocate(obj%dtype_nest%dtype_nest%arr3(n))
3737
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
3838

39-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
40-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
41-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
42-
! OpenMP behaviour.
43-
4439
!$omp target enter data map(ref_ptr, to: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
4540
!$omp target enter data map(ref_ptr, present, storage: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
4641

@@ -51,7 +46,6 @@ program udt_release
5146
print *, "obj%dtype_nest%dtype_nest%arr3 ref_ptr on device"
5247
print *, "obj%dtype_nest%dtype_nest%scalar_ptr ref_ptr on device"
5348

54-
5549
if(omp_target_is_present(C_LOC(obj%arr), omp_get_default_device()) == 0) then
5650
print *, "After enter: obj%arr ref_ptee NOT on device"
5751
else

test/fortran-map-tests/SWDEV-564425-v3-alloca-parent-and-children.f90

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ program udt_release
4040
allocate(obj%dtype_nest%dtype_nest%arr3(n))
4141
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
4242

43-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
44-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
45-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
46-
! OpenMP behaviour.
47-
4843
!$omp target enter data map(ref_ptee, to: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
4944

5045
if(omp_target_is_present(C_LOC(obj%arr), omp_get_default_device()) == 0) then

test/fortran-map-tests/SWDEV-564425-v3-alloca-parent.f90

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ program udt_release
3737
allocate(obj%dtype_nest%dtype_nest%arr3(n))
3838
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
3939

40-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
41-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
42-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
43-
! OpenMP behaviour.
44-
4540
!$omp target enter data map(ref_ptee, to: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
4641

4742
if(omp_target_is_present(C_LOC(obj%arr), omp_get_default_device()) == 0) then

test/fortran-map-tests/SWDEV-564425-v3.f90

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ program udt_release
3636
allocate(obj%dtype_nest%dtype_nest%arr3(n))
3737
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
3838

39-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
40-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
41-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
42-
! OpenMP behaviour.
43-
4439
!$omp target enter data map(ref_ptee, to: obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
4540

4641
if(omp_target_is_present(C_LOC(obj%arr), omp_get_default_device()) == 0) then

test/fortran-map-tests/SWDEV-564425-v4-alloca-parent-and-children.f90

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ program udt_release
4040
allocate(obj%dtype_nest%dtype_nest%arr3(n))
4141
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
4242

43-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
44-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
45-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
46-
! OpenMP behaviour.
47-
4843
!$omp target enter data map(ref_ptee, to: obj%arr)
4944
!$omp target enter data map(ref_ptee, to: obj%dtype_nest2%arr3)
5045
!$omp target enter data map(ref_ptee, to: obj%dtype_nest2%scalar_ptr)

test/fortran-map-tests/SWDEV-564425-v4-alloca-parent.f90

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,6 @@ program udt_release
3838
allocate(obj%dtype_nest%dtype_nest%arr3(n))
3939
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
4040

41-
42-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
43-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
44-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
45-
! OpenMP behaviour.
46-
47-
! it's somewhat illegal to have the obj in the follow up ref_ptee as we've already mapped chunks of
48-
! it before when mapping members in the ref_ptr enter map, it will currently work but it shouldn't be
49-
! encouraged as there's no guarantee it'll remain that way or be portable. And as we're mapping members
50-
! of obj (the descriptors of the pointer/allocatable members) we actually have to map the contiguous blocks
51-
! of data.
5241
!$omp target enter data map(ref_ptr, to: obj, obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
5342
!$omp target enter data map(ref_ptr, present, storage: obj, obj%arr, obj%dtype_nest2%arr3, obj%dtype_nest2%scalar_ptr, obj%dtype_nest%scalar_ptr, obj%dtype_nest%dtype_nest%arr3, obj%dtype_nest%dtype_nest%scalar_ptr)
5443

@@ -107,8 +96,6 @@ program udt_release
10796
stop 1
10897
endif
10998

110-
! We technically map bits of the object when we specify the mapping of the
111-
! descriptors for each of the member maps.
11299
if(omp_target_is_present(C_LOC(obj), omp_get_default_device()) == 0) then
113100
print *, "After enter: obj parent structure NOT on device"
114101
print*, "======= FORTRAN Test Failed! ======="

test/fortran-map-tests/SWDEV-564425-v5-alloca-parent-and-children.f90

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ program udt_release
4040
allocate(obj%dtype_nest%dtype_nest%arr3(n))
4141
allocate(obj%dtype_nest%dtype_nest%scalar_ptr)
4242

43-
! Present checking and sending separately as if we send it in a single map/present check it in a single map
44-
! we end up allocating bits and pieces implicitly due to the implicit binding parent map, but this seems
45-
! analogous to Clang behaviour. It may need a bit of a rethink though, or a verification if it's the correct
46-
! OpenMP behaviour.
47-
4843
!$omp target enter data map(ref_ptr, to: obj%arr)
4944
!$omp target enter data map(ref_ptr, present, storage: obj%arr)
5045

0 commit comments

Comments
 (0)