[llvm] r335154 - [RISCV] Accept fmv.s.x and fmv.x.s as mnemonic aliases for fmv.w.x and fmv.x.w

[Alex Bradbury via llvm-commits]

Author: asb
Date: Wed Jun 20 11:42:25 2018
New Revision: 335154

URL: http://llvm.org/viewvc/llvm-project?rev=335154&view=rev
Log:
[RISCV] Accept fmv.s.x and fmv.x.s as mnemonic aliases for fmv.w.x and fmv.x.w

These instructions were renamed in version 2.2 of the user-level ISA spec, but 
the old name should also be accepted by standard tools.

Modified:
    llvm/trunk/lib/Target/RISCV/RISCVInstrInfoF.td
    llvm/trunk/test/MC/RISCV/rvf-aliases-valid.s

Modified: llvm/trunk/lib/Target/RISCV/RISCVInstrInfoF.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/RISCV/RISCVInstrInfoF.td?rev=335154&r1=335153&r2=335154&view=diff
==============================================================================
--- llvm/trunk/lib/Target/RISCV/RISCVInstrInfoF.td (original)
+++ llvm/trunk/lib/Target/RISCV/RISCVInstrInfoF.td Wed Jun 20 11:42:25 2018
@@ -226,6 +226,11 @@ def : InstAlias<"fsflags $rd, $rs",   (C
 def : InstAlias<"fsflags $rs",        (CSRRW       X0, 0x001, GPR:$rs), 2>;
 def : InstAlias<"fsflagsi $rd, $imm", (CSRRWI GPR:$rd, 0x001, uimm5:$imm)>;
 def : InstAlias<"fsflagsi $imm",      (CSRRWI      X0, 0x001, uimm5:$imm), 2>;
+
+// fmv.w.x and fmv.x.w were previously known as fmv.s.x and fmv.x.s. Both
+// spellings should be supported by standard tools.
+def : MnemonicAlias<"fmv.s.x", "fmv.w.x">;
+def : MnemonicAlias<"fmv.x.s", "fmv.x.w">;
 } // Predicates = [HasStdExtF]
 
 //===----------------------------------------------------------------------===//

Modified: llvm/trunk/test/MC/RISCV/rvf-aliases-valid.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/RISCV/rvf-aliases-valid.s?rev=335154&r1=335153&r2=335154&view=diff
==============================================================================
--- llvm/trunk/test/MC/RISCV/rvf-aliases-valid.s (original)
+++ llvm/trunk/test/MC/RISCV/rvf-aliases-valid.s Wed Jun 20 11:42:25 2018
@@ -87,6 +87,13 @@ fsflagsi x14, 0x1d
 # CHECK-ALIAS: fsflagsi 28
 fsflagsi 0x1c
 
+# CHECK-INST: fmv.x.w a2, fs7
+# CHECK-ALIAS: fmv.x.w a2, fs7
+fmv.x.s a2, fs7
+# CHECK-INST: fmv.w.x ft1, a6
+# CHECK-ALIAS: fmv.w.x ft1, a6
+fmv.s.x ft1, a6
+
 ##===----------------------------------------------------------------------===##
 ## Aliases which omit the rounding mode.
 ##===----------------------------------------------------------------------===##