From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 293AB385782F for ; Tue, 5 Dec 2023 15:24:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 293AB385782F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 293AB385782F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::62b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701789875; cv=none; b=geFcdI3YlEDtmN6BneYWd1WE5Luoi47MSY/VmPVzXshKDpuPfREIp52nAt0jko6iFnUkccml/QHBVd7IC1+6CpZOqyvRkHfF7iMrvEPdr014dBQX776DYFNGz/FQMo+rIQF3UewOdifLp4E6OQAdpGFy/9xpR0n/Zj3DzrIEza0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701789875; c=relaxed/simple; bh=FwzBP3WcYPcPE7V0KoP4eOnyB2WWztku6CRDhwEKIn0=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=W6q3+2csN2oGp3aTMJMl8SbRCQYtiPuY18IlqvFyn524g/l/8qd1TRXtyEeOG+DU5MbGbKooMUt/1hGNHfDPqi9xeHZH2fTksadBZngezhFRobcoulO7tb3QUg7ivi81Sh5mJZW4Hh2rb2Cc8/vYbv2WVq28+fo1+3YZ3tgcRz4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a1cdeab6b53so88647366b.1 for ; Tue, 05 Dec 2023 07:24:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701789872; x=1702394672; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=z3ImnO15/evtkXcbdxgaO+Sfd04vHRq6dfzqIBGqmrk=; b=VI8nOiO0Ul8UbM4ALXSZoVZkZ+yZqFCQUU4kMnx61ZEzoyEB7+2wnkvFbrhTxrCHPz r/rDHbjsNntxbQS/i6LYW8+nP4911ey3AfohG01CnyJ3J6JaFNun7+We9EzAO4M/XV+O gWwyrQl2uSJryOBD984mx2NLYgH68Gtz7BeKtCKzqLoYA8FsR96yR7go8C2wzKhDpvqk 4lZnD3Z9waalMNrOwIcbkX53Ew9rmzeEPgAVgLGRJVWuT7HqB07QremBwzI31GguQV4j s3t3UN2pfUdLy4uI53iE4nlbc5x2qtt8i3spV84w/Tf2W5Fsi7wc4wTDp/aoewspdmdv zq0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701789872; x=1702394672; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=z3ImnO15/evtkXcbdxgaO+Sfd04vHRq6dfzqIBGqmrk=; b=EzhMQoXnERoLyQXo3PoKaSppXZDFyyM6zm2DPAjWXb4hhwyUrWfBEKQKz+iyEtOJNK CPlK6j8EgEQrL5Ck7hsgWwc13HNi70U0DLLv+VAS+erMJ4L2UeqrQT5F10X+6BrtAhxU pbIJ2pOuyVVeXKZKr7TUPexI737zkIkDFxmSsmbGOeQo2JA4yFTMtDVb7YR0GTXszVf/ uziwEmjaHCxAzXl/hNm0I4MYfgbl924Cy5jDQKLfGD8c6qRigX6cTnRjHs7VnhBzuD5q emnqjxeNkXnPwgABkgCu4o3MQkC/31ui2VKzfw327L86ubKNSYSDhTu13R0EkxfYIhjr 71WQ== X-Gm-Message-State: AOJu0YxZ3yUItOeFUK/4zl9SiT0vXulKEg6XmUdVGep2ojYoB+ODKWII qzPIW+U3zKN4cIRlaEWvvQJzVrIhSKIUUJWUKtk= X-Google-Smtp-Source: AGHT+IFafjW3fZYxTQ5WM9bH6HAK/0tZwrakUmYEU2ov3Qx/LyS4klqY5ozMQRd4WhMUejjDDb0zy1VTZ7+oh/Px8aE= X-Received: by 2002:a17:907:1b89:b0:a19:a409:37e6 with SMTP id mz9-20020a1709071b8900b00a19a40937e6mr999257ejc.63.1701789871565; Tue, 05 Dec 2023 07:24:31 -0800 (PST) MIME-Version: 1.0 References: <20231113133530.1727444-1-mary.bennett@embecosm.com> <20231128131615.3986922-1-mary.bennett@embecosm.com> <20231128131615.3986922-4-mary.bennett@embecosm.com> In-Reply-To: <20231128131615.3986922-4-mary.bennett@embecosm.com> From: Kito Cheng Date: Tue, 5 Dec 2023 23:24:19 +0800 Message-ID: Subject: Re: [PATCH v3 3/3] RISC-V: Add support for XCVbi extension in CV32E40P To: Mary Bennett Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,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 List-Id: On Tue, Nov 28, 2023 at 9:17=E2=80=AFPM Mary Bennett wrote: > > Spec: github.com/openhwgroup/core-v-sw/blob/master/specifications/corev-b= uiltin-spec.md > > Contributors: > Mary Bennett > Nandni Jamnadas > Pietra Ferreira > Charlie Keaney > Jessica Mills > Craig Blackmore > Simon Cook > Jeremy Bennett > Helene Chelin > > gcc/ChangeLog: > * common/config/riscv/riscv-common.cc: Create XCVbi extension > support. > * config/riscv/riscv.opt: Likewise. > * config/riscv/corev.md: Implement cv_branch pattern > for cv.beqimm and cv.bneimm. > * config/riscv/riscv.md: Add CORE-V branch immediate to RISC-V > branch instruction pattern. > * config/riscv/constraints.md: Implement constraints > cv_bi_s5 - signed 5-bit immediate. > * config/riscv/predicates.md: Implement predicate > const_int5s_operand - signed 5 bit immediate. > * doc/sourcebuild.texi: Add XCVbi documentation. > > gcc/testsuite/ChangeLog: > * gcc.target/riscv/cv-bi-beqimm-compile-1.c: New test. > * gcc.target/riscv/cv-bi-beqimm-compile-2.c: New test. > * gcc.target/riscv/cv-bi-bneimm-compile-1.c: New test. > * gcc.target/riscv/cv-bi-bneimm-compile-2.c: New test. > * lib/target-supports.exp: Add proc for XCVbi. > --- > gcc/common/config/riscv/riscv-common.cc | 2 + > gcc/config/riscv/constraints.md | 6 +++ > gcc/config/riscv/corev.md | 14 ++++++ > gcc/config/riscv/predicates.md | 4 ++ > gcc/config/riscv/riscv.md | 4 ++ > gcc/config/riscv/riscv.opt | 2 + > gcc/doc/sourcebuild.texi | 3 ++ > .../gcc.target/riscv/cv-bi-beqimm-compile-1.c | 17 +++++++ > .../gcc.target/riscv/cv-bi-beqimm-compile-2.c | 48 +++++++++++++++++++ > .../gcc.target/riscv/cv-bi-bneimm-compile-1.c | 17 +++++++ > .../gcc.target/riscv/cv-bi-bneimm-compile-2.c | 48 +++++++++++++++++++ > gcc/testsuite/lib/target-supports.exp | 13 +++++ > 12 files changed, 178 insertions(+) > create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bi-beqimm-compile-1= .c > create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bi-beqimm-compile-2= .c > create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bi-bneimm-compile-1= .c > create mode 100644 gcc/testsuite/gcc.target/riscv/cv-bi-bneimm-compile-2= .c > > diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/= riscv/riscv-common.cc > index c8c0d0a2252..125f8fb71f7 100644 > --- a/gcc/common/config/riscv/riscv-common.cc > +++ b/gcc/common/config/riscv/riscv-common.cc > @@ -313,6 +313,7 @@ static const struct riscv_ext_version riscv_ext_versi= on_table[] =3D > {"xcvmac", ISA_SPEC_CLASS_NONE, 1, 0}, > {"xcvalu", ISA_SPEC_CLASS_NONE, 1, 0}, > {"xcvelw", ISA_SPEC_CLASS_NONE, 1, 0}, > + {"xcvbi", ISA_SPEC_CLASS_NONE, 1, 0}, > > {"xtheadba", ISA_SPEC_CLASS_NONE, 1, 0}, > {"xtheadbb", ISA_SPEC_CLASS_NONE, 1, 0}, > @@ -1678,6 +1679,7 @@ static const riscv_ext_flag_table_t riscv_ext_flag_= table[] =3D > {"xcvmac", &gcc_options::x_riscv_xcv_subext, MASK_XCVMAC}, > {"xcvalu", &gcc_options::x_riscv_xcv_subext, MASK_XCVALU}, > {"xcvelw", &gcc_options::x_riscv_xcv_subext, MASK_XCVELW}, > + {"xcvbi", &gcc_options::x_riscv_xcv_subext, MASK_XCVBI}, > > {"xtheadba", &gcc_options::x_riscv_xthead_subext, MASK_XTHEADBA}, > {"xtheadbb", &gcc_options::x_riscv_xthead_subext, MASK_XTHEADBB}, > diff --git a/gcc/config/riscv/constraints.md b/gcc/config/riscv/constrain= ts.md > index 2711efe68c5..718b4bd77df 100644 > --- a/gcc/config/riscv/constraints.md > +++ b/gcc/config/riscv/constraints.md > @@ -247,3 +247,9 @@ > (and (match_code "const_int") > (and (match_test "IN_RANGE (ival, 0, 1073741823)") > (match_test "exact_log2 (ival + 1) !=3D -1")))) > + > +(define_constraint "CV_bi_sign5" > + "@internal > + A 5-bit signed immediate for CORE-V Immediate Branch." > + (and (match_code "const_int") > + (match_test "IN_RANGE (ival, -16, 15)"))) > diff --git a/gcc/config/riscv/corev.md b/gcc/config/riscv/corev.md > index 92bf0b5d6a6..f6a1f916d7e 100644 > --- a/gcc/config/riscv/corev.md > +++ b/gcc/config/riscv/corev.md > @@ -706,3 +706,17 @@ > > [(set_attr "type" "load") > (set_attr "mode" "SI")]) > + > +;; XCVBI Builtins It's not builtin I think? maybe just "XCVBI Instructions" > +(define_insn "cv_branch" "*cv_branch" > + [(set (pc) > + (if_then_else > + (match_operator 1 "equality_operator" > + [(match_operand:X 2 "register_operand" "r") > + (match_operand:X 3 "const_int5s_operand" "CV_bi= _sign5")]) > + (label_ref (match_operand 0 "" "")) > + (pc)))] > + "TARGET_XCVBI" > + "cv.b%C1imm\t%2,%3,%0" And then duplicate content of "*branch" here. > + [(set_attr "type" "branch") > + (set_attr "mode" "none")]) > diff --git a/gcc/config/riscv/predicates.md b/gcc/config/riscv/predicates= .md > index ff213e5f8a3..dfe0db02ac1 100644 > --- a/gcc/config/riscv/predicates.md > +++ b/gcc/config/riscv/predicates.md > @@ -406,6 +406,10 @@ > (ior (match_operand 0 "register_operand") > (match_code "const_int"))) > > +(define_predicate "const_int5s_operand" > + (and (match_code "const_int") > + (match_test "IN_RANGE (INTVAL (op), -16, 15)"))) > + > ;; Predicates for the V extension. > (define_special_predicate "vector_length_operand" > (ior (match_operand 0 "pmode_register_operand") > diff --git a/gcc/config/riscv/riscv.md b/gcc/config/riscv/riscv.md > index 935eeb7fd8e..467cd09d8b0 100644 > --- a/gcc/config/riscv/riscv.md > +++ b/gcc/config/riscv/riscv.md > @@ -2647,6 +2647,10 @@ > (pc)))] > "" I would prefer to put (!TARGET_XCVBI || !equality_operator (operands[1], mode)) here, The intention of that is dispatch =3D=3D and !=3D to cv_branch if it is ena= bled. > { > + if (TARGET_XCVBI && const_int5s_operand (operands[3], SImode) > + && (GET_CODE (operands[1]) =3D=3D EQ || GET_CODE (operands[1]) = =3D=3D NE)) > + return "cv.b%C1imm\t%2,%3,%0"; then this is not necessary, just use cv_branch, and I guess this can't not handle long branches well, you may need something like that: if (get_attr_length (insn) =3D=3D 12) return "cv.b%N1\t%2,%z3,1f; jump\t%l0,ra; 1:"; > + > if (get_attr_length (insn) =3D=3D 12) > return "b%N1\t%2,%z3,1f; jump\t%l0,ra; 1:";