From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) by sourceware.org (Postfix) with ESMTPS id BBD4B3858D38 for ; Wed, 21 Sep 2022 03:47:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BBD4B3858D38 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivosinc.com Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-1278a61bd57so7294410fac.7 for ; Tue, 20 Sep 2022 20:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=RXaIJ9Z+trXT1nNea6cgeQGTOK9tbEMlamA5iCYJkts=; b=v/tAw2cKEI9wVTHKKbVb44mHQEb9pLdlVGm8sP2pH+oOTCB4npMAlJ16eqtHIttau+ h0Rtz31aeS3hEJXZfo3fOmFsEbZc7fov01qcaZCkKH+KKVr5pDq2pb8u9NIP5sZSxp0d hHJB/DcVXlQmxZm4A+5FBzpWp8lGhqYXPAnu6vmvFwmA8mf4iGUuxdXU0HFaDHz3yJeS HQno9Hor0omI0UxZ8o/hzfsJGX2DLj2MK2aBHIfFJplmQmfaquG6Z36Bc2cWbYPRCYRz i+Bb9bg1ruQQeGohHkhxKWBRmtKOCNPBWsV3jsa6Aa7UvupnK9NrMQ5H/qs4S9ccYlw5 rG6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=RXaIJ9Z+trXT1nNea6cgeQGTOK9tbEMlamA5iCYJkts=; b=1pIWgCIuuXAc0sczFeoenMfblHOhYi4+icq732dDSmE07XhzUSxaLsBG1o8C6O04xn AUhwta6r2OZ6meZ0Ozky7wutAxck8/2yoEjVUZ3NpQM3tqdq2++44byLLe9SfE6IoNtn z4XXAaILK9RxTlcAPPrMn89Wf1tQJCjbdC0Haa63KtPJcoSsFnGRA8o2IuscfheEacRy sJQbiVZpbAaG9VPSGY00G+nXQrzgd6TgZbTqjZIWNkEOaK8cnzbuKTeUTkuArQD1Xstf XOeG7v0F1kBlN3W3g6uXSbdSxcwjt07hB4C+jQJYqj0dq1hMlsycPGvRj6uhKoIwdxCv 9vKg== X-Gm-Message-State: ACrzQf213IVAjs44Rsp2ASEdiFked9fv6fsnaPk3+Z/h3miOyCUX+MfD IxlIUpd938EnkN2XfaE9gGKHyGqdfSwqloXKtWKR4A== X-Google-Smtp-Source: AMsMyM5/jr8pVC0bmE6+W72dr8i1ueJphzP60Y1YJkZfH9+/GyVWyLkq2toQ/p/7ME6cQHfxapOOe4OwRE9iSLqS67U= X-Received: by 2002:a05:6870:58aa:b0:118:307d:bb43 with SMTP id be42-20020a05687058aa00b00118307dbb43mr3978529oab.82.1663732075743; Tue, 20 Sep 2022 20:47:55 -0700 (PDT) MIME-Version: 1.0 References: <20220920094504.1729-1-shihua@iscas.ac.cn> In-Reply-To: <20220920094504.1729-1-shihua@iscas.ac.cn> From: Nelson Chu Date: Wed, 21 Sep 2022 11:47:44 +0800 Message-ID: Subject: Re: [PATCH V4] RISC-V: Implement Ztso extension To: shihua@iscas.ac.cn Cc: binutils@sourceware.org, kito.cheng@sifive.com, vineetg@rivosinc.com, research_trasio@irq.a4lg.com, christoph.muellner@vrull.eu, palmer@dabbelt.com, jiawei@iscas.ac.cn Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.7 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 List-Id: Committed, thanks. Nelson On Tue, Sep 20, 2022 at 5:46 PM wrote: > > From: Shihua > > This patch support ZTSO extension. It will turn on the tso flag for elf_flags once we have enabled Ztso extension. > This is intended to implement v0.1 of the proposed specification which can be found in Chapter 25 of https://github.com/riscv/riscv-isa-manual/releases/download/draft-20220723-10eea63/riscv-spec.pdf. > > V4: > According to Nelson Chu's feedback ( https://sourceware.org/pipermail/binutils/2022-September/122960.html ), > * remove support tso for the .option directive > > V3: > According to Tsukasa OI's feedback ( https://sourceware.org/pipermail/binutils/2022-September/122915.html ), > * remove CLASS_INSN_ZTSO because it is not used. > * remove testsuite attribute-015.d, because it is not necessary. > * add testsuite ztso.d, to verify whether the flag TSO is generated. > > bfd\ChangeLog: > > * elfnn-riscv.c (_bfd_riscv_elf_merge_private_bfd_data): Set TSO flag. > * elfxx-riscv.c: Add Ztso's arch. > > binutils\ChangeLog: > > * readelf.c (get_machine_flags): Set TSO flag. > > gas\ChangeLog: > > * config/tc-riscv.c (riscv_set_tso): Ditto. > (riscv_set_arch): Ditto. > * testsuite/gas/riscv/ztso.d: New test. > > include\ChangeLog: > > * elf/riscv.h (EF_RISCV_TSO): Ditto. > > --- > bfd/elfnn-riscv.c | 3 +++ > bfd/elfxx-riscv.c | 1 + > binutils/readelf.c | 3 +++ > gas/config/tc-riscv.c | 11 +++++++++++ > gas/testsuite/gas/riscv/ztso.d | 8 ++++++++ > include/elf/riscv.h | 3 +++ > 6 files changed, 29 insertions(+) > create mode 100644 gas/testsuite/gas/riscv/ztso.d > > diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c > index 0e0a0b09e24..3d2ddf4e651 100644 > --- a/bfd/elfnn-riscv.c > +++ b/bfd/elfnn-riscv.c > @@ -3872,6 +3872,9 @@ _bfd_riscv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) > /* Allow linking RVC and non-RVC, and keep the RVC flag. */ > elf_elfheader (obfd)->e_flags |= new_flags & EF_RISCV_RVC; > > + /* Allow linking TSO and non-TSO, and keep the TSO flag. */ > + elf_elfheader (obfd)->e_flags |= new_flags & EF_RISCV_TSO; > + > return true; > > fail: > diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c > index e03b312a381..7eda177bd6e 100644 > --- a/bfd/elfxx-riscv.c > +++ b/bfd/elfxx-riscv.c > @@ -1204,6 +1204,7 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = > {"zvl16384b", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, > {"zvl32768b", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, > {"zvl65536b", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, > + {"ztso", ISA_SPEC_CLASS_DRAFT, 0, 1, 0 }, > {NULL, 0, 0, 0, 0} > }; > > diff --git a/binutils/readelf.c b/binutils/readelf.c > index cafba9a4f56..b1dbcad06f5 100644 > --- a/binutils/readelf.c > +++ b/binutils/readelf.c > @@ -4079,6 +4079,9 @@ get_machine_flags (Filedata * filedata, unsigned e_flags, unsigned e_machine) > if (e_flags & EF_RISCV_RVE) > strcat (buf, ", RVE"); > > + if (e_flags & EF_RISCV_TSO) > + strcat (buf, ", TSO"); > + > switch (e_flags & EF_RISCV_FLOAT_ABI) > { > case EF_RISCV_FLOAT_ABI_SOFT: > diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c > index 2f5ee18e451..088f75d6a83 100644 > --- a/gas/config/tc-riscv.c > +++ b/gas/config/tc-riscv.c > @@ -257,6 +257,14 @@ riscv_set_rvc (bool rvc_value) > riscv_opts.rvc = rvc_value; > } > > +/* Turn on the tso flag for elf_flags once we have enabled ztso extension. */ > + > +static void > +riscv_set_tso () > +{ > + elf_flags |= EF_RISCV_TSO; > +} > + > /* This linked list records all enabled extensions, which are parsed from > the architecture string. The architecture string can be set by the > -march option, the elf architecture attributes, and the --with-arch > @@ -307,6 +315,9 @@ riscv_set_arch (const char *s) > riscv_set_rvc (false); > if (riscv_subset_supports (&riscv_rps_as, "c")) > riscv_set_rvc (true); > + > + if (riscv_subset_supports (&riscv_rps_as, "ztso")) > + riscv_set_tso (); > } > > /* Indicate -mabi option is explictly set. */ > diff --git a/gas/testsuite/gas/riscv/ztso.d b/gas/testsuite/gas/riscv/ztso.d > new file mode 100644 > index 00000000000..cb038db89d3 > --- /dev/null > +++ b/gas/testsuite/gas/riscv/ztso.d > @@ -0,0 +1,8 @@ > +#as: -march=rv64i_ztso > +#readelf: -h > +#source: empty.s > + > +ELF Header: > +#... > +[ ]+Flags:[ ]+0x10, TSO.* > +#... > \ No newline at end of file > diff --git a/include/elf/riscv.h b/include/elf/riscv.h > index 9b3ea376ff3..d7b5c09d5c3 100644 > --- a/include/elf/riscv.h > +++ b/include/elf/riscv.h > @@ -121,6 +121,9 @@ END_RELOC_NUMBERS (R_RISCV_max) > /* RISC-V specific values for st_other. */ > #define STO_RISCV_VARIANT_CC 0x80 > > +/* File uses the TSO model. */ > +#define EF_RISCV_TSO 0x0010 > + > /* Additional section types. */ > #define SHT_RISCV_ATTRIBUTES 0x70000003 /* Section holds attributes. */ > > -- > 2.37.1.windows.1 >