[ Fixing ENOPATCH. ] On 9/11/20 4:24 PM, Tom de Vries wrote: > On 9/2/20 1:48 PM, Tom de Vries wrote: >> On 9/2/20 12:44 PM, Jakub Jelinek wrote: >>> On Wed, Sep 02, 2020 at 12:22:28PM +0200, Tom de Vries wrote: >>>> And test-case passes on x86_64 with this patch (obviously, in >>>> combination with trigger patch above). >>>> >>>> Jakub, WDYT? >>> >>> I guess the normal answer would be use libatomic, but it isn't ported for >>> nvptx. >> >> Ah, I was not aware of that one, filed >> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96898 to look into that. >> >>> I guess at least temporarily this is ok, though I'm wondering why >>> you need __sync_*_16 rather than __atomic_*_16, >> >> That's what omp-expand.c uses in expand_omp_atomic_pipeline: >> BUILT_IN_SYNC_VAL_COMPARE_AND_SWAP_N . >> > > I've got an updated version of this patch. It: > - no longer supplies the __atomic_load_16, since that's now handled by > libatomic > - the __sync_val_compare_and_swap now uses __atomic_compare_and_swap, > which also falls back on libatomic. > > I'm currently retesting. > > Any comments? > > Otherwise, I'll commit on Monday. > > Thanks, > - Tom >
[libgomp, nvptx] Add __sync_compare_and_swap_16
As reported here ( https://gcc.gnu.org/pipermail/gcc-patches/2020-September/553070.html ), when running test-case libgomp.c-c++-common/reduction-16.c for powerpc host with nvptx accelerator, we run into: ... unresolved symbol __sync_val_compare_and_swap_16 ... I can reproduce the problem on x86_64 with a trigger patch that: - initializes ix86_isa_flags2 to TARGET_ISA2_CX16 - enables define_expand "atomic_load<mode>" in gcc/config/i386/sync.md for TImode The problem is that omp-expand.c generates atomic builtin calls based on checks whether those are supported on the host, which forces the target to support these, even though those checks fail for the accelerator target. Fix this by: - adding a __sync_val_compare_and_swap_16 in libgomp for nvptx, which falls back onto libatomic's __atomic_compare_and_swap_16 - adding -foffload=-latomic in the test-case Tested libgomp on x86_64-linux with nvptx accelerator. Tested libgomp with trigger patch on x86_64-linux with nvptx accelerator. libgomp/ChangeLog: * config/nvptx/atomic.c: New file. Add __sync_val_compare_and_swap_16. --- libgomp/config/nvptx/atomic.c | 18 ++++++++++++++++++ libgomp/testsuite/libgomp.c-c++-common/reduction-16.c | 1 + 2 files changed, 19 insertions(+) diff --git a/libgomp/config/nvptx/atomic.c b/libgomp/config/nvptx/atomic.c new file mode 100644 index 00000000000..2e13b09b497 --- /dev/null +++ b/libgomp/config/nvptx/atomic.c @@ -0,0 +1,18 @@ +#include "libgomp.h" + +#include "../../atomic.c" + +/* Implement __sync_val_compare_and_swap_16, to support offloading from hosts + that support this builtin. Fallback on libatomic. This can be removed + once omp-expand starts using __atomic_compare_exchange_n instead. */ + +unsigned __int128 +__sync_val_compare_and_swap_16 (volatile void *vptr, unsigned __int128 oldval, + unsigned __int128 newval) +{ + volatile __int128 *ptr = vptr; + __int128 expected = oldval; + __atomic_compare_exchange_n (ptr, &expected, newval, false, + MEMMODEL_SEQ_CST, MEMMODEL_SEQ_CST); + return expected; +} diff --git a/libgomp/testsuite/libgomp.c-c++-common/reduction-16.c b/libgomp/testsuite/libgomp.c-c++-common/reduction-16.c index d0e82b04790..cfa8853f18b 100644 --- a/libgomp/testsuite/libgomp.c-c++-common/reduction-16.c +++ b/libgomp/testsuite/libgomp.c-c++-common/reduction-16.c @@ -1,4 +1,5 @@ /* { dg-do run } */ +/* { dg-additional-options "-foffload=-latomic" } */ #include <stdlib.h>
