diff --git a/llvm/test/CodeGen/SystemZ/atomic-store-03.ll b/llvm/test/CodeGen/SystemZ/atomic-store-03.ll
index 6e2996313db6..cbf1e511d2b0 100644
--- a/llvm/test/CodeGen/SystemZ/atomic-store-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomic-store-03.ll
@@ -9,7 +9,7 @@ define void @f1(i32 %val, i32 *%src) {
 ; CHECK: l %r0, 0(%r3)
 ; CHECK: [[LABEL:\.[^:]*]]:
 ; CHECK: cs %r0, %r2, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   store atomic i32 %val, i32 *%src seq_cst, align 4
   ret void
diff --git a/llvm/test/CodeGen/SystemZ/atomic-store-04.ll b/llvm/test/CodeGen/SystemZ/atomic-store-04.ll
index 7a611c8cf081..a2d83c5e5c3d 100644
--- a/llvm/test/CodeGen/SystemZ/atomic-store-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomic-store-04.ll
@@ -9,7 +9,7 @@ define void @f1(i64 %val, i64 *%src) {
 ; CHECK: lg %r0, 0(%r3)
 ; CHECK: [[LABEL:\.[^:]*]]:
 ; CHECK: csg %r0, %r2, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   store atomic i64 %val, i64 *%src seq_cst, align 8
   ret void
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-add-01.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-add-01.ll
index 2a84857f836d..615b2921abe6 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-add-01.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-add-01.ll
@@ -22,7 +22,7 @@ define i8 @f1(i8 *%src, i8 %b) {
 ; CHECK: ar [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -56,7 +56,7 @@ define i8 @f2(i8 *%src) {
 ; CHECK: afi [[ROT]], -2147483648
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-add-02.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-add-02.ll
index 3dd482dd323d..95fb02ae641c 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-add-02.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-add-02.ll
@@ -22,7 +22,7 @@ define i16 @f1(i16 *%src, i16 %b) {
 ; CHECK: ar [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -56,7 +56,7 @@ define i16 @f2(i16 *%src) {
 ; CHECK: afi [[ROT]], -2147483648
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-add-03.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-add-03.ll
index 01eb8e0d7464..e3190574eed7 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-add-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-add-03.ll
@@ -10,7 +10,7 @@ define i32 @f1(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: lr %r0, %r2
 ; CHECK: ar %r0, %r4
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw add i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -24,7 +24,7 @@ define i32 @f2(i32 %dummy, i32 *%src) {
 ; CHECK: lr %r0, %r2
 ; CHECK: ahi %r0, 1
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw add i32 *%src, i32 1 seq_cst
   ret i32 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-add-04.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-add-04.ll
index 6b1d20bd080e..b2cbaca852d1 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-add-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-add-04.ll
@@ -10,7 +10,7 @@ define i64 @f1(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: agr %r0, %r4
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw add i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -24,7 +24,7 @@ define i64 @f2(i64 %dummy, i64 *%src) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: aghi %r0, 1
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw add i64 *%src, i64 1 seq_cst
   ret i64 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-and-01.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-and-01.ll
index ebbce8e7872b..6d66df3b50ef 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-and-01.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-and-01.ll
@@ -22,7 +22,7 @@ define i8 @f1(i8 *%src, i8 %b) {
 ; CHECK: nr [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -57,7 +57,7 @@ define i8 @f2(i8 *%src) {
 ; CHECK: nilh [[ROT]], 33023
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-and-02.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-and-02.ll
index b63ca4ab4407..76e33bb3ce73 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-and-02.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-and-02.ll
@@ -22,7 +22,7 @@ define i16 @f1(i16 *%src, i16 %b) {
 ; CHECK: nr [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -57,7 +57,7 @@ define i16 @f2(i16 *%src) {
 ; CHECK: nilh [[ROT]], 32768
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-and-03.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-and-03.ll
index ec69edcf1a47..8449a7cacf74 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-and-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-and-03.ll
@@ -10,7 +10,7 @@ define i32 @f1(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: lr %r0, %r2
 ; CHECK: nr %r0, %r4
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw and i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -24,7 +24,7 @@ define i32 @f2(i32 %dummy, i32 *%src) {
 ; CHECK: lr %r0, %r2
 ; CHECK: nilf %r0, 1
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw and i32 *%src, i32 1 seq_cst
   ret i32 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-and-04.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-and-04.ll
index 71f29baa0e6f..ade7617d967a 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-and-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-and-04.ll
@@ -10,7 +10,7 @@ define i64 @f1(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: ngr %r0, %r4
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw and i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -33,7 +33,7 @@ define i64 @f3(i64 %dummy, i64 *%src) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: nihf %r0, 0
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw and i64 *%src, i64 4294967295 seq_cst
   ret i64 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-01.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-01.ll
index c6ec77e91b3d..83d6156c5dbd 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-01.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-01.ll
@@ -20,12 +20,12 @@ define i8 @f1(i8 *%src, i8 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: rll [[ROT:%r[0-9]+]], [[OLD]], 0([[SHIFT]])
 ; CHECK: cr [[ROT]], %r3
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: risbg [[ROT]], %r3, 32, 39, 0
 ; CHECK: [[KEEP]]:
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -57,12 +57,12 @@ define i8 @f2(i8 *%src, i8 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: rll [[ROT:%r[0-9]+]], [[OLD]], 0([[SHIFT]])
 ; CHECK: cr [[ROT]], %r3
-; CHECK: j{{g?}}he [[KEEP:\..*]]
+; CHECK: jhe [[KEEP:\..*]]
 ; CHECK: risbg [[ROT]], %r3, 32, 39, 0
 ; CHECK: [[KEEP]]:
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -94,12 +94,12 @@ define i8 @f3(i8 *%src, i8 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: rll [[ROT:%r[0-9]+]], [[OLD]], 0([[SHIFT]])
 ; CHECK: clr [[ROT]], %r3
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: risbg [[ROT]], %r3, 32, 39, 0
 ; CHECK: [[KEEP]]:
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -131,12 +131,12 @@ define i8 @f4(i8 *%src, i8 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: rll [[ROT:%r[0-9]+]], [[OLD]], 0([[SHIFT]])
 ; CHECK: clr [[ROT]], %r3
-; CHECK: j{{g?}}he [[KEEP:\..*]]
+; CHECK: jhe [[KEEP:\..*]]
 ; CHECK: risbg [[ROT]], %r3, 32, 39, 0
 ; CHECK: [[KEEP]]:
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-02.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-02.ll
index 9612e99b7387..27dc3e925b36 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-02.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-02.ll
@@ -20,12 +20,12 @@ define i16 @f1(i16 *%src, i16 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: rll [[ROT:%r[0-9]+]], [[OLD]], 0([[SHIFT]])
 ; CHECK: cr [[ROT]], %r3
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: risbg [[ROT]], %r3, 32, 47, 0
 ; CHECK: [[KEEP]]:
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -57,12 +57,12 @@ define i16 @f2(i16 *%src, i16 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: rll [[ROT:%r[0-9]+]], [[OLD]], 0([[SHIFT]])
 ; CHECK: cr [[ROT]], %r3
-; CHECK: j{{g?}}he [[KEEP:\..*]]
+; CHECK: jhe [[KEEP:\..*]]
 ; CHECK: risbg [[ROT]], %r3, 32, 47, 0
 ; CHECK: [[KEEP]]:
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -94,12 +94,12 @@ define i16 @f3(i16 *%src, i16 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: rll [[ROT:%r[0-9]+]], [[OLD]], 0([[SHIFT]])
 ; CHECK: clr [[ROT]], %r3
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: risbg [[ROT]], %r3, 32, 47, 0
 ; CHECK: [[KEEP]]:
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -131,12 +131,12 @@ define i16 @f4(i16 *%src, i16 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: rll [[ROT:%r[0-9]+]], [[OLD]], 0([[SHIFT]])
 ; CHECK: clr [[ROT]], %r3
-; CHECK: j{{g?}}he [[KEEP:\..*]]
+; CHECK: jhe [[KEEP:\..*]]
 ; CHECK: risbg [[ROT]], %r3, 32, 47, 0
 ; CHECK: [[KEEP]]:
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-03.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-03.ll
index b5809bdc1693..53d0e737e071 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-03.ll
@@ -9,10 +9,10 @@ define i32 @f1(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: cr %r2, %r4
 ; CHECK: lr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: lr [[NEW]], %r4
 ; CHECK: cs %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw min i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -25,10 +25,10 @@ define i32 @f2(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: cr %r2, %r4
 ; CHECK: lr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}he [[KEEP:\..*]]
+; CHECK: jhe [[KEEP:\..*]]
 ; CHECK: lr [[NEW]], %r4
 ; CHECK: cs %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw max i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -41,10 +41,10 @@ define i32 @f3(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: clr %r2, %r4
 ; CHECK: lr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: lr [[NEW]], %r4
 ; CHECK: cs %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw umin i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -57,10 +57,10 @@ define i32 @f4(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: clr %r2, %r4
 ; CHECK: lr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}he [[KEEP:\..*]]
+; CHECK: jhe [[KEEP:\..*]]
 ; CHECK: lr [[NEW]], %r4
 ; CHECK: cs %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw umax i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -166,10 +166,10 @@ define i32 @f13(i32 %dummy, i32 *%ptr) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: cr %r2, [[LIMIT]]
 ; CHECK: lr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: lr [[NEW]], [[LIMIT]]
 ; CHECK: cs %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw min i32 *%ptr, i32 42 seq_cst
   ret i32 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-04.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-04.ll
index 68978547d3e9..d77233141807 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-minmax-04.ll
@@ -9,10 +9,10 @@ define i64 @f1(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: cgr %r2, %r4
 ; CHECK: lgr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: lgr [[NEW]], %r4
 ; CHECK: csg %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw min i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -25,10 +25,10 @@ define i64 @f2(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: cgr %r2, %r4
 ; CHECK: lgr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}he [[KEEP:\..*]]
+; CHECK: jhe [[KEEP:\..*]]
 ; CHECK: lgr [[NEW]], %r4
 ; CHECK: csg %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw max i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -41,10 +41,10 @@ define i64 @f3(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: clgr %r2, %r4
 ; CHECK: lgr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: lgr [[NEW]], %r4
 ; CHECK: csg %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw umin i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -57,10 +57,10 @@ define i64 @f4(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: clgr %r2, %r4
 ; CHECK: lgr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}he [[KEEP:\..*]]
+; CHECK: jhe [[KEEP:\..*]]
 ; CHECK: lgr [[NEW]], %r4
 ; CHECK: csg %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw umax i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -133,10 +133,10 @@ define i64 @f10(i64 %dummy, i64 *%ptr) {
 ; CHECK: [[LOOP:\.[^:]*]]:
 ; CHECK: cgr %r2, [[LIMIT]]
 ; CHECK: lgr [[NEW:%r[0-9]+]], %r2
-; CHECK: j{{g?}}le [[KEEP:\..*]]
+; CHECK: jle [[KEEP:\..*]]
 ; CHECK: lgr [[NEW]], [[LIMIT]]
 ; CHECK: csg %r2, [[NEW]], 0(%r3)
-; CHECK: j{{g?}}lh [[LOOP]]
+; CHECK: jlh [[LOOP]]
 ; CHECK: br %r14
   %res = atomicrmw min i64 *%ptr, i64 42 seq_cst
   ret i64 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-nand-01.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-nand-01.ll
index 1ede3b465be2..b5f2c1014124 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-nand-01.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-nand-01.ll
@@ -23,7 +23,7 @@ define i8 @f1(i8 *%src, i8 %b) {
 ; CHECK: xilf [[ROT]], 4278190080
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -59,7 +59,7 @@ define i8 @f2(i8 *%src) {
 ; CHECK: xilf [[ROT]], 4278190080
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-nand-02.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-nand-02.ll
index d5cf864a3f79..7a37a38ef928 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-nand-02.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-nand-02.ll
@@ -23,7 +23,7 @@ define i16 @f1(i16 *%src, i16 %b) {
 ; CHECK: xilf [[ROT]], 4294901760
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -59,7 +59,7 @@ define i16 @f2(i16 *%src) {
 ; CHECK: xilf [[ROT]], 4294901760
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-nand-03.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-nand-03.ll
index cc2a0866b391..56c241690d00 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-nand-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-nand-03.ll
@@ -11,7 +11,7 @@ define i32 @f1(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: nr %r0, %r4
 ; CHECK: xilf %r0, 4294967295
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw nand i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -26,7 +26,7 @@ define i32 @f2(i32 %dummy, i32 *%src) {
 ; CHECK: nilf %r0, 1
 ; CHECK: xilf %r0, 4294967295
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw nand i32 *%src, i32 1 seq_cst
   ret i32 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-nand-04.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-nand-04.ll
index 0c857d97fe83..dee661c9d4b0 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-nand-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-nand-04.ll
@@ -12,7 +12,7 @@ define i64 @f1(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: lcgr %r0, %r0
 ; CHECK: aghi %r0, -1
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw nand i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -37,7 +37,7 @@ define i64 @f3(i64 %dummy, i64 *%src) {
 ; CHECK: lcgr %r0, %r0
 ; CHECK: aghi %r0, -1
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw nand i64 *%src, i64 4294967295 seq_cst
   ret i64 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-or-01.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-or-01.ll
index 31303b769237..f0313d60c127 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-or-01.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-or-01.ll
@@ -22,7 +22,7 @@ define i8 @f1(i8 *%src, i8 %b) {
 ; CHECK: or [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -56,7 +56,7 @@ define i8 @f2(i8 *%src) {
 ; CHECK: oilh [[ROT]], 32768
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-or-02.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-or-02.ll
index 9880d0b9859f..5c3f286996e1 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-or-02.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-or-02.ll
@@ -22,7 +22,7 @@ define i16 @f1(i16 *%src, i16 %b) {
 ; CHECK: or [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -56,7 +56,7 @@ define i16 @f2(i16 *%src) {
 ; CHECK: oilh [[ROT]], 32768
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-or-03.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-or-03.ll
index 33fd21b04c6c..1def200a899a 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-or-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-or-03.ll
@@ -10,7 +10,7 @@ define i32 @f1(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: lr %r0, %r2
 ; CHECK: or %r0, %r4
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw or i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -24,7 +24,7 @@ define i32 @f2(i32 %dummy, i32 *%src) {
 ; CHECK: lr %r0, %r2
 ; CHECK: oill %r0, 1
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw or i32 *%src, i32 1 seq_cst
   ret i32 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-or-04.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-or-04.ll
index a74f6f9dd501..be0b23cbfe03 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-or-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-or-04.ll
@@ -10,7 +10,7 @@ define i64 @f1(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: ogr %r0, %r4
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw or i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -24,7 +24,7 @@ define i64 @f2(i64 %dummy, i64 *%src) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: oill %r0, 1
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw or i64 *%src, i64 1 seq_cst
   ret i64 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-sub-01.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-sub-01.ll
index d073dc5ec29f..31cbdf5d06db 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-sub-01.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-sub-01.ll
@@ -22,7 +22,7 @@ define i8 @f1(i8 *%src, i8 %b) {
 ; CHECK: sr [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -56,7 +56,7 @@ define i8 @f2(i8 *%src) {
 ; CHECK: afi [[ROT]], -2147483648
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-sub-02.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-sub-02.ll
index 449d92ff3b30..f72bf4a1221c 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-sub-02.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-sub-02.ll
@@ -22,7 +22,7 @@ define i16 @f1(i16 *%src, i16 %b) {
 ; CHECK: sr [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -56,7 +56,7 @@ define i16 @f2(i16 *%src) {
 ; CHECK: afi [[ROT]], -2147483648
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-sub-03.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-sub-03.ll
index da07fb57ef72..c2821ad0ca8b 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-sub-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-sub-03.ll
@@ -10,7 +10,7 @@ define i32 @f1(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: lr %r0, %r2
 ; CHECK: sr %r0, %r4
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw sub i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -24,7 +24,7 @@ define i32 @f2(i32 %dummy, i32 *%src) {
 ; CHECK: lr %r0, %r2
 ; CHECK: ahi %r0, -1
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw sub i32 *%src, i32 1 seq_cst
   ret i32 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-sub-04.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-sub-04.ll
index 26f75afe85f4..6b3e1c9ae681 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-sub-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-sub-04.ll
@@ -10,7 +10,7 @@ define i64 @f1(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: sgr %r0, %r4
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw sub i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -24,7 +24,7 @@ define i64 @f2(i64 %dummy, i64 *%src) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: aghi %r0, -1
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw sub i64 *%src, i64 1 seq_cst
   ret i64 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-01.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-01.ll
index e33597b7297d..502fa2f8a03b 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-01.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-01.ll
@@ -20,7 +20,7 @@ define i8 @f1(i8 *%src, i8 %b) {
 ; CHECK: risbg [[ROT]], %r3, 32, 39, 24
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-02.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-02.ll
index 31f802625a32..55ede4125883 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-02.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-02.ll
@@ -20,7 +20,7 @@ define i16 @f1(i16 *%src, i16 %b) {
 ; CHECK: risbg [[ROT]], %r3, 32, 47, 16
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-03.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-03.ll
index 37581ab9d602..4a4882667a43 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-03.ll
@@ -8,7 +8,7 @@ define i32 @f1(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: l %r2, 0(%r3)
 ; CHECK: [[LABEL:\.[^:]*]]:
 ; CHECK: cs %r2, %r4, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw xchg i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -114,7 +114,7 @@ define i32 @f10(i32 %dummy, i32 *%src) {
 ; CHECK: l %r2, 0(%r3)
 ; CHECK: [[LABEL:\.[^:]*]]:
 ; CHECK: cs %r2, [[VALUE]], 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw xchg i32 *%src, i32 40000 seq_cst
   ret i32 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-04.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-04.ll
index a68295ea8b04..ac1f6cd1da19 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-xchg-04.ll
@@ -8,7 +8,7 @@ define i64 @f1(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: lg %r2, 0(%r3)
 ; CHECK: [[LABEL:\.[^:]*]]:
 ; CHECK: csg %r2, %r4, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw xchg i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -81,7 +81,7 @@ define i64 @f7(i64 %dummy, i64 *%ptr) {
 ; CHECK: lg %r2, 0(%r3)
 ; CHECK: [[LABEL:\.[^:]*]]:
 ; CHECK: csg %r2, [[VALUE]], 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw xchg i64 *%ptr, i64 3000000000 seq_cst
   ret i64 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-xor-01.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-xor-01.ll
index 13cdf02f486c..4801e80eb321 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-xor-01.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-xor-01.ll
@@ -22,7 +22,7 @@ define i8 @f1(i8 *%src, i8 %b) {
 ; CHECK: xr [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -56,7 +56,7 @@ define i8 @f2(i8 *%src) {
 ; CHECK: xilf [[ROT]], 2147483648
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-xor-02.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-xor-02.ll
index 4faa64f8e837..7a525a899772 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-xor-02.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-xor-02.ll
@@ -22,7 +22,7 @@ define i16 @f1(i16 *%src, i16 %b) {
 ; CHECK: xr [[ROT]], %r3
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0({{%r[1-9]+}})
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
@@ -56,7 +56,7 @@ define i16 @f2(i16 *%src) {
 ; CHECK: xilf [[ROT]], 2147483648
 ; CHECK: rll [[NEW:%r[0-9]+]], [[ROT]], 0([[NEGSHIFT:%r[1-9]+]])
 ; CHECK: cs [[OLD]], [[NEW]], 0(%r2)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK: br %r14
 ;
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-xor-03.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-xor-03.ll
index 23884f888e13..0c1951534bbb 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-xor-03.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-xor-03.ll
@@ -10,7 +10,7 @@ define i32 @f1(i32 %dummy, i32 *%src, i32 %b) {
 ; CHECK: lr %r0, %r2
 ; CHECK: xr %r0, %r4
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw xor i32 *%src, i32 %b seq_cst
   ret i32 %res
@@ -24,7 +24,7 @@ define i32 @f2(i32 %dummy, i32 *%src) {
 ; CHECK: lr %r0, %r2
 ; CHECK: xilf %r0, 1
 ; CHECK: cs %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw xor i32 *%src, i32 1 seq_cst
   ret i32 %res
diff --git a/llvm/test/CodeGen/SystemZ/atomicrmw-xor-04.ll b/llvm/test/CodeGen/SystemZ/atomicrmw-xor-04.ll
index 21130fb47776..6487b882f406 100644
--- a/llvm/test/CodeGen/SystemZ/atomicrmw-xor-04.ll
+++ b/llvm/test/CodeGen/SystemZ/atomicrmw-xor-04.ll
@@ -10,7 +10,7 @@ define i64 @f1(i64 %dummy, i64 *%src, i64 %b) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: xgr %r0, %r4
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw xor i64 *%src, i64 %b seq_cst
   ret i64 %res
@@ -24,7 +24,7 @@ define i64 @f2(i64 %dummy, i64 *%src) {
 ; CHECK: lgr %r0, %r2
 ; CHECK: xilf %r0, 1
 ; CHECK: csg %r2, %r0, 0(%r3)
-; CHECK: j{{g?}}lh [[LABEL]]
+; CHECK: jlh [[LABEL]]
 ; CHECK: br %r14
   %res = atomicrmw xor i64 *%src, i64 1 seq_cst
   ret i64 %res
diff --git a/llvm/test/CodeGen/SystemZ/branch-01.ll b/llvm/test/CodeGen/SystemZ/branch-01.ll
index 8ff91ac38e80..f201ddd2a9da 100644
--- a/llvm/test/CodeGen/SystemZ/branch-01.ll
+++ b/llvm/test/CodeGen/SystemZ/branch-01.ll
@@ -6,7 +6,7 @@ define void @f1(i8 *%dest) {
 ; CHECK: f1:
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: mvi 0(%r2), 1
-; CHECK: j{{g?}} .L[[LABEL]]
+; CHECK: j .L[[LABEL]]
   br label %loop
 loop:
   store volatile i8 1, i8 *%dest
diff --git a/llvm/test/CodeGen/SystemZ/branch-02.ll b/llvm/test/CodeGen/SystemZ/branch-02.ll
index cde9b568b38c..9365f1614309 100644
--- a/llvm/test/CodeGen/SystemZ/branch-02.ll
+++ b/llvm/test/CodeGen/SystemZ/branch-02.ll
@@ -8,7 +8,7 @@ define void @f1(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: c %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}e .L[[LABEL]]
+; CHECK-NEXT: je .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
@@ -23,7 +23,7 @@ define void @f2(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: c %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}lh .L[[LABEL]]
+; CHECK-NEXT: jlh .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
@@ -38,7 +38,7 @@ define void @f3(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: c %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}le .L[[LABEL]]
+; CHECK-NEXT: jle .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
@@ -53,7 +53,7 @@ define void @f4(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: c %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}l .L[[LABEL]]
+; CHECK-NEXT: jl .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
@@ -68,7 +68,7 @@ define void @f5(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: c %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}h .L[[LABEL]]
+; CHECK-NEXT: jh .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
@@ -83,7 +83,7 @@ define void @f6(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: c %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}he .L[[LABEL]]
+; CHECK-NEXT: jhe .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
diff --git a/llvm/test/CodeGen/SystemZ/branch-03.ll b/llvm/test/CodeGen/SystemZ/branch-03.ll
index 1e447d034a39..9d00f6e9af51 100644
--- a/llvm/test/CodeGen/SystemZ/branch-03.ll
+++ b/llvm/test/CodeGen/SystemZ/branch-03.ll
@@ -7,7 +7,7 @@ define void @f1(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: cl %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}le .L[[LABEL]]
+; CHECK-NEXT: jle .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
@@ -22,7 +22,7 @@ define void @f2(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: cl %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}l .L[[LABEL]]
+; CHECK-NEXT: jl .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
@@ -37,7 +37,7 @@ define void @f3(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: cl %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}h .L[[LABEL]]
+; CHECK-NEXT: jh .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
@@ -52,7 +52,7 @@ define void @f4(i32 *%src, i32 %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: cl %r3, 0(%r2)
-; CHECK-NEXT: j{{g?}}he .L[[LABEL]]
+; CHECK-NEXT: jhe .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile i32 *%src
diff --git a/llvm/test/CodeGen/SystemZ/branch-04.ll b/llvm/test/CodeGen/SystemZ/branch-04.ll
index 3d4175041db2..d6826fb9cddc 100644
--- a/llvm/test/CodeGen/SystemZ/branch-04.ll
+++ b/llvm/test/CodeGen/SystemZ/branch-04.ll
@@ -8,7 +8,7 @@ define void @f1(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}e .L[[LABEL]]
+; CHECK-NEXT: je .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -23,7 +23,7 @@ define void @f2(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}lh .L[[LABEL]]
+; CHECK-NEXT: jlh .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -38,7 +38,7 @@ define void @f3(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}le .L[[LABEL]]
+; CHECK-NEXT: jle .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -53,7 +53,7 @@ define void @f4(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}l .L[[LABEL]]
+; CHECK-NEXT: jl .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -68,7 +68,7 @@ define void @f5(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}h .L[[LABEL]]
+; CHECK-NEXT: jh .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -83,7 +83,7 @@ define void @f6(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}he .L[[LABEL]]
+; CHECK-NEXT: jhe .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -98,7 +98,7 @@ define void @f7(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}nlh .L[[LABEL]]
+; CHECK-NEXT: jnlh .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -113,7 +113,7 @@ define void @f8(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}ne .L[[LABEL]]
+; CHECK-NEXT: jne .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -128,7 +128,7 @@ define void @f9(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}nh .L[[LABEL]]
+; CHECK-NEXT: jnh .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -143,7 +143,7 @@ define void @f10(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}nhe .L[[LABEL]]
+; CHECK-NEXT: jnhe .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -158,7 +158,7 @@ define void @f11(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}nle .L[[LABEL]]
+; CHECK-NEXT: jnle .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -173,7 +173,7 @@ define void @f12(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}nl .L[[LABEL]]
+; CHECK-NEXT: jnl .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -190,7 +190,7 @@ define void @f13(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}no .L[[LABEL]]
+; CHECK-NEXT: jno .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
@@ -207,7 +207,7 @@ define void @f14(float *%src, float %target) {
 ; CHECK: .cfi_startproc
 ; CHECK: .L[[LABEL:.*]]:
 ; CHECK: ceb %f0, 0(%r2)
-; CHECK-NEXT: j{{g?}}o .L[[LABEL]]
+; CHECK-NEXT: jo .L[[LABEL]]
   br label %loop
 loop:
   %val = load volatile float *%src
diff --git a/llvm/test/CodeGen/SystemZ/branch-05.ll b/llvm/test/CodeGen/SystemZ/branch-05.ll
index 4c6b96fd542b..268692a473a2 100644
--- a/llvm/test/CodeGen/SystemZ/branch-05.ll
+++ b/llvm/test/CodeGen/SystemZ/branch-05.ll
@@ -6,7 +6,7 @@ define i32 @f1(i32 %x, i32 %y, i32 %op) {
 ; CHECK: f1:
 ; CHECK: ahi %r4, -1
 ; CHECK: clfi %r4, 5
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: llgfr [[OP64:%r[0-5]]], %r4
 ; CHECK: sllg [[INDEX:%r[1-5]]], [[OP64]], 3
 ; CHECK: larl [[BASE:%r[1-5]]]
diff --git a/llvm/test/CodeGen/SystemZ/cmpxchg-01.ll b/llvm/test/CodeGen/SystemZ/cmpxchg-01.ll
index 477bcb00e9bd..e8488615bd1a 100644
--- a/llvm/test/CodeGen/SystemZ/cmpxchg-01.ll
+++ b/llvm/test/CodeGen/SystemZ/cmpxchg-01.ll
@@ -19,11 +19,11 @@ define i8 @f1(i8 %dummy, i8 *%src, i8 %cmp, i8 %swap) {
 ; CHECK-MAIN: rll %r2, [[OLD]], 8([[SHIFT]])
 ; CHECK-MAIN: risbg %r4, %r2, 32, 55, 0
 ; CHECK-MAIN: cr %r2, %r4
-; CHECK-MAIN: j{{g?}}lh [[EXIT:\.[^ ]*]]
+; CHECK-MAIN: jlh [[EXIT:\.[^ ]*]]
 ; CHECK-MAIN: risbg %r5, %r2, 32, 55, 0
 ; CHECK-MAIN: rll [[NEW:%r[0-9]+]], %r5, -8({{%r[1-9]+}})
 ; CHECK-MAIN: cs [[OLD]], [[NEW]], 0(%r3)
-; CHECK-MAIN: j{{g?}}lh [[LOOP]]
+; CHECK-MAIN: jlh [[LOOP]]
 ; CHECK-MAIN: [[EXIT]]:
 ; CHECK-MAIN-NOT: %r2
 ; CHECK-MAIN: br %r14
diff --git a/llvm/test/CodeGen/SystemZ/cmpxchg-02.ll b/llvm/test/CodeGen/SystemZ/cmpxchg-02.ll
index cc3452320b3d..2c2f76cd7c10 100644
--- a/llvm/test/CodeGen/SystemZ/cmpxchg-02.ll
+++ b/llvm/test/CodeGen/SystemZ/cmpxchg-02.ll
@@ -19,11 +19,11 @@ define i16 @f1(i16 %dummy, i16 *%src, i16 %cmp, i16 %swap) {
 ; CHECK-MAIN: rll %r2, [[OLD]], 16([[SHIFT]])
 ; CHECK-MAIN: risbg %r4, %r2, 32, 47, 0
 ; CHECK-MAIN: cr %r2, %r4
-; CHECK-MAIN: j{{g?}}lh [[EXIT:\.[^ ]*]]
+; CHECK-MAIN: jlh [[EXIT:\.[^ ]*]]
 ; CHECK-MAIN: risbg %r5, %r2, 32, 47, 0
 ; CHECK-MAIN: rll [[NEW:%r[0-9]+]], %r5, -16({{%r[1-9]+}})
 ; CHECK-MAIN: cs [[OLD]], [[NEW]], 0(%r3)
-; CHECK-MAIN: j{{g?}}lh [[LOOP]]
+; CHECK-MAIN: jlh [[LOOP]]
 ; CHECK-MAIN: [[EXIT]]:
 ; CHECK-MAIN-NOT: %r2
 ; CHECK-MAIN: br %r14
diff --git a/llvm/test/CodeGen/SystemZ/fp-cmp-01.ll b/llvm/test/CodeGen/SystemZ/fp-cmp-01.ll
index b80a71595e87..cb2a6be88dd2 100644
--- a/llvm/test/CodeGen/SystemZ/fp-cmp-01.ll
+++ b/llvm/test/CodeGen/SystemZ/fp-cmp-01.ll
@@ -6,7 +6,7 @@
 define i64 @f1(i64 %a, i64 %b, float %f1, float %f2) {
 ; CHECK: f1:
 ; CHECK: cebr %f0, %f2
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %cond = fcmp oeq float %f1, %f2
@@ -18,7 +18,7 @@ define i64 @f1(i64 %a, i64 %b, float %f1, float %f2) {
 define i64 @f2(i64 %a, i64 %b, float %f1, float *%ptr) {
 ; CHECK: f2:
 ; CHECK: ceb %f0, 0(%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %f2 = load float *%ptr
@@ -31,7 +31,7 @@ define i64 @f2(i64 %a, i64 %b, float %f1, float *%ptr) {
 define i64 @f3(i64 %a, i64 %b, float %f1, float *%base) {
 ; CHECK: f3:
 ; CHECK: ceb %f0, 4092(%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %ptr = getelementptr float *%base, i64 1023
@@ -47,7 +47,7 @@ define i64 @f4(i64 %a, i64 %b, float %f1, float *%base) {
 ; CHECK: f4:
 ; CHECK: aghi %r4, 4096
 ; CHECK: ceb %f0, 0(%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %ptr = getelementptr float *%base, i64 1024
@@ -62,7 +62,7 @@ define i64 @f5(i64 %a, i64 %b, float %f1, float *%base) {
 ; CHECK: f5:
 ; CHECK: aghi %r4, -4
 ; CHECK: ceb %f0, 0(%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %ptr = getelementptr float *%base, i64 -1
@@ -77,7 +77,7 @@ define i64 @f6(i64 %a, i64 %b, float %f1, float *%base, i64 %index) {
 ; CHECK: f6:
 ; CHECK: sllg %r1, %r5, 2
 ; CHECK: ceb %f0, 400(%r1,%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %ptr1 = getelementptr float *%base, i64 %index
diff --git a/llvm/test/CodeGen/SystemZ/fp-cmp-02.ll b/llvm/test/CodeGen/SystemZ/fp-cmp-02.ll
index 8227308ce810..2987d501c760 100644
--- a/llvm/test/CodeGen/SystemZ/fp-cmp-02.ll
+++ b/llvm/test/CodeGen/SystemZ/fp-cmp-02.ll
@@ -6,7 +6,7 @@
 define i64 @f1(i64 %a, i64 %b, double %f1, double %f2) {
 ; CHECK: f1:
 ; CHECK: cdbr %f0, %f2
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %cond = fcmp oeq double %f1, %f2
@@ -18,7 +18,7 @@ define i64 @f1(i64 %a, i64 %b, double %f1, double %f2) {
 define i64 @f2(i64 %a, i64 %b, double %f1, double *%ptr) {
 ; CHECK: f2:
 ; CHECK: cdb %f0, 0(%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %f2 = load double *%ptr
@@ -31,7 +31,7 @@ define i64 @f2(i64 %a, i64 %b, double %f1, double *%ptr) {
 define i64 @f3(i64 %a, i64 %b, double %f1, double *%base) {
 ; CHECK: f3:
 ; CHECK: cdb %f0, 4088(%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %ptr = getelementptr double *%base, i64 511
@@ -47,7 +47,7 @@ define i64 @f4(i64 %a, i64 %b, double %f1, double *%base) {
 ; CHECK: f4:
 ; CHECK: aghi %r4, 4096
 ; CHECK: cdb %f0, 0(%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %ptr = getelementptr double *%base, i64 512
@@ -62,7 +62,7 @@ define i64 @f5(i64 %a, i64 %b, double %f1, double *%base) {
 ; CHECK: f5:
 ; CHECK: aghi %r4, -8
 ; CHECK: cdb %f0, 0(%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %ptr = getelementptr double *%base, i64 -1
@@ -77,7 +77,7 @@ define i64 @f6(i64 %a, i64 %b, double %f1, double *%base, i64 %index) {
 ; CHECK: f6:
 ; CHECK: sllg %r1, %r5, 3
 ; CHECK: cdb %f0, 800(%r1,%r4)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %ptr1 = getelementptr double *%base, i64 %index
diff --git a/llvm/test/CodeGen/SystemZ/fp-cmp-03.ll b/llvm/test/CodeGen/SystemZ/fp-cmp-03.ll
index fd12c93e27a5..1a5009e35f39 100644
--- a/llvm/test/CodeGen/SystemZ/fp-cmp-03.ll
+++ b/llvm/test/CodeGen/SystemZ/fp-cmp-03.ll
@@ -9,7 +9,7 @@ define i64 @f1(i64 %a, i64 %b, fp128 *%ptr, float %f2) {
 ; CHECK: ld %f1, 0(%r4)
 ; CHECK: ld %f3, 8(%r4)
 ; CHECK: cxbr %f1, %f0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: lgr %r2, %r3
 ; CHECK: br %r14
   %f2x = fpext float %f2 to fp128
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-02.ll b/llvm/test/CodeGen/SystemZ/int-cmp-02.ll
index c158fb4af77f..262ade0b99bc 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-02.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-02.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i32 %i1, i32 %i2) {
 ; CHECK: f1:
 ; CHECK: cr %r2, %r3
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i32 %i1, %i2
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i32 %i1, i32 %i2) {
 define double @f2(double %a, double %b, i32 %i1, i32 *%ptr) {
 ; CHECK: f2:
 ; CHECK: c %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = load i32 *%ptr
@@ -31,7 +31,7 @@ define double @f2(double %a, double %b, i32 %i1, i32 *%ptr) {
 define double @f3(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f3:
 ; CHECK: c %r2, 4092(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 1023
@@ -45,7 +45,7 @@ define double @f3(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f4(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f4:
 ; CHECK: cy %r2, 4096(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 1024
@@ -59,7 +59,7 @@ define double @f4(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f5(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f5:
 ; CHECK: cy %r2, 524284(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 131071
@@ -75,7 +75,7 @@ define double @f6(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f6:
 ; CHECK: agfi %r3, 524288
 ; CHECK: c %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 131072
@@ -89,7 +89,7 @@ define double @f6(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f7(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f7:
 ; CHECK: cy %r2, -4(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -1
@@ -103,7 +103,7 @@ define double @f7(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f8(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f8:
 ; CHECK: cy %r2, -524288(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -131072
@@ -119,7 +119,7 @@ define double @f9(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f9:
 ; CHECK: agfi %r3, -524292
 ; CHECK: c %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -131073
@@ -133,7 +133,7 @@ define double @f9(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f10(double %a, double %b, i32 %i1, i64 %base, i64 %index) {
 ; CHECK: f10:
 ; CHECK: c %r2, 4092({{%r4,%r3|%r3,%r4}})
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add1 = add i64 %base, %index
@@ -149,7 +149,7 @@ define double @f10(double %a, double %b, i32 %i1, i64 %base, i64 %index) {
 define double @f11(double %a, double %b, i32 %i1, i64 %base, i64 %index) {
 ; CHECK: f11:
 ; CHECK: cy %r2, 4096({{%r4,%r3|%r3,%r4}})
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add1 = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-03.ll b/llvm/test/CodeGen/SystemZ/int-cmp-03.ll
index 4203bee6ac44..bd802bcedcd3 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-03.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-03.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i32 %i1, i32 %i2) {
 ; CHECK: f1:
 ; CHECK: clr %r2, %r3
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ult i32 %i1, %i2
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i32 %i1, i32 %i2) {
 define double @f2(double %a, double %b, i32 %i1, i32 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cl %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = load i32 *%ptr
@@ -31,7 +31,7 @@ define double @f2(double %a, double %b, i32 %i1, i32 *%ptr) {
 define double @f3(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f3:
 ; CHECK: cl %r2, 4092(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 1023
@@ -45,7 +45,7 @@ define double @f3(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f4(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f4:
 ; CHECK: cly %r2, 4096(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 1024
@@ -59,7 +59,7 @@ define double @f4(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f5(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f5:
 ; CHECK: cly %r2, 524284(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 131071
@@ -75,7 +75,7 @@ define double @f6(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f6:
 ; CHECK: agfi %r3, 524288
 ; CHECK: cl %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 131072
@@ -89,7 +89,7 @@ define double @f6(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f7(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f7:
 ; CHECK: cly %r2, -4(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -1
@@ -103,7 +103,7 @@ define double @f7(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f8(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f8:
 ; CHECK: cly %r2, -524288(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -131072
@@ -119,7 +119,7 @@ define double @f9(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f9:
 ; CHECK: agfi %r3, -524292
 ; CHECK: cl %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -131073
@@ -133,7 +133,7 @@ define double @f9(double %a, double %b, i32 %i1, i32 *%base) {
 define double @f10(double %a, double %b, i32 %i1, i64 %base, i64 %index) {
 ; CHECK: f10:
 ; CHECK: cl %r2, 4092({{%r4,%r3|%r3,%r4}})
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add1 = add i64 %base, %index
@@ -149,7 +149,7 @@ define double @f10(double %a, double %b, i32 %i1, i64 %base, i64 %index) {
 define double @f11(double %a, double %b, i32 %i1, i64 %base, i64 %index) {
 ; CHECK: f11:
 ; CHECK: cly %r2, 4096({{%r4,%r3|%r3,%r4}})
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add1 = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-05.ll b/llvm/test/CodeGen/SystemZ/int-cmp-05.ll
index 2ab64d5319a8..38cd1a5e6697 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-05.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-05.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i64 %i1, i32 %unext) {
 ; CHECK: f1:
 ; CHECK: cgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = sext i32 %unext to i64
@@ -30,7 +30,7 @@ define double @f2(double %a, double %b, i64 %i1, i32 %unext) {
 define double @f3(double %a, double %b, i64 %i1, i32 %unext) {
 ; CHECK: f3:
 ; CHECK: cgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = sext i32 %unext to i64
@@ -43,7 +43,7 @@ define double @f3(double %a, double %b, i64 %i1, i32 %unext) {
 define double @f4(double %a, double %b, i64 %i1, i32 %unext) {
 ; CHECK: f4:
 ; CHECK: cgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = sext i32 %unext to i64
@@ -56,7 +56,7 @@ define double @f4(double %a, double %b, i64 %i1, i32 %unext) {
 define double @f5(double %a, double %b, i64 %i1, i32 *%ptr) {
 ; CHECK: f5:
 ; CHECK: cgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %unext = load i32 *%ptr
@@ -82,7 +82,7 @@ define double @f6(double %a, double %b, i64 %i1, i32 *%ptr) {
 define double @f7(double %a, double %b, i64 %i1, i32 *%ptr) {
 ; CHECK: f7:
 ; CHECK: cgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %unext = load i32 *%ptr
@@ -96,7 +96,7 @@ define double @f7(double %a, double %b, i64 %i1, i32 *%ptr) {
 define double @f8(double %a, double %b, i64 %i1, i32 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %unext = load i32 *%ptr
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i64 %i1, i32 *%ptr) {
 define double @f9(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f9:
 ; CHECK: cgf %r2, 524284(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 131071
@@ -127,7 +127,7 @@ define double @f10(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f10:
 ; CHECK: agfi %r3, 524288
 ; CHECK: cgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 131072
@@ -142,7 +142,7 @@ define double @f10(double %a, double %b, i64 %i1, i32 *%base) {
 define double @f11(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f11:
 ; CHECK: cgf %r2, -4(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -1
@@ -157,7 +157,7 @@ define double @f11(double %a, double %b, i64 %i1, i32 *%base) {
 define double @f12(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f12:
 ; CHECK: cgf %r2, -524288(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -131072
@@ -174,7 +174,7 @@ define double @f13(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f13:
 ; CHECK: agfi %r3, -524292
 ; CHECK: cgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -131073
@@ -189,7 +189,7 @@ define double @f13(double %a, double %b, i64 %i1, i32 *%base) {
 define double @f14(double %a, double %b, i64 %i1, i64 %base, i64 %index) {
 ; CHECK: f14:
 ; CHECK: cgf %r2, 524284({{%r4,%r3|%r3,%r4}})
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add1 = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-06.ll b/llvm/test/CodeGen/SystemZ/int-cmp-06.ll
index 26f6dbfe6f22..efb6ad863c8d 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-06.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-06.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i64 %i1, i32 %unext) {
 ; CHECK: f1:
 ; CHECK: clgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = zext i32 %unext to i64
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i64 %i1, i32 %unext) {
 define double @f2(double %a, double %b, i64 %i1, i64 %unext) {
 ; CHECK: f2:
 ; CHECK: clgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = and i64 %unext, 4294967295
@@ -54,7 +54,7 @@ define double @f4(double %a, double %b, i64 %i1, i64 %unext) {
 define double @f5(double %a, double %b, i64 %i1, i32 %unext) {
 ; CHECK: f5:
 ; CHECK: clgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = zext i32 %unext to i64
@@ -67,7 +67,7 @@ define double @f5(double %a, double %b, i64 %i1, i32 %unext) {
 define double @f6(double %a, double %b, i64 %i1, i64 %unext) {
 ; CHECK: f6:
 ; CHECK: clgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = and i64 %unext, 4294967295
@@ -80,7 +80,7 @@ define double @f6(double %a, double %b, i64 %i1, i64 %unext) {
 define double @f7(double %a, double %b, i64 %i1, i32 %unext) {
 ; CHECK: f7:
 ; CHECK: clgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = zext i32 %unext to i64
@@ -93,7 +93,7 @@ define double @f7(double %a, double %b, i64 %i1, i32 %unext) {
 define double @f8(double %a, double %b, i64 %i1, i64 %unext) {
 ; CHECK: f8:
 ; CHECK: clgfr %r2, %r3
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = and i64 %unext, 4294967295
@@ -106,7 +106,7 @@ define double @f8(double %a, double %b, i64 %i1, i64 %unext) {
 define double @f9(double %a, double %b, i64 %i1, i32 *%ptr) {
 ; CHECK: f9:
 ; CHECK: clgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %unext = load i32 *%ptr
@@ -132,7 +132,7 @@ define double @f10(double %a, double %b, i64 %i1, i32 *%ptr) {
 define double @f11(double %a, double %b, i64 %i1, i32 *%ptr) {
 ; CHECK: f11:
 ; CHECK: clgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %unext = load i32 *%ptr
@@ -146,7 +146,7 @@ define double @f11(double %a, double %b, i64 %i1, i32 *%ptr) {
 define double @f12(double %a, double %b, i64 %i1, i32 *%ptr) {
 ; CHECK: f12:
 ; CHECK: clgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %unext = load i32 *%ptr
@@ -160,7 +160,7 @@ define double @f12(double %a, double %b, i64 %i1, i32 *%ptr) {
 define double @f13(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f13:
 ; CHECK: clgf %r2, 524284(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 131071
@@ -177,7 +177,7 @@ define double @f14(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f14:
 ; CHECK: agfi %r3, 524288
 ; CHECK: clgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 131072
@@ -192,7 +192,7 @@ define double @f14(double %a, double %b, i64 %i1, i32 *%base) {
 define double @f15(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f15:
 ; CHECK: clgf %r2, -4(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -1
@@ -207,7 +207,7 @@ define double @f15(double %a, double %b, i64 %i1, i32 *%base) {
 define double @f16(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f16:
 ; CHECK: clgf %r2, -524288(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -131072
@@ -224,7 +224,7 @@ define double @f17(double %a, double %b, i64 %i1, i32 *%base) {
 ; CHECK: f17:
 ; CHECK: agfi %r3, -524292
 ; CHECK: clgf %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -131073
@@ -239,7 +239,7 @@ define double @f17(double %a, double %b, i64 %i1, i32 *%base) {
 define double @f18(double %a, double %b, i64 %i1, i64 %base, i64 %index) {
 ; CHECK: f18:
 ; CHECK: clgf %r2, 524284({{%r4,%r3|%r3,%r4}})
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add1 = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-07.ll b/llvm/test/CodeGen/SystemZ/int-cmp-07.ll
index 1a6f6226dd9f..6e626bca7f11 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-07.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-07.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i64 %i1, i64 %i2) {
 ; CHECK: f1:
 ; CHECK: cgr %r2, %r3
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, %i2
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i64 %i1, i64 %i2) {
 define double @f2(double %a, double %b, i64 %i1, i64 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cg %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = load i64 *%ptr
@@ -31,7 +31,7 @@ define double @f2(double %a, double %b, i64 %i1, i64 *%ptr) {
 define double @f3(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f3:
 ; CHECK: cg %r2, 524280(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 65535
@@ -47,7 +47,7 @@ define double @f4(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f4:
 ; CHECK: agfi %r3, 524288
 ; CHECK: cg %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 65536
@@ -61,7 +61,7 @@ define double @f4(double %a, double %b, i64 %i1, i64 *%base) {
 define double @f5(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f5:
 ; CHECK: cg %r2, -8(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 -1
@@ -75,7 +75,7 @@ define double @f5(double %a, double %b, i64 %i1, i64 *%base) {
 define double @f6(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f6:
 ; CHECK: cg %r2, -524288(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 -65536
@@ -91,7 +91,7 @@ define double @f7(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f7:
 ; CHECK: agfi %r3, -524296
 ; CHECK: cg %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 -65537
@@ -105,7 +105,7 @@ define double @f7(double %a, double %b, i64 %i1, i64 *%base) {
 define double @f8(double %a, double %b, i64 %i1, i64 %base, i64 %index) {
 ; CHECK: f8:
 ; CHECK: cg %r2, 524280({{%r4,%r3|%r3,%r4}})
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add1 = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-08.ll b/llvm/test/CodeGen/SystemZ/int-cmp-08.ll
index 6e9a13e9cede..b091ba67e1e4 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-08.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-08.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i64 %i1, i64 %i2) {
 ; CHECK: f1:
 ; CHECK: clgr %r2, %r3
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ult i64 %i1, %i2
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i64 %i1, i64 %i2) {
 define double @f2(double %a, double %b, i64 %i1, i64 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clg %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %i2 = load i64 *%ptr
@@ -31,7 +31,7 @@ define double @f2(double %a, double %b, i64 %i1, i64 *%ptr) {
 define double @f3(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f3:
 ; CHECK: clg %r2, 524280(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 65535
@@ -47,7 +47,7 @@ define double @f4(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f4:
 ; CHECK: agfi %r3, 524288
 ; CHECK: clg %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 65536
@@ -61,7 +61,7 @@ define double @f4(double %a, double %b, i64 %i1, i64 *%base) {
 define double @f5(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f5:
 ; CHECK: clg %r2, -8(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 -1
@@ -75,7 +75,7 @@ define double @f5(double %a, double %b, i64 %i1, i64 *%base) {
 define double @f6(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f6:
 ; CHECK: clg %r2, -524288(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 -65536
@@ -91,7 +91,7 @@ define double @f7(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f7:
 ; CHECK: agfi %r3, -524296
 ; CHECK: clg %r2, 0(%r3)
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 -65537
@@ -105,7 +105,7 @@ define double @f7(double %a, double %b, i64 %i1, i64 *%base) {
 define double @f8(double %a, double %b, i64 %i1, i64 %base, i64 %index) {
 ; CHECK: f8:
 ; CHECK: clg %r2, 524280({{%r4,%r3|%r3,%r4}})
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add1 = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-09.ll b/llvm/test/CodeGen/SystemZ/int-cmp-09.ll
index bb7213c6a436..06ebee250bcb 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-09.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-09.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i32 %i1) {
 ; CHECK: f1:
 ; CHECK: chi %r2, 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i32 %i1, 0
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i32 %i1) {
 define double @f2(double %a, double %b, i32 %i1) {
 ; CHECK: f2:
 ; CHECK: chi %r2, 1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i32 %i1, 1
@@ -30,7 +30,7 @@ define double @f2(double %a, double %b, i32 %i1) {
 define double @f3(double %a, double %b, i32 %i1) {
 ; CHECK: f3:
 ; CHECK: chi %r2, 32767
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i32 %i1, 32767
@@ -42,7 +42,7 @@ define double @f3(double %a, double %b, i32 %i1) {
 define double @f4(double %a, double %b, i32 %i1) {
 ; CHECK: f4:
 ; CHECK: cfi %r2, 32768
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i32 %i1, 32768
@@ -54,7 +54,7 @@ define double @f4(double %a, double %b, i32 %i1) {
 define double @f5(double %a, double %b, i32 %i1) {
 ; CHECK: f5:
 ; CHECK: cfi %r2, 2147483647
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i32 %i1, 2147483647
@@ -66,7 +66,7 @@ define double @f5(double %a, double %b, i32 %i1) {
 define double @f6(double %a, double %b, i32 %i1) {
 ; CHECK: f6:
 ; CHECK: cfi %r2, -2147483648
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i32 %i1, 2147483648
@@ -78,7 +78,7 @@ define double @f6(double %a, double %b, i32 %i1) {
 define double @f7(double %a, double %b, i32 %i1) {
 ; CHECK: f7:
 ; CHECK: chi %r2, -1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i32 %i1, -1
@@ -90,7 +90,7 @@ define double @f7(double %a, double %b, i32 %i1) {
 define double @f8(double %a, double %b, i32 %i1) {
 ; CHECK: f8:
 ; CHECK: chi %r2, -32768
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i32 %i1, -32768
@@ -102,7 +102,7 @@ define double @f8(double %a, double %b, i32 %i1) {
 define double @f9(double %a, double %b, i32 %i1) {
 ; CHECK: f9:
 ; CHECK: cfi %r2, -32769
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i32 %i1, -32769
@@ -114,7 +114,7 @@ define double @f9(double %a, double %b, i32 %i1) {
 define double @f10(double %a, double %b, i32 %i1) {
 ; CHECK: f10:
 ; CHECK: cfi %r2, -2147483648
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i32 %i1, -2147483648
@@ -126,7 +126,7 @@ define double @f10(double %a, double %b, i32 %i1) {
 define double @f11(double %a, double %b, i32 %i1) {
 ; CHECK: f11:
 ; CHECK: cfi %r2, 2147483647
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i32 %i1, -2147483649
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-10.ll b/llvm/test/CodeGen/SystemZ/int-cmp-10.ll
index f2d3ccd64af6..937b1bccffa3 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-10.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-10.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i32 %i1) {
 ; CHECK: f1:
 ; CHECK: clfi %r2, 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ugt i32 %i1, 1
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i32 %i1) {
 define double @f2(double %a, double %b, i32 %i1) {
 ; CHECK: f2:
 ; CHECK: clfi %r2, 4294967280
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ult i32 %i1, 4294967280
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-11.ll b/llvm/test/CodeGen/SystemZ/int-cmp-11.ll
index 1bfb0c61cb90..876882ea8f31 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-11.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-11.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i64 %i1) {
 ; CHECK: f1:
 ; CHECK: cghi %r2, 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, 0
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i64 %i1) {
 define double @f2(double %a, double %b, i64 %i1) {
 ; CHECK: f2:
 ; CHECK: cghi %r2, 1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, 1
@@ -30,7 +30,7 @@ define double @f2(double %a, double %b, i64 %i1) {
 define double @f3(double %a, double %b, i64 %i1) {
 ; CHECK: f3:
 ; CHECK: cghi %r2, 32767
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, 32767
@@ -42,7 +42,7 @@ define double @f3(double %a, double %b, i64 %i1) {
 define double @f4(double %a, double %b, i64 %i1) {
 ; CHECK: f4:
 ; CHECK: cgfi %r2, 32768
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, 32768
@@ -54,7 +54,7 @@ define double @f4(double %a, double %b, i64 %i1) {
 define double @f5(double %a, double %b, i64 %i1) {
 ; CHECK: f5:
 ; CHECK: cgfi %r2, 2147483647
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, 2147483647
@@ -66,7 +66,7 @@ define double @f5(double %a, double %b, i64 %i1) {
 define double @f6(double %a, double %b, i64 %i1) {
 ; CHECK: f6:
 ; CHECK: cgr
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, 2147483648
@@ -78,7 +78,7 @@ define double @f6(double %a, double %b, i64 %i1) {
 define double @f7(double %a, double %b, i64 %i1) {
 ; CHECK: f7:
 ; CHECK: cghi %r2, -1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, -1
@@ -90,7 +90,7 @@ define double @f7(double %a, double %b, i64 %i1) {
 define double @f8(double %a, double %b, i64 %i1) {
 ; CHECK: f8:
 ; CHECK: cghi %r2, -32768
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, -32768
@@ -102,7 +102,7 @@ define double @f8(double %a, double %b, i64 %i1) {
 define double @f9(double %a, double %b, i64 %i1) {
 ; CHECK: f9:
 ; CHECK: cgfi %r2, -32769
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, -32769
@@ -114,7 +114,7 @@ define double @f9(double %a, double %b, i64 %i1) {
 define double @f10(double %a, double %b, i64 %i1) {
 ; CHECK: f10:
 ; CHECK: cgfi %r2, -2147483648
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, -2147483648
@@ -126,7 +126,7 @@ define double @f10(double %a, double %b, i64 %i1) {
 define double @f11(double %a, double %b, i64 %i1) {
 ; CHECK: f11:
 ; CHECK: cgr
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp slt i64 %i1, -2147483649
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-12.ll b/llvm/test/CodeGen/SystemZ/int-cmp-12.ll
index 0288730c3a80..74d16cc251fb 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-12.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-12.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i64 %i1) {
 ; CHECK: f1:
 ; CHECK: clgfi %r2, 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ugt i64 %i1, 1
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i64 %i1) {
 define double @f2(double %a, double %b, i64 %i1) {
 ; CHECK: f2:
 ; CHECK: clgfi %r2, 4294967295
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ult i64 %i1, 4294967295
@@ -31,7 +31,7 @@ define double @f2(double %a, double %b, i64 %i1) {
 define double @f3(double %a, double %b, i64 %i1) {
 ; CHECK: f3:
 ; CHECK: clgr %r2,
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ult i64 %i1, 4294967296
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-13.ll b/llvm/test/CodeGen/SystemZ/int-cmp-13.ll
index c180831debb0..0eec8903056a 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-13.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-13.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i64 %i1) {
 ; CHECK: f1:
 ; CHECK: cghi %r2, 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, 0
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i64 %i1) {
 define double @f2(double %a, double %b, i64 %i1) {
 ; CHECK: f2:
 ; CHECK: cghi %r2, 32767
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, 32767
@@ -30,7 +30,7 @@ define double @f2(double %a, double %b, i64 %i1) {
 define double @f3(double %a, double %b, i64 %i1) {
 ; CHECK: f3:
 ; CHECK: cgfi %r2, 32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, 32768
@@ -42,7 +42,7 @@ define double @f3(double %a, double %b, i64 %i1) {
 define double @f4(double %a, double %b, i64 %i1) {
 ; CHECK: f4:
 ; CHECK: cgfi %r2, 2147483647
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, 2147483647
@@ -54,7 +54,7 @@ define double @f4(double %a, double %b, i64 %i1) {
 define double @f5(double %a, double %b, i64 %i1) {
 ; CHECK: f5:
 ; CHECK: clgfi %r2, 2147483648
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, 2147483648
@@ -66,7 +66,7 @@ define double @f5(double %a, double %b, i64 %i1) {
 define double @f6(double %a, double %b, i64 %i1) {
 ; CHECK: f6:
 ; CHECK: clgfi %r2, 4294967295
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, 4294967295
@@ -78,7 +78,7 @@ define double @f6(double %a, double %b, i64 %i1) {
 define double @f7(double %a, double %b, i64 %i1) {
 ; CHECK: f7:
 ; CHECK: cgr %r2,
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, 4294967296
@@ -90,7 +90,7 @@ define double @f7(double %a, double %b, i64 %i1) {
 define double @f8(double %a, double %b, i64 %i1) {
 ; CHECK: f8:
 ; CHECK: cghi %r2, -1
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, -1
@@ -102,7 +102,7 @@ define double @f8(double %a, double %b, i64 %i1) {
 define double @f9(double %a, double %b, i64 %i1) {
 ; CHECK: f9:
 ; CHECK: cghi %r2, -32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, -32768
@@ -114,7 +114,7 @@ define double @f9(double %a, double %b, i64 %i1) {
 define double @f10(double %a, double %b, i64 %i1) {
 ; CHECK: f10:
 ; CHECK: cgfi %r2, -32769
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, -32769
@@ -126,7 +126,7 @@ define double @f10(double %a, double %b, i64 %i1) {
 define double @f11(double %a, double %b, i64 %i1) {
 ; CHECK: f11:
 ; CHECK: cgfi %r2, -2147483648
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, -2147483648
@@ -138,7 +138,7 @@ define double @f11(double %a, double %b, i64 %i1) {
 define double @f12(double %a, double %b, i64 %i1) {
 ; CHECK: f12:
 ; CHECK: cgr
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp eq i64 %i1, -2147483649
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-14.ll b/llvm/test/CodeGen/SystemZ/int-cmp-14.ll
index 6a7e0e6d552a..e3a561e38aaf 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-14.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-14.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i64 %i1) {
 ; CHECK: f1:
 ; CHECK: cghi %r2, 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, 0
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i64 %i1) {
 define double @f2(double %a, double %b, i64 %i1) {
 ; CHECK: f2:
 ; CHECK: cghi %r2, 32767
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, 32767
@@ -30,7 +30,7 @@ define double @f2(double %a, double %b, i64 %i1) {
 define double @f3(double %a, double %b, i64 %i1) {
 ; CHECK: f3:
 ; CHECK: cgfi %r2, 32768
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, 32768
@@ -42,7 +42,7 @@ define double @f3(double %a, double %b, i64 %i1) {
 define double @f4(double %a, double %b, i64 %i1) {
 ; CHECK: f4:
 ; CHECK: cgfi %r2, 2147483647
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, 2147483647
@@ -54,7 +54,7 @@ define double @f4(double %a, double %b, i64 %i1) {
 define double @f5(double %a, double %b, i64 %i1) {
 ; CHECK: f5:
 ; CHECK: clgfi %r2, 2147483648
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, 2147483648
@@ -66,7 +66,7 @@ define double @f5(double %a, double %b, i64 %i1) {
 define double @f6(double %a, double %b, i64 %i1) {
 ; CHECK: f6:
 ; CHECK: clgfi %r2, 4294967295
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, 4294967295
@@ -78,7 +78,7 @@ define double @f6(double %a, double %b, i64 %i1) {
 define double @f7(double %a, double %b, i64 %i1) {
 ; CHECK: f7:
 ; CHECK: cgr %r2,
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, 4294967296
@@ -90,7 +90,7 @@ define double @f7(double %a, double %b, i64 %i1) {
 define double @f8(double %a, double %b, i64 %i1) {
 ; CHECK: f8:
 ; CHECK: cghi %r2, -1
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, -1
@@ -102,7 +102,7 @@ define double @f8(double %a, double %b, i64 %i1) {
 define double @f9(double %a, double %b, i64 %i1) {
 ; CHECK: f9:
 ; CHECK: cghi %r2, -32768
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, -32768
@@ -114,7 +114,7 @@ define double @f9(double %a, double %b, i64 %i1) {
 define double @f10(double %a, double %b, i64 %i1) {
 ; CHECK: f10:
 ; CHECK: cgfi %r2, -32769
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, -32769
@@ -126,7 +126,7 @@ define double @f10(double %a, double %b, i64 %i1) {
 define double @f11(double %a, double %b, i64 %i1) {
 ; CHECK: f11:
 ; CHECK: cgfi %r2, -2147483648
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, -2147483648
@@ -138,7 +138,7 @@ define double @f11(double %a, double %b, i64 %i1) {
 define double @f12(double %a, double %b, i64 %i1) {
 ; CHECK: f12:
 ; CHECK: cgr
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %cond = icmp ne i64 %i1, -2147483649
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-15.ll b/llvm/test/CodeGen/SystemZ/int-cmp-15.ll
index 6bb7e2b3ac3d..1868c5746bb8 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-15.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-15.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i8 *%ptr) {
 ; CHECK: f1:
 ; CHECK: cli 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp ugt i8 %val, 1
@@ -18,7 +18,7 @@ define double @f1(double %a, double %b, i8 *%ptr) {
 define double @f2(double %a, double %b, i8 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cli 0(%r2), 254
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp ult i8 %val, 254
@@ -30,7 +30,7 @@ define double @f2(double %a, double %b, i8 *%ptr) {
 define double @f3(double %a, double %b, i8 *%ptr) {
 ; CHECK: f3:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp slt i8 %val, 0
@@ -42,7 +42,7 @@ define double @f3(double %a, double %b, i8 *%ptr) {
 define double @f4(double %a, double %b, i8 *%ptr) {
 ; CHECK: f4:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp sle i8 %val, -1
@@ -54,7 +54,7 @@ define double @f4(double %a, double %b, i8 *%ptr) {
 define double @f5(double %a, double %b, i8 *%ptr) {
 ; CHECK: f5:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp sge i8 %val, 0
@@ -66,7 +66,7 @@ define double @f5(double %a, double %b, i8 *%ptr) {
 define double @f6(double %a, double %b, i8 *%ptr) {
 ; CHECK: f6:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp sgt i8 %val, -1
@@ -78,7 +78,7 @@ define double @f6(double %a, double %b, i8 *%ptr) {
 define double @f7(double %a, double %b, i8 *%ptr) {
 ; CHECK: f7:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp eq i8 %val, -128
@@ -90,7 +90,7 @@ define double @f7(double %a, double %b, i8 *%ptr) {
 define double @f8(double %a, double %b, i8 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp eq i8 %val, 0
@@ -102,7 +102,7 @@ define double @f8(double %a, double %b, i8 *%ptr) {
 define double @f9(double %a, double %b, i8 *%ptr) {
 ; CHECK: f9:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp eq i8 %val, 127
@@ -114,7 +114,7 @@ define double @f9(double %a, double %b, i8 *%ptr) {
 define double @f10(double %a, double %b, i8 *%ptr) {
 ; CHECK: f10:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %cond = icmp eq i8 %val, 255
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-16.ll b/llvm/test/CodeGen/SystemZ/int-cmp-16.ll
index 8af854efaabf..a2c9e87a3b20 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-16.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-16.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i8 *%ptr) {
 ; CHECK: f1:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i32
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i8 *%ptr) {
 define double @f2(double %a, double %b, i8 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i32
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i8 *%ptr) {
 define double @f5(double %a, double %b, i8 *%ptr) {
 ; CHECK: f5:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i8 *%ptr) {
 define double @f6(double %a, double %b, i8 *%ptr) {
 ; CHECK: f6:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -97,7 +97,7 @@ define double @f7(double %a, double %b, i8 *%ptr) {
 define double @f8(double %a, double %b, i8 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i8 *%ptr) {
 define double @f9(double %a, double %b, i8 *%ptr) {
 ; CHECK: f9:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-17.ll b/llvm/test/CodeGen/SystemZ/int-cmp-17.ll
index d4d5e98b8358..83e4d2d5e425 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-17.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-17.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i8 *%ptr) {
 ; CHECK: f1:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i32
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i8 *%ptr) {
 define double @f2(double %a, double %b, i8 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i32
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i8 *%ptr) {
 define double @f5(double %a, double %b, i8 *%ptr) {
 ; CHECK: f5:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i8 *%ptr) {
 define double @f6(double %a, double %b, i8 *%ptr) {
 ; CHECK: f6:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -97,7 +97,7 @@ define double @f7(double %a, double %b, i8 *%ptr) {
 define double @f8(double %a, double %b, i8 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i8 *%ptr) {
 define double @f9(double %a, double %b, i8 *%ptr) {
 ; CHECK: f9:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-18.ll b/llvm/test/CodeGen/SystemZ/int-cmp-18.ll
index 9822dc212248..99cf68a6b538 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-18.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-18.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i8 *%ptr) {
 ; CHECK: f1:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i64
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i8 *%ptr) {
 define double @f2(double %a, double %b, i8 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i64
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i8 *%ptr) {
 define double @f5(double %a, double %b, i8 *%ptr) {
 ; CHECK: f5:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i8 *%ptr) {
 define double @f6(double %a, double %b, i8 *%ptr) {
 ; CHECK: f6:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -97,7 +97,7 @@ define double @f7(double %a, double %b, i8 *%ptr) {
 define double @f8(double %a, double %b, i8 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i8 *%ptr) {
 define double @f9(double %a, double %b, i8 *%ptr) {
 ; CHECK: f9:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-19.ll b/llvm/test/CodeGen/SystemZ/int-cmp-19.ll
index 7d29dbcedcd6..4f84687ee800 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-19.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-19.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i8 *%ptr) {
 ; CHECK: f1:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i64
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i8 *%ptr) {
 define double @f2(double %a, double %b, i8 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i64
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i8 *%ptr) {
 define double @f5(double %a, double %b, i8 *%ptr) {
 ; CHECK: f5:
 ; CHECK: cli 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i8 *%ptr) {
 define double @f6(double %a, double %b, i8 *%ptr) {
 ; CHECK: f6:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -97,7 +97,7 @@ define double @f7(double %a, double %b, i8 *%ptr) {
 define double @f8(double %a, double %b, i8 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cli 0(%r2), 255
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i8 *%ptr) {
 define double @f9(double %a, double %b, i8 *%ptr) {
 ; CHECK: f9:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-20.ll b/llvm/test/CodeGen/SystemZ/int-cmp-20.ll
index 8fffbc86a737..eb21bd1749d0 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-20.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-20.ll
@@ -8,7 +8,7 @@
 define double @f1(double %a, double %b, i8 *%ptr) {
 ; CHECK: f1:
 ; CHECK: cli 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i32
@@ -22,7 +22,7 @@ define double @f1(double %a, double %b, i8 *%ptr) {
 define double @f2(double %a, double %b, i8 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cli 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -36,7 +36,7 @@ define double @f2(double %a, double %b, i8 *%ptr) {
 define double @f3(double %a, double %b, i8 *%ptr) {
 ; CHECK: f3:
 ; CHECK: cli 0(%r2), 254
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i32
@@ -50,7 +50,7 @@ define double @f3(double %a, double %b, i8 *%ptr) {
 define double @f4(double %a, double %b, i8 *%ptr) {
 ; CHECK: f4:
 ; CHECK: cli 0(%r2), 254
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -105,7 +105,7 @@ define double @f7(double %a, double %b, i8 *%ptr) {
 define double @f8(double %a, double %b, i8 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cli 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i32
@@ -132,7 +132,7 @@ define double @f9(double %a, double %b, i8 *%ptr) {
 define double @f10(double %a, double %b, i8 *%ptr) {
 ; CHECK: f10:
 ; CHECK: cli 0(%r2), 254
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i32
@@ -171,7 +171,7 @@ define double @f12(double %a, double %b, i8 *%ptr) {
 define double @f13(double %a, double %b, i8 *%ptr) {
 ; CHECK: f13:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -184,7 +184,7 @@ define double @f13(double %a, double %b, i8 *%ptr) {
 define double @f14(double %a, double %b, i8 *%ptr) {
 ; CHECK: f14:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -197,7 +197,7 @@ define double @f14(double %a, double %b, i8 *%ptr) {
 define double @f15(double %a, double %b, i8 *%ptr) {
 ; CHECK: f15:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
@@ -210,7 +210,7 @@ define double @f15(double %a, double %b, i8 *%ptr) {
 define double @f16(double %a, double %b, i8 *%ptr) {
 ; CHECK: f16:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i32
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-21.ll b/llvm/test/CodeGen/SystemZ/int-cmp-21.ll
index 43447b8fda07..9f81ad88e9c9 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-21.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-21.ll
@@ -8,7 +8,7 @@
 define double @f1(double %a, double %b, i8 *%ptr) {
 ; CHECK: f1:
 ; CHECK: cli 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i64
@@ -22,7 +22,7 @@ define double @f1(double %a, double %b, i8 *%ptr) {
 define double @f2(double %a, double %b, i8 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cli 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -36,7 +36,7 @@ define double @f2(double %a, double %b, i8 *%ptr) {
 define double @f3(double %a, double %b, i8 *%ptr) {
 ; CHECK: f3:
 ; CHECK: cli 0(%r2), 254
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i64
@@ -50,7 +50,7 @@ define double @f3(double %a, double %b, i8 *%ptr) {
 define double @f4(double %a, double %b, i8 *%ptr) {
 ; CHECK: f4:
 ; CHECK: cli 0(%r2), 254
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -105,7 +105,7 @@ define double @f7(double %a, double %b, i8 *%ptr) {
 define double @f8(double %a, double %b, i8 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cli 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i64
@@ -132,7 +132,7 @@ define double @f9(double %a, double %b, i8 *%ptr) {
 define double @f10(double %a, double %b, i8 *%ptr) {
 ; CHECK: f10:
 ; CHECK: cli 0(%r2), 254
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = zext i8 %val to i64
@@ -171,7 +171,7 @@ define double @f12(double %a, double %b, i8 *%ptr) {
 define double @f13(double %a, double %b, i8 *%ptr) {
 ; CHECK: f13:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -184,7 +184,7 @@ define double @f13(double %a, double %b, i8 *%ptr) {
 define double @f14(double %a, double %b, i8 *%ptr) {
 ; CHECK: f14:
 ; CHECK: cli 0(%r2), 128
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -197,7 +197,7 @@ define double @f14(double %a, double %b, i8 *%ptr) {
 define double @f15(double %a, double %b, i8 *%ptr) {
 ; CHECK: f15:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
@@ -210,7 +210,7 @@ define double @f15(double %a, double %b, i8 *%ptr) {
 define double @f16(double %a, double %b, i8 *%ptr) {
 ; CHECK: f16:
 ; CHECK: cli 0(%r2), 127
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i8 *%ptr
   %ext = sext i8 %val to i64
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-22.ll b/llvm/test/CodeGen/SystemZ/int-cmp-22.ll
index 513d4be2f423..7cecacb8712d 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-22.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-22.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: chhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: chhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -32,7 +32,7 @@ define double @f2(double %a, double %b, i16 *%ptr) {
 define double @f3(double %a, double %b, i16 *%ptr) {
 ; CHECK: f3:
 ; CHECK: chhsi 0(%r2), 32766
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -45,7 +45,7 @@ define double @f3(double %a, double %b, i16 *%ptr) {
 define double @f4(double %a, double %b, i16 *%ptr) {
 ; CHECK: f4:
 ; CHECK: chhsi 0(%r2), -1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i16 *%ptr) {
 define double @f5(double %a, double %b, i16 *%ptr) {
 ; CHECK: f5:
 ; CHECK: chhsi 0(%r2), -32766
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i16 *%ptr) {
 define double @f6(double %a, double %b, i16 %i1, i16 *%base) {
 ; CHECK: f6:
 ; CHECK: chhsi 4094(%r3), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i16 *%base, i64 2047
@@ -86,7 +86,7 @@ define double @f7(double %a, double %b, i16 *%base) {
 ; CHECK: f7:
 ; CHECK: aghi %r2, 4096
 ; CHECK: chhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i16 *%base, i64 2048
@@ -101,7 +101,7 @@ define double @f8(double %a, double %b, i16 *%base) {
 ; CHECK: f8:
 ; CHECK: aghi %r2, -2
 ; CHECK: chhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i16 *%base, i64 -1
@@ -116,7 +116,7 @@ define double @f9(double %a, double %b, i64 %base, i64 %index) {
 ; CHECK: f9:
 ; CHECK: agr {{%r2, %r3|%r3, %r2}}
 ; CHECK: chhsi 0({{%r[23]}}), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-23.ll b/llvm/test/CodeGen/SystemZ/int-cmp-23.ll
index 40e13310d55c..2ca89c54281a 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-23.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-23.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 65534
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -32,7 +32,7 @@ define double @f2(double %a, double %b, i16 *%ptr) {
 define double @f3(double %a, double %b, i16 %i1, i16 *%base) {
 ; CHECK: f3:
 ; CHECK: clhhsi 4094(%r3), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i16 *%base, i64 2047
@@ -47,7 +47,7 @@ define double @f4(double %a, double %b, i16 *%base) {
 ; CHECK: f4:
 ; CHECK: aghi %r2, 4096
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i16 *%base, i64 2048
@@ -62,7 +62,7 @@ define double @f5(double %a, double %b, i16 *%base) {
 ; CHECK: f5:
 ; CHECK: aghi %r2, -2
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i16 *%base, i64 -1
@@ -77,7 +77,7 @@ define double @f6(double %a, double %b, i64 %base, i64 %index) {
 ; CHECK: f6:
 ; CHECK: agr {{%r2, %r3|%r3, %r2}}
 ; CHECK: clhhsi 0({{%r[23]}}), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-24.ll b/llvm/test/CodeGen/SystemZ/int-cmp-24.ll
index 46186cd74b53..01cc7b3103ba 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-24.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-24.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -32,7 +32,7 @@ define double @f2(double %a, double %b, i16 *%ptr) {
 define double @f3(double %a, double %b, i16 *%ptr) {
 ; CHECK: f3:
 ; CHECK: clhhsi 0(%r2), 32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -45,7 +45,7 @@ define double @f3(double %a, double %b, i16 *%ptr) {
 define double @f4(double %a, double %b, i16 *%ptr) {
 ; CHECK: f4:
 ; CHECK: clhhsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-25.ll b/llvm/test/CodeGen/SystemZ/int-cmp-25.ll
index a3a223fa3448..8ea8d6c3ae30 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-25.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-25.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -32,7 +32,7 @@ define double @f2(double %a, double %b, i16 *%ptr) {
 define double @f3(double %a, double %b, i16 *%ptr) {
 ; CHECK: f3:
 ; CHECK: clhhsi 0(%r2), 32768
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
@@ -45,7 +45,7 @@ define double @f3(double %a, double %b, i16 *%ptr) {
 define double @f4(double %a, double %b, i16 *%ptr) {
 ; CHECK: f4:
 ; CHECK: clhhsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i16 *%ptr
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-26.ll b/llvm/test/CodeGen/SystemZ/int-cmp-26.ll
index 31330b2a6397..9eb02f4d6562 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-26.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-26.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i32
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i32
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i16 *%ptr) {
 define double @f5(double %a, double %b, i16 *%ptr) {
 ; CHECK: f5:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i16 *%ptr) {
 define double @f6(double %a, double %b, i16 *%ptr) {
 ; CHECK: f6:
 ; CHECK: clhhsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -97,7 +97,7 @@ define double @f7(double %a, double %b, i16 *%ptr) {
 define double @f8(double %a, double %b, i16 *%ptr) {
 ; CHECK: f8:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i16 *%ptr) {
 define double @f9(double %a, double %b, i16 *%ptr) {
 ; CHECK: f9:
 ; CHECK: clhhsi 0(%r2), 32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-27.ll b/llvm/test/CodeGen/SystemZ/int-cmp-27.ll
index 7cbea3d92526..3a16e9ed9b87 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-27.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-27.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i32
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i32
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i16 *%ptr) {
 define double @f5(double %a, double %b, i16 *%ptr) {
 ; CHECK: f5:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i16 *%ptr) {
 define double @f6(double %a, double %b, i16 *%ptr) {
 ; CHECK: f6:
 ; CHECK: clhhsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -97,7 +97,7 @@ define double @f7(double %a, double %b, i16 *%ptr) {
 define double @f8(double %a, double %b, i16 *%ptr) {
 ; CHECK: f8:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i16 *%ptr) {
 define double @f9(double %a, double %b, i16 *%ptr) {
 ; CHECK: f9:
 ; CHECK: clhhsi 0(%r2), 32768
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-28.ll b/llvm/test/CodeGen/SystemZ/int-cmp-28.ll
index 629eb4f06013..d40a95d691d6 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-28.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-28.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i64
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i64
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i16 *%ptr) {
 define double @f5(double %a, double %b, i16 *%ptr) {
 ; CHECK: f5:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i16 *%ptr) {
 define double @f6(double %a, double %b, i16 *%ptr) {
 ; CHECK: f6:
 ; CHECK: clhhsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -97,7 +97,7 @@ define double @f7(double %a, double %b, i16 *%ptr) {
 define double @f8(double %a, double %b, i16 *%ptr) {
 ; CHECK: f8:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i16 *%ptr) {
 define double @f9(double %a, double %b, i16 *%ptr) {
 ; CHECK: f9:
 ; CHECK: clhhsi 0(%r2), 32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-29.ll b/llvm/test/CodeGen/SystemZ/int-cmp-29.ll
index de41dd782d21..221bbcf7ea8f 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-29.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-29.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i64
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i64
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i16 *%ptr) {
 define double @f5(double %a, double %b, i16 *%ptr) {
 ; CHECK: f5:
 ; CHECK: clhhsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -71,7 +71,7 @@ define double @f5(double %a, double %b, i16 *%ptr) {
 define double @f6(double %a, double %b, i16 *%ptr) {
 ; CHECK: f6:
 ; CHECK: clhhsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -97,7 +97,7 @@ define double @f7(double %a, double %b, i16 *%ptr) {
 define double @f8(double %a, double %b, i16 *%ptr) {
 ; CHECK: f8:
 ; CHECK: clhhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -110,7 +110,7 @@ define double @f8(double %a, double %b, i16 *%ptr) {
 define double @f9(double %a, double %b, i16 *%ptr) {
 ; CHECK: f9:
 ; CHECK: clhhsi 0(%r2), 32768
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-30.ll b/llvm/test/CodeGen/SystemZ/int-cmp-30.ll
index a5a39e32f8ea..507191b96e20 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-30.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-30.ll
@@ -8,7 +8,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i32
@@ -22,7 +22,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -36,7 +36,7 @@ define double @f2(double %a, double %b, i16 *%ptr) {
 define double @f3(double %a, double %b, i16 *%ptr) {
 ; CHECK: f3:
 ; CHECK: clhhsi 0(%r2), 65534
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i32
@@ -50,7 +50,7 @@ define double @f3(double %a, double %b, i16 *%ptr) {
 define double @f4(double %a, double %b, i16 *%ptr) {
 ; CHECK: f4:
 ; CHECK: clhhsi 0(%r2), 65534
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -106,7 +106,7 @@ define double @f7(double %a, double %b, i16 *%ptr) {
 define double @f8(double %a, double %b, i16 *%ptr) {
 ; CHECK: f8:
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i32
@@ -120,7 +120,7 @@ define double @f8(double %a, double %b, i16 *%ptr) {
 define double @f9(double %a, double %b, i16 *%ptr) {
 ; CHECK: f9:
 ; CHECK: chhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -134,7 +134,7 @@ define double @f9(double %a, double %b, i16 *%ptr) {
 define double @f10(double %a, double %b, i16 *%ptr) {
 ; CHECK: f10:
 ; CHECK: clhhsi 0(%r2), 65534
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i32
@@ -148,7 +148,7 @@ define double @f10(double %a, double %b, i16 *%ptr) {
 define double @f11(double %a, double %b, i16 *%ptr) {
 ; CHECK: f11:
 ; CHECK: chhsi 0(%r2), -2
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -175,7 +175,7 @@ define double @f12(double %a, double %b, i16 *%ptr) {
 define double @f13(double %a, double %b, i16 *%ptr) {
 ; CHECK: f13:
 ; CHECK: chhsi 0(%r2), 32766
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
@@ -202,7 +202,7 @@ define double @f14(double %a, double %b, i16 *%ptr) {
 define double @f15(double %a, double %b, i16 *%ptr) {
 ; CHECK: f15:
 ; CHECK: chhsi 0(%r2), -32767
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i32
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-31.ll b/llvm/test/CodeGen/SystemZ/int-cmp-31.ll
index a935c180f1c7..a70ce2b7b301 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-31.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-31.ll
@@ -8,7 +8,7 @@
 define double @f1(double %a, double %b, i16 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i64
@@ -22,7 +22,7 @@ define double @f1(double %a, double %b, i16 *%ptr) {
 define double @f2(double %a, double %b, i16 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -36,7 +36,7 @@ define double @f2(double %a, double %b, i16 *%ptr) {
 define double @f3(double %a, double %b, i16 *%ptr) {
 ; CHECK: f3:
 ; CHECK: clhhsi 0(%r2), 65534
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i64
@@ -50,7 +50,7 @@ define double @f3(double %a, double %b, i16 *%ptr) {
 define double @f4(double %a, double %b, i16 *%ptr) {
 ; CHECK: f4:
 ; CHECK: clhhsi 0(%r2), 65534
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -106,7 +106,7 @@ define double @f7(double %a, double %b, i16 *%ptr) {
 define double @f8(double %a, double %b, i16 *%ptr) {
 ; CHECK: f8:
 ; CHECK: clhhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i64
@@ -120,7 +120,7 @@ define double @f8(double %a, double %b, i16 *%ptr) {
 define double @f9(double %a, double %b, i16 *%ptr) {
 ; CHECK: f9:
 ; CHECK: chhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -134,7 +134,7 @@ define double @f9(double %a, double %b, i16 *%ptr) {
 define double @f10(double %a, double %b, i16 *%ptr) {
 ; CHECK: f10:
 ; CHECK: clhhsi 0(%r2), 65534
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = zext i16 %val to i64
@@ -148,7 +148,7 @@ define double @f10(double %a, double %b, i16 *%ptr) {
 define double @f11(double %a, double %b, i16 *%ptr) {
 ; CHECK: f11:
 ; CHECK: chhsi 0(%r2), -2
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -175,7 +175,7 @@ define double @f12(double %a, double %b, i16 *%ptr) {
 define double @f13(double %a, double %b, i16 *%ptr) {
 ; CHECK: f13:
 ; CHECK: chhsi 0(%r2), 32766
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
@@ -202,7 +202,7 @@ define double @f14(double %a, double %b, i16 *%ptr) {
 define double @f15(double %a, double %b, i16 *%ptr) {
 ; CHECK: f15:
 ; CHECK: chhsi 0(%r2), -32767
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: br %r14
   %val = load i16 *%ptr
   %ext = sext i16 %val to i64
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-32.ll b/llvm/test/CodeGen/SystemZ/int-cmp-32.ll
index 4bdeebb35c99..f79182b91ec8 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-32.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-32.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i32 *%ptr) {
 ; CHECK: f1:
 ; CHECK: chsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i32 *%ptr) {
 define double @f2(double %a, double %b, i32 *%ptr) {
 ; CHECK: f2:
 ; CHECK: chsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -32,7 +32,7 @@ define double @f2(double %a, double %b, i32 *%ptr) {
 define double @f3(double %a, double %b, i32 *%ptr) {
 ; CHECK: f3:
 ; CHECK: chsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -56,7 +56,7 @@ define double @f4(double %a, double %b, i32 *%ptr) {
 define double @f5(double %a, double %b, i32 *%ptr) {
 ; CHECK: f5:
 ; CHECK: chsi 0(%r2), -1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -69,7 +69,7 @@ define double @f5(double %a, double %b, i32 *%ptr) {
 define double @f6(double %a, double %b, i32 *%ptr) {
 ; CHECK: f6:
 ; CHECK: chsi 0(%r2), -32768
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -93,7 +93,7 @@ define double @f7(double %a, double %b, i32 *%ptr) {
 define double @f8(double %a, double %b, i32 *%ptr) {
 ; CHECK: f8:
 ; CHECK: chsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -106,7 +106,7 @@ define double @f8(double %a, double %b, i32 *%ptr) {
 define double @f9(double %a, double %b, i32 *%ptr) {
 ; CHECK: f9:
 ; CHECK: chsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -119,7 +119,7 @@ define double @f9(double %a, double %b, i32 *%ptr) {
 define double @f10(double %a, double %b, i32 *%ptr) {
 ; CHECK: f10:
 ; CHECK: chsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -143,7 +143,7 @@ define double @f11(double %a, double %b, i32 *%ptr) {
 define double @f12(double %a, double %b, i32 *%ptr) {
 ; CHECK: f12:
 ; CHECK: chsi 0(%r2), -1
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -156,7 +156,7 @@ define double @f12(double %a, double %b, i32 *%ptr) {
 define double @f13(double %a, double %b, i32 *%ptr) {
 ; CHECK: f13:
 ; CHECK: chsi 0(%r2), -32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -180,7 +180,7 @@ define double @f14(double %a, double %b, i32 *%ptr) {
 define double @f15(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f15:
 ; CHECK: chsi 4092(%r3), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 1023
@@ -195,7 +195,7 @@ define double @f16(double %a, double %b, i32 *%base) {
 ; CHECK: f16:
 ; CHECK: aghi %r2, 4096
 ; CHECK: chsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 1024
@@ -210,7 +210,7 @@ define double @f17(double %a, double %b, i32 *%base) {
 ; CHECK: f17:
 ; CHECK: aghi %r2, -4
 ; CHECK: chsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -1
@@ -225,7 +225,7 @@ define double @f18(double %a, double %b, i64 %base, i64 %index) {
 ; CHECK: f18:
 ; CHECK: agr {{%r2, %r3|%r3, %r2}}
 ; CHECK: chsi 0({{%r[23]}}), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-33.ll b/llvm/test/CodeGen/SystemZ/int-cmp-33.ll
index 0144806d4465..2c1a26ed52b8 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-33.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-33.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i32 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clfhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i32 *%ptr) {
 define double @f2(double %a, double %b, i32 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clfhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -45,7 +45,7 @@ define double @f3(double %a, double %b, i32 *%ptr) {
 define double @f4(double %a, double %b, i32 *%ptr) {
 ; CHECK: f4:
 ; CHECK: clfhsi 0(%r2), 32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i32 *%ptr) {
 define double @f5(double %a, double %b, i32 *%ptr) {
 ; CHECK: f5:
 ; CHECK: clfhsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i32 *%ptr
@@ -82,7 +82,7 @@ define double @f6(double %a, double %b, i32 *%ptr) {
 define double @f7(double %a, double %b, i32 %i1, i32 *%base) {
 ; CHECK: f7:
 ; CHECK: clfhsi 4092(%r3), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 1023
@@ -97,7 +97,7 @@ define double @f8(double %a, double %b, i32 *%base) {
 ; CHECK: f8:
 ; CHECK: aghi %r2, 4096
 ; CHECK: clfhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 1024
@@ -112,7 +112,7 @@ define double @f9(double %a, double %b, i32 *%base) {
 ; CHECK: f9:
 ; CHECK: aghi %r2, -4
 ; CHECK: clfhsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i32 *%base, i64 -1
@@ -127,7 +127,7 @@ define double @f10(double %a, double %b, i64 %base, i64 %index) {
 ; CHECK: f10:
 ; CHECK: agr {{%r2, %r3|%r3, %r2}}
 ; CHECK: clfhsi 0({{%r[23]}}), 1
-; CHECK-NEXT: j{{g?}}h
+; CHECK-NEXT: jh
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-34.ll b/llvm/test/CodeGen/SystemZ/int-cmp-34.ll
index b10bd4e08031..ff0914a3e562 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-34.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-34.ll
@@ -6,7 +6,7 @@
 define double @f1(double %a, double %b, i64 *%ptr) {
 ; CHECK: f1:
 ; CHECK: cghsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -19,7 +19,7 @@ define double @f1(double %a, double %b, i64 *%ptr) {
 define double @f2(double %a, double %b, i64 *%ptr) {
 ; CHECK: f2:
 ; CHECK: cghsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -32,7 +32,7 @@ define double @f2(double %a, double %b, i64 *%ptr) {
 define double @f3(double %a, double %b, i64 *%ptr) {
 ; CHECK: f3:
 ; CHECK: cghsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -56,7 +56,7 @@ define double @f4(double %a, double %b, i64 *%ptr) {
 define double @f5(double %a, double %b, i64 *%ptr) {
 ; CHECK: f5:
 ; CHECK: cghsi 0(%r2), -1
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -69,7 +69,7 @@ define double @f5(double %a, double %b, i64 *%ptr) {
 define double @f6(double %a, double %b, i64 *%ptr) {
 ; CHECK: f6:
 ; CHECK: cghsi 0(%r2), -32768
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -93,7 +93,7 @@ define double @f7(double %a, double %b, i64 *%ptr) {
 define double @f8(double %a, double %b, i64 *%ptr) {
 ; CHECK: f8:
 ; CHECK: cghsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -106,7 +106,7 @@ define double @f8(double %a, double %b, i64 *%ptr) {
 define double @f9(double %a, double %b, i64 *%ptr) {
 ; CHECK: f9:
 ; CHECK: cghsi 0(%r2), 1
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -119,7 +119,7 @@ define double @f9(double %a, double %b, i64 *%ptr) {
 define double @f10(double %a, double %b, i64 *%ptr) {
 ; CHECK: f10:
 ; CHECK: cghsi 0(%r2), 32767
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -143,7 +143,7 @@ define double @f11(double %a, double %b, i64 *%ptr) {
 define double @f12(double %a, double %b, i64 *%ptr) {
 ; CHECK: f12:
 ; CHECK: cghsi 0(%r2), -1
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -156,7 +156,7 @@ define double @f12(double %a, double %b, i64 *%ptr) {
 define double @f13(double %a, double %b, i64 *%ptr) {
 ; CHECK: f13:
 ; CHECK: cghsi 0(%r2), -32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -180,7 +180,7 @@ define double @f14(double %a, double %b, i64 *%ptr) {
 define double @f15(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f15:
 ; CHECK: cghsi 4088(%r3), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 511
@@ -195,7 +195,7 @@ define double @f16(double %a, double %b, i64 *%base) {
 ; CHECK: f16:
 ; CHECK: aghi %r2, 4096
 ; CHECK: cghsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 512
@@ -210,7 +210,7 @@ define double @f17(double %a, double %b, i64 *%base) {
 ; CHECK: f17:
 ; CHECK: aghi %r2, -8
 ; CHECK: cghsi 0(%r2), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 -1
@@ -225,7 +225,7 @@ define double @f18(double %a, double %b, i64 %base, i64 %index) {
 ; CHECK: f18:
 ; CHECK: agr {{%r2, %r3|%r3, %r2}}
 ; CHECK: cghsi 0({{%r[23]}}), 0
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-35.ll b/llvm/test/CodeGen/SystemZ/int-cmp-35.ll
index 9934906ba8d4..b74d67ed1f84 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-35.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-35.ll
@@ -7,7 +7,7 @@
 define double @f1(double %a, double %b, i64 *%ptr) {
 ; CHECK: f1:
 ; CHECK: clghsi 0(%r2), 2
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -20,7 +20,7 @@ define double @f1(double %a, double %b, i64 *%ptr) {
 define double @f2(double %a, double %b, i64 *%ptr) {
 ; CHECK: f2:
 ; CHECK: clghsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -45,7 +45,7 @@ define double @f3(double %a, double %b, i64 *%ptr) {
 define double @f4(double %a, double %b, i64 *%ptr) {
 ; CHECK: f4:
 ; CHECK: clghsi 0(%r2), 32768
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -58,7 +58,7 @@ define double @f4(double %a, double %b, i64 *%ptr) {
 define double @f5(double %a, double %b, i64 *%ptr) {
 ; CHECK: f5:
 ; CHECK: clghsi 0(%r2), 65535
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %val = load i64 *%ptr
@@ -82,7 +82,7 @@ define double @f6(double %a, double %b, i64 *%ptr) {
 define double @f7(double %a, double %b, i64 %i1, i64 *%base) {
 ; CHECK: f7:
 ; CHECK: clghsi 4088(%r3), 2
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 511
@@ -97,7 +97,7 @@ define double @f8(double %a, double %b, i64 *%base) {
 ; CHECK: f8:
 ; CHECK: aghi %r2, 4096
 ; CHECK: clghsi 0(%r2), 2
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 512
@@ -112,7 +112,7 @@ define double @f9(double %a, double %b, i64 *%base) {
 ; CHECK: f9:
 ; CHECK: aghi %r2, -8
 ; CHECK: clghsi 0(%r2), 2
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %ptr = getelementptr i64 *%base, i64 -1
@@ -127,7 +127,7 @@ define double @f10(double %a, double %b, i64 %base, i64 %index) {
 ; CHECK: f10:
 ; CHECK: agr {{%r2, %r3|%r3, %r2}}
 ; CHECK: clghsi 0({{%r[23]}}), 2
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: ldr %f0, %f2
 ; CHECK: br %r14
   %add = add i64 %base, %index
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-36.ll b/llvm/test/CodeGen/SystemZ/int-cmp-36.ll
index 0813594325e4..9c8cd81b7b8e 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-36.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-36.ll
@@ -9,7 +9,7 @@
 define i32 @f1(i32 %src1) {
 ; CHECK: f1:
 ; CHECK: chrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
@@ -46,7 +46,7 @@ exit:
 define i32 @f3(i32 %src1) {
 ; CHECK: f3:
 ; CHECK: chrl %r2, g
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
@@ -65,7 +65,7 @@ exit:
 define i32 @f4(i32 %src1) {
 ; CHECK: f4:
 ; CHECK: chrl %r2, g
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-37.ll b/llvm/test/CodeGen/SystemZ/int-cmp-37.ll
index aebd1f610d27..862cf38458aa 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-37.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-37.ll
@@ -9,7 +9,7 @@
 define i32 @f1(i32 %src1) {
 ; CHECK: f1:
 ; CHECK: clhrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
@@ -46,7 +46,7 @@ exit:
 define i32 @f3(i32 %src1) {
 ; CHECK: f3:
 ; CHECK: clhrl %r2, g
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
@@ -65,7 +65,7 @@ exit:
 define i32 @f4(i32 %src1) {
 ; CHECK: f4:
 ; CHECK: clhrl %r2, g
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-38.ll b/llvm/test/CodeGen/SystemZ/int-cmp-38.ll
index 347073027554..3e1ebfb55827 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-38.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-38.ll
@@ -9,7 +9,7 @@
 define i32 @f1(i32 %src1) {
 ; CHECK: f1:
 ; CHECK: crl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %src2 = load i32 *@g
@@ -27,7 +27,7 @@ exit:
 define i32 @f2(i32 %src1) {
 ; CHECK: f2:
 ; CHECK: clrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %src2 = load i32 *@g
@@ -45,7 +45,7 @@ exit:
 define i32 @f3(i32 %src1) {
 ; CHECK: f3:
 ; CHECK: c{{l?}}rl %r2, g
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
 entry:
   %src2 = load i32 *@g
@@ -63,7 +63,7 @@ exit:
 define i32 @f4(i32 %src1) {
 ; CHECK: f4:
 ; CHECK: c{{l?}}rl %r2, g
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
 entry:
   %src2 = load i32 *@g
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-39.ll b/llvm/test/CodeGen/SystemZ/int-cmp-39.ll
index 1129dce84a44..7d654ee594c0 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-39.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-39.ll
@@ -9,7 +9,7 @@
 define i64 @f1(i64 %src1) {
 ; CHECK: f1:
 ; CHECK: cghrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
@@ -46,7 +46,7 @@ exit:
 define i64 @f3(i64 %src1) {
 ; CHECK: f3:
 ; CHECK: cghrl %r2, g
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
@@ -65,7 +65,7 @@ exit:
 define i64 @f4(i64 %src1) {
 ; CHECK: f4:
 ; CHECK: cghrl %r2, g
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-40.ll b/llvm/test/CodeGen/SystemZ/int-cmp-40.ll
index 8d9fd9aa140a..6c179ccf89e0 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-40.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-40.ll
@@ -9,7 +9,7 @@
 define i64 @f1(i64 %src1) {
 ; CHECK: f1:
 ; CHECK: clghrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
@@ -46,7 +46,7 @@ exit:
 define i64 @f3(i64 %src1) {
 ; CHECK: f3:
 ; CHECK: clghrl %r2, g
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
@@ -65,7 +65,7 @@ exit:
 define i64 @f4(i64 %src1) {
 ; CHECK: f4:
 ; CHECK: clghrl %r2, g
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
 entry:
   %val = load i16 *@g
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-41.ll b/llvm/test/CodeGen/SystemZ/int-cmp-41.ll
index 0808bffe6d3e..e2bdcad44080 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-41.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-41.ll
@@ -9,7 +9,7 @@
 define i64 @f1(i64 %src1) {
 ; CHECK: f1:
 ; CHECK: cgfrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %val = load i32 *@g
@@ -46,7 +46,7 @@ exit:
 define i64 @f3(i64 %src1) {
 ; CHECK: f3:
 ; CHECK: cgfrl %r2, g
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
 entry:
   %val = load i32 *@g
@@ -65,7 +65,7 @@ exit:
 define i64 @f4(i64 %src1) {
 ; CHECK: f4:
 ; CHECK: cgfrl %r2, g
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
 entry:
   %val = load i32 *@g
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-42.ll b/llvm/test/CodeGen/SystemZ/int-cmp-42.ll
index 5c67581dc29a..dbdf91d29133 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-42.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-42.ll
@@ -9,7 +9,7 @@
 define i64 @f1(i64 %src1) {
 ; CHECK: f1:
 ; CHECK: clgfrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %val = load i32 *@g
@@ -46,7 +46,7 @@ exit:
 define i64 @f3(i64 %src1) {
 ; CHECK: f3:
 ; CHECK: clgfrl %r2, g
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
 entry:
   %val = load i32 *@g
@@ -65,7 +65,7 @@ exit:
 define i64 @f4(i64 %src1) {
 ; CHECK: f4:
 ; CHECK: clgfrl %r2, g
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
 entry:
   %val = load i32 *@g
diff --git a/llvm/test/CodeGen/SystemZ/int-cmp-43.ll b/llvm/test/CodeGen/SystemZ/int-cmp-43.ll
index f387293b2b1b..3df25fa3db65 100644
--- a/llvm/test/CodeGen/SystemZ/int-cmp-43.ll
+++ b/llvm/test/CodeGen/SystemZ/int-cmp-43.ll
@@ -9,7 +9,7 @@
 define i64 @f1(i64 %src1) {
 ; CHECK: f1:
 ; CHECK: cgrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %src2 = load i64 *@g
@@ -27,7 +27,7 @@ exit:
 define i64 @f2(i64 %src1) {
 ; CHECK: f2:
 ; CHECK: clgrl %r2, g
-; CHECK-NEXT: j{{g?}}l
+; CHECK-NEXT: jl
 ; CHECK: br %r14
 entry:
   %src2 = load i64 *@g
@@ -45,7 +45,7 @@ exit:
 define i64 @f3(i64 %src1) {
 ; CHECK: f3:
 ; CHECK: c{{l?}}grl %r2, g
-; CHECK-NEXT: j{{g?}}e
+; CHECK-NEXT: je
 ; CHECK: br %r14
 entry:
   %src2 = load i64 *@g
@@ -63,7 +63,7 @@ exit:
 define i64 @f4(i64 %src1) {
 ; CHECK: f4:
 ; CHECK: c{{l?}}grl %r2, g
-; CHECK-NEXT: j{{g?}}lh
+; CHECK-NEXT: jlh
 ; CHECK: br %r14
 entry:
   %src2 = load i64 *@g