From patchwork Mon Dec 19 20:40:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 62169 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 65A893858C36 for ; Mon, 19 Dec 2022 20:40:44 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 18F393858C2F for ; Mon, 19 Dec 2022 20:40:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 18F393858C2F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.96,257,1665475200"; d="scan'208";a="90110649" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 19 Dec 2022 12:40:23 -0800 IronPort-SDR: c/zQJnw70dRIFSmSpEbUQbSP+nPJZhkmIhh6Yf357zKCiOzKFgD0d66twHInHk0+7emNFwcz6w xHoiOy0NmI6GaHmfUqpnAltK1cDPCSdd2QO1sI+vRezlf8vQxtyKOwQ8h5rnyhQZvNv8RhyRtg Ex7moZ1iwInBj2IbnFDN1kQXb8llSedVN+qftTFT8JtaRlJHroU0UADJY4ua9YqG3xlY8A8yZD GB83EQ/0BQKJZ2NM/V0Q2EkYFHShW4kmegL8uiAe0Q9F13sTccX+YrKzJPfRajHpNyM8uIJjEp T4o= From: Thomas Schwinge To: , , CC: Thomas Schwinge Subject: [PATCH 1/2] Add 'gcc.target/nvptx/softstack-decl-1.c', 'gcc.target/nvptx/uniform-simt-decl-1.c' Date: Mon, 19 Dec 2022 21:40:06 +0100 Message-ID: <20221219204007.2818567-1-thomas@codesourcery.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" ... to document the status quo re implicit (via 'need_softstack_decl', 'need_unisimt_decl') and explicit declarations of '__nvptx_stacks', '__nvptx_uni'. gcc/testsuite/ * gcc.target/nvptx/softstack-decl-1.c: New. * gcc.target/nvptx/uniform-simt-decl-1.c: Likewise. --- .../gcc.target/nvptx/softstack-decl-1.c | 20 +++++++++++++ .../gcc.target/nvptx/uniform-simt-decl-1.c | 29 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c create mode 100644 gcc/testsuite/gcc.target/nvptx/uniform-simt-decl-1.c -- 2.25.1 ----------------- 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 diff --git a/gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c b/gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c new file mode 100644 index 00000000000..c502eacc1b3 --- /dev/null +++ b/gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options {-save-temps -O0 -msoft-stack} } */ + +extern void *__nvptx_stacks[32] __attribute__((shared,nocommon)); + +void *f() +{ + /* Implicit '__nvptx_stacks' usage for frame; per 'init_softstack_frame': + { dg-final { scan-assembler-times {mov\.u64 %fstmp2, __nvptx_stacks;} 1 } } + */ + void *stack_array[123]; + /* Explicit '__nvptx_stacks' usage. */ + stack_array[5] = __nvptx_stacks[0]; + 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 } } +*/ diff --git a/gcc/testsuite/gcc.target/nvptx/uniform-simt-decl-1.c b/gcc/testsuite/gcc.target/nvptx/uniform-simt-decl-1.c new file mode 100644 index 00000000000..486456ab243 --- /dev/null +++ b/gcc/testsuite/gcc.target/nvptx/uniform-simt-decl-1.c @@ -0,0 +1,29 @@ +/* { dg-do compile } */ +/* { dg-options {-save-temps -O0 -muniform-simt} } */ + +extern unsigned __nvptx_uni[32] __attribute__((shared,nocommon)); + +enum memmodel +{ + MEMMODEL_RELAXED = 0, +}; + +int a = 0; + +int f (void) +{ + /* Explicit '__nvptx_uni' usage. */ + __builtin_printf("%u\n", __nvptx_uni[0]); + + /* Implicit '__nvptx_uni' usage; per 'nvptx_init_unisimt_predicate': + { dg-final { scan-assembler-times {mov\.u64 %r[0-9]+, __nvptx_uni;} 1 } } + */ + int expected = 1; + return __atomic_compare_exchange_n (&a, &expected, 0, 0, MEMMODEL_RELAXED, + 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 } } +*/ From patchwork Mon Dec 19 20:40:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 62170 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F2989385221C for ; Mon, 19 Dec 2022 20:40:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 057BC385840E for ; Mon, 19 Dec 2022 20:40:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 057BC385840E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.96,257,1665475200"; d="scan'208";a="90850154" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 19 Dec 2022 12:40:30 -0800 IronPort-SDR: 8K+nfYAFQj39pgfK61zjrXH//642HQvBluqMRJ3tdNeikUyjCYrDQn7jC9/30PVojHExmtO3wT v4bc+WE++wG+CQuaI5bap1QG4fFNjKdGEEWGCRkcQv+dMq73OmIKT7I5lSsITHpnUMim1odN0o m/NKICXnEeZSfECu8KnvcszMyINxsqdlUrz9JcEkzgKMjkmkYH2qF/WBvkPArwaytK7nxb2M/q 8w2whD0Dnfsk+pqond+G9/FUEe0r6DsZ67L320sxZhN6pqbYzOFyNITfO8HzZsNX1GHW9YDo/Y 0N8= From: Thomas Schwinge To: , , CC: Thomas Schwinge Subject: [PATCH 2/2] nvptx: Prevent emitting duplicate declarations for '__nvptx_stacks', '__nvptx_uni' Date: Mon, 19 Dec 2022 21:40:07 +0100 Message-ID: <20221219204007.2818567-2-thomas@codesourcery.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221219204007.2818567-1-thomas@codesourcery.com> References: <20221219204007.2818567-1-thomas@codesourcery.com> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-15.mgc.mentorg.com (139.181.222.15) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" 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/config/nvptx/nvptx.cc | 14 ++++++++++++-- gcc/testsuite/gcc.target/nvptx/softstack-decl-1.c | 8 ++++---- .../gcc.target/nvptx/uniform-simt-decl-1.c | 8 ++++---- 3 files changed, 20 insertions(+), 10 deletions(-) -- 2.25.1 ----------------- 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 diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc index 8e49dd9c647..b93a253ab31 100644 --- a/gcc/config/nvptx/nvptx.cc +++ b/gcc/config/nvptx/nvptx.cc @@ -180,9 +180,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 (); @@ -2571,6 +2573,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. */ @@ -6002,7 +6011,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 @@ -6011,7 +6020,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/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 } } */