Skip to content

R
riscv-gcc-1
Commit 1241136c by Thomas Schwinge Committed by Thomas Schwinge
Options

[libgomp] In OpenACC offloading testing, be more explicit in what is supported,… 

[libgomp] In OpenACC offloading testing, be more explicit in what is supported, and what is not, or why not

	libgomp/
	* testsuite/lib/libgomp.exp: Error out for unknown offload target.
	* testsuite/libgomp.oacc-c++/c++.exp: Likewise.  Report if
	"offloading: supported, but hardware not accessible".
	* testsuite/libgomp.oacc-c/c.exp: Likewise.
	* testsuite/libgomp.oacc-fortran/fortran.exp: Likewise.

From-SVN: r269106
parent 68034b1b
Showing with 19 additions and 8 deletions
libgomp/ChangeLog
2019-02-22 Thomas Schwinge <thomas@codesourcery.com>
* testsuite/lib/libgomp.exp: Error out for unknown offload target.
* testsuite/libgomp.oacc-c++/c++.exp: Likewise. Report if
"offloading: supported, but hardware not accessible".
* testsuite/libgomp.oacc-c/c.exp: Likewise.
* testsuite/libgomp.oacc-fortran/fortran.exp: Likewise.
2019-02-19 Chung-Lin Tang <cltang@codesourcery.com> 2019-02-19 Chung-Lin Tang <cltang@codesourcery.com>
PR c/87924 PR c/87924
......
libgomp/testsuite/lib/libgomp.exp
...@@ -58,6 +58,9 @@ foreach offload_target_openacc $offload_targets_s { ...@@ -58,6 +58,9 @@ foreach offload_target_openacc $offload_targets_s {
hsa { hsa {
continue continue
} }
default {
error "Unknown offload target: $offload_target_openacc"
}
} }
lappend offload_targets_s_openacc "$offload_target_openacc" lappend offload_targets_s_openacc "$offload_target_openacc"
} }
...@@ -375,7 +378,7 @@ proc check_effective_target_openacc_nvidia_accel_configured { } { ...@@ -375,7 +378,7 @@ proc check_effective_target_openacc_nvidia_accel_configured { } {
return [is-effective-target lp64] return [is-effective-target lp64]
} }
# Return 1 if at least one nvidia board is present. # Return 1 if at least one Nvidia GPU is accessible.
proc check_effective_target_openacc_nvidia_accel_present { } { proc check_effective_target_openacc_nvidia_accel_present { } {
return [check_runtime openacc_nvidia_accel_present { return [check_runtime openacc_nvidia_accel_present {
...@@ -386,7 +389,7 @@ proc check_effective_target_openacc_nvidia_accel_present { } { ...@@ -386,7 +389,7 @@ proc check_effective_target_openacc_nvidia_accel_present { } {
} "" ] } "" ]
} }
# Return 1 if at least one nvidia board is present, and the nvidia device type # Return 1 if at least one Nvidia GPU is accessible, and the nvidia device type
# is selected by default by means of setting the environment variable # is selected by default by means of setting the environment variable
# ACC_DEVICE_TYPE. # ACC_DEVICE_TYPE.
......
libgomp/testsuite/libgomp.oacc-c++/c++.exp
...@@ -88,7 +88,7 @@ if { $lang_test_file_found } { ...@@ -88,7 +88,7 @@ if { $lang_test_file_found } {
nvidia { nvidia {
if { ![check_effective_target_openacc_nvidia_accel_present] } { if { ![check_effective_target_openacc_nvidia_accel_present] } {
# Don't bother; execution testing is going to FAIL. # Don't bother; execution testing is going to FAIL.
untested "$subdir $offload_target_openacc offloading" untested "$subdir $offload_target_openacc offloading: supported, but hardware not accessible"
continue continue
} }
...@@ -101,7 +101,7 @@ if { $lang_test_file_found } { ...@@ -101,7 +101,7 @@ if { $lang_test_file_found } {
set acc_mem_shared 0 set acc_mem_shared 0
} }
default { default {
set acc_mem_shared 0 error "Unknown OpenACC device type: $offload_target_openacc"
} }
} }
set tagopt "$tagopt -DACC_MEM_SHARED=$acc_mem_shared" set tagopt "$tagopt -DACC_MEM_SHARED=$acc_mem_shared"
......
libgomp/testsuite/libgomp.oacc-c/c.exp
...@@ -51,7 +51,7 @@ foreach offload_target_openacc $offload_targets_s_openacc { ...@@ -51,7 +51,7 @@ foreach offload_target_openacc $offload_targets_s_openacc {
nvidia { nvidia {
if { ![check_effective_target_openacc_nvidia_accel_present] } { if { ![check_effective_target_openacc_nvidia_accel_present] } {
# Don't bother; execution testing is going to FAIL. # Don't bother; execution testing is going to FAIL.
untested "$subdir $offload_target_openacc offloading" untested "$subdir $offload_target_openacc offloading: supported, but hardware not accessible"
continue continue
} }
...@@ -64,7 +64,7 @@ foreach offload_target_openacc $offload_targets_s_openacc { ...@@ -64,7 +64,7 @@ foreach offload_target_openacc $offload_targets_s_openacc {
set acc_mem_shared 0 set acc_mem_shared 0
} }
default { default {
set acc_mem_shared 0 error "Unknown OpenACC device type: $offload_target_openacc"
} }
} }
set tagopt "$tagopt -DACC_MEM_SHARED=$acc_mem_shared" set tagopt "$tagopt -DACC_MEM_SHARED=$acc_mem_shared"
......
libgomp/testsuite/libgomp.oacc-fortran/fortran.exp
...@@ -76,14 +76,14 @@ if { $lang_test_file_found } { ...@@ -76,14 +76,14 @@ if { $lang_test_file_found } {
nvidia { nvidia {
if { ![check_effective_target_openacc_nvidia_accel_present] } { if { ![check_effective_target_openacc_nvidia_accel_present] } {
# Don't bother; execution testing is going to FAIL. # Don't bother; execution testing is going to FAIL.
untested "$subdir $offload_target_openacc offloading" untested "$subdir $offload_target_openacc offloading: supported, but hardware not accessible"
continue continue
} }
set acc_mem_shared 0 set acc_mem_shared 0
} }
default { default {
set acc_mem_shared 0 error "Unknown OpenACC device type: $offload_target_openacc"
} }
} }
set tagopt "$tagopt -DACC_MEM_SHARED=$acc_mem_shared" set tagopt "$tagopt -DACC_MEM_SHARED=$acc_mem_shared"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment