From patchwork Wed Jun 12 23:20:26 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: 92025 X-Patchwork-Delegate: jlaw@ventanamicro.com 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 425E33882075 for ; Wed, 12 Jun 2024 23:20:59 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-oo1-xc34.google.com (mail-oo1-xc34.google.com [IPv6:2607:f8b0:4864:20::c34]) by sourceware.org (Postfix) with ESMTPS id 7801E3882049 for ; Wed, 12 Jun 2024 23:20:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7801E3882049 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 7801E3882049 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c34 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718234437; cv=none; b=A4uQZm1Q2QTcLbA04KEUTywAvMaeY78QKPyvnVf3bloqIVCUasn2OiurIJC42SYeEEE9gNa1Bcp+JE+nPerWPjdsmn4gfGstNMSqnYIez2VINJlK1nSH4r6BixenT1d3+17cenSGs3OUbAFa4ialaLavK3jR84DGnOHzhABGIGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718234437; c=relaxed/simple; bh=mFPEQC8rx/MlJcJwMSxFK6gv5sVQT9YOWMS5Q4rhMrM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=roSHSX1NZIzNFCBxScbnPFLWPCqbPwGMJVLl+SgHbqm8Mm5wn1sejaFVAWyK8k0YXdTLWmEWFFMVgJnHBx4xpDycVKk+W7d87niUFAF0qVhxMZkhAfnpk5LFaL/9+pHUYQjt295M5l5jIbf4cyLY+rjINrHdHA2PJeOjcDNOI5w= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-xc34.google.com with SMTP id 006d021491bc7-5bb041514c1so260319eaf.0 for ; Wed, 12 Jun 2024 16:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1718234433; x=1718839233; 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=prmzrZoyDR4WrU7OnAntlKZeByLIn8Ej/FfXxdDy0XM=; b=PfrJQtpbDvzKCGWRLxMnpqc1dqGMYMhPAYIEZ4bJ+xWZMtJYIiKsO0JabsoVdBm5O/ cm3dy5GDtvsdg7DVPpyipMEYz7BCTD/vwTTsWu0egorfUmfarynyWcBRIejxwA9RnJpZ 8kjikGYVI2NRI9txYsBLdvUcymU1S4v1v2/Mn5toywEd121YhTdxKVIylWGrtl/Oeme0 xUhP7H0R2gnglR7NICfTQrAsaneg/5tdq+2x5M6T12J9DZiB6tNEqUVLl+502Ze7J7QG mcEup/266PLg7wcvNSD5uxR/d5xUh9YL8sE7hkyQcRZ5qOnOE+YrbH7lP8x87fkTqQe6 gCqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718234433; x=1718839233; 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=prmzrZoyDR4WrU7OnAntlKZeByLIn8Ej/FfXxdDy0XM=; b=lB1GvNVdvYtGVt5nZnPK2BxtV2hNxn8473wQ5fO1MvdaWk6Cw1numdoRUO9lsLjw+o mdNQE8oDiM2eIFOe7xYmgZhn4tVAlIlsE67Deyapwa0r6ClhLZtKdqJ8nLP1uPXHx7t4 9qannJurN9y1Y2O5ue+FalxnMA6HIQ3bS0bzLOXDh9Apu8MQYJ/z8yOS/mQWhzfEBJZ0 q1Lz9CCzkUmzMEeelkQ1v2e9gBV5JDp/N7ju66sqS51t3rnqWK9uS3GvvEFBQBX7Ywcj fEjcPLNmiTGKvhyoWpmcgd2CGbJHbThFQoKeqjeHi9V4WIq7avsfGKrxsc8TGK0/U4ej KyFg== X-Gm-Message-State: AOJu0YzpZ8iD5jQyTbbgGKXiHRMYVEWu2Gs3jNLEy+twm2TRwmWcbUeM iZrn/8eEPsGU5LIe7ZQ8JkOcDD4A4hwFD6CZxVqgM9L3CaS2h1f4Fjea2iWOAQaETNlAP8eFQXR a X-Google-Smtp-Source: AGHT+IFOEMYa+Ab7+yysTbRI/jWEIdX/BRolqeOh/s/oGrO3iFgF7SVTETLAz9OhIxEoqGpBwzQ28Q== X-Received: by 2002:a05:6358:e4a6:b0:19f:4a60:e6f4 with SMTP id e5c5f4694b2df-19f69d54bb3mr399867355d.17.1718234432710; Wed, 12 Jun 2024 16:20:32 -0700 (PDT) Received: from patrick-ThinkPad-X1-Carbon-Gen-8.hq.rivosinc.com ([50.145.13.30]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-6fedcf36b88sm24981a12.10.2024.06.12.16.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 16:20:32 -0700 (PDT) From: Patrick O'Neill To: gcc-patches@gcc.gnu.org Cc: kito.cheng@gmail.com, jeffreyalaw@gmail.com, palmer@dabbelt.com, gnu-toolchain@rivosinc.com, pan2.li@intel.com, schwab@suse.de, andrea@rivosinc.com, Patrick O'Neill Subject: [PATCH] RISC-V: Add configure check for Zaamo/Zalrsc assembler support Date: Wed, 12 Jun 2024 16:20:26 -0700 Message-ID: <20240612232026.41780-1-patrick@rivosinc.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, 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+patchwork=sourceware.org@gcc.gnu.org Binutils 2.42 and before don't support Zaamo/Zalrsc. Add a configure check to prevent emitting Zaamo/Zalrsc in the arch string when the assember does not support it. gcc/ChangeLog: * common/config/riscv/riscv-common.cc (riscv_subset_list::to_string): Skip zaamo/zalrsc when not supported by the assembler. * config.in: Regenerate. * configure: Regenerate. * configure.ac: Add zaamo/zalrsc assmeber check. Signed-off-by: Patrick O'Neill Acked-by: Palmer Dabbelt # RISC-V Reviewed-by: Palmer Dabbelt # RISC-V --- Tested using newlib rv64gc with binutils tip-of-tree and 2.42. This results in calls being emitted when compiling for _zaamo_zalrsc when the assember does not support these extensions. > cat amo.c void foo (int* bar, int* baz) { __atomic_add_fetch(bar, baz, __ATOMIC_RELAXED); } > gcc -march=rv64id_zaamo_zalrsc -O3 amo.c results in: foo: sext.w a1,a1 li a2,0 tail __atomic_fetch_add_4 As a result there are some testsuite failures on zalrsc specific testcases and when using an old version of binutils on non-a targets. Not a cause for concern imo but worth calling out. Also testcases that check for the default isa string will fail with the old binutils since zaamo/zalrsc aren't emitted anymore. --- gcc/common/config/riscv/riscv-common.cc | 11 +++++++ gcc/config.in | 6 ++++ gcc/configure | 41 ++++++++++++++++++++++--- gcc/configure.ac | 5 +++ 4 files changed, 58 insertions(+), 5 deletions(-) -- 2.34.1 diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc index 78dfd6b1470..1dc1d9904c7 100644 --- a/gcc/common/config/riscv/riscv-common.cc +++ b/gcc/common/config/riscv/riscv-common.cc @@ -916,6 +916,7 @@ riscv_subset_list::to_string (bool version_p) const riscv_subset_t *subset; bool skip_zifencei = false; + bool skip_zaamo_zalrsc = false; bool skip_zicsr = false; bool i2p0 = false; @@ -943,6 +944,10 @@ riscv_subset_list::to_string (bool version_p) const a mistake in that binutils 2.35 supports zicsr but not zifencei. */ skip_zifencei = true; #endif +#ifndef HAVE_AS_MARCH_ZAAMO_ZALRSC + /* Skip since binutils 2.42 and earlier don't recognize zaamo/zalrsc. */ + skip_zaamo_zalrsc = true; +#endif for (subset = m_head; subset != NULL; subset = subset->next) { @@ -954,6 +959,12 @@ riscv_subset_list::to_string (bool version_p) const subset->name == "zicsr") continue; + if (skip_zaamo_zalrsc && subset->name == "zaamo") + continue; + + if (skip_zaamo_zalrsc && subset->name == "zalrsc") + continue; + /* For !version_p, we only separate extension with underline for multi-letter extension. */ if (!first && diff --git a/gcc/config.in b/gcc/config.in index e41b6dc97cd..acab3c0f126 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -629,6 +629,12 @@ #endif +/* Define if the assembler understands -march=rv*_zaamo_zalrsc. */ +#ifndef USED_FOR_TARGET +#undef HAVE_AS_MARCH_ZAAMO_ZALRSC +#endif + + /* Define if the assembler understands -march=rv*_zifencei. */ #ifndef USED_FOR_TARGET #undef HAVE_AS_MARCH_ZIFENCEI diff --git a/gcc/configure b/gcc/configure index aaf5899cc03..09b794c1225 100755 --- a/gcc/configure +++ b/gcc/configure @@ -6228,7 +6228,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6274,7 +6274,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6298,7 +6298,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6343,7 +6343,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -6367,7 +6367,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -30820,6 +30820,37 @@ if test $gcc_cv_as_riscv_march_zifencei = yes; then $as_echo "#define HAVE_AS_MARCH_ZIFENCEI 1" >>confdefs.h +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for -march=rv32i_zaamo_zalrsc support" >&5 +$as_echo_n "checking assembler for -march=rv32i_zaamo_zalrsc support... " >&6; } +if ${gcc_cv_as_riscv_march_zaamo_zalrsc+:} false; then : + $as_echo_n "(cached) " >&6 +else + gcc_cv_as_riscv_march_zaamo_zalrsc=no + if test x$gcc_cv_as != x; then + $as_echo '' > conftest.s + if { ac_try='$gcc_cv_as $gcc_cv_as_flags -march=rv32i_zaamo_zalrsc -o conftest.o conftest.s >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } + then + gcc_cv_as_riscv_march_zaamo_zalrsc=yes + else + echo "configure: failed program was" >&5 + cat conftest.s >&5 + fi + rm -f conftest.o conftest.s + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_riscv_march_zaamo_zalrsc" >&5 +$as_echo "$gcc_cv_as_riscv_march_zaamo_zalrsc" >&6; } +if test $gcc_cv_as_riscv_march_zaamo_zalrsc = yes; then + +$as_echo "#define HAVE_AS_MARCH_ZAAMO_ZALRSC 1" >>confdefs.h + fi ;; diff --git a/gcc/configure.ac b/gcc/configure.ac index f8d67efeb98..c54748cd9aa 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5452,6 +5452,11 @@ configured with --enable-newlib-nano-formatted-io.]) [-march=rv32i_zifencei2p0],,, [AC_DEFINE(HAVE_AS_MARCH_ZIFENCEI, 1, [Define if the assembler understands -march=rv*_zifencei.])]) + gcc_GAS_CHECK_FEATURE([-march=rv32i_zaamo_zalrsc support], + gcc_cv_as_riscv_march_zaamo_zalrsc, + [-march=rv32i_zaamo_zalrsc],,, + [AC_DEFINE(HAVE_AS_MARCH_ZAAMO_ZALRSC, 1, + [Define if the assembler understands -march=rv*_zaamo_zalrsc.])]) ;; loongarch*-*-*) gcc_GAS_CHECK_FEATURE([.dtprelword support],