diff --git a/clang/test/CodeGen/RISCV/Float16-arith.c b/clang/test/CodeGen/RISCV/Float16-arith.c
new file mode 100644
index 0000000000000..63097de2fabb4
--- /dev/null
+++ b/clang/test/CodeGen/RISCV/Float16-arith.c
@@ -0,0 +1,43 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 2
+// RUN: %clang_cc1 -triple riscv32 -emit-llvm %s -o - \
+// RUN:   | FileCheck -check-prefix=NOZFH %s
+// RUN: %clang_cc1 -triple riscv64 -emit-llvm %s -o - \
+// RUN:   | FileCheck -check-prefix=NOZFH %s
+// RUN: %clang_cc1 -triple riscv32 -target-feature +zfh -emit-llvm %s -o - \
+// RUN:   | FileCheck -check-prefix=ZFH %s
+// RUN: %clang_cc1 -triple riscv64 -target-feature +zfh -emit-llvm %s -o - \
+// RUN:   | FileCheck -check-prefix=ZFH %s
+
+_Float16 x, y, z;
+
+// With no native half type support (no zfh), f16 will be promoted to f32.
+// With zfh, it shouldn't be (FIXME: set HasLegalHalfType = true in order to
+// get this behaviour for zfh).
+
+// NOZFH-LABEL: define dso_local void @f16_add
+// NOZFH-SAME: () #[[ATTR0:[0-9]+]] {
+// NOZFH-NEXT:  entry:
+// NOZFH-NEXT:    [[TMP0:%.*]] = load half, ptr @y, align 2
+// NOZFH-NEXT:    [[EXT:%.*]] = fpext half [[TMP0]] to float
+// NOZFH-NEXT:    [[TMP1:%.*]] = load half, ptr @z, align 2
+// NOZFH-NEXT:    [[EXT1:%.*]] = fpext half [[TMP1]] to float
+// NOZFH-NEXT:    [[ADD:%.*]] = fadd float [[EXT]], [[EXT1]]
+// NOZFH-NEXT:    [[UNPROMOTION:%.*]] = fptrunc float [[ADD]] to half
+// NOZFH-NEXT:    store half [[UNPROMOTION]], ptr @x, align 2
+// NOZFH-NEXT:    ret void
+//
+// ZFH-LABEL: define dso_local void @f16_add
+// ZFH-SAME: () #[[ATTR0:[0-9]+]] {
+// ZFH-NEXT:  entry:
+// ZFH-NEXT:    [[TMP0:%.*]] = load half, ptr @y, align 2
+// ZFH-NEXT:    [[EXT:%.*]] = fpext half [[TMP0]] to float
+// ZFH-NEXT:    [[TMP1:%.*]] = load half, ptr @z, align 2
+// ZFH-NEXT:    [[EXT1:%.*]] = fpext half [[TMP1]] to float
+// ZFH-NEXT:    [[ADD:%.*]] = fadd float [[EXT]], [[EXT1]]
+// ZFH-NEXT:    [[UNPROMOTION:%.*]] = fptrunc float [[ADD]] to half
+// ZFH-NEXT:    store half [[UNPROMOTION]], ptr @x, align 2
+// ZFH-NEXT:    ret void
+//
+void f16_add() {
+  x = y + z;
+}