Roger Chang has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/70600?usp=email ) Change subject: arch-riscv: Merge rv32 and rv64 version of xperm4 and xperm8 ...................................................................... arch-riscv: Merge rv32 and rv64 version of xperm4 and xperm8 Remove unessential postfix like '_32' and '_64' from mnemonic Change-Id: I83d47eeccd04fe61ac8ee0addd7221abbdcefbd1 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70600 Reviewed-by: Yu-hsin Wang <yuhsingw@google.com> Tested-by: kokoro <noreply+kokoro@google.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> --- M src/arch/riscv/isa/decoder.isa 1 file changed, 12 insertions(+), 14 deletions(-) Approvals: kokoro: Regressions pass Yu-hsin Wang: Looks good to me, approved Jason Lowe-Power: Looks good to me, approved diff --git a/src/arch/riscv/isa/decoder.isa b/src/arch/riscv/isa/decoder.isa index ae2f0a4..c7eefbc 100644 --- a/src/arch/riscv/isa/decoder.isa +++ b/src/arch/riscv/isa/decoder.isa @@ -1124,14 +1124,13 @@ 0x10: sh1add({{ Rd = rvSext((Rs1 << 1) + Rs2); }}); - 0x14: decode RVTYPE { - 0x0: xperm4_32({{ - Rd_sw = _rvk_emu_xperm4_32(Rs1_sw, Rs2_sw); - }}); - 0x1: xperm4_64({{ + 0x14: xperm4({{ + if (machInst.rv_type == RV32) { + Rd_sd = _rvk_emu_xperm4_32(Rs1_sd, Rs2_sd); + } else { Rd_sd = _rvk_emu_xperm4_64(Rs1_sd, Rs2_sd); - }}); - } + } + }}); } 0x3: decode FUNCT7 { 0x0: sltu({{ @@ -1181,14 +1180,13 @@ 0x10: sh2add({{ Rd = rvSext((Rs1 << 2) + Rs2); }}); - 0x14: decode RVTYPE { - 0x0: xperm8_32({{ - Rd_sw = _rvk_emu_xperm8_32(Rs1_sw, Rs2_sw); - }}); - 0x1: xperm8_64({{ + 0x14: xperm8({{ + if (machInst.rv_type == RV32) { + Rd_sd = _rvk_emu_xperm8_32(Rs1_sd, Rs2_sd); + } else { Rd_sd = _rvk_emu_xperm8_64(Rs1_sd, Rs2_sd); - }}); - } + } + }}); 0x20: xnor({{ Rd = rvSext(~(Rs1 ^ Rs2)); }}); -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/70600?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I83d47eeccd04fe61ac8ee0addd7221abbdcefbd1 Gerrit-Change-Number: 70600 Gerrit-PatchSet: 5 Gerrit-Owner: Roger Chang <rogerycchang@google.com> Gerrit-Reviewer: Ayaz Akram <yazakram@ucdavis.edu> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Hoa Nguyen <hoanguyen@ucdavis.edu> Gerrit-Reviewer: Jason Lowe-Power <jason@lowepower.com> Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com> Gerrit-Reviewer: Roger Chang <rogerycchang@google.com> Gerrit-Reviewer: Yu-hsin Wang <yuhsingw@google.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com>