From patchwork Tue Oct 31 00:49:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick O'Neill X-Patchwork-Id: 1857288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=ZH7dGX8C; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SKBSB0rjyz1yQ4 for ; Tue, 31 Oct 2023 11:52:25 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 01AF03858D20 for ; Tue, 31 Oct 2023 00:52:24 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by sourceware.org (Postfix) with ESMTPS id 4D7B23858D1E for ; Tue, 31 Oct 2023 00:52:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4D7B23858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4D7B23858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::102e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698713532; cv=none; b=abJJ7t5ftBmz1KLrgeVz1ZHjd7hfw4oMggSMqjPAjc7MDjsl47Vr4jmzmH2pnZjpH2+GG1kLSoNGtbgcGQcHP6D2mJMJiEJyD4DbSyEyTQRS2ZTpMe+xBvKMQLSmduwnzBi+qgBc6+y/w7X01s+/QPsN1jDSNt2nZORN5SKVK0U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698713532; c=relaxed/simple; bh=Xt8tf9rJwrt+jTrYUY0vnUWu6JYDW+EW/Fp9MU+fRd8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=sIk+bxM1nP55YYli55aL5BC6Z23/6WwdLvokmgyXVxmbfRWK7FReJJW8s4mJFJjt9nK2+eEEfa9/+Llsnr5rjUEl0C6renmiiEqJtUkglwmBO3cbu4SJpi3CD2xE+KjjkXtMh2e5bQXp/yc+d1I+L8TEf0kpOXIl8cjEEpDcQ8Y= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-28014fed9efso2203728a91.0 for ; Mon, 30 Oct 2023 17:52:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698713528; x=1699318328; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+TofWZ20RsQj/NI6DA7VskIHyWGVZ8i9o8pKEhQ1T58=; b=ZH7dGX8CMZe1+sZPwRmLVQrvTD+QLNJRab4FZKzLTfR74yJidtG3r7sgvqp3PaZnJJ 4L5sW5PqQtDAzWAs5FET524fpWNGM+9cU5+qGaKitt65rWaaxu76KeTFVXrnZ9u0zli8 4XhMt8iHXoaAOSc1zx2F7tXQBp6tOXnO71ilHKn+LGPydr/Scap02nrq8PahON9Gjlsy Yxdc+ciPd8GOGKhilBf976kgk3Nc7Hvu+c7FEKopIFctIaMvzxFw47XMUzwE/0gBQayg 3jk8xqIGLaL+DpeC77t8necCOAR0Mi53okmEyJ8YNeb4zSzzKutrRRGoZES6ji1mU9O6 vmfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698713528; x=1699318328; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+TofWZ20RsQj/NI6DA7VskIHyWGVZ8i9o8pKEhQ1T58=; b=txIuKkJ1IbGBkvOdtzX11bbkHRxl29GMENXVbRl7Jbqg0liyKQtOJ9wee7QCav6Gq7 42nhhD95+gWQ52QhGP/yFVEgMO3bA35wna87Qh1he673j7axc0Ub1JH55lMBMpyvrwur tCfj0crAXKNWT0cH4LyJhISontAp3QY2VN836xpRFtGeBSGH/Hl42GgYwioIcK2g8st5 vlYKKtyNnbqx5Re31n1FVPBk1YRcqNKoRhROnZ8Hn2QyOCfsZGtfWNgCbANFeTN/eBCM C4IHg2fsZ9P7muv/w5ARwhuk6e0JuWsMm0gwkQDUMfCluVOXA/ShRKvnzGMc0CayMrms Qyew== X-Gm-Message-State: AOJu0YzG8BbYQOSGhvxbOjAN9QarEk0EKyQSfaiZYN2ClzpLDmr3DNY0 iViZMgQmmK+GMneBRRlD6lNKqhudNLL4o+1eNAE= X-Google-Smtp-Source: AGHT+IHtdkzVh5nZWgOspAgQz4Y5yvzPujhvjCC0Rru3wia/hICn1V2rNQzcTAKV2wHQOdPsLxmcbA== X-Received: by 2002:a17:90a:1a17:b0:280:2c55:77c5 with SMTP id 23-20020a17090a1a1700b002802c5577c5mr4661526pjk.46.1698713528406; Mon, 30 Oct 2023 17:52:08 -0700 (PDT) Received: from patrick-ThinkPad-X1-Carbon-Gen-8.hq.rivosinc.com ([12.44.203.122]) by smtp.gmail.com with ESMTPSA id 9-20020a17090a004900b0027782f611d1sm89335pjb.36.2023.10.30.17.52.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 17:52:08 -0700 (PDT) From: Patrick O'Neill To: gcc-patches@gcc.gnu.org Cc: Patrick O'Neill Subject: [PATCH 1/2] RISC-V: Let non-atomic targets use optimized amo loads/stores Date: Mon, 30 Oct 2023 17:49:28 -0700 Message-ID: <20231031004929.1435217-1-patrick@rivosinc.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Non-atomic targets are currently prevented from using the optimized fencing for seq_cst load/seq_cst store. This patch removes that constraint. gcc/ChangeLog: * config/riscv/sync-rvwmo.md (atomic_load_rvwmo): Remove TARGET_ATOMIC constraint (atomic_store_rvwmo): Ditto. * config/riscv/sync-ztso.md (atomic_load_ztso): Ditto. (atomic_store_ztso): Ditto. * config/riscv/sync.md (atomic_load): Ditto. (atomic_store): Ditto. Signed-off-by: Patrick O'Neill --- gcc/config/riscv/sync-rvwmo.md | 4 ++-- gcc/config/riscv/sync-ztso.md | 4 ++-- gcc/config/riscv/sync.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.34.1 diff --git a/gcc/config/riscv/sync-rvwmo.md b/gcc/config/riscv/sync-rvwmo.md index cb641ea9ec3..c35eae15334 100644 --- a/gcc/config/riscv/sync-rvwmo.md +++ b/gcc/config/riscv/sync-rvwmo.md @@ -52,7 +52,7 @@ [(match_operand:GPR 1 "memory_operand" "A") (match_operand:SI 2 "const_int_operand")] ;; model UNSPEC_ATOMIC_LOAD))] - "TARGET_ATOMIC && !TARGET_ZTSO" + "!TARGET_ZTSO" { enum memmodel model = (enum memmodel) INTVAL (operands[2]); model = memmodel_base (model); @@ -78,7 +78,7 @@ [(match_operand:GPR 1 "reg_or_0_operand" "rJ") (match_operand:SI 2 "const_int_operand")] ;; model UNSPEC_ATOMIC_STORE))] - "TARGET_ATOMIC && !TARGET_ZTSO" + "!TARGET_ZTSO" { enum memmodel model = (enum memmodel) INTVAL (operands[2]); model = memmodel_base (model); diff --git a/gcc/config/riscv/sync-ztso.md b/gcc/config/riscv/sync-ztso.md index 7bb15b7ab8c..6fdfa912a2c 100644 --- a/gcc/config/riscv/sync-ztso.md +++ b/gcc/config/riscv/sync-ztso.md @@ -46,7 +46,7 @@ [(match_operand:GPR 1 "memory_operand" "A") (match_operand:SI 2 "const_int_operand")] ;; model UNSPEC_ATOMIC_LOAD))] - "TARGET_ATOMIC && TARGET_ZTSO" + "TARGET_ZTSO" { enum memmodel model = (enum memmodel) INTVAL (operands[2]); model = memmodel_base (model); @@ -66,7 +66,7 @@ [(match_operand:GPR 1 "reg_or_0_operand" "rJ") (match_operand:SI 2 "const_int_operand")] ;; model UNSPEC_ATOMIC_STORE))] - "TARGET_ATOMIC && TARGET_ZTSO" + "TARGET_ZTSO" { enum memmodel model = (enum memmodel) INTVAL (operands[2]); model = memmodel_base (model); diff --git a/gcc/config/riscv/sync.md b/gcc/config/riscv/sync.md index 6ff3493b5ce..ec9d4b4f59e 100644 --- a/gcc/config/riscv/sync.md +++ b/gcc/config/riscv/sync.md @@ -60,7 +60,7 @@ [(match_operand:GPR 0 "register_operand") (match_operand:GPR 1 "memory_operand") (match_operand:SI 2 "const_int_operand")] ;; model - "TARGET_ATOMIC" + "" { if (TARGET_ZTSO) emit_insn (gen_atomic_load_ztso (operands[0], operands[1], @@ -75,7 +75,7 @@ [(match_operand:GPR 0 "memory_operand") (match_operand:GPR 1 "reg_or_0_operand") (match_operand:SI 2 "const_int_operand")] ;; model - "TARGET_ATOMIC" + "" { if (TARGET_ZTSO) emit_insn (gen_atomic_store_ztso (operands[0], operands[1], From patchwork Tue Oct 31 00:49:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick O'Neill X-Patchwork-Id: 1857289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=Ftt8D5Av; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SKBSK45PDz1yQ4 for ; Tue, 31 Oct 2023 11:52:33 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9CDBD3858C2D for ; Tue, 31 Oct 2023 00:52:31 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by sourceware.org (Postfix) with ESMTPS id 79DC73858D20 for ; Tue, 31 Oct 2023 00:52:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 79DC73858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 79DC73858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1035 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698713534; cv=none; b=srNe6FLrCQBUaGjEjkUfrkk0SS8h2ws9vVqSTUn93+fnUeK++QOqyhgFpttq3N6gIo0x6F+P41582xkwSdc3/lhTjmUxtpwaWSIevA9t82LPgioyT/EwQOLznCEHwW+emrY/RJBrBN5kr59UfoB7pJgxfFCEVUwFCSjtK7LgGtU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698713534; c=relaxed/simple; bh=7ESAEbWcnCx89xiYQUuezcwGFLQNeJE8y3bIb8aG4GA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=J2lFfh8UfQ990/rB6ObFGt9sIUTRh73Lw9SjyEgDiixXVWb92rTuEIGd86wb1POrP4kx+nEHvUsnJ/sbipeS5KjOUBTFLbgBXD+X6XjY1r9u868Bh7aj1llDuGsY+SxGeyflU5hRvVgMTcilcJ+vIhVPPaFKIzwj41E1jrYKic8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x1035.google.com with SMTP id 98e67ed59e1d1-27d8e2ac2b1so3566178a91.2 for ; Mon, 30 Oct 2023 17:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698713530; x=1699318330; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tHzHWt1oNtd2O+qZMQ4hktk/uAZnxIPXuaDsiLkkaJk=; b=Ftt8D5AvU7SXACGCRONfrlIOBGT16XcreVKo4VelTiX++X8zmZ/u9wj0tboRth+vGH 6dAixoOZVr7fp4jvTHa+FBIyL1pMKm+/wVns3gwgM2fYj50MiV1vZoshNQ3Q9X+XKQmx ccqASHYDFloG2p5zkhuVZWOGtAC8srRQfsL8Ay+L5WRw0s3a/5X0J83onWh1KX5ki+lL i+SsodJ+IdHjlqeLhi6nBKjEy+eASNTP4OVEpog2elQej1lc8Tp6sd6Cx4mGvJo6eMYE 1SzE+z6QnY0A9kkSyFDlAzEoMv5WxtNSklYxUDkWvGu2RTqi7Qkylty3u5rRNk2g+Oho F6nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698713530; x=1699318330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tHzHWt1oNtd2O+qZMQ4hktk/uAZnxIPXuaDsiLkkaJk=; b=oU59DjfZXD9fWa1Wgj30tB+yH5v7vk69UFotAsb9c93oBWixkQMK4H4xV/2z6eSm4f 8IIAXYddw1Z4KNOTw+JNg1UYYr221PaVSb3+nzFpiwd249EdZhU2FjS1UFjLn9ggNSUZ hzs62fVHXPYZOZJgyegO6W1rUlH0rh0o+DVXa0QWwaG+L2ou481qpFtsu0GTrYBEacI+ 7jsaWTNee2Y0uTMtKjV1jHu+ze3+8po43ybegQnBolPIUYxPsoUubPBwxuTx8SslqApR 8rnIBkpBayyBLcO+bWLhlwHF+UomuyJx0njKbV7+A4DITsH1FFupyXoX1HS9bK8bDMRe EgqA== X-Gm-Message-State: AOJu0Yyqnuxzby5SkAmfptkqcFhefJobMvZeCS62iRkDdgOSJNGNEBel nnaPc1xnZ3s90582e24DMBodfVm9S30aVyza3PY= X-Google-Smtp-Source: AGHT+IFhqUigLhQUN5cgN4amwo0DQSCSCZ2coR4y340WfXMgFbOf0oMGTOo07bNzNgpCr9KGKBCrJA== X-Received: by 2002:a17:90a:1a51:b0:27d:4278:ba53 with SMTP id 17-20020a17090a1a5100b0027d4278ba53mr9038103pjl.47.1698713529694; Mon, 30 Oct 2023 17:52:09 -0700 (PDT) Received: from patrick-ThinkPad-X1-Carbon-Gen-8.hq.rivosinc.com ([12.44.203.122]) by smtp.gmail.com with ESMTPSA id 9-20020a17090a004900b0027782f611d1sm89335pjb.36.2023.10.30.17.52.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 17:52:09 -0700 (PDT) From: Patrick O'Neill To: gcc-patches@gcc.gnu.org Cc: Patrick O'Neill Subject: [PATCH 2/2] RISC-V: Require a extension for testcases with atomic insns Date: Mon, 30 Oct 2023 17:49:29 -0700 Message-ID: <20231031004929.1435217-2-patrick@rivosinc.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231031004929.1435217-1-patrick@rivosinc.com> References: <20231031004929.1435217-1-patrick@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Add testsuite infrastructure for the A extension and use it to require the A extension for dg-do run and add the add extension for non-A dg-do compile. gcc/testsuite/ChangeLog: * gcc.target/riscv/amo-table-a-6-amo-add-1.c: Add A extension to dg-options for dg-do compile. * gcc.target/riscv/amo-table-a-6-amo-add-2.c: Ditto. * gcc.target/riscv/amo-table-a-6-amo-add-3.c: Ditto. * gcc.target/riscv/amo-table-a-6-amo-add-4.c: Ditto. * gcc.target/riscv/amo-table-a-6-amo-add-5.c: Ditto. * gcc.target/riscv/amo-table-a-6-compare-exchange-1.c: Ditto. * gcc.target/riscv/amo-table-a-6-compare-exchange-2.c: Ditto. * gcc.target/riscv/amo-table-a-6-compare-exchange-3.c: Ditto. * gcc.target/riscv/amo-table-a-6-compare-exchange-4.c: Ditto. * gcc.target/riscv/amo-table-a-6-compare-exchange-5.c: Ditto. * gcc.target/riscv/amo-table-a-6-compare-exchange-6.c: Ditto. * gcc.target/riscv/amo-table-a-6-compare-exchange-7.c: Ditto. * gcc.target/riscv/amo-table-a-6-subword-amo-add-1.c: Ditto. * gcc.target/riscv/amo-table-a-6-subword-amo-add-2.c: Ditto. * gcc.target/riscv/amo-table-a-6-subword-amo-add-3.c: Ditto. * gcc.target/riscv/amo-table-a-6-subword-amo-add-4.c: Ditto. * gcc.target/riscv/amo-table-a-6-subword-amo-add-5.c: Ditto. * gcc.target/riscv/inline-atomics-2.c: Ditto. * gcc.target/riscv/inline-atomics-3.c: Require A extension for dg-do run. * gcc.target/riscv/inline-atomics-4.c: Ditto. * gcc.target/riscv/inline-atomics-5.c: Ditto. * gcc.target/riscv/inline-atomics-6.c: Ditto. * gcc.target/riscv/inline-atomics-7.c: Ditto. * gcc.target/riscv/inline-atomics-8.c: Ditto. * lib/target-supports.exp: Add testing infrastructure to require the A extension or add it to an existing -march. Signed-off-by: Patrick O'Neill --- This patch relies on the previous one in the series. If applied seperately, amo-table-a-6-store-compat-3.c and amo-table-a-6-load-3.c must be updated to require the A extension as those testcases check for the optimized fences. --- .../riscv/amo-table-a-6-amo-add-1.c | 1 + .../riscv/amo-table-a-6-amo-add-2.c | 1 + .../riscv/amo-table-a-6-amo-add-3.c | 1 + .../riscv/amo-table-a-6-amo-add-4.c | 1 + .../riscv/amo-table-a-6-amo-add-5.c | 1 + .../riscv/amo-table-a-6-compare-exchange-1.c | 1 + .../riscv/amo-table-a-6-compare-exchange-2.c | 1 + .../riscv/amo-table-a-6-compare-exchange-3.c | 1 + .../riscv/amo-table-a-6-compare-exchange-4.c | 1 + .../riscv/amo-table-a-6-compare-exchange-5.c | 1 + .../riscv/amo-table-a-6-compare-exchange-6.c | 1 + .../riscv/amo-table-a-6-compare-exchange-7.c | 1 + .../riscv/amo-table-a-6-subword-amo-add-1.c | 1 + .../riscv/amo-table-a-6-subword-amo-add-2.c | 1 + .../riscv/amo-table-a-6-subword-amo-add-3.c | 1 + .../riscv/amo-table-a-6-subword-amo-add-4.c | 1 + .../riscv/amo-table-a-6-subword-amo-add-5.c | 1 + .../gcc.target/riscv/inline-atomics-2.c | 3 ++- .../gcc.target/riscv/inline-atomics-3.c | 2 +- .../gcc.target/riscv/inline-atomics-4.c | 2 +- .../gcc.target/riscv/inline-atomics-5.c | 2 +- .../gcc.target/riscv/inline-atomics-6.c | 2 +- .../gcc.target/riscv/inline-atomics-7.c | 2 +- .../gcc.target/riscv/inline-atomics-8.c | 2 +- gcc/testsuite/lib/target-supports.exp | 23 +++++++++++++++++++ 25 files changed, 48 insertions(+), 7 deletions(-) -- 2.34.1 diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-1.c index 071a33928fe..8ab1a02b40c 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-1.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-add-options riscv_a } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-2.c index d6b2d91db2a..a5a841abdcd 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-2.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-add-options riscv_a } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-3.c index 68a69ed8b78..f523821b658 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-3.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-add-options riscv_a } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-4.c index b5cac4c4797..f1561b52c89 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-4.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-4.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-add-options riscv_a } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-5.c index 268e58cb95f..81f876ee625 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-5.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-amo-add-5.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-add-options riscv_a } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-1.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-1.c index 8349e7a69ac..dc445f0316a 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-1.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-2.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-2.c index bf30b298b4b..7e8ab7bb5ef 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-2.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-3.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-3.c index 41444ec95e9..4cb6c422213 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-3.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-4.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-4.c index dc2d7bd300d..da81c34b92c 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-4.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-4.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-5.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-5.c index 53246210900..bb16ccc754c 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-5.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-5.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-6.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-6.c index 1376ac2a95b..0f3f0b49d95 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-6.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-6.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* Mixed mappings need to be unioned. */ /* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-7.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-7.c index 98083cbae08..d51de56cc78 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-7.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-compare-exchange-7.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-1.c index d7d887dd181..ca8aa715bed 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-1.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-2.c index 897bad26ebd..e64759a54ae 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-2.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-3.c index 79efca2839a..9d3f69264fa 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-3.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-4.c index 772ac1be6eb..ba32ed59c2f 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-4.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-4.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w.aq\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-5.c index b0bec66990e..f9be8c5e628 100644 --- a/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-5.c +++ b/gcc/testsuite/gcc.target/riscv/amo-table-a-6-subword-amo-add-5.c @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ +/* { dg-add-options riscv_a } */ /* { dg-final { scan-assembler-times "lr.w.aqrl\t" 1 } } */ /* { dg-final { scan-assembler-times "sc.w.rl\t" 1 } } */ diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-2.c b/gcc/testsuite/gcc.target/riscv/inline-atomics-2.c index 01b43908692..76c99829f33 100644 --- a/gcc/testsuite/gcc.target/riscv/inline-atomics-2.c +++ b/gcc/testsuite/gcc.target/riscv/inline-atomics-2.c @@ -1,9 +1,10 @@ /* { dg-do compile } */ /* Verify that subword atomics do not generate calls. */ /* { dg-options "-minline-atomics" } */ +/* { dg-add-options riscv_a } */ /* { dg-message "note: '__sync_fetch_and_nand' changed semantics in GCC 4.4" "fetch_and_nand" { target *-*-* } 0 } */ /* { dg-final { scan-assembler-not "\tcall\t__sync_fetch_and_add_1" } } */ /* { dg-final { scan-assembler-not "\tcall\t__sync_fetch_and_nand_1" } } */ /* { dg-final { scan-assembler-not "\tcall\t__sync_bool_compare_and_swap_1" } } */ -#include "inline-atomics-1.c" \ No newline at end of file +#include "inline-atomics-1.c" diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-3.c b/gcc/testsuite/gcc.target/riscv/inline-atomics-3.c index 709f3734377..7bab0dda03f 100644 --- a/gcc/testsuite/gcc.target/riscv/inline-atomics-3.c +++ b/gcc/testsuite/gcc.target/riscv/inline-atomics-3.c @@ -2,7 +2,7 @@ /* Duplicate logic as libatomic/testsuite/libatomic.c/atomic-op-1.c */ /* Test __atomic routines for existence and proper execution on 1 byte values with each valid memory model. */ -/* { dg-do run } */ +/* { dg-do run { target { riscv_a } } } */ /* { dg-options "-minline-atomics -Wno-address-of-packed-member" } */ /* Test the execution of the __atomic_*OP builtin routines for a char. */ diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-4.c b/gcc/testsuite/gcc.target/riscv/inline-atomics-4.c index eecfaae5cc6..480661353b8 100644 --- a/gcc/testsuite/gcc.target/riscv/inline-atomics-4.c +++ b/gcc/testsuite/gcc.target/riscv/inline-atomics-4.c @@ -2,7 +2,7 @@ /* Duplicate logic as libatomic/testsuite/libatomic.c/atomic-op-2.c */ /* Test __atomic routines for existence and proper execution on 2 byte values with each valid memory model. */ -/* { dg-do run } */ +/* { dg-do run { target { riscv_a } } } */ /* { dg-options "-minline-atomics -Wno-address-of-packed-member" } */ /* Test the execution of the __atomic_*OP builtin routines for a short. */ diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-5.c b/gcc/testsuite/gcc.target/riscv/inline-atomics-5.c index 52093894a79..b677418e480 100644 --- a/gcc/testsuite/gcc.target/riscv/inline-atomics-5.c +++ b/gcc/testsuite/gcc.target/riscv/inline-atomics-5.c @@ -1,7 +1,7 @@ /* Test __atomic routines for existence and proper execution on 1 byte values with each valid memory model. */ /* Duplicate logic as libatomic/testsuite/libatomic.c/atomic-compare-exchange-1.c */ -/* { dg-do run } */ +/* { dg-do run { target { riscv_a } } } */ /* { dg-options "-minline-atomics" } */ /* Test the execution of the __atomic_compare_exchange_n builtin for a char. */ diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-6.c b/gcc/testsuite/gcc.target/riscv/inline-atomics-6.c index 8fee8c44811..fcf2a13fd26 100644 --- a/gcc/testsuite/gcc.target/riscv/inline-atomics-6.c +++ b/gcc/testsuite/gcc.target/riscv/inline-atomics-6.c @@ -1,7 +1,7 @@ /* Test __atomic routines for existence and proper execution on 2 byte values with each valid memory model. */ /* Duplicate logic as libatomic/testsuite/libatomic.c/atomic-compare-exchange-2.c */ -/* { dg-do run } */ +/* { dg-do run { target { riscv_a } } } */ /* { dg-options "-minline-atomics" } */ /* Test the execution of the __atomic_compare_exchange_n builtin for a short. */ diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-7.c b/gcc/testsuite/gcc.target/riscv/inline-atomics-7.c index 24c344c0ce3..72dc42272f1 100644 --- a/gcc/testsuite/gcc.target/riscv/inline-atomics-7.c +++ b/gcc/testsuite/gcc.target/riscv/inline-atomics-7.c @@ -1,7 +1,7 @@ /* Test __atomic routines for existence and proper execution on 1 byte values with each valid memory model. */ /* Duplicate logic as libatomic/testsuite/libatomic.c/atomic-exchange-1.c */ -/* { dg-do run } */ +/* { dg-do run { target { riscv_a } } } */ /* { dg-options "-minline-atomics" } */ /* Test the execution of the __atomic_exchange_n builtin for a char. */ diff --git a/gcc/testsuite/gcc.target/riscv/inline-atomics-8.c b/gcc/testsuite/gcc.target/riscv/inline-atomics-8.c index edc212df04e..f583e7187ea 100644 --- a/gcc/testsuite/gcc.target/riscv/inline-atomics-8.c +++ b/gcc/testsuite/gcc.target/riscv/inline-atomics-8.c @@ -1,7 +1,7 @@ /* Test __atomic routines for existence and proper execution on 2 byte values with each valid memory model. */ /* Duplicate logic as libatomic/testsuite/libatomic.c/atomic-exchange-2.c */ -/* { dg-do run } */ +/* { dg-do run { target { riscv_a } } } */ /* { dg-options "-minline-atomics" } */ /* Test the execution of the __atomic_X builtin for a short. */ diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index f0b692a2e19..8cc170242eb 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -1903,6 +1903,17 @@ proc check_effective_target_rv_float_abi_soft { } { }] } +# Return 1 if the target arch supports the atomic extension, 0 otherwise. +# Cache the result. + +proc check_effective_target_riscv_a { } { + return [check_no_compiler_messages riscv_ext_a assembly { + #ifndef __riscv_a + #error "Not __riscv_a" + #endif + }] +} + # Return 1 if the target arch supports the double precision floating point # extension, 0 otherwise. Cache the result. @@ -2018,6 +2029,18 @@ proc riscv_get_arch { } { return "$gcc_march" } +proc add_options_for_riscv_a { flags } { + if { [lsearch $flags -march=*] >= 0 } { + # If there are multiple -march flags, we have to adjust all of them. + set expanded_flags [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*)g+} $flags \\1imafd ] + return [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*[b-eg-rt-wy]*)a*} $expanded_flags \\1a ] + } + if { [check_effective_target_riscv_a] } { + return "$flags" + } + return "$flags -march=[regsub {(rv[[:digit:]]*[b-eg-rt-wy]*)a*} [riscv_get_arch] &a]" +} + proc add_options_for_riscv_d { flags } { if { [lsearch $flags -march=*] >= 0 } { # If there are multiple -march flags, we have to adjust all of them.