From 7a8ced43d7ec60f184ed88cc2dd085aba900ce3b Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 6 Jan 2021 15:59:30 -0800 Subject: [PATCH] [RISCV] Fix a few section number comments in RISCVInstrInfoVPseudos.td to match the V extension 1.0 draft spec. NFC The majority of the comments use the 1.0 draft spec section numbers. --- llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td | 34 ++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td index d10c2a2c70a..62d88752495 100644 --- a/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td +++ b/llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td @@ -2671,7 +2671,7 @@ defm PseudoVFWMSAC : VPseudoTernaryW_VV_VX; defm PseudoVFWNMSAC : VPseudoTernaryW_VV_VX; //===----------------------------------------------------------------------===// -// 14.9. Vector Floating-Point Min/Max Instructions +// 14.11. Vector Floating-Point Min/Max Instructions //===----------------------------------------------------------------------===// defm PseudoVFMIN : VPseudoBinaryV_VV_VX; defm PseudoVFMAX : VPseudoBinaryV_VV_VX; @@ -2694,17 +2694,17 @@ defm PseudoVMFGT : VPseudoBinaryM_VX; defm PseudoVMFGE : VPseudoBinaryM_VX; //===----------------------------------------------------------------------===// -// 14.14. Vector Floating-Point Move Instruction -//===----------------------------------------------------------------------===// -defm PseudoVFMV_V : VPseudoUnaryV_F_NoDummyMask; - -//===----------------------------------------------------------------------===// // 14.15. Vector Floating-Point Merge Instruction //===----------------------------------------------------------------------===// defm PseudoVFMERGE : VPseudoBinaryV_XM; //===----------------------------------------------------------------------===// +// 14.16. Vector Floating-Point Move Instruction +//===----------------------------------------------------------------------===// +defm PseudoVFMV_V : VPseudoUnaryV_F_NoDummyMask; + +//===----------------------------------------------------------------------===// // 14.17. Single-Width Floating-Point/Integer Type-Convert Instructions //===----------------------------------------------------------------------===// defm PseudoVFCVT_XU_F : VPseudoConversionV_V; @@ -3307,7 +3307,7 @@ defm "" : VPatTernaryW_VV_VX<"int_riscv_vfwmsac", "PseudoVFWMSAC", AllWidenableF defm "" : VPatTernaryW_VV_VX<"int_riscv_vfwnmsac", "PseudoVFWNMSAC", AllWidenableFloatVectors>; //===----------------------------------------------------------------------===// -// 14.9. Vector Floating-Point Min/Max Instructions +// 14.11. Vector Floating-Point Min/Max Instructions //===----------------------------------------------------------------------===// defm "" : VPatBinaryV_VV_VX<"int_riscv_vfmin", "PseudoVFMIN", AllFloatVectors>; defm "" : VPatBinaryV_VV_VX<"int_riscv_vfmax", "PseudoVFMAX", AllFloatVectors>; @@ -3330,7 +3330,16 @@ defm "" : VPatBinaryM_VX<"int_riscv_vmfgt", "PseudoVMFGT", AllFloatVectors>; defm "" : VPatBinaryM_VX<"int_riscv_vmfge", "PseudoVMFGE", AllFloatVectors>; //===----------------------------------------------------------------------===// -// 14.14. Vector Floating-Point Move Instruction +// 14.15. Vector Floating-Point Merge Instruction +//===----------------------------------------------------------------------===// +// We can use vmerge.vvm to support vector-vector vfmerge. +defm "" : VPatBinaryV_VM<"int_riscv_vfmerge", "PseudoVMERGE", + /*CarryOut = */0, /*vtilist=*/AllFloatVectors>; +defm "" : VPatBinaryV_XM<"int_riscv_vfmerge", "PseudoVFMERGE", + /*CarryOut = */0, /*vtilist=*/AllFloatVectors>; + +//===----------------------------------------------------------------------===// +// 14.16. Vector Floating-Point Move Instruction //===----------------------------------------------------------------------===// foreach fvti = AllFloatVectors in { // If we're splatting fpimm0, use vmv.v.x vd, x0. @@ -3347,15 +3356,6 @@ foreach fvti = AllFloatVectors in { } //===----------------------------------------------------------------------===// -// 14.15. Vector Floating-Point Merge Instruction -//===----------------------------------------------------------------------===// -// We can use vmerge.vvm to support vector-vector vfmerge. -defm "" : VPatBinaryV_VM<"int_riscv_vfmerge", "PseudoVMERGE", - /*CarryOut = */0, /*vtilist=*/AllFloatVectors>; -defm "" : VPatBinaryV_XM<"int_riscv_vfmerge", "PseudoVFMERGE", - /*CarryOut = */0, /*vtilist=*/AllFloatVectors>; - -//===----------------------------------------------------------------------===// // 14.17. Single-Width Floating-Point/Integer Type-Convert Instructions //===----------------------------------------------------------------------===// defm "" : VPatConversionVI_VF<"int_riscv_vfcvt_xu_f_v", "PseudoVFCVT_XU_F">; -- 2.11.0