提交: ca79a89b9b90bd76cd026898bfa2b8aaf8395e6e - gcc_os216 (git)

GCC with patches for OS216

Commit MetaInfo

• 修訂: ca79a89b9b90bd76cd026898bfa2b8aaf8395e6e (tree)
• 時間: 2020-06-27 06:23:05
• 作者: Kwok Cheung Yeung <kcy@code...>
• Commiter: Kwok Cheung Yeung

Log Message

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_'.

This is a backport from master
(commit 0fce12c0920c12492c878c0ca5f639f93b93f183).

2020-06-26 Kwok Cheung Yeung <[e-mail]>

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.

Change Summary

• modified: gcc/testsuite/ChangeLog.omp
• modified: gcc/testsuite/gfortran.dg/gomp/combined-if.f90
• modified: gcc/testsuite/lib/target-supports.exp

差異

--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,10 @@
[phone]  Kwok Cheung Yeung  <[e-mail]>
+
+	* 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.
+
 2020-06-25  Tobias Burnus  <[e-mail]>
 	    Kwok Cheung Yeung  <[e-mail]>
 

--- a/gcc/testsuite/gfortran.dg/gomp/combined-if.f90
+++ b/gcc/testsuite/gfortran.dg/gomp/combined-if.f90
@@ -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" } }

--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -9754,6 +9754,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 { } {
@@ -9762,7 +9770,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 {