From patchwork Wed Jan 12 14:57:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 49920 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 B4BB8394003A for ; Wed, 12 Jan 2022 14:58:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B4BB8394003A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641999502; bh=A0UQRPHfTrp7HwY2357mhvstERwhF0sNV8MMUvLLxMc=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=M/jKntqJ0sV4G2yh1qfBOy3K3Q4YqskxqQDs64sV9d65tUwHMMTpfFrIx/XeISRSh wzJIK3chI03YZBKrMl3c9liSlJx8ij/vObGl75H7NZnAC1TUQeLb5mtOaiKhjFxDcs Bfb7VJLSFyGyr7oTRzgqZnJFsMOOJfwCYD0UXwbs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 9BF063940013 for ; Wed, 12 Jan 2022 14:57:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9BF063940013 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 72771210FD for ; Wed, 12 Jan 2022 14:57:09 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5EDC913B70 for ; Wed, 12 Jan 2022 14:57:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id GhkDFkXs3mEsEAAAMHmgww (envelope-from ) for ; Wed, 12 Jan 2022 14:57:09 +0000 Date: Wed, 12 Jan 2022 15:57:07 +0100 To: gcc-patches@gcc.gnu.org Subject: [committed][nvptx] Improve gcc.target/nvptx/atomic_fetch-*.c test-cases Message-ID: <20220112145706.GA5174@delia.home> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , X-Patchwork-Original-From: Tom de Vries via Gcc-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi, Fix a few issues in test-cases gcc.target/nvptx/atomic_fetch-*.c: - atomic_fetch-1.c uses scan-assembler instead of scan-assembler-times, which is less accurate - atomic_fetch-2.c only contains negative testing using scan-assembler-not - the test-cases use stack variables to generate generic addresses, while stack atomics are not natively supported - the test-cases only test (64-bit) x (generic), instead of (32-bit, 64-bit) x (generic, global, shared) - the test-cases use a hardcoded '0' instead of the clearer MEMMODEL_RELAXED Tested on nvptx. Committed to trunk. Thanks, - Tom [nvptx] Improve gcc.target/nvptx/atomic_fetch-*.c test-cases gcc/testsuite/ChangeLog: 2022-01-12 Tom de Vries * gcc.target/nvptx/atomic_fetch-1.c: Rewrite. * gcc.target/nvptx/atomic_fetch-2.c: Rewrite. --- gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c | 98 ++++++++++++++++++++++--- gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c | 92 ++++++++++++++++++++--- 2 files changed, 168 insertions(+), 22 deletions(-) diff --git a/gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c b/gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c index c637caa79a0..941cf3a2ab4 100644 --- a/gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c +++ b/gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c @@ -4,21 +4,97 @@ /* { dg-do compile } */ /* { dg-options "-O2 -misa=sm_35" } */ +enum memmodel +{ + MEMMODEL_RELAXED = 0 +}; + +unsigned long long int *p64; +unsigned int *p32; + +unsigned long long int g64; +unsigned int g32; + +unsigned int s32 __attribute__((shared)); +unsigned long long int s64 __attribute__((shared)); + +unsigned long long int v64; +unsigned int v32; + int main() { - unsigned long long a = ~0; - unsigned b = 0xa; + /* Generic. */ - __atomic_fetch_add (&a, b, 0); - __atomic_fetch_and (&a, b, 0); - __atomic_fetch_or (&a, b, 0); - __atomic_fetch_xor (&a, b, 0); + __atomic_fetch_add (p64, v64, MEMMODEL_RELAXED); + __atomic_fetch_and (p64, v64, MEMMODEL_RELAXED); + __atomic_fetch_or (p64, v64, MEMMODEL_RELAXED); + __atomic_fetch_xor (p64, v64, MEMMODEL_RELAXED); - return a; + __atomic_fetch_add (p32, v32, MEMMODEL_RELAXED); + __atomic_fetch_and (p32, v32, MEMMODEL_RELAXED); + __atomic_fetch_or (p32, v32, MEMMODEL_RELAXED); + __atomic_fetch_xor (p32, v32, MEMMODEL_RELAXED); + + /* Global. */ + + __atomic_fetch_add (&g64, v64, MEMMODEL_RELAXED); + __atomic_fetch_and (&g64, v64, MEMMODEL_RELAXED); + __atomic_fetch_or (&g64, v64, MEMMODEL_RELAXED); + __atomic_fetch_xor (&g64, v64, MEMMODEL_RELAXED); + + __atomic_fetch_add (&g32, v32, MEMMODEL_RELAXED); + __atomic_fetch_and (&g32, v32, MEMMODEL_RELAXED); + __atomic_fetch_or (&g32, v32, MEMMODEL_RELAXED); + __atomic_fetch_xor (&g32, v32, MEMMODEL_RELAXED); + + /* Shared. */ + + __atomic_fetch_add (&s64, v64, MEMMODEL_RELAXED); + __atomic_fetch_and (&s64, v64, MEMMODEL_RELAXED); + __atomic_fetch_or (&s64, v64, MEMMODEL_RELAXED); + __atomic_fetch_xor (&s64, v64, MEMMODEL_RELAXED); + + __atomic_fetch_add (&s32, v32, MEMMODEL_RELAXED); + __atomic_fetch_and (&s32, v32, MEMMODEL_RELAXED); + __atomic_fetch_or (&s32, v32, MEMMODEL_RELAXED); + __atomic_fetch_xor (&s32, v32, MEMMODEL_RELAXED); + + return 0; } -/* { dg-final { scan-assembler "atom.add.u64" } } */ -/* { dg-final { scan-assembler "atom.b64.and" } } */ -/* { dg-final { scan-assembler "atom.b64.or" } } */ -/* { dg-final { scan-assembler "atom.b64.xor" } } */ +/* Generic. */ + +/* { dg-final { scan-assembler-times "atom.add.u64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b64.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b64.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b64.xor" 1 } } */ + +/* { dg-final { scan-assembler-times "atom.add.u32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b32.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b32.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b32.xor" 1 } } */ + +/* Global. */ + +/* { dg-final { scan-assembler-times "atom.global.add.u64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b64.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b64.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b64.xor" 1 } } */ + +/* { dg-final { scan-assembler-times "atom.global.add.u32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b32.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b32.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b32.xor" 1 } } */ + +/* Shared. */ + +/* { dg-final { scan-assembler-times "atom.shared.add.u64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b64.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b64.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b64.xor" 1 } } */ + +/* { dg-final { scan-assembler-times "atom.shared.add.u32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b32.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b32.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b32.xor" 1 } } */ diff --git a/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c b/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c index 1d35a176a62..f5131fc4984 100644 --- a/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c +++ b/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c @@ -4,21 +4,91 @@ /* { dg-do compile } */ /* { dg-options "-O2 -misa=sm_30" } */ +enum memmodel +{ + MEMMODEL_RELAXED = 0 +}; + +unsigned long long int *p64; +unsigned int *p32; + +unsigned long long int g64; +unsigned int g32; + +unsigned int s32 __attribute__((shared)); +unsigned long long int s64 __attribute__((shared)); + +unsigned long long int v64; +unsigned int v32; + int main() { - unsigned long long a = ~0; - unsigned b = 0xa; + /* Generic. */ - __atomic_fetch_add (&a, b, 0); - __atomic_fetch_and (&a, b, 0); - __atomic_fetch_or (&a, b, 0); - __atomic_fetch_xor (&a, b, 0); + __atomic_fetch_add (p64, v64, MEMMODEL_RELAXED); + __atomic_fetch_and (p64, v64, MEMMODEL_RELAXED); + __atomic_fetch_or (p64, v64, MEMMODEL_RELAXED); + __atomic_fetch_xor (p64, v64, MEMMODEL_RELAXED); - return a; + __atomic_fetch_add (p32, v32, MEMMODEL_RELAXED); + __atomic_fetch_and (p32, v32, MEMMODEL_RELAXED); + __atomic_fetch_or (p32, v32, MEMMODEL_RELAXED); + __atomic_fetch_xor (p32, v32, MEMMODEL_RELAXED); + + /* Global. */ + + __atomic_fetch_add (&g64, v64, MEMMODEL_RELAXED); + __atomic_fetch_and (&g64, v64, MEMMODEL_RELAXED); + __atomic_fetch_or (&g64, v64, MEMMODEL_RELAXED); + __atomic_fetch_xor (&g64, v64, MEMMODEL_RELAXED); + + __atomic_fetch_add (&g32, v32, MEMMODEL_RELAXED); + __atomic_fetch_and (&g32, v32, MEMMODEL_RELAXED); + __atomic_fetch_or (&g32, v32, MEMMODEL_RELAXED); + __atomic_fetch_xor (&g32, v32, MEMMODEL_RELAXED); + + /* Shared. */ + + __atomic_fetch_add (&s64, v64, MEMMODEL_RELAXED); + __atomic_fetch_and (&s64, v64, MEMMODEL_RELAXED); + __atomic_fetch_or (&s64, v64, MEMMODEL_RELAXED); + __atomic_fetch_xor (&s64, v64, MEMMODEL_RELAXED); + + __atomic_fetch_add (&s32, v32, MEMMODEL_RELAXED); + __atomic_fetch_and (&s32, v32, MEMMODEL_RELAXED); + __atomic_fetch_or (&s32, v32, MEMMODEL_RELAXED); + __atomic_fetch_xor (&s32, v32, MEMMODEL_RELAXED); + + return 0; } -/* { dg-final { scan-assembler-not "atom.b64.add" } } */ -/* { dg-final { scan-assembler-not "atom.b64.and" } } */ -/* { dg-final { scan-assembler-not "atom.b64.or" } } */ -/* { dg-final { scan-assembler-not "atom.b64.xor" } } */ +/* Generic. */ + +/* { dg-final { scan-assembler-times "atom.add.u64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.cas.b64" 3 } } */ + +/* { dg-final { scan-assembler-times "atom.add.u32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b32.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b32.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.b32.xor" 1 } } */ + +/* Global. */ + +/* { dg-final { scan-assembler-times "atom.global.add.u64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.cas.b64" 3 } } */ + +/* { dg-final { scan-assembler-times "atom.global.add.u32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b32.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b32.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.b32.xor" 1 } } */ + +/* Shared. */ + +/* { dg-final { scan-assembler-times "atom.shared.add.u64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.cas.b64" 3 } } */ + +/* { dg-final { scan-assembler-times "atom.shared.add.u32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b32.and" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b32.or" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.b32.xor" 1 } } */