From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cstnet.cn (smtp84.cstnet.cn [159.226.251.84]) by sourceware.org (Postfix) with ESMTP id C4E9F3858D28 for ; Tue, 20 Sep 2022 02:17:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C4E9F3858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from localhost.localdomain (unknown [121.237.92.33]) by APP-05 (Coremail) with SMTP id zQCowABnb7PDIiljdpL+AA--.203S2; Tue, 20 Sep 2022 10:17:43 +0800 (CST) From: shihua@iscas.ac.cn To: binutils@sourceware.org Cc: kito.cheng@sifive.com, vineetg@rivosinc.com, research_trasio@irq.a4lg.com, christoph.muellner@vrull.eu, nelson@rivosinc.com, palmer@dabbelt.com, jiawei@iscas.ac.cn, Shihua Subject: [PATCH] Implement Ztso extension Date: Tue, 20 Sep 2022 10:17:28 +0800 Message-Id: <20220920021728.2257-1-shihua@iscas.ac.cn> X-Mailer: git-send-email 2.37.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:zQCowABnb7PDIiljdpL+AA--.203S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtr47CF15GF13JrW5Wr15Jwb_yoW7Ww1fpF WrKF1FkF95AF1xXa1fJw4jgw4fXw409Fy3Zr1Sk3yUJryxXrW8Xrykt3WrCanxXF4Duaya vayrKry3ua1vyr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvI14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUtVWrXwAv7VC2z280aVAFwI0_Gr1j6F4UJwAm72CE4IkC6x0Yz7v_Jr 0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4kE6xkIj40Ew7xC 0wCY02Avz4vE14v_Gr1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2 IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v2 6r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2 IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv 67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf 9x0JUQo7NUUUUU= X-Originating-IP: [121.237.92.33] X-CM-SenderInfo: xvklx33d6l2u1dvotugofq/1tbiAwQPEWMpIUUFIAAAsS X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_PASS,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: 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. 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 (struct riscv_set_options):Set TSO flag. (riscv_set_tso):Set TSO flag. (riscv_set_arch):Set TSO flag. * testsuite/gas/riscv/ztso.d: New test. include\ChangeLog: * elf/riscv.h (EF_RISCV_TSO) Set TSO flag. --- bfd/elfnn-riscv.c | 3 +++ bfd/elfxx-riscv.c | 1 + binutils/readelf.c | 3 +++ gas/config/tc-riscv.c | 18 ++++++++++++++++++ gas/testsuite/gas/riscv/ztso.d | 8 ++++++++ include/elf/riscv.h | 3 +++ 6 files changed, 36 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..3de8865a228 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..c025890ea74 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -234,6 +234,7 @@ struct riscv_set_options int relax; /* Emit relocs the linker is allowed to relax. */ int arch_attr; /* Emit architecture and privileged elf attributes. */ int csr_check; /* Enable the CSR checking. */ + int tso; /* Use tso model. */ }; static struct riscv_set_options riscv_opts = @@ -243,6 +244,7 @@ static struct riscv_set_options riscv_opts = 1, /* relax */ DEFAULT_RISCV_ATTR, /* arch_attr */ 0, /* csr_check */ + 0, /* tso */ }; /* Enable or disable the rvc flags for riscv_opts. Turn on the rvc flag @@ -257,6 +259,18 @@ riscv_set_rvc (bool rvc_value) riscv_opts.rvc = rvc_value; } +/* Enable or disable the tso flags for riscv_opts. Turn on the tso flag + for elf_flags once we have enabled ztso extension. */ + +static void +riscv_set_tso (bool tso_value) +{ + if (tso_value) + elf_flags |= EF_RISCV_TSO; + + riscv_opts.tso = tso_value; +} + /* 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 +321,10 @@ riscv_set_arch (const char *s) riscv_set_rvc (false); if (riscv_subset_supports (&riscv_rps_as, "c")) riscv_set_rvc (true); + + riscv_set_tso (false); + if (riscv_subset_supports (&riscv_rps_as, "ztso")) + riscv_set_tso (true); } /* 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