From patchwork Thu Jun 20 16:31:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick O'Neill X-Patchwork-Id: 1950310 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=hoCCr6ul; 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 4W4mGl6Bsbz20Wb for ; Fri, 21 Jun 2024 02:31:58 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D121438930D5 for ; Thu, 20 Jun 2024 16:31:56 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 5CD20389000C for ; Thu, 20 Jun 2024 16:31:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5CD20389000C 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 5CD20389000C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::635 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718901095; cv=none; b=BiwVQkWHI2w302sDcG2D5gmAGWTE0BIkDOuclU1yNYEBSRchlvEKWfpaIDTQxZnnqM9DIYVPnbQ8NFKCEUmyazEGuH4DycEgFqObglpMJ6lLB9h2u0NLbES6G12Wav0tGNpuYLT6uuzoxrWCK36aNCvgljXdn9YIP1uxk8xaoAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718901095; c=relaxed/simple; bh=2iL65jq2RvTXaHiK4IYBgOv36fUUSIAa7jy8osmSz5A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=qRLMnTPiQPLa4KL769g+7L/YvNtqXQ7CHVQs7C2Dm+fJCj49xGpgXFwLJ9f9lWKDicVR7w03suVH1qZVGI0tG8UXUgdxKKEgWfrX69A1d3wQITY7alGf18qaN1Nd/ENoXz0uTXOizozB+XrYy8QfX/nDf8ZDMXGD63vJBriciCE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1f99fe4dc5aso9536545ad.0 for ; Thu, 20 Jun 2024 09:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1718901089; x=1719505889; 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=4nRXwBi22uhzzzbD9/MDAcllZicF8hKvRjb7qysSaGI=; b=hoCCr6ul7JFZwZs70Srhx45t5W1yC08+ThiD4Wg4HppW+Y04Ye3xMdkx3vCg+oz3Uo 1CtKWGG32xu8oFdHbdEBb92SzUhMiQzYWvs3fqbIvtGzSgiDPlXmkqVrine99UWnyZJE qbZGhFmxyVLlFo4JyQy61w5gXOZ6STXUGvqnVMKppbE85VBHeWo3yYZs13e4TvbEE19W lypxFkhH3+QdCfqILDT2Oj4pajX5ED6tmWiCS1/ASNdeC1WgByp2m/dxPjXaL13Dzrap VqspOS4vbPDVgYECQkaJcnzKtXwcCGPSju04FpybH+niINOgRx7Y41dcRr5duAS7gn0q y89w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718901089; x=1719505889; 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=4nRXwBi22uhzzzbD9/MDAcllZicF8hKvRjb7qysSaGI=; b=k1yqnskVdjAu7W744s6spm5UCnLrw9M6PZxyOFC4c+OAKJYUWKqxD+X41U1sVrD3xN xFD777izqC60ILYBaj07qsUaOKkXIbhbZzBMzvO6BkfMEN9l0PGsgkt11l4mxHc+KsEk ZQQPnUVv6vz03OYvjl766DNHhgsCKwqxmIRfMf5ndwhs4Vk9zuz3j4x2gT8F2EmmrP+J tPIvm2m6aLzANr7kzz9Dl1pdxRyiXjZbw2/cmeA/wt3dRYfS/udbcOVEVOTYLHhBmsT4 0jEpuFi0RgSTa8aw/1NYveDXW7IHTBLpyF2aLO+fgj5I+zu8VG0P1FdvJjZ3O1DFTUWM WL8Q== X-Gm-Message-State: AOJu0Ywn1RvionHn6OPAf7/8cP2o2QxcLCwFOzdhKhrbdWQQtFYrzLDH R9nZoWYJlUvrUE99/tFNuGSpubPTzZpDj/P0/FgHOm4S+8u8aXeU0ShdRnrnuC15gCWxC7Qowra d X-Google-Smtp-Source: AGHT+IEbH8qxdLRdGtggxK1doShhFUoaglzanpbgMqDLC52sDgfqR06sSlzy1aUYxtdJiHbPF5WJjQ== X-Received: by 2002:a17:902:d4c9:b0:1f9:e3e8:456b with SMTP id d9443c01a7336-1f9e3e852cbmr3185385ad.4.1718901088033; Thu, 20 Jun 2024 09:31:28 -0700 (PDT) Received: from patrick-ThinkPad-X1-Carbon-Gen-8.ba.rivosinc.com ([2601:647:5700:6860:7fef:e61e:2d26:1b5]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-6fedd3fe89bsm11060963a12.11.2024.06.20.09.31.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jun 2024 09:31:27 -0700 (PDT) From: Patrick O'Neill To: gcc-patches@gcc.gnu.org Cc: joern.rennecke@embecosm.com, jeffreyalaw@gmail.com, palmer@dabbelt.com, kito.cheng@gmail.com, gnu-toolchain@rivosinc.com, Patrick O'Neill Subject: [PATCH v2] RISC-V: Add dg-remove-option for z* extensions Date: Thu, 20 Jun 2024 09:31:12 -0700 Message-ID: <20240620163112.2159275-1-patrick@rivosinc.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 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, T_SCC_BODY_TEXT_LINE 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 This introduces testsuite support infra for removing extensions. Since z* extensions don't have ordering requirements the logic for adding/removing those extensions has also been consolidated. This fixes RVWMO compile testcases failing on Ztso targets by removing the extension from the -march string. gcc/testsuite/ChangeLog: * gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c: Add dg-remove-options for ztso. * gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-1.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-2.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-3.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-4.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-5.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-6.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-compare-exchange-7.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-fence-1.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-fence-2.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-fence-3.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-fence-4.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-fence-5.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-load-1.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-load-2.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-load-3.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-store-1.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-store-2.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c: Ditto. * gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c: Ditto. * gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c: Replace manually specified -march string with dg-add/remove-options directives. * gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c: Ditto. * gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c: Ditto. * gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c: Ditto. * gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c: Ditto. * lib/target-supports-dg.exp: Add dg-remove-options. * lib/target-supports.exp: Add dg-remove-options and consolidate z* extension add/remove-option code. Signed-off-by: Patrick O'Neill --- Tested using rv64gcv_ztso/rv64id but relying on precommit to run the targets there. Beyond testing Ztso/Zalrsc this is also helpful for the Zabha patch I'm working on. We can continue to test the atomic subword emulation routines without specifing a -march string. --- v2 ChangeLog: Remove spare bracket that pre-commit flagged. Add missing dg-add-options for zalrsc testcases. --- .../riscv/amo/amo-table-a-6-amo-add-1.c | 1 + .../riscv/amo/amo-table-a-6-amo-add-2.c | 1 + .../riscv/amo/amo-table-a-6-amo-add-3.c | 1 + .../riscv/amo/amo-table-a-6-amo-add-4.c | 1 + .../riscv/amo/amo-table-a-6-amo-add-5.c | 1 + .../amo/amo-table-a-6-compare-exchange-1.c | 1 + .../amo/amo-table-a-6-compare-exchange-2.c | 1 + .../amo/amo-table-a-6-compare-exchange-3.c | 1 + .../amo/amo-table-a-6-compare-exchange-4.c | 1 + .../amo/amo-table-a-6-compare-exchange-5.c | 1 + .../amo/amo-table-a-6-compare-exchange-6.c | 1 + .../amo/amo-table-a-6-compare-exchange-7.c | 1 + .../riscv/amo/amo-table-a-6-fence-1.c | 1 + .../riscv/amo/amo-table-a-6-fence-2.c | 1 + .../riscv/amo/amo-table-a-6-fence-3.c | 1 + .../riscv/amo/amo-table-a-6-fence-4.c | 1 + .../riscv/amo/amo-table-a-6-fence-5.c | 1 + .../riscv/amo/amo-table-a-6-load-1.c | 1 + .../riscv/amo/amo-table-a-6-load-2.c | 1 + .../riscv/amo/amo-table-a-6-load-3.c | 1 + .../riscv/amo/amo-table-a-6-store-1.c | 1 + .../riscv/amo/amo-table-a-6-store-2.c | 1 + .../riscv/amo/amo-table-a-6-store-compat-3.c | 1 + .../amo/amo-table-a-6-subword-amo-add-1.c | 1 + .../amo/amo-table-a-6-subword-amo-add-2.c | 1 + .../amo/amo-table-a-6-subword-amo-add-3.c | 1 + .../amo/amo-table-a-6-subword-amo-add-4.c | 1 + .../amo/amo-table-a-6-subword-amo-add-5.c | 1 + .../riscv/amo/amo-zalrsc-amo-add-1.c | 5 +- .../riscv/amo/amo-zalrsc-amo-add-2.c | 5 +- .../riscv/amo/amo-zalrsc-amo-add-3.c | 5 +- .../riscv/amo/amo-zalrsc-amo-add-4.c | 5 +- .../riscv/amo/amo-zalrsc-amo-add-5.c | 5 +- gcc/testsuite/lib/target-supports-dg.exp | 16 ++ gcc/testsuite/lib/target-supports.exp | 190 +++++++++++++----- 35 files changed, 203 insertions(+), 56 deletions(-) -- 2.34.1 diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c index 2e53abf28aa..2acad7d44bf 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-1.c @@ -2,6 +2,7 @@ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ /* { dg-add-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c index 14d6b7e4b1b..ab21f079eaa 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-2.c @@ -2,6 +2,7 @@ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ /* { dg-add-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c index 937a00daf4c..919ff37d096 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-3.c @@ -2,6 +2,7 @@ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ /* { dg-add-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c index 7d7f4e11dd4..1531d3763b7 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-4.c @@ -2,6 +2,7 @@ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ /* { dg-add-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c index e5cf1e2e9cf..03b70111a74 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-amo-add-5.c @@ -2,6 +2,7 @@ /* Verify that atomic op mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ /* { dg-add-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-1.c index 4917cd6bd2b..fd8a8bfe9c6 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-1.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-compare-exchange-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-2.c index 121936507e3..b3cffad005d 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-2.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-compare-exchange-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-3.c index 649c7d2b1fe..70107c40a53 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-3.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-compare-exchange-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-4.c index 5f7fdeb1b21..faab1ab728c 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-4.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-4.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-compare-exchange-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-5.c index f4bd7d6d842..a1435a07a21 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-5.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-5.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-compare-exchange-6.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-6.c index 154764425ae..0cbc89c617c 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-6.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-6.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* 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/amo-table-a-6-compare-exchange-7.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-7.c index 16712540919..957aa3c0afd 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-7.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-compare-exchange-7.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that compare exchange mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-fence-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-1.c index bf590489c39..202479a005e 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-1.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that fence mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-2.c index 9848f8cae31..7d6c73a6b50 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-2.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that fence mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-3.c index 3c3ce6e0d18..a53889a4fa1 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-3.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that fence mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-4.c index 12d71717085..63a3a234d43 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-4.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-4.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that fence mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-5.c index 9567b604c2c..78040bd11e9 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-5.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-fence-5.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that fence mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c index 948fece6125..7b99db06d75 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-1.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that load mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c index e855db9b761..f9871b92c0b 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-2.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that load mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c index 6e79ca72abc..35f196c23c0 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-load-3.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that load mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c index ee7e7dbc8ee..eb67d1968e0 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-1.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that store mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c index 5110512e1ad..25a998b86eb 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-2.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that store mappings match Table A.6's recommended mapping. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c index 016e5dec87d..43880b9734a 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-store-compat-3.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that store mapping are compatible with Table A.6 & A.7. */ /* { dg-options "-O3" } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c index 348b9c8db9c..50009f021dc 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-1.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-subword-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c index 31011580684..782ffcb0a70 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-2.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-subword-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c index 38bedcd6b41..76ec8a81d1f 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-3.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-subword-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c index d69610e2d9e..3f5fa20c87c 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-4.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-table-a-6-subword-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c index 976f8909bdd..7417a67f692 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-table-a-6-subword-amo-add-5.c @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* Verify that subword atomic op mappings match Table A.6's recommended mapping. */ /* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_ztso } */ /* { 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/amo-zalrsc-amo-add-1.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c index 49c1a181d69..582e96534de 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-1.c @@ -1,6 +1,9 @@ /* { dg-do compile } */ /* Verify that lrsc atomic op mappings match Table A.6's recommended mapping. */ -/* { dg-options "-O3 -march=rv64id_zalrsc -mabi=lp64d" } */ +/* { dg-options "-O3" } */ +/* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c index af93c9a182b..987429640de 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-2.c @@ -1,6 +1,9 @@ /* { dg-do compile } */ /* Verify that lrsc atomic op mappings match Table A.6's recommended mapping. */ -/* { dg-options "-O3 -march=rv64id_zalrsc -mabi=lp64d" } */ +/* { dg-options "-O3" } */ +/* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c index ce68af841ea..b29966ce7d7 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-3.c @@ -1,6 +1,9 @@ /* { dg-do compile } */ /* Verify that lrsc atomic op mappings match Table A.6's recommended mapping. */ -/* { dg-options "-O3 -march=rv64id_zalrsc -mabi=lp64d" } */ +/* { dg-options "-O3" } */ +/* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c index be9f847782e..5dfb7ac2bac 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-4.c @@ -1,6 +1,9 @@ /* { dg-do compile } */ /* Verify that lrsc atomic op mappings match Table A.6's recommended mapping. */ -/* { dg-options "-O3 -march=rv64id_zalrsc -mabi=lp64d" } */ +/* { dg-options "-O3" } */ +/* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c index b31170c15db..fcc64131fec 100644 --- a/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c +++ b/gcc/testsuite/gcc.target/riscv/amo/amo-zalrsc-amo-add-5.c @@ -1,6 +1,9 @@ /* { dg-do compile } */ /* Verify that lrsc atomic op mappings match Table A.6's recommended mapping. */ -/* { dg-options "-O3 -march=rv64id_zalrsc -mabi=lp64d" } */ +/* { dg-options "-O3" } */ +/* { dg-add-options riscv_zalrsc } */ +/* { dg-remove-options riscv_zaamo } */ +/* { dg-remove-options riscv_ztso } */ /* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ /* { dg-final { check-function-bodies "**" "" } } */ diff --git a/gcc/testsuite/lib/target-supports-dg.exp b/gcc/testsuite/lib/target-supports-dg.exp index 6dce9fdc1ce..a098beb368e 100644 --- a/gcc/testsuite/lib/target-supports-dg.exp +++ b/gcc/testsuite/lib/target-supports-dg.exp @@ -321,6 +321,22 @@ proc dg-add-options { args } { } } +# Remove any target-specific flags needed for accessing the given list +# of features. This must come after all dg-options. + +proc dg-remove-options { args } { + upvar dg-extra-tool-flags extra-tool-flags + + foreach arg [lrange $args 1 end] { + if { [info procs remove_options_for_$arg] != "" } { + set extra-tool-flags \ + [eval [list remove_options_for_$arg ${extra-tool-flags}]] + } else { + error "Unrecognized option type: $arg" + } + } +} + # Compare flags for a test directive against flags that will be used to # compile the test: multilib flags, flags for torture options, and either # the default flags for this group of tests or flags specified with a diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index e307f4e69ef..44a5a671a3b 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -2156,7 +2156,7 @@ proc riscv_get_arch { } { 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. + # If there are any -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 ] } @@ -2166,9 +2166,41 @@ proc add_options_for_riscv_a { flags } { return "$flags -march=[regsub {(rv[[:digit:]]*[b-eg-rt-wy]*)a*} [riscv_get_arch] &a]" } +proc remove_options_for_riscv_a_only { flags } { + # Only remove the 'a' extension. Useful when removing zalrsc/zaamo. + if { [lsearch $flags -march=*] >= 0 } { + # If there are any -march flags, we have to adjust all of them. + set expanded_flags [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*)g+} $flags \\1imafd ] + set modified_flags [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*[b-eg-rt-wy]*)a*} $expanded_flags \\1 ] + return $modified_flags + } + if { [check_effective_target_riscv_a] } { + # Manually specify the -march and remove it with another call + return [remove_options_for_riscv_a_only "$flags -march=[riscv_get_arch]"] + } + return $flags +} + +proc remove_options_for_riscv_a { flags } { + # Remove the 'a' extension and implied zalrsc/zaamo extensions. + if { [lsearch $flags -march=*] >= 0 } { + # If there are any -march flags, we have to adjust all of them. + set modified_flags [remove_options_for_riscv_a_only $flags] + # Also removed implied extensions + set modified_flags [remove_options_for_riscv_z_ext zaamo $flags] + set modified_flags [remove_options_for_riscv_z_ext zalrsc $flags] + return $modified_flags + } + if { [check_effective_target_riscv_a] } { + # Manually specify the -march and remove it with another call + return [remove_options_for_riscv_a "$flags -march=[riscv_get_arch]"] + } + return $flags +} + 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. + # If there are any -march flags, we have to adjust all of them. return [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*[a-ce-rt-wy]*)d*} $flags \\1d ] } if { [check_effective_target_riscv_d] } { @@ -2177,9 +2209,21 @@ proc add_options_for_riscv_d { flags } { return "$flags -march=[regsub {[[:alnum:]]*} [riscv_get_arch] &d]" } +proc remove_options_for_riscv_d { flags } { + if { [lsearch $flags -march=*] >= 0 } { + # If there are any -march flags, we have to adjust all of them. + return [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*[a-ce-rt-wy]*)d*} $flags \\1d ] + } + if { [check_effective_target_riscv_d] } { + # Manually specify the -march and remove it with another call + return [remove_options_for_riscv_d "$flags -march=[riscv_get_arch]"] + } + return $flags +} + proc add_options_for_riscv_v { flags } { if { [lsearch $flags -march=*] >= 0 } { - # If there are multiple -march flags, we have to adjust all of them. + # If there are any -march flags, we have to adjust all of them. return [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*[a-rt-uwy]*)v*} $flags \\1v ] } if { [check_effective_target_riscv_v] } { @@ -2188,76 +2232,120 @@ proc add_options_for_riscv_v { flags } { return "$flags -march=[regsub {[[:alnum:]]*} [riscv_get_arch] &v]" } -proc add_options_for_riscv_zaamo { flags } { +proc remove_options_for_riscv_v { flags } { if { [lsearch $flags -march=*] >= 0 } { - # If there are multiple -march flags, we have to adjust all of them. - set flags [regsub -all -- {(?:^|[[:space:]])-march=[[:alnum:]_.]*} $flags &_zaamo ] - return [regsub -all -- {((?:^|[[:space:]])-march=[[:alnum:]_.]*_zaamo[[:alnum:]_.]*)_zaamo} $flags \\1 ] + # If there are any -march flags, we have to adjust all of them. + return [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*[a-rt-uwy]*)v*} $flags \\1 ] } - if { [check_effective_target_riscv_zaamo] } { - return "$flags" + if { [check_effective_target_riscv_v] } { + # Manually specify the -march and remove it with another call + return [remove_options_for_riscv_v "$flags -march=[riscv_get_arch]"] } - return "$flags -march=[riscv_get_arch]_zaamo" + return $flags } -proc add_options_for_riscv_zalrsc { flags } { - if { [lsearch $flags -march=*] >= 0 } { - # If there are multiple -march flags, we have to adjust all of them. - set flags [regsub -all -- {(?:^|[[:space:]])-march=[[:alnum:]_.]*} $flags &_zalrsc ] - return [regsub -all -- {((?:^|[[:space:]])-march=[[:alnum:]_.]*_zalrsc[[:alnum:]_.]*)_zalrsc} $flags \\1 ] - } - if { [check_effective_target_riscv_zalrsc] } { +proc add_options_for_riscv_z_ext { ext flags } { + if {[lsearch $flags "-march=*"] >= 0} { + # If there are any -march flags, we have to adjust all of them. + set modified_flags {} + foreach flag $flags { + if {[regexp {^-march=(\S+)} $flag match march_name]} { + if {![string match "*_${ext}*" $march_name]} { + set march_name "${march_name}_${ext}" + } + lappend modified_flags "-march=$march_name" + } else { + lappend modified_flags $flag + } + } + return [join $modified_flags " "] + } + if { [check_effective_target_riscv_$ext] } { return "$flags" } - return "$flags -march=[riscv_get_arch]_zalrsc" + return "$flags -march=[riscv_get_arch]_${ext}" } -proc add_options_for_riscv_zfh { flags } { +proc remove_options_for_riscv_z_ext { ext flags } { if { [lsearch $flags -march=*] >= 0 } { # If there are multiple -march flags, we have to adjust all of them. - set flags [regsub -all -- {(?:^|[[:space:]])-march=[[:alnum:]_.]*} $flags &_zfh ] - return [regsub -all -- {((?:^|[[:space:]])-march=[[:alnum:]_.]*_zfh[[:alnum:]_.]*)_zfh} $flags \\1 ] + set modified_flags "" + foreach flag $flags { + if {[regexp {^-march=(\S+)} $flag -> march_name]} { + # Remove "_ext" from the march_name if present + set march_name [string map [list _${ext} {}] $march_name] + lappend modified_flags "-march=$march_name" + } else { + lappend modified_flags $flag + } + } + return [join $modified_flags " "] } - if { [check_effective_target_riscv_zfh] } { - return "$flags" + if { [check_effective_target_riscv_$ext] } { + # Manually specify the -march and remove it with another call + return [remove_options_for_riscv_z_ext $ext "$flags -march=[riscv_get_arch]"] } - return "$flags -march=[riscv_get_arch]_zfh" + return $flags } -proc add_options_for_riscv_ztso { flags } { - if { [lsearch $flags -march=*] >= 0 } { - # If there are multiple -march flags, we have to adjust all of them. - set flags [regsub -all -- {(?:^|[[:space:]])-march=[[:alnum:]_.]*} $flags &_ztso ] - return [regsub -all -- {((?:^|[[:space:]])-march=[[:alnum:]_.]*_ztso[[:alnum:]_.]*)_ztso} $flags \\1 ] - } - if { [check_effective_target_riscv_ztso] } { - return "$flags" - } - return "$flags -march=[riscv_get_arch]_ztso" +proc add_options_for_riscv_zaamo { flags } { + return [add_options_for_riscv_z_ext zaamo $flags] } -proc add_options_for_riscv_zvfh { flags } { - if { [lsearch $flags -march=*] >= 0 } { - # If there are multiple -march flags, we have to adjust all of them. - set flags [regsub -all -- {(?:^|[[:space:]])-march=[[:alnum:]_.]*} $flags &_zvfh ] - return [regsub -all -- {((?:^|[[:space:]])-march=[[:alnum:]_.]*_zvfh[[:alnum:]_.]*)_zvfh} $flags \\1 ] +proc remove_options_for_riscv_zaamo { flags } { + set modified_flags [remove_options_for_riscv_z_ext zaamo $flags] + # If 'a' is set then zaamo will be implied. We need to downgrade instances + # of 'a' to 'zalrsc' + set no_a_flags [remove_options_for_riscv_a_only [split $modified_flags]] + if {![string equal $modified_flags $no_a_flags]} { + # 'a' was removed, add 'zalrsc' since it was previously implied + set modified_flags [add_options_for_riscv_zalrsc [split $no_a_flags]] } - if { [check_effective_target_riscv_zvfh] } { - return "$flags" + return $modified_flags +} + +proc add_options_for_riscv_zalrsc { flags } { + return [add_options_for_riscv_z_ext zalrsc $flags] +} + +proc remove_options_for_riscv_zalrsc { flags } { + set modified_flags [remove_options_for_riscv_z_ext zalrsc $flags] + # If 'a' is set then zalrsc will be implied. We need to downgrade instances + # of 'a' to 'zaamo' + set no_a_flags [remove_options_for_riscv_a_only [split $modified_flags]] + if {![string equal $modified_flags $no_a_flags]} { + # 'a' was removed, add 'zalrsc' since it was previously implied + set modified_flags [add_options_for_riscv_zalrsc [split $no_a_flags]] } - return "$flags -march=[riscv_get_arch]_zvfh" + return $modified_flags +} + +proc add_options_for_riscv_zfh { flags } { + return [add_options_for_riscv_z_ext zfh $flags] +} + +proc remove_options_for_riscv_zfh { flags } { + return [remove_options_for_riscv_z_ext zfh $flags] +} + +proc add_options_for_riscv_ztso { flags } { + return [add_options_for_riscv_z_ext ztso $flags] +} + +proc remove_options_for_riscv_ztso { flags } { + return [remove_options_for_riscv_z_ext ztso $flags] +} + +proc remove_options_for_riscv_zvfh { flags } { + return [add_options_for_riscv_z_ext zvfh $flags] } proc add_options_for_riscv_zvbb { flags } { - if { [lsearch $flags -march=*] >= 0 } { - # If there are multiple -march flags, we have to adjust all of them. - set flags [regsub -all -- {(?:^|[[:space:]])-march=[[:alnum:]_.]*} $flags &_zvbb ] - return [regsub -all -- {((?:^|[[:space:]])-march=[[:alnum:]_.]*_zvbb[[:alnum:]_.]*)_zvbb} $flags \\1 ] - } - if { [check_effective_target_riscv_zvbb] } { - return "$flags" - } - return "$flags -march=[riscv_get_arch]_zvbb" + return [add_options_for_riscv_z_ext zvbb $flags] +} + +proc remove_options_for_riscv_zvbb { flags } { + return [add_options_for_riscv_z_ext zvbb $flags] } # Return 1 if the target OS supports running SSE executables, 0