OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[nvptx] Don't skip atomic insns in nvptx_reorg_uniform_simt 

In nvptx_reorg_uniform_simt we have a loop:
...
  for (insn = get_insns (); insn; insn = next)
    {
      next = NEXT_INSN (insn);
      if (!(CALL_P (insn) && nvptx_call_insn_is_syscall_p (insn))
         && !(NONJUMP_INSN_P (insn)
              && GET_CODE (PATTERN (insn)) == PARALLEL
              && get_attr_atomic (insn)))
       continue;
...
that intends to handle syscalls and atomic insns.

However, this also silently skips the atomic insn nvptx_atomic_store, which
has GET_CODE (PATTERN (insn)) == SET.

This does not cause problems, because the nvptx_atomic_store actually maps
onto a "st" insn, and therefore is not atomic and doesn't need to be handled
by nvptx_reorg_uniform_simt.

Fix this by:
- explicitly setting nvptx_atomic_store's atomic attribute to false,
- rewriting the skip condition to make sure all insn
  with atomic attribute are handled, and
- asserting that all handled insns are PARALLEL.

Tested on nvptx.

gcc/ChangeLog:

2022-02-19  Tom de Vries  <tdevries@suse.de>

	* config/nvptx/nvptx.cc (nvptx_reorg_uniform_simt): Handle all
	insns with atomic attribute.  Assert that all handled insns are
	PARALLELs.
	* config/nvptx/nvptx.md (define_insn "nvptx_atomic_store<mode>"):
	Set atomic attribute to false.

gcc/testsuite/ChangeLog:

2022-02-19  Tom de Vries  <tdevries@suse.de>

	* gcc.target/nvptx/uniform-simt-3.c: New test.
This commit is contained in:
Tom de Vries 2022-02-18 17:38:50 +01:00
parent 8e5c34ab45
commit 9ed52438b8
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gcc/config/nvptx/nvptx.cc
View File

@ -3274,12 +3274,24 @@ nvptx_reorg_uniform_simt ()
for (insn = get_insns (); insn; insn = next)
{
next = NEXT_INSN (insn);
if (!(CALL_P (insn) && nvptx_call_insn_is_syscall_p (insn))
&& !(NONJUMP_INSN_P (insn)
&& GET_CODE (PATTERN (insn)) == PARALLEL
&& get_attr_atomic (insn)))
/* Skip NOTE, USE, etc. */
if (!INSN_P (insn) || recog_memoized (insn) == -1)
continue;
if (CALL_P (insn) && nvptx_call_insn_is_syscall_p (insn))
{
/* Handle syscall. */
}
else if (get_attr_atomic (insn))
{
/* Handle atomic insn. */
}
else
continue;
rtx pat = PATTERN (insn);
gcc_assert (GET_CODE (pat) == PARALLEL);
rtx master = nvptx_get_unisimt_master ();
bool shuffle_p = false;
for (int i = 0; i < XVECLEN (pat, 0); i++)

2
gcc/config/nvptx/nvptx.md
View File

@ -2097,7 +2097,7 @@
= "%.\tst%A0.b%T0\t%0, %1;";
return nvptx_output_atomic_insn (t, operands, 0, 2);
}
[(set_attr "atomic" "true")])
[(set_attr "atomic" "false")]) ;; Note: st is not an atomic insn.
(define_insn "atomic_fetch_add<mode>"
[(set (match_operand:SDIM 1 "memory_operand" "+m")

4
gcc/testsuite/gcc.target/nvptx/uniform-simt-3.c Normal file
View File

@ -0,0 +1,4 @@
/* { dg-do compile } */
/* { dg-options "-O2 -muniform-simt -misa=sm_75" } */
#include "atomic-store-2.c"