Fix failure in gfortran.dg/gomp/combined-if.f90 test

Enabling nvptx offloading results in extra '#pragma omp simd' statements
in the tree dump with an extra '_simt_'.

2020-06-26  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/testsuite/
	* gfortran.dg/gomp/combined-if.f90: Adjust expected number
	of matches depending on whether nvptx offloading is supported.
	* lib/target-supports.exp
	(check_effective_target_offload_nvptx): New.
This commit is contained in:
Kwok Cheung Yeung 2020-06-26 10:35:36 -07:00
parent b3d77404c0
commit 0fce12c092
2 changed files with 11 additions and 2 deletions

View File

@ -104,5 +104,6 @@ contains
end module
! { dg-final { scan-tree-dump-times "(?n)#pragma omp target.* if\\(" 9 "omplower" } }
! { dg-final { scan-tree-dump-times "(?n)#pragma omp simd.* if\\(" 7 "omplower" } }
! { dg-final { scan-tree-dump-times "(?n)#pragma omp simd.* if\\(" 4 "omplower" { target { ! offload_nvptx } } } }
! { dg-final { scan-tree-dump-times "(?n)#pragma omp simd.* if\\(" 7 "omplower" { target { offload_nvptx } } } }
! { dg-final { scan-tree-dump-times "(?n)#pragma omp parallel.* if\\(" 6 "omplower" } }

View File

@ -9820,6 +9820,14 @@ proc check_effective_target_vect_max_reduc { } {
return 0
}
# Return 1 if the compiler has been configured with nvptx offloading.
proc check_effective_target_offload_nvptx { } {
return [check_no_compiler_messages offload_nvptx assembly {
int main () {return 0;}
} "-foffload=nvptx-none" ]
}
# Return 1 if the compiler has been configured with hsa offloading.
proc check_effective_target_offload_hsa { } {
@ -9828,7 +9836,7 @@ proc check_effective_target_offload_hsa { } {
} "-foffload=hsa" ]
}
# Return 1 if the compiler has been configured with hsa offloading.
# Return 1 if the compiler has been configured with gcn offloading.
proc check_effective_target_offload_gcn { } {
return [check_no_compiler_messages offload_gcn assembly {