diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -886,8 +886,9 @@
         // If the source type is not legal, see if there is a legal extload to
         // an intermediate type that we can then extend further.
         EVT LoadVT = TLI.getRegisterType(SrcVT.getSimpleVT());
-        if (TLI.isTypeLegal(SrcVT) || // Same as SrcVT == LoadVT?
-            TLI.isLoadExtLegal(ExtType, LoadVT, SrcVT)) {
+        if ((LoadVT.isFloatingPoint() == SrcVT.isFloatingPoint()) &&
+            (TLI.isTypeLegal(SrcVT) || // Same as SrcVT == LoadVT?
+             TLI.isLoadExtLegal(ExtType, LoadVT, SrcVT))) {
           // If we are loading a legal type, this is a non-extload followed by a
           // full extend.
           ISD::LoadExtType MidExtType =
diff --git a/llvm/test/CodeGen/RISCV/pr63816.ll b/llvm/test/CodeGen/RISCV/pr63816.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/RISCV/pr63816.ll
@@ -0,0 +1,83 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 3
+; RUN: llc < %s -mtriple=riscv64 -mattr=+d | FileCheck %s
+
+define void @test(ptr %0, ptr %1) nounwind {
+; CHECK-LABEL: test:
+; CHECK:       # %bb.0:
+; CHECK-NEXT:    addi sp, sp, -80
+; CHECK-NEXT:    sd ra, 72(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    sd s0, 64(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    sd s1, 56(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    fsd fs0, 48(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    fsd fs1, 40(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    fsd fs2, 32(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    fsd fs3, 24(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    fsd fs4, 16(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    fsd fs5, 8(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    fsd fs6, 0(sp) # 8-byte Folded Spill
+; CHECK-NEXT:    mv s0, a1
+; CHECK-NEXT:    mv s1, a0
+; CHECK-NEXT:    lhu a0, 12(a0)
+; CHECK-NEXT:    fmv.w.x fa0, a0
+; CHECK-NEXT:    call __extendhfsf2@plt
+; CHECK-NEXT:    fmv.s fs0, fa0
+; CHECK-NEXT:    lhu a0, 10(s1)
+; CHECK-NEXT:    fmv.w.x fa0, a0
+; CHECK-NEXT:    call __extendhfsf2@plt
+; CHECK-NEXT:    fmv.s fs1, fa0
+; CHECK-NEXT:    lhu a0, 8(s1)
+; CHECK-NEXT:    fmv.w.x fa0, a0
+; CHECK-NEXT:    call __extendhfsf2@plt
+; CHECK-NEXT:    fmv.s fs2, fa0
+; CHECK-NEXT:    lhu a0, 6(s1)
+; CHECK-NEXT:    fmv.w.x fa0, a0
+; CHECK-NEXT:    call __extendhfsf2@plt
+; CHECK-NEXT:    fmv.s fs3, fa0
+; CHECK-NEXT:    lhu a0, 4(s1)
+; CHECK-NEXT:    fmv.w.x fa0, a0
+; CHECK-NEXT:    call __extendhfsf2@plt
+; CHECK-NEXT:    fmv.s fs4, fa0
+; CHECK-NEXT:    lhu a0, 2(s1)
+; CHECK-NEXT:    fmv.w.x fa0, a0
+; CHECK-NEXT:    call __extendhfsf2@plt
+; CHECK-NEXT:    fmv.s fs5, fa0
+; CHECK-NEXT:    lhu a0, 0(s1)
+; CHECK-NEXT:    fmv.w.x fa0, a0
+; CHECK-NEXT:    call __extendhfsf2@plt
+; CHECK-NEXT:    fcvt.d.s fs6, fa0
+; CHECK-NEXT:    fcvt.d.s fs5, fs5
+; CHECK-NEXT:    fcvt.d.s fs4, fs4
+; CHECK-NEXT:    lhu a0, 14(s1)
+; CHECK-NEXT:    fcvt.d.s fs3, fs3
+; CHECK-NEXT:    fcvt.d.s fs2, fs2
+; CHECK-NEXT:    fcvt.d.s fs1, fs1
+; CHECK-NEXT:    fmv.w.x fa0, a0
+; CHECK-NEXT:    fcvt.d.s fs0, fs0
+; CHECK-NEXT:    call __extendhfsf2@plt
+; CHECK-NEXT:    fcvt.d.s fa5, fa0
+; CHECK-NEXT:    fsd fa5, 56(s0)
+; CHECK-NEXT:    fsd fs0, 48(s0)
+; CHECK-NEXT:    fsd fs1, 40(s0)
+; CHECK-NEXT:    fsd fs2, 32(s0)
+; CHECK-NEXT:    fsd fs3, 24(s0)
+; CHECK-NEXT:    fsd fs4, 16(s0)
+; CHECK-NEXT:    fsd fs5, 8(s0)
+; CHECK-NEXT:    fsd fs6, 0(s0)
+; CHECK-NEXT:    ld ra, 72(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    ld s0, 64(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    ld s1, 56(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    fld fs0, 48(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    fld fs1, 40(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    fld fs2, 32(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    fld fs3, 24(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    fld fs4, 16(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    fld fs5, 8(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    fld fs6, 0(sp) # 8-byte Folded Reload
+; CHECK-NEXT:    addi sp, sp, 80
+; CHECK-NEXT:    ret
+  %V1 = load <8 x half>, ptr %0
+  %V2 = fpext <8 x half> %V1 to <8 x double>
+  store <8 x double> %V2, ptr %1
+  ret void
+}
+