diff --git a/llvm/test/Analysis/CostModel/RISCV/phi-const.ll b/llvm/test/Analysis/CostModel/RISCV/phi-const.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/Analysis/CostModel/RISCV/phi-const.ll
@@ -0,0 +1,19 @@
+; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --version 2
+; RUN: opt < %s -mtriple=riscv64 -disable-output -passes="print<cost-model>" 2>&1 | FileCheck %s
+define i32 @f(i1 %c) {
+; CHECK-LABEL: 'f'
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: br i1 %c, label %a, label %b
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: br label %d
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: br label %d
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: %x = phi i32 [ 42, %a ], [ 123456, %b ]
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: ret i32 %x
+;
+  br i1 %c, label %a, label %b
+a:
+  br label %d
+b:
+  br label %d
+d:
+  %x = phi i32 [42, %a], [123456, %b]
+  ret i32 %x
+}
diff --git a/llvm/test/Analysis/CostModel/RISCV/rvv-phi-const.ll b/llvm/test/Analysis/CostModel/RISCV/rvv-phi-const.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/Analysis/CostModel/RISCV/rvv-phi-const.ll
@@ -0,0 +1,19 @@
+; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --version 2
+; RUN: opt < %s -mtriple=riscv64 -mattr=+v -disable-output -passes="print<cost-model>" 2>&1 | FileCheck %s
+define <2 x i8> @f(i1 %c) {
+; CHECK-LABEL: 'f'
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: br i1 %c, label %a, label %b
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: br label %d
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: br label %d
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: %x = phi <2 x i8> [ <i8 1, i8 -1>, %a ], [ <i8 -1, i8 1>, %b ]
+; CHECK-NEXT:  Cost Model: Found an estimated cost of 1 for instruction: ret <2 x i8> %x
+;
+  br i1 %c, label %a, label %b
+a:
+  br label %d
+b:
+  br label %d
+d:
+  %x = phi <2 x i8> [<i8 1, i8 -1>, %a], [<i8 -1, i8 1>, %b]
+  ret <2 x i8> %x
+}
diff --git a/llvm/test/Transforms/SLPVectorizer/RISCV/phi-const.ll b/llvm/test/Transforms/SLPVectorizer/RISCV/phi-const.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/Transforms/SLPVectorizer/RISCV/phi-const.ll
@@ -0,0 +1,69 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 2
+; RUN: opt -passes=slp-vectorizer -S < %s -mtriple=riscv32 -mattr=+v \
+; RUN:     -riscv-v-slp-max-vf=0 | FileCheck %s
+; RUN: opt -passes=slp-vectorizer -S < %s -mtriple=riscv64 -mattr=+v \
+; RUN:     -riscv-v-slp-max-vf=0 | FileCheck %s
+
+; These shouldn't be vectorized as the cost of materializing the constants as
+; vectors should outweigh the scalar cost
+
+define void @f(ptr %p, i1 %c) {
+; CHECK-LABEL: define void @f
+; CHECK-SAME: (ptr [[P:%.*]], i1 [[C:%.*]]) #[[ATTR0:[0-9]+]] {
+; CHECK-NEXT:    [[P_0:%.*]] = getelementptr i8, ptr [[P]]
+; CHECK-NEXT:    br i1 [[C]], label [[A:%.*]], label [[B:%.*]]
+; CHECK:       a:
+; CHECK-NEXT:    br label [[D:%.*]]
+; CHECK:       b:
+; CHECK-NEXT:    br label [[D]]
+; CHECK:       d:
+; CHECK-NEXT:    [[TMP1:%.*]] = phi <2 x i8> [ <i8 1, i8 -1>, [[A]] ], [ <i8 -1, i8 1>, [[B]] ]
+; CHECK-NEXT:    store <2 x i8> [[TMP1]], ptr [[P_0]], align 1
+; CHECK-NEXT:    ret void
+;
+  %p.0 = getelementptr i8, ptr %p
+  %p.1 = getelementptr i8, ptr %p, i32 1
+  br i1 %c, label %a, label %b
+a:
+  br label %d
+b:
+  br label %d
+d:
+  %x = phi i8 [1, %a], [-1, %b]
+  %y = phi i8 [-1, %a], [1, %b]
+  store i8 %x, ptr %p.0
+  store i8 %y, ptr %p.1
+  ret void
+}
+
+define void @g(ptr %p, i1 %c) {
+; CHECK-LABEL: define void @g
+; CHECK-SAME: (ptr [[P:%.*]], i1 [[C:%.*]]) #[[ATTR0]] {
+; CHECK-NEXT:    [[P_0:%.*]] = getelementptr i8, ptr [[P]]
+; CHECK-NEXT:    br i1 [[C]], label [[A:%.*]], label [[B:%.*]]
+; CHECK:       a:
+; CHECK-NEXT:    br label [[D:%.*]]
+; CHECK:       b:
+; CHECK-NEXT:    br label [[D]]
+; CHECK:       d:
+; CHECK-NEXT:    [[TMP1:%.*]] = phi <2 x i8> [ <i8 1, i8 -1>, [[A]] ], [ <i8 -1, i8 1>, [[B]] ]
+; CHECK-NEXT:    [[TMP2:%.*]] = add <2 x i8> [[TMP1]], <i8 1, i8 1>
+; CHECK-NEXT:    store <2 x i8> [[TMP2]], ptr [[P_0]], align 1
+; CHECK-NEXT:    ret void
+;
+  %p.0 = getelementptr i8, ptr %p
+  %p.1 = getelementptr i8, ptr %p, i32 1
+  br i1 %c, label %a, label %b
+a:
+  br label %d
+b:
+  br label %d
+d:
+  %x = phi i8 [1, %a], [-1, %b]
+  %y = phi i8 [-1, %a], [1, %b]
+  %x.add = add i8 %x, 1
+  %y.add = add i8 %y, 1
+  store i8 %x.add, ptr %p.0
+  store i8 %y.add, ptr %p.1
+  ret void
+}