diff --git a/llvm/lib/Target/Hexagon/HexagonPatterns.td b/llvm/lib/Target/Hexagon/HexagonPatterns.td
index f185c49b85d6..72d7569076aa 100644
--- a/llvm/lib/Target/Hexagon/HexagonPatterns.td
+++ b/llvm/lib/Target/Hexagon/HexagonPatterns.td
@@ -63,6 +63,11 @@ def IsNPow2_64H : PatLeaf<(i64 imm), [{
   return isPowerOf2_64(NV) && Log2_64(NV) >= 32;
 }]>;
 
+class IsUGT<int Width, int Arg>: PatLeaf<(i32 imm),
+  "uint64_t V = N->getZExtValue();" #
+  "return isUInt<" # Width # ">(V) && V > " # Arg # ";"
+>;
+
 def SDEC1 : SDNodeXForm<imm, [{
   int32_t V = N->getSExtValue();
   return CurDAG->getTargetConstant(V-1, SDLoc(N), MVT::i32);
@@ -114,6 +119,47 @@ def : T_CMP_pat <C2_cmpeqi,  seteq,  s10_0ImmPred>;
 def : T_CMP_pat <C2_cmpgti,  setgt,  s10_0ImmPred>;
 def : T_CMP_pat <C2_cmpgtui, setugt, u9_0ImmPred>;
 
+
+def SDTAssertZext: SDTypeProfile<1, 2, [SDTCisInt<0>, SDTCisSameAs<0,1>]>;
+def AssertZextSD: SDNode<"ISD::AssertZext", SDTAssertZext>;
+class AssertZext<ValueType T>: PatFrag<(ops node:$A), (AssertZextSD $A, T)>;
+
+multiclass Cmpb_pat<InstHexagon MI, PatFrag Op, PatFrag AssertExt,
+                    PatLeaf ImmPred, int Mask> {
+  def: Pat<(i1 (Op (and I32:$Rs, Mask), ImmPred:$I)),
+           (MI I32:$Rs, imm:$I)>;
+  def: Pat<(i1 (Op (AssertExt I32:$Rs), ImmPred:$I)),
+           (MI I32:$Rs, imm:$I)>;
+}
+
+multiclass CmpbN_pat<InstHexagon MI, PatFrag Op, PatFrag AssertExt,
+                     PatLeaf ImmPred, int Mask> {
+  def: Pat<(i1 (Op (and I32:$Rs, Mask), ImmPred:$I)),
+           (C2_not (MI I32:$Rs, imm:$I))>;
+  def: Pat<(i1 (Op (AssertExt I32:$Rs), ImmPred:$I)),
+           (C2_not (MI I32:$Rs, imm:$I))>;
+}
+
+multiclass CmpbND_pat<InstHexagon MI, PatFrag Op, PatFrag AssertExt,
+                      PatLeaf ImmPred, int Mask> {
+  def: Pat<(i1 (Op (and I32:$Rs, Mask), ImmPred:$I)),
+           (C2_not (MI I32:$Rs, (UDEC1 imm:$I)))>;
+  def: Pat<(i1 (Op (AssertExt I32:$Rs), ImmPred:$I)),
+           (C2_not (MI I32:$Rs, (UDEC1 imm:$I)))>;
+}
+
+let AddedComplexity = 200 in {
+  defm: Cmpb_pat  <A4_cmpbeqi,  seteq,  AssertZext<i8>,  IsUGT<8,31>,  255>;
+  defm: CmpbN_pat <A4_cmpbeqi,  setne,  AssertZext<i8>,  IsUGT<8,31>,  255>;
+  defm: Cmpb_pat  <A4_cmpbgtui, setugt, AssertZext<i8>,  IsUGT<32,31>, 255>;
+  defm: CmpbN_pat <A4_cmpbgtui, setule, AssertZext<i8>,  IsUGT<32,31>, 255>;
+  defm: Cmpb_pat  <A4_cmphgtui, setugt, AssertZext<i16>, IsUGT<32,31>, 65535>;
+  defm: CmpbN_pat <A4_cmphgtui, setule, AssertZext<i16>, IsUGT<32,31>, 65535>;
+  defm: CmpbND_pat<A4_cmpbgtui, setult, AssertZext<i8>,  IsUGT<32,32>, 255>;
+  defm: CmpbND_pat<A4_cmphgtui, setult, AssertZext<i16>, IsUGT<32,32>, 65535>;
+}
+
+
 def SDTHexagonI64I32I32 : SDTypeProfile<1, 2,
   [SDTCisVT<0, i64>, SDTCisVT<1, i32>, SDTCisSameAs<1, 2>]>;
 
diff --git a/llvm/test/CodeGen/Hexagon/cmpb-dec-imm.ll b/llvm/test/CodeGen/Hexagon/cmpb-dec-imm.ll
new file mode 100644
index 000000000000..d3b48e6b294e
--- /dev/null
+++ b/llvm/test/CodeGen/Hexagon/cmpb-dec-imm.ll
@@ -0,0 +1,30 @@
+; RUN: llc -march=hexagon -debug-only=isel < %s 2>&1 | FileCheck %s
+; REQUIRES: asserts
+
+; Check that we generate 'cmpb.gtu' instruction for a byte comparision
+; The "Optimized Lowered Selection" converts the "ugt with #40" to
+; "ult with #41". The immediate value should be decremented to #40
+; with the selected cmpb.gtu pattern
+; CHECK: setcc{{.*}}41{{.*}}setult
+; CHECK: A4_cmpbgtui{{.*}}40
+
+@glob = common global i8 0, align 1
+
+define i32 @cmpgtudec(i32 %a0, i32 %a1) #0 {
+b2:
+  %v3 = xor i32 %a1, %a0
+  %v4 = and i32 %v3, 255
+  %v5 = icmp ugt i32 %v4, 40
+  br i1 %v5, label %b6, label %b8
+
+b6:                                               ; preds = %b2
+  %v7 = trunc i32 %a0 to i8
+  store i8 %v7, i8* @glob, align 1
+  br label %b8
+
+b8:                                               ; preds = %b6, %b2
+  %v9 = phi i32 [ 1, %b6 ], [ 0, %b2 ]
+  ret i32 %v9
+}
+
+attributes #0 = { nounwind }
diff --git a/llvm/test/CodeGen/Hexagon/cmph-gtu.ll b/llvm/test/CodeGen/Hexagon/cmph-gtu.ll
new file mode 100644
index 000000000000..f5feb7bc6fb1
--- /dev/null
+++ b/llvm/test/CodeGen/Hexagon/cmph-gtu.ll
@@ -0,0 +1,46 @@
+; RUN: llc -march=hexagon < %s | FileCheck %s
+
+; Check that we generate 'cmph.gtu' instruction.
+; CHECK-LABEL: @cmphgtu
+; CHECK: cmph.gtu
+
+@glob = common global i8 0, align 1
+
+define i32 @cmphgtu(i32 %a0, i32 %a1) #0 {
+b2:
+  %v3 = xor i32 %a1, %a0
+  %v4 = and i32 %v3, 65535
+  %v5 = icmp ugt i32 %v4, 40
+  br i1 %v5, label %b6, label %b8
+
+b6:                                               ; preds = %b2
+  %v7 = trunc i32 %a0 to i8
+  store i8 %v7, i8* @glob, align 1
+  br label %b8
+
+b8:                                               ; preds = %b6, %b2
+  %v9 = phi i32 [ 1, %b6 ], [ 0, %b2 ]
+  ret i32 %v9
+}
+
+; With zxtb, we must not generate a cmph.gtu instruction.
+; CHECK-LABEL: @nocmphgtu
+; CHECK-NOT: cmph.gtu
+define i32 @nocmphgtu(i32 %a0, i32 %a1) #0 {
+b2:
+  %v3 = xor i32 %a1, %a0
+  %v4 = and i32 %v3, 255
+  %v5 = icmp ugt i32 %v4, 40
+  br i1 %v5, label %b6, label %b8
+
+b6:                                               ; preds = %b2
+  %v7 = trunc i32 %a0 to i8
+  store i8 %v7, i8* @glob, align 1
+  br label %b8
+
+b8:                                               ; preds = %b6, %b2
+  %v9 = phi i32 [ 1, %b6 ], [ 0, %b2 ]
+  ret i32 %v9
+}
+
+attributes #0 = { nounwind }