[PATCH] RISC-V: Convert the ADD/ADDI to the compressed MV/LI if RS1 is zero.

[PATCH] RISC-V: Convert the ADD/ADDI to the compressed MV/LI if RS1 is zero.

[Nelson Chu]

	gas/
	* testsuite/gas/riscv/c-add-addi.d: New testcase.
	* testsuite/gas/riscv/c-add-addi.s: Likewise.

	opcodes/
	* riscv-opc.c (riscv_opcodes): Convert add/addi to the compressed
	c.mv/c.li if rs1 is zero.
---
 gas/testsuite/gas/riscv/c-add-addi.d | 11 +++++++++++
 gas/testsuite/gas/riscv/c-add-addi.s |  3 +++
 opcodes/riscv-opc.c                  |  2 ++
 3 files changed, 16 insertions(+)
 create mode 100644 gas/testsuite/gas/riscv/c-add-addi.d
 create mode 100644 gas/testsuite/gas/riscv/c-add-addi.s

diff --git a/gas/testsuite/gas/riscv/c-add-addi.d b/gas/testsuite/gas/riscv/c-add-addi.d
new file mode 100644
index 0000000..14913df
--- /dev/null
+++ b/gas/testsuite/gas/riscv/c-add-addi.d
@@ -0,0 +1,11 @@
+#as:
+#objdump: -dr
+
+.*:[ 	]+file format .*
+
+
+Disassembly of section .text:
+
+0+000 <.text>:
+[ 	]+0:[ 	]+4605[ 	]+li[ 	]+a2,1
+[ 	]+2:[ 	]+852e[ 	]+mv[ 	]+a0,a1
diff --git a/gas/testsuite/gas/riscv/c-add-addi.s b/gas/testsuite/gas/riscv/c-add-addi.s
new file mode 100644
index 0000000..5274491
--- /dev/null
+++ b/gas/testsuite/gas/riscv/c-add-addi.s
@@ -0,0 +1,3 @@
+.option rvc
+addi a2, zero, 1
+add a0, zero, a1
diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c
index cc46d16..ceedcaf 100644
--- a/opcodes/riscv-opc.c
+++ b/opcodes/riscv-opc.c
@@ -269,12 +269,14 @@ const struct riscv_opcode riscv_opcodes[] =
 {"addi",        0, INSN_CLASS_C,   "d,CU,Cj",  MATCH_C_ADDI, MASK_C_ADDI, match_rd_nonzero, INSN_ALIAS },
 {"addi",        0, INSN_CLASS_C,   "d,CU,z",    MATCH_C_NOP, MASK_C_ADDI | MASK_RVC_IMM, match_c_nop, INSN_ALIAS },
 {"addi",        0, INSN_CLASS_C,   "Cc,Cc,CL", MATCH_C_ADDI16SP, MASK_C_ADDI16SP, match_c_addi16sp, INSN_ALIAS },
+{"addi",        0, INSN_CLASS_C,   "d,Cz,Co",  MATCH_C_LI, MASK_C_LI, match_rd_nonzero, INSN_ALIAS },
 {"addi",        0, INSN_CLASS_I,   "d,s,j",  MATCH_ADDI, MASK_ADDI, match_opcode, 0 },
 {"add",         0, INSN_CLASS_C,   "d,CU,CV",  MATCH_C_ADD, MASK_C_ADD, match_c_add, INSN_ALIAS },
 {"add",         0, INSN_CLASS_C,   "d,CV,CU",  MATCH_C_ADD, MASK_C_ADD, match_c_add, INSN_ALIAS },
 {"add",         0, INSN_CLASS_C,   "d,CU,Co",  MATCH_C_ADDI, MASK_C_ADDI, match_rd_nonzero, INSN_ALIAS },
 {"add",         0, INSN_CLASS_C,   "Ct,Cc,CK", MATCH_C_ADDI4SPN, MASK_C_ADDI4SPN, match_c_addi4spn, INSN_ALIAS },
 {"add",         0, INSN_CLASS_C,   "Cc,Cc,CL", MATCH_C_ADDI16SP, MASK_C_ADDI16SP, match_c_addi16sp, INSN_ALIAS },
+{"add",         0, INSN_CLASS_C,   "d,Cz,CV",  MATCH_C_MV, MASK_C_MV, match_c_add, INSN_ALIAS },
 {"add",         0, INSN_CLASS_I,   "d,s,t",  MATCH_ADD, MASK_ADD, match_opcode, 0 },
 /* This is used for TLS, where the fourth arg is %tprel_add, to get a reloc
    applied to an add instruction, for relaxation to use.  */
-- 
2.7.4

Re: [PATCH] RISC-V: Convert the ADD/ADDI to the compressed MV/LI if RS1 is zero.

[Jim Wilson]

On Tue, Feb 18, 2020 at 5:42 PM Nelson Chu <nelson.chu@sifive.com> wrote:
>         gas/
>         * testsuite/gas/riscv/c-add-addi.d: New testcase.
>         * testsuite/gas/riscv/c-add-addi.s: Likewise.
>         opcodes/
>         * riscv-opc.c (riscv_opcodes): Convert add/addi to the compressed
>         c.mv/c.li if rs1 is zero.

Looks good to me.  Committed.

Though apparently I committed it wrong as I didn't realize that git
has a way to assign authors to patches separate from the person that
commits the patch.  I just included a changelog line to attribute the
patch to you.  I shall have to try setting the author for the commit
next time.

Jim

Re: [PATCH] RISC-V: Convert the ADD/ADDI to the compressed MV/LI if RS1 is zero.

[Kito Cheng]

Hi Jim:

FYI, I used to using this command to update author of last commit
without change global git setting:

git commit --amend --author="Author Name <email@address.com>"

[1] https://stackoverflow.com/questions/3042437/how-to-change-the-commit-author-for-one-specific-commit


On Thu, Feb 20, 2020 at 7:11 AM Jim Wilson <jimw@sifive.com> wrote:
>
> On Tue, Feb 18, 2020 at 5:42 PM Nelson Chu <nelson.chu@sifive.com> wrote:
> >         gas/
> >         * testsuite/gas/riscv/c-add-addi.d: New testcase.
> >         * testsuite/gas/riscv/c-add-addi.s: Likewise.
> >         opcodes/
> >         * riscv-opc.c (riscv_opcodes): Convert add/addi to the compressed
> >         c.mv/c.li if rs1 is zero.
>
> Looks good to me.  Committed.
>
> Though apparently I committed it wrong as I didn't realize that git
> has a way to assign authors to patches separate from the person that
> commits the patch.  I just included a changelog line to attribute the
> patch to you.  I shall have to try setting the author for the commit
> next time.
>
> Jim

Re: [PATCH] RISC-V: Convert the ADD/ADDI to the compressed MV/LI if RS1 is zero.

[Nelson Chu]

On Thu, Feb 20, 2020 at 7:11 AM Jim Wilson <jimw@sifive.com> wrote:
> Looks good to me.  Committed.

Thanks!

> Though apparently I committed it wrong as I didn't realize that git
> has a way to assign authors to patches separate from the person that
> commits the patch.  I just included a changelog line to attribute the
> patch to you.  I shall have to try setting the author for the commit
> next time.

It's fine with me :)

Thanks
Nelson