diff options
| author | Julian Brown <julian@codesourcery.com> | 2019-08-07 06:40:29 -0700 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2020-03-03 12:50:41 +0100 |
| commit | 1dcedb6c849d5afa7213c14d021426611faddb05 (patch) | |
| tree | f8d6ecd1f03eb733b1d08394a5eae40907b797d1 /libgomp | |
| parent | 48baddfe4b917a1586d8df2297852c771cfd0f06 (diff) | |
| download | gcc-1dcedb6c849d5afa7213c14d021426611faddb05.zip gcc-1dcedb6c849d5afa7213c14d021426611faddb05.tar.gz gcc-1dcedb6c849d5afa7213c14d021426611faddb05.tar.bz2 | |
[og9] Fix configury for AMD GCN testing
libgomp/
* plugin/configfrag.ac (amdgcn): Set tgt_plugin.
* testsuite/lib/libgomp.exp (offload_target_to_openacc_device_type):
Add AMD GCN support.
(check_effective_target_openacc_amdgcn_accel_selected): Test
offload_target instead of offload_target_openacc.
* testsuite/libgomp.oacc-c++/c++.exp (amdgcn*): Rename stanza to...
(gcn): ...this. Don't set tagopt redundantly here.
* testsuite/libgomp.oacc-c/c.exp (amdgcn*, gcn): Likewise.
* testsuite/libgomp.oacc-fortran/fortran.exp (amdgcn*, gcn): Likewise.
* configure: Regenerated.
(cherry picked from openacc-gcc-9-branch commit
a48bf635e1b7ef94a057ed10d433070ccf5724de)
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog.omp | 13 | ||||
| -rwxr-xr-x | libgomp/configure | 1 | ||||
| -rw-r--r-- | libgomp/plugin/configfrag.ac | 1 | ||||
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 7 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-c++/c++.exp | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-c/c.exp | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.oacc-fortran/fortran.exp | 3 |
7 files changed, 23 insertions, 8 deletions
diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp index 80d089f..62c56e3 100644 --- a/libgomp/ChangeLog.omp +++ b/libgomp/ChangeLog.omp @@ -1,5 +1,18 @@ 2019-08-08 Julian Brown <julian@codesourcery.com> + * plugin/configfrag.ac (amdgcn): Set tgt_plugin. + * testsuite/lib/libgomp.exp (offload_target_to_openacc_device_type): + Add AMD GCN support. + (check_effective_target_openacc_amdgcn_accel_selected): Test + offload_target instead of offload_target_openacc. + * testsuite/libgomp.oacc-c++/c++.exp (amdgcn*): Rename stanza to... + (gcn): ...this. Don't set tagopt redundantly here. + * testsuite/libgomp.oacc-c/c.exp (amdgcn*, gcn): Likewise. + * testsuite/libgomp.oacc-fortran/fortran.exp (amdgcn*, gcn): Likewise. + * configure: Regenerated. + +2019-08-08 Julian Brown <julian@codesourcery.com> + * plugin/plugin-gcn.c (GOMP_OFFLOAD_openacc_exec_params, GOMP_OFFLOAD_openacc_async_exec_params): New functions. diff --git a/libgomp/configure b/libgomp/configure index 39da8af..85a29c5 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15781,6 +15781,7 @@ rm -f core conftest.err conftest.$ac_objext \ ;; *) tgt_name=gcn + tgt_plugin=gcn PLUGIN_GCN=$tgt PLUGIN_GCN_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS PLUGIN_GCN_LDFLAGS="$HSA_RUNTIME_LDFLAGS" diff --git a/libgomp/plugin/configfrag.ac b/libgomp/plugin/configfrag.ac index 6fedd28..1ea67c9 100644 --- a/libgomp/plugin/configfrag.ac +++ b/libgomp/plugin/configfrag.ac @@ -256,6 +256,7 @@ if test x"$enable_offload_targets" != x; then ;; *) tgt_name=gcn + tgt_plugin=gcn PLUGIN_GCN=$tgt PLUGIN_GCN_CPPFLAGS=$HSA_RUNTIME_CPPFLAGS PLUGIN_GCN_LDFLAGS="$HSA_RUNTIME_LDFLAGS" diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 19bee80..9644176 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -316,6 +316,9 @@ proc offload_target_to_openacc_device_type { offload_target } { nvptx* { return "nvidia" } + amdgcn* { + return "gcn" + } default { error "Unknown offload target: $offload_target" } @@ -463,8 +466,8 @@ proc check_effective_target_openacc_amdgcn_accel_selected { } { if { ![check_effective_target_openacc_amdgcn_accel_present] } { return 0; } - global offload_target_openacc - if { [string match "amdgcn*" $offload_target_openacc] } { + global offload_target + if { [string match "amdgcn*" $offload_target] } { return 1; } return 0; diff --git a/libgomp/testsuite/libgomp.oacc-c++/c++.exp b/libgomp/testsuite/libgomp.oacc-c++/c++.exp index 1285a6a..86aacff 100644 --- a/libgomp/testsuite/libgomp.oacc-c++/c++.exp +++ b/libgomp/testsuite/libgomp.oacc-c++/c++.exp @@ -111,9 +111,8 @@ if { $lang_test_file_found } { set acc_mem_shared 0 } - amdgcn* { + gcn { set acc_mem_shared 0 - set tagopt "-DACC_DEVICE_TYPE_gcn=\"$offload_target_openacc\"" } default { error "Unknown OpenACC device type: $openacc_device_type (offload target: $offload_target)" diff --git a/libgomp/testsuite/libgomp.oacc-c/c.exp b/libgomp/testsuite/libgomp.oacc-c/c.exp index f7005eb..9ab68bb 100644 --- a/libgomp/testsuite/libgomp.oacc-c/c.exp +++ b/libgomp/testsuite/libgomp.oacc-c/c.exp @@ -72,9 +72,8 @@ foreach offload_target [concat [split $offload_targets ":"] "disable"] { set acc_mem_shared 0 } - amdgcn* { + gcn { set acc_mem_shared 0 - set tagopt "-DACC_DEVICE_TYPE_gcn=\"$offload_target_openacc\"" } default { error "Unknown OpenACC device type: $openacc_device_type (offload target: $offload_target)" diff --git a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp index 0f8d1db..e36fb15 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.oacc-fortran/fortran.exp @@ -90,9 +90,8 @@ if { $lang_test_file_found } { set acc_mem_shared 0 } - amdgcn* { + gcn { set acc_mem_shared 0 - set tagopt "-DACC_DEVICE_TYPE_gcn=\"$offload_target_openacc\"" } default { error "Unknown OpenACC device type: $openacc_device_type (offload target: $offload_target)" |