diff --git a/llvm/test/CodeGen/RISCV/rvv/vsetvli-valid-elen-fp.ll b/llvm/test/CodeGen/RISCV/rvv/vsetvli-valid-elen-fp.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/RISCV/rvv/vsetvli-valid-elen-fp.ll
@@ -0,0 +1,64 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -mtriple riscv64 -mattr=+64bit,+m,+d,+zve64f,+zvfh \
+; RUN:   -target-abi=lp64d < %s | FileCheck %s --check-prefix=CHECK-NO-FELEN64
+; RUN: llc -mtriple riscv64 -mattr=+64bit,+m,+d,+zve64d,+zvfh \
+; RUN:   -target-abi=lp64d < %s | FileCheck %s --check-prefix=CHECK-FELEN64
+
+define void @foo(half %y, ptr %i64p) {
+; CHECK-NO-FELEN64-LABEL: foo:
+; CHECK-NO-FELEN64:       # %bb.0: # %entry
+; CHECK-NO-FELEN64-NEXT:    vsetivli zero, 1, e64, m1, ta, ma
+; CHECK-NO-FELEN64-NEXT:    vle64.v v8, (a0)
+; CHECK-NO-FELEN64-NEXT:    vfmv.s.f v9, fa0
+; CHECK-NO-FELEN64-NEXT:    #APP
+; CHECK-NO-FELEN64-NEXT:    # use v8 v9
+; CHECK-NO-FELEN64-NEXT:    #NO_APP
+; CHECK-NO-FELEN64-NEXT:    ret
+;
+; CHECK-FELEN64-LABEL: foo:
+; CHECK-FELEN64:       # %bb.0: # %entry
+; CHECK-FELEN64-NEXT:    vsetivli zero, 1, e64, m1, ta, ma
+; CHECK-FELEN64-NEXT:    vle64.v v8, (a0)
+; CHECK-FELEN64-NEXT:    vfmv.s.f v9, fa0
+; CHECK-FELEN64-NEXT:    #APP
+; CHECK-FELEN64-NEXT:    # use v8 v9
+; CHECK-FELEN64-NEXT:    #NO_APP
+; CHECK-FELEN64-NEXT:    ret
+entry:
+  %0 = tail call <vscale x 1 x i64> @llvm.riscv.vle.nxv1i64.i64(<vscale x 1 x i64> poison, ptr %i64p, i64 1)
+  %1 = tail call <vscale x 4 x half> @llvm.riscv.vfmv.s.f.nxv4f16.i64(<vscale x 4 x half> poison, half %y, i64 1)
+  tail call void asm sideeffect "# use $0 $1", "^vr,^vr"(<vscale x 1 x i64> %0, <vscale x 4 x half> %1)
+  ret void
+}
+
+declare <vscale x 1 x i64> @llvm.riscv.vle.nxv1i64.i64(<vscale x 1 x i64>, ptr nocapture, i64)
+declare <vscale x 4 x half> @llvm.riscv.vfmv.s.f.nxv4f16.i64(<vscale x 4 x half>, half, i64)
+
+define void @bar(half %y, ptr %i32p) {
+; CHECK-NO-FELEN64-LABEL: bar:
+; CHECK-NO-FELEN64:       # %bb.0: # %entry
+; CHECK-NO-FELEN64-NEXT:    vsetivli zero, 1, e32, m1, ta, ma
+; CHECK-NO-FELEN64-NEXT:    vle32.v v8, (a0)
+; CHECK-NO-FELEN64-NEXT:    vfmv.s.f v9, fa0
+; CHECK-NO-FELEN64-NEXT:    #APP
+; CHECK-NO-FELEN64-NEXT:    # use v8 v9
+; CHECK-NO-FELEN64-NEXT:    #NO_APP
+; CHECK-NO-FELEN64-NEXT:    ret
+;
+; CHECK-FELEN64-LABEL: bar:
+; CHECK-FELEN64:       # %bb.0: # %entry
+; CHECK-FELEN64-NEXT:    vsetivli zero, 1, e32, m1, ta, ma
+; CHECK-FELEN64-NEXT:    vle32.v v8, (a0)
+; CHECK-FELEN64-NEXT:    vfmv.s.f v9, fa0
+; CHECK-FELEN64-NEXT:    #APP
+; CHECK-FELEN64-NEXT:    # use v8 v9
+; CHECK-FELEN64-NEXT:    #NO_APP
+; CHECK-FELEN64-NEXT:    ret
+entry:
+  %0 = tail call <vscale x 2 x i32> @llvm.riscv.vle.nxv2i32.i64(<vscale x 2 x i32> poison, ptr %i32p, i64 1)
+  %1 = tail call <vscale x 4 x half> @llvm.riscv.vfmv.s.f.nxv4f16.i64(<vscale x 4 x half> poison, half %y, i64 1)
+  tail call void asm sideeffect "# use $0 $1", "^vr,^vr"(<vscale x 2 x i32> %0, <vscale x 4 x half> %1)
+  ret void
+}
+
+declare <vscale x 2 x i32> @llvm.riscv.vle.nxv2i32.i64(<vscale x 2 x i32>, ptr nocapture, i64)