diff --git a/llvm/test/FileCheck/numeric-expression.txt b/llvm/test/FileCheck/numeric-expression.txt
--- a/llvm/test/FileCheck/numeric-expression.txt
+++ b/llvm/test/FileCheck/numeric-expression.txt
@@ -63,104 +63,60 @@
 
 ; Numeric expressions in explicit matching format and default matching rule using
 ; variables defined on other lines without spaces.
-USE DEF FMT IMPL MATCH
-11
-12
-10
-c
-d
-b
-1a
-D
-E
-C
-1B
-11
-11
-11
-c
-c
-c
-c
-c
-CHECK-LABEL: USE DEF FMT IMPL MATCH
-CHECK-NEXT: [[#%u,VAR1]]
-CHECK-NEXT: [[#%u,VAR1+1]]
-CHECK-NEXT: [[#%u,VAR1-1]]
-CHECK-NEXT: [[#%x,VAR2]]
-CHECK-NEXT: [[#%x,VAR2+1]]
-CHECK-NEXT: [[#%x,VAR2-1]]
-CHECK-NEXT: [[#%x,VAR2+14]]
-CHECK-NEXT: [[#%X,VAR3]]
-CHECK-NEXT: [[#%X,VAR3+1]]
-CHECK-NEXT: [[#%X,VAR3-1]]
-CHECK-NEXT: [[#%X,VAR3+14]]
-CHECK-NEXT: [[#%u,VAR1a]]
-CHECK-NEXT: [[#%u,VAR1b]]
-CHECK-NEXT: [[#%u,VAR1c]]
-CHECK-NEXT: [[#%x,VAR2a]]
+USE DEF FMT IMPL MATCH  // CHECK-LABEL: USE DEF FMT IMPL MATCH
+11  // CHECK-NEXT: [[#%u,VAR1]]     {{.*}}
+12  // CHECK-NEXT: [[#%u,VAR1+1]]   {{.*}}
+10  // CHECK-NEXT: [[#%u,VAR1-1]]   {{.*}}
+c   // CHECK-NEXT: [[#%x,VAR2]]     {{.*}}
+d   // CHECK-NEXT: [[#%x,VAR2+1]]   {{.*}}
+b   // CHECK-NEXT: [[#%x,VAR2-1]]   {{.*}}
+1a  // CHECK-NEXT: [[#%x,VAR2+0xe]] {{.*}}
+1a  // CHECK-NEXT: [[#%x,VAR2+0xE]] {{.*}}
+D   // CHECK-NEXT: [[#%X,VAR3]]     {{.*}}
+E   // CHECK-NEXT: [[#%X,VAR3+1]]   {{.*}}
+C   // CHECK-NEXT: [[#%X,VAR3-1]]   {{.*}}
+1B  // CHECK-NEXT: [[#%X,VAR3+0xe]] {{.*}}
+1B  // CHECK-NEXT: [[#%X,VAR3+0xE]] {{.*}}
+11  // CHECK-NEXT: [[#%u,VAR1a]]    {{.*}}
+11  // CHECK-NEXT: [[#%u,VAR1b]]    {{.*}}
+11  // CHECK-NEXT: [[#%u,VAR1c]]    {{.*}}
+c   // CHECK-NEXT: [[#%x,VAR2a]]    {{.*}}
 
 ; Numeric expressions in explicit matching format and default matching rule using
 ; variables defined on other lines with different spacing.
-USE EXPL FMT IMPL MATCH SPC
-11
-11
-11
-12
-12
-12
-12
-12
-12
-10
-10
-10
-10
-10
-10
-CHECK-LABEL: USE EXPL FMT IMPL MATCH SPC
-CHECK-NEXT: [[#%u, VAR1]]
-CHECK-NEXT: [[# %u, VAR1]]
-CHECK-NEXT: [[# %u, VAR1 ]]
-CHECK-NEXT: [[#%u, VAR1+1]]
-CHECK-NEXT: [[# %u, VAR1+1]]
-CHECK-NEXT: [[# %u , VAR1+1]]
-CHECK-NEXT: [[# %u , VAR1 +1]]
-CHECK-NEXT: [[# %u , VAR1 + 1]]
-CHECK-NEXT: [[# %u , VAR1 + 1 ]]
-CHECK-NEXT: [[#%u, VAR1-1]]
-CHECK-NEXT: [[# %u, VAR1-1]]
-CHECK-NEXT: [[# %u , VAR1-1]]
-CHECK-NEXT: [[# %u , VAR1 -1]]
-CHECK-NEXT: [[# %u , VAR1 - 1]]
-CHECK-NEXT: [[# %u , VAR1 - 1 ]]
+USE EXPL FMT IMPL MATCH SPC  // CHECK-LABEL: USE EXPL FMT IMPL MATCH SPC
+11  // CHECK-NEXT: [[#%u, VAR1]]        {{.*}}
+11  // CHECK-NEXT: [[# %u, VAR1]]       {{.*}}
+11  // CHECK-NEXT: [[# %u, VAR1 ]]      {{.*}}
+12  // CHECK-NEXT: [[#%u, VAR1+1]]      {{.*}}
+12  // CHECK-NEXT: [[# %u, VAR1+1]]     {{.*}}
+12  // CHECK-NEXT: [[# %u , VAR1+1]]    {{.*}}
+12  // CHECK-NEXT: [[# %u , VAR1 +1]]   {{.*}}
+12  // CHECK-NEXT: [[# %u , VAR1 + 1]]  {{.*}}
+12  // CHECK-NEXT: [[# %u , VAR1 + 1 ]] {{.*}}
+10  // CHECK-NEXT: [[#%u, VAR1-1]]      {{.*}}
+10  // CHECK-NEXT: [[# %u, VAR1-1]]     {{.*}}
+10  // CHECK-NEXT: [[# %u , VAR1-1]]    {{.*}}
+10  // CHECK-NEXT: [[# %u , VAR1 -1]]   {{.*}}
+10  // CHECK-NEXT: [[# %u , VAR1 - 1]]  {{.*}}
+10  // CHECK-NEXT: [[# %u , VAR1 - 1 ]] {{.*}}
 
 ; Numeric expressions in implicit matching format and default matching rule using
 ; variables defined on other lines.
-USE IMPL FMT IMPL MATCH
-11
-12
-10
-c
-d
-b
-1a
-D
-E
-C
-1B
-CHECK-LABEL: USE IMPL FMT IMPL MATCH
-CHECK-NEXT: [[#VAR1]]
-CHECK-NEXT: [[#VAR1+1]]
-CHECK-NEXT: [[#VAR1-1]]
-CHECK-NEXT: [[#VAR2]]
-CHECK-NEXT: [[#VAR2+1]]
-CHECK-NEXT: [[#VAR2-1]]
-CHECK-NEXT: [[#VAR2+14]]
-CHECK-NEXT: [[#VAR3]]
-CHECK-NEXT: [[#VAR3+1]]
-CHECK-NEXT: [[#VAR3-1]]
-CHECK-NEXT: [[#VAR3+14]]
+USE IMPL FMT IMPL MATCH  // CHECK-LABEL: USE IMPL FMT IMPL MATCH
+11  // CHECK-NEXT: [[#VAR1]]     {{.*}}
+12  // CHECK-NEXT: [[#VAR1+1]]   {{.*}}
+10  // CHECK-NEXT: [[#VAR1-1]]   {{.*}}
+c   // CHECK-NEXT: [[#VAR2]]     {{.*}}
+d   // CHECK-NEXT: [[#VAR2+1]]   {{.*}}
+b   // CHECK-NEXT: [[#VAR2-1]]   {{.*}}
+1a  // CHECK-NEXT: [[#VAR2+0xe]] {{.*}}
+1a  // CHECK-NEXT: [[#VAR2+0xE]] {{.*}}
+D   // CHECK-NEXT: [[#VAR3]]     {{.*}}
+E   // CHECK-NEXT: [[#VAR3+1]]   {{.*}}
+C   // CHECK-NEXT: [[#VAR3-1]]   {{.*}}
+1B  // CHECK-NEXT: [[#VAR3+0xe]] {{.*}}
+1B  // CHECK-NEXT: [[#VAR3+0xE]] {{.*}}
 
 ; Numeric expressions using variables defined on other lines and an immediate
 ; interpreted as an unsigned value.
@@ -172,16 +128,13 @@
 
 ; Numeric expressions with matching format overriding the implicit format of
 ; variables defined on other lines.
-USE CONV FMT IMPL MATCH
-b
-B
-12
-13
-CHECK-LABEL: USE CONV FMT IMPL MATCH
-CHECK-NEXT: [[# %x, VAR1]]
-CHECK-NEXT: [[# %X, VAR1]]
-CHECK-NEXT: [[# %u, VAR2]]
-CHECK-NEXT: [[# %u, VAR3]]
+USE CONV FMT IMPL MATCH  // CHECK-LABEL: USE CONV FMT IMPL MATCH
+b   // CHECK-NEXT: [[# %x, VAR1]] {{.*}}
+B   // CHECK-NEXT: [[# %X, VAR1]] {{.*}}
+12  // CHECK-NEXT: [[# %u, VAR2]] {{.*}}
+C   // CHECK-NEXT: [[# %X, VAR2]] {{.*}}
+13  // CHECK-NEXT: [[# %u, VAR3]] {{.*}}
+d   // CHECK-NEXT: [[# %x, VAR3]] {{.*}}
 
 ; Conflicting implicit format.
 RUN: %ProtectFileCheckOutput \
@@ -385,4 +338,4 @@
 REDEF-NEW-FMT-NEXT: [[#%X,VAR1:]]
 REDEF-NEW-FMT-MSG: numeric-expression.txt:[[#@LINE-1]]:31: error: format different from previous variable definition
 REDEF-NEW-FMT-MSG-NEXT: {{R}}EDEF-NEW-FMT-NEXT: {{\[\[#%X,VAR1:\]\]}}
-REDEF-NEW-FMT-MSG-NEXT: {{^                              \^$}}
+REDEF-NEW-FMT-MSG-NEXT:    {{^}}                              ^{{$}}