From: Thomas Schwinge <thomas@codesourcery.com>
To: <gcc-patches@gcc.gnu.org>
Cc: <tdevries@suse.de>, <amonakov@ispras.ru>
Subject: [og12] nvptx: Prevent emitting duplicate declarations for '__nvptx_stacks', '__nvptx_uni'
Date: Fri, 20 Jan 2023 21:30:14 +0100 [thread overview]
Message-ID: <874jsl2bl5.fsf@dem-tschwing-1.ger.mentorg.com> (raw)
In-Reply-To: <20221219204007.2818567-2-thomas@codesourcery.com>
[-- Attachment #1: Type: text/plain, Size: 1551 bytes --]
Hi!
On 2022-12-19T21:40:07+0100, Thomas Schwinge <thomas@codesourcery.com> wrote:
> As I have reported to Nvidia in 2022-12-01 'NVIDIA Incident Report (3891704):
> ptxas: Duplicate declaration error: "cannot be resolved by a '.static'"',
> 'ptxas' has an inscrutable error mode for duplicate declarations:
>
> ptxas softstack-decl-1.o, line 11; error : '.extern' variable '__nvptx_stacks' cannot be resolved by a '.static'
> ptxas fatal : Ptx assembly aborted due to errors
> nvptx-as: ptxas returned 255 exit status
>
> ptxas uniform-simt-decl-1.o, line 12; error : '.extern' variable '__nvptx_uni' cannot be resolved by a '.static'
> ptxas fatal : Ptx assembly aborted due to errors
> nvptx-as: ptxas returned 255 exit status
>
> This is inscrutable, because (a) what is "cannot be resolved by a '.static'"
> supposed to tell me (there is no '.static' in PTX?), and (b) why arent't
> repeated declaration just verified to match the first, but otherwise a no-op
> (like in other programming languages)?
For now pushed to devel/omp/gcc-12 branch in
commit ea52f1ca16870e4228f8044588b1bf958d4723b0
"nvptx: Prevent emitting duplicate declarations for '__nvptx_stacks', '__nvptx_uni'",
see attached.
Grüße
Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-nvptx-Prevent-emitting-duplicate-declarations-for-__.patch --]
[-- Type: text/x-diff, Size: 6569 bytes --]
From ea52f1ca16870e4228f8044588b1bf958d4723b0 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Mon, 19 Dec 2022 17:19:19 +0100
Subject: [PATCH] nvptx: Prevent emitting duplicate declarations for
'__nvptx_stacks', '__nvptx_uni'
As I have reported to Nvidia in 2022-12-01 'NVIDIA Incident Report (3891704):
ptxas: Duplicate declaration error: "cannot be resolved by a '.static'"',
'ptxas' has an inscrutable error mode for duplicate declarations:
ptxas softstack-decl-1.o, line 11; error : '.extern' variable '__nvptx_stacks' cannot be resolved by a '.static'
ptxas fatal : Ptx assembly aborted due to errors
nvptx-as: ptxas returned 255 exit status
ptxas uniform-simt-decl-1.o, line 12; error : '.extern' variable '__nvptx_uni' cannot be resolved by a '.static'
ptxas fatal : Ptx assembly aborted due to errors
nvptx-as: ptxas returned 255 exit status
This is inscrutable, because (a) what is "cannot be resolved by a '.static'"
supposed to tell me (there is no '.static' in PTX?), and (b) why arent't
repeated declaration just verified to match the first, but otherwise a no-op
(like in other programming languages)?
gcc/
* config/nvptx/nvptx.cc (nvptx_assemble_undefined_decl): Notice
'__nvptx_stacks', '__nvptx_uni' declarations.
(nvptx_file_end): Don't emit duplicate declarations for those.
gcc/testsuite/
* gcc.target/nvptx/softstack-decl-1.c: Make 'dg-do assemble',
adjust.
* gcc.target/nvptx/uniform-simt-decl-1.c: Likewise.
---
gcc/ChangeLog.omp | 4 ++++
gcc/config/nvptx/nvptx.cc | 14 ++++++++++++--
gcc/testsuite/ChangeLog.omp | 4 ++++
gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c | 8 ++++----
.../gcc.target/nvptx/uniform-simt-decl-1.c | 8 ++++----
5 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 382cd5c80c2..127b450644b 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,5 +1,9 @@
2023-01-20 Thomas Schwinge <thomas@codesourcery.com>
+ * config/nvptx/nvptx.cc (nvptx_assemble_undefined_decl): Notice
+ '__nvptx_stacks', '__nvptx_uni' declarations.
+ (nvptx_file_end): Don't emit duplicate declarations for those.
+
* config/nvptx/nvptx.md (nvptx_uniform_warp_check): Make fit for
non-full-warp execution.
diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index da735cf82ff..9c284ed5b01 100644
--- a/gcc/config/nvptx/nvptx.cc
+++ b/gcc/config/nvptx/nvptx.cc
@@ -181,9 +181,11 @@ static GTY(()) tree global_lock_var;
/* True if any function references __nvptx_stacks. */
static bool need_softstack_decl;
+static bool have_softstack_decl;
/* True if any function references __nvptx_uni. */
static bool need_unisimt_decl;
+static bool have_unisimt_decl;
static int nvptx_mach_max_workers ();
@@ -2572,6 +2574,13 @@ nvptx_assemble_undefined_decl (FILE *file, const char *name, const_tree decl)
TREE_TYPE (decl), size ? tree_to_shwi (size) : 0,
DECL_ALIGN (decl), true);
nvptx_assemble_decl_end ();
+
+ static tree softstack_id = get_identifier ("__nvptx_stacks");
+ static tree unisimt_id = get_identifier ("__nvptx_uni");
+ if (DECL_NAME (decl) == softstack_id)
+ have_softstack_decl = true;
+ else if (DECL_NAME (decl) == unisimt_id)
+ have_unisimt_decl = true;
}
/* Output a pattern for a move instruction. */
@@ -6052,7 +6061,7 @@ nvptx_file_end (void)
write_shared_buffer (asm_out_file, gang_private_shared_sym,
gang_private_shared_align, gang_private_shared_size);
- if (need_softstack_decl)
+ if (need_softstack_decl && !have_softstack_decl)
{
write_var_marker (asm_out_file, false, true, "__nvptx_stacks");
/* 32 is the maximum number of warps in a block. Even though it's an
@@ -6061,7 +6070,8 @@ nvptx_file_end (void)
fprintf (asm_out_file, ".extern .shared .u%d __nvptx_stacks[32];\n",
POINTER_SIZE);
}
- if (need_unisimt_decl)
+
+ if (need_unisimt_decl && !have_unisimt_decl)
{
write_var_marker (asm_out_file, false, true, "__nvptx_uni");
fprintf (asm_out_file, ".extern .shared .u32 __nvptx_uni[32];\n");
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index 5b3d9fe416b..c942c34dc70 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,5 +1,9 @@
2023-01-20 Thomas Schwinge <thomas@codesourcery.com>
+ * gcc.target/nvptx/softstack-decl-1.c: Make 'dg-do assemble',
+ adjust.
+ * gcc.target/nvptx/uniform-simt-decl-1.c: Likewise.
+
* gcc.target/nvptx/softstack-decl-1.c: New.
* gcc.target/nvptx/uniform-simt-decl-1.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c b/gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c
index c502eacc1b3..2415f6adb1f 100644
--- a/gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c
+++ b/gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile } */
+/* { dg-do assemble } */
/* { dg-options {-save-temps -O0 -msoft-stack} } */
extern void *__nvptx_stacks[32] __attribute__((shared,nocommon));
@@ -14,7 +14,7 @@ void *f()
return stack_array[5];
}
-/* The implicit (via 'need_softstack_decl') and explicit declarations of
- '__nvptx_stacks' are both emitted:
- { dg-final { scan-assembler-times {(?n)\.extern .* __nvptx_stacks\[32\];} 2 } }
+/* Of the implicit (via 'need_softstack_decl') and explicit declarations of
+ '__nvptx_stacks', only one is emitted:
+ { dg-final { scan-assembler-times {(?n)\.extern .* __nvptx_stacks\[32\];} 1 } }
*/
diff --git a/gcc/testsuite/gcc.target/nvptx/uniform-simt-decl-1.c b/gcc/testsuite/gcc.target/nvptx/uniform-simt-decl-1.c
index 486456ab243..5a975bdb269 100644
--- a/gcc/testsuite/gcc.target/nvptx/uniform-simt-decl-1.c
+++ b/gcc/testsuite/gcc.target/nvptx/uniform-simt-decl-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile } */
+/* { dg-do assemble } */
/* { dg-options {-save-temps -O0 -muniform-simt} } */
extern unsigned __nvptx_uni[32] __attribute__((shared,nocommon));
@@ -23,7 +23,7 @@ int f (void)
MEMMODEL_RELAXED);
}
-/* The implicit (via 'need_unisimt_decl') and explicit declarations of
- '__nvptx_uni' are both emitted:
- { dg-final { scan-assembler-times {(?n)\.extern .* __nvptx_uni\[32\];} 2 } }
+/* Of the implicit (via 'need_unisimt_decl') and explicit declarations of
+ '__nvptx_uni', only one is emitted:
+ { dg-final { scan-assembler-times {(?n)\.extern .* __nvptx_uni\[32\];} 1 } }
*/
--
2.25.1
next prev parent reply other threads:[~2023-01-20 20:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-19 20:40 [PATCH 1/2] Add 'gcc.target/nvptx/softstack-decl-1.c', 'gcc.target/nvptx/uniform-simt-decl-1.c' Thomas Schwinge
2022-12-19 20:40 ` [PATCH 2/2] nvptx: Prevent emitting duplicate declarations for '__nvptx_stacks', '__nvptx_uni' Thomas Schwinge
2023-01-11 11:44 ` [PING] " Thomas Schwinge
2023-01-20 20:30 ` Thomas Schwinge [this message]
2023-05-12 9:34 ` Thomas Schwinge
2023-01-20 20:26 ` [og12] Add 'gcc.target/nvptx/softstack-decl-1.c', 'gcc.target/nvptx/uniform-simt-decl-1.c' Thomas Schwinge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874jsl2bl5.fsf@dem-tschwing-1.ger.mentorg.com \
--to=thomas@codesourcery.com \
--cc=amonakov@ispras.ru \
--cc=gcc-patches@gcc.gnu.org \
--cc=tdevries@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).