diff --git a/lib/Target/BPF/BPFISelLowering.cpp b/lib/Target/BPF/BPFISelLowering.cpp
index 3ea96e3148f..2966cf78742 100644
--- a/lib/Target/BPF/BPFISelLowering.cpp
+++ b/lib/Target/BPF/BPFISelLowering.cpp
@@ -488,6 +488,11 @@ SDValue BPFTargetLowering::LowerSELECT_CC(SDValue Op, SelectionDAG &DAG) const {
   SDValue TargetCC = DAG.getConstant(CC, DL, MVT::i64);
 
   SDVTList VTs = DAG.getVTList(Op.getValueType(), MVT::Glue);
+
+  // The constant is expected at RHS in Select_Ri pattern.
+  if (isa<ConstantSDNode>(LHS.getNode()))
+    std::swap(LHS, RHS);
+
   SDValue Ops[] = {LHS, RHS, TargetCC, TrueV, FalseV};
 
   return DAG.getNode(BPFISD::SELECT_CC, DL, VTs, Ops);
diff --git a/test/CodeGen/BPF/cmp.ll b/test/CodeGen/BPF/cmp.ll
index 66345ab52a1..e12f4a95138 100644
--- a/test/CodeGen/BPF/cmp.ll
+++ b/test/CodeGen/BPF/cmp.ll
@@ -97,7 +97,7 @@ define zeroext i8 @minu(i8 zeroext %a, i8 zeroext %b) #0 {
   %a.b = select i1 %1, i8 %a, i8 %b
   ret i8 %a.b
 ; CHECK-LABEL:minu:
-; CHECK: if r3 > r1
+; CHECK: if r{{[0-9]+}} {{<|>}} 100
 }
 
 ; Function Attrs: nounwind readnone uwtable
diff --git a/test/CodeGen/BPF/select_ri.ll b/test/CodeGen/BPF/select_ri.ll
index 7b1f852ca79..dbd21113d7f 100644
--- a/test/CodeGen/BPF/select_ri.ll
+++ b/test/CodeGen/BPF/select_ri.ll
@@ -60,3 +60,28 @@ define i32 @foo(i8*) local_unnamed_addr #0 {
 
 ; Function Attrs: nounwind readonly
 declare i64 @llvm.bpf.load.word(i8*, i64) #1
+
+; Source file:
+; int m, n;
+; int test2() {
+;   int a = m;
+;   if (a < 6)
+;     a = n;
+;   return a;
+; }
+
+@m = common local_unnamed_addr global i32 0, align 4
+@n = common local_unnamed_addr global i32 0, align 4
+
+; Function Attrs: norecurse nounwind readonly
+define i32 @test2() local_unnamed_addr #0 {
+entry:
+  %0 = load i32, i32* @m, align 4
+  %cmp = icmp slt i32 %0, 6
+; CHECK:  if r{{[0-9]+}} s{{<|>}} 6 goto
+  %1 = load i32, i32* @n, align 4
+  %spec.select = select i1 %cmp, i32 %1, i32 %0
+  ret i32 %spec.select
+}
+
+attributes #0 = { norecurse nounwind readonly }