From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id BD2403857C56; Thu, 10 Mar 2022 11:22:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD2403857C56 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Tom de Vries To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7583] [nvptx] Use atom.and.b64 instead of atom.b64.and X-Act-Checkin: gcc X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 975e7ade35095839b4dd2cc0f2b303bd63950db9 X-Git-Newrev: 248bbcb2c3212bcb9f2a485b591dd37371133402 Message-Id: <20220310112240.BD2403857C56@sourceware.org> Date: Thu, 10 Mar 2022 11:22:40 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2022 11:22:40 -0000 https://gcc.gnu.org/g:248bbcb2c3212bcb9f2a485b591dd37371133402 commit r12-7583-g248bbcb2c3212bcb9f2a485b591dd37371133402 Author: Tom de Vries Date: Mon Mar 7 14:59:02 2022 +0100 [nvptx] Use atom.and.b64 instead of atom.b64.and The ptx manual prescribes the instruction format atom{.space}.op.type but the compiler currently emits: ... atom.b64.and %r31, [%r30], %r32; ... which uses the instruction format atom{.space}.type.op. Fix this by emitting instead: ... atom.and.b64 %r31, [%r30], %r32; ... Tested on nvptx. gcc/ChangeLog: 2022-03-07 Tom de Vries * config/nvptx/nvptx.md (define_insn "atomic_fetch_"): Emit atom.and.b64 instead of atom.b64.and. gcc/testsuite/ChangeLog: 2022-03-07 Tom de Vries * gcc.target/nvptx/atomic_fetch-1.c: Update. * gcc.target/nvptx/atomic_fetch-2.c: Update. Diff: --- gcc/config/nvptx/nvptx.md | 2 +- gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c | 36 ++++++++++++------------- gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c | 18 ++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gcc/config/nvptx/nvptx.md b/gcc/config/nvptx/nvptx.md index a453c1de503..8079763077f 100644 --- a/gcc/config/nvptx/nvptx.md +++ b/gcc/config/nvptx/nvptx.md @@ -2226,7 +2226,7 @@ return ""; } const char *t - = "%.\\tatom%A1.b%T0.\\t%0, %1, %2;"; + = "%.\\tatom%A1..b%T0\\t%0, %1, %2;"; return nvptx_output_atomic_insn (t, operands, 1, 3); } diff --git a/gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c b/gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c index 941cf3a2ab4..801572928cb 100644 --- a/gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c +++ b/gcc/testsuite/gcc.target/nvptx/atomic_fetch-1.c @@ -66,35 +66,35 @@ main() /* 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.and.b64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.or.b64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.xor.b64" 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 } } */ +/* { dg-final { scan-assembler-times "atom.and.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.or.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.xor.b32" 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.and.b64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.or.b64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.xor.b64" 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 } } */ +/* { dg-final { scan-assembler-times "atom.global.and.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.or.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.xor.b32" 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.and.b64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.or.b64" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.xor.b64" 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 } } */ +/* { dg-final { scan-assembler-times "atom.shared.and.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.or.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.xor.b32" 1 } } */ diff --git a/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c b/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c index f5131fc4984..fa8d158cac3 100644 --- a/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c +++ b/gcc/testsuite/gcc.target/nvptx/atomic_fetch-2.c @@ -69,9 +69,9 @@ main() /* { 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 } } */ +/* { dg-final { scan-assembler-times "atom.and.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.or.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.xor.b32" 1 } } */ /* Global. */ @@ -79,9 +79,9 @@ main() /* { 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 } } */ +/* { dg-final { scan-assembler-times "atom.global.and.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.or.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.global.xor.b32" 1 } } */ /* Shared. */ @@ -89,6 +89,6 @@ main() /* { 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 } } */ +/* { dg-final { scan-assembler-times "atom.shared.and.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.or.b32" 1 } } */ +/* { dg-final { scan-assembler-times "atom.shared.xor.b32" 1 } } */