[WebAssembly] Tighten up some regexes in some tests.

llvm-svn: 258295

4 files changed, 80 insertions, 80 deletions

diff --git a/llvm/test/CodeGen/WebAssembly/cfg-stackify.ll b/llvm/test/CodeGen/WebAssembly/cfg-stackify.ll
index 196bed01115..f5b4b77c3d7 100644
--- a/llvm/test/CodeGen/WebAssembly/cfg-stackify.ll
+++ b/llvm/test/CodeGen/WebAssembly/cfg-stackify.ll
@@ -95,7 +95,7 @@ back:
 ; CHECK-LABEL: test2:
 ; CHECK-NOT: local
 ; CHECK: block{{$}}
-; CHECK: br_if {{[^,]*}}, 0{{$}}
+; CHECK: br_if {{[^,]+}}, 0{{$}}
 ; CHECK: .LBB2_1:
 ; CHECK: br_if ${{[0-9]+}}, 0{{$}}
 ; CHECK: .LBB2_2:
@@ -103,7 +103,7 @@ back:
 ; OPT-LABEL: test2:
 ; OPT-NOT: local
 ; OPT: block{{$}}
-; OPT: br_if {{[^,]*}}, 0{{$}}
+; OPT: br_if {{[^,]+}}, 0{{$}}
 ; OPT: .LBB2_1:
 ; OPT: br_if ${{[0-9]+}}, 0{{$}}
 ; OPT: .LBB2_2:
@@ -136,12 +136,12 @@ for.end:
 ; CHECK-LABEL: doublediamond:
 ; CHECK: block{{$}}
 ; CHECK-NEXT: block{{$}}
-; CHECK: br_if ${{[^,]*}}, 0{{$}}
+; CHECK: br_if ${{[^,]+}}, 0{{$}}
 ; CHECK: br 1{{$}}
 ; CHECK: .LBB3_2:
 ; CHECK-NEXT: end_block{{$}}
 ; CHECK: block{{$}}
-; CHECK: br_if ${{[^,]*}}, 0{{$}}
+; CHECK: br_if ${{[^,]+}}, 0{{$}}
 ; CHECK: br 1{{$}}
 ; CHECK: .LBB3_4:
 ; CHECK-NEXT: end_block{{$}}
@@ -152,9 +152,9 @@ for.end:
 ; OPT-LABEL: doublediamond:
 ; OPT: block{{$}}
 ; OPT-NEXT: block{{$}}
-; OPT: br_if ${{[^,]*}}, 0{{$}}
+; OPT: br_if ${{[^,]+}}, 0{{$}}
 ; OPT: block{{$}}
-; OPT: br_if ${{[^,]*}}, 0{{$}}
+; OPT: br_if ${{[^,]+}}, 0{{$}}
 ; OPT: br 1{{$}}
 ; OPT: .LBB3_4:
 ; OPT: .LBB3_5:
@@ -218,7 +218,7 @@ exit:
 ; OPT-LABEL: diamond:
 ; OPT: block{{$}}
 ; OPT: block{{$}}
-; OPT: br_if {{[^,]*}}, 0{{$}}
+; OPT: br_if {{[^,]+}}, 0{{$}}
 ; OPT: br 1{{$}}
 ; OPT: .LBB5_2:
 ; OPT: .LBB5_3:
@@ -285,7 +285,7 @@ loop:
 ; OPT-NOT: br
 ; OPT: .LBB8_1:
 ; OPT: loop{{$}}
-; OPT: br_if {{[^,]*}}, 0{{$}}
+; OPT: br_if {{[^,]+}}, 0{{$}}
 ; OPT-NEXT: end_loop{{$}}
 ; OPT: i32.const $push{{[0-9]+}}=, 0{{$}}
 ; OPT-NEXT: return $pop{{[0-9]+}}{{$}}
@@ -351,7 +351,7 @@ exit:
 ; OPT-LABEL: ifelse_earlyexits:
 ; OPT: block{{$}}
 ; OPT: block{{$}}
-; OPT: br_if {{[^,]*}}, 0{{$}}
+; OPT: br_if {{[^,]+}}, 0{{$}}
 ; OPT: br_if $1, 1{{$}}
 ; OPT: br 1{{$}}
 ; OPT: .LBB10_3:
@@ -399,9 +399,9 @@ exit:
 ; OPT: loop{{$}}
 ; OPT: block{{$}}
 ; OPT: block{{$}}
-; OPT: br_if           {{[^,]*}}, 0{{$}}
+; OPT: br_if           {{[^,]+}}, 0{{$}}
 ; OPT: block{{$}}
-; OPT: br_if           {{[^,]*}}, 0{{$}}
+; OPT: br_if           {{[^,]+}}, 0{{$}}
 ; OPT: br              2{{$}}
 ; OPT: .LBB11_4:
 ; OPT-NEXT: end_block{{$}}
@@ -484,16 +484,16 @@ if.end:
 ; CHECK:      block{{$}}
 ; CHECK-NEXT: block{{$}}
 ; CHECK-NEXT: block{{$}}
-; CHECK:      br_if       $pop{{[0-9]*}}, 0{{$}}
+; CHECK:      br_if       $pop{{[0-9]+}}, 0{{$}}
 ; CHECK-NEXT: block{{$}}
-; CHECK:      br_if       $pop{{[0-9]*}}, 0{{$}}
-; CHECK:      br_if       $pop{{[0-9]*}}, 2{{$}}
+; CHECK:      br_if       $pop{{[0-9]+}}, 0{{$}}
+; CHECK:      br_if       $pop{{[0-9]+}}, 2{{$}}
 ; CHECK-NEXT: .LBB13_3:
 ; CHECK-NEXT: end_block{{$}}
 ; CHECK-NEXT: return{{$}}
 ; CHECK-NEXT: .LBB13_4:
-; CHECK:      br_if       $pop{{[0-9]*}}, 1{{$}}
-; CHECK:      br_if       $pop{{[0-9]*}}, 0{{$}}
+; CHECK:      br_if       $pop{{[0-9]+}}, 1{{$}}
+; CHECK:      br_if       $pop{{[0-9]+}}, 0{{$}}
 ; CHECK-NEXT: return{{$}}
 ; CHECK-NEXT: .LBB13_7:
 ; CHECK-NEXT: end_block{{$}}
@@ -506,16 +506,16 @@ if.end:
 ; OPT:      block{{$}}
 ; OPT-NEXT: block{{$}}
 ; OPT-NEXT: block{{$}}
-; OPT:      br_if       $pop{{[0-9]*}}, 0{{$}}
+; OPT:      br_if       $pop{{[0-9]+}}, 0{{$}}
 ; OPT-NEXT: block{{$}}
-; OPT:      br_if       $pop{{[0-9]*}}, 0{{$}}
-; OPT:      br_if       $pop{{[0-9]*}}, 2{{$}}
+; OPT:      br_if       $pop{{[0-9]+}}, 0{{$}}
+; OPT:      br_if       $pop{{[0-9]+}}, 2{{$}}
 ; OPT-NEXT: .LBB13_3:
 ; OPT-NEXT: end_block{{$}}
 ; OPT-NEXT: return{{$}}
 ; OPT-NEXT: .LBB13_4:
-; OPT:      br_if       $pop{{[0-9]*}}, 1{{$}}
-; OPT:      br_if       $pop{{[0-9]*}}, 0{{$}}
+; OPT:      br_if       $pop{{[0-9]+}}, 1{{$}}
+; OPT:      br_if       $pop{{[0-9]+}}, 0{{$}}
 ; OPT-NEXT: return{{$}}
 ; OPT-NEXT: .LBB13_7:
 ; OPT-NEXT: end_block{{$}}
@@ -552,8 +552,8 @@ default:
 ; CHECK:       .LBB14_1:
 ; CHECK-NEXT:  block{{$}}
 ; CHECK-NEXT:  loop{{$}}
-; CHECK:       br_if {{[^,]*}}, 2{{$}}
-; CHECK:       br_if {{[^,]*}}, 0{{$}}
+; CHECK:       br_if {{[^,]+}}, 2{{$}}
+; CHECK:       br_if {{[^,]+}}, 0{{$}}
 ; CHECK-NEXT:  end_loop{{$}}
 ; CHECK:       return{{$}}
 ; CHECK-NEXT:  .LBB14_4:
@@ -562,8 +562,8 @@ default:
 ; OPT:       .LBB14_1:
 ; OPT-NEXT:  block{{$}}
 ; OPT-NEXT:  loop{{$}}
-; OPT:       br_if {{[^,]*}}, 2{{$}}
-; OPT:       br_if {{[^,]*}}, 0{{$}}
+; OPT:       br_if {{[^,]+}}, 2{{$}}
+; OPT:       br_if {{[^,]+}}, 0{{$}}
 ; OPT-NEXT:  end_loop{{$}}
 ; OPT:       return{{$}}
 ; OPT-NEXT:  .LBB14_4:
@@ -599,11 +599,11 @@ return:
 ; CHECK-NEXT:  block{{$}}
 ; CHECK-NEXT:  loop{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if {{[^,]*}}, 3{{$}}
+; CHECK:       br_if {{[^,]+}}, 3{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if {{[^,]*}}, 2{{$}}
+; CHECK:       br_if {{[^,]+}}, 2{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if {{[^,]*}}, 0{{$}}
+; CHECK:       br_if {{[^,]+}}, 0{{$}}
 ; CHECK-NEXT:  end_loop{{$}}
 ; CHECK-NOT:   block
 ; CHECK:       return{{$}}
@@ -620,11 +620,11 @@ return:
 ; OPT-NEXT:  block{{$}}
 ; OPT-NEXT:  loop{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if {{[^,]*}}, 3{{$}}
+; OPT:       br_if {{[^,]+}}, 3{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if {{[^,]*}}, 2{{$}}
+; OPT:       br_if {{[^,]+}}, 2{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if {{[^,]*}}, 0{{$}}
+; OPT:       br_if {{[^,]+}}, 0{{$}}
 ; OPT-NEXT:  end_loop{{$}}
 ; OPT-NOT:   block
 ; OPT:       return{{$}}
@@ -672,15 +672,15 @@ second:
 ; CHECK-NEXT:  loop{{$}}
 ; CHECK-NOT:   block
 ; CHECK:       block{{$}}
-; CHECK:       br_if {{[^,]*}}, 0{{$}}
+; CHECK:       br_if {{[^,]+}}, 0{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if {{[^,]*}}, 1{{$}}
+; CHECK:       br_if {{[^,]+}}, 1{{$}}
 ; CHECK-NOT:   block
 ; CHECK:       unreachable
 ; CHECK-NEXT:  .LBB16_4:
 ; CHECK-NEXT:  end_block{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if {{[^,]*}}, 0{{$}}
+; CHECK:       br_if {{[^,]+}}, 0{{$}}
 ; CHECK-NEXT:  end_loop{{$}}
 ; CHECK-NOT:   block
 ; CHECK:       unreachable
@@ -690,15 +690,15 @@ second:
 ; OPT-NOT:   block
 ; OPT:       block{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if {{[^,]*}}, 0{{$}}
+; OPT:       br_if {{[^,]+}}, 0{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if {{[^,]*}}, 1{{$}}
+; OPT:       br_if {{[^,]+}}, 1{{$}}
 ; OPT-NOT:   block
 ; OPT:       unreachable
 ; OPT-NEXT:  .LBB16_4:
 ; OPT-NEXT:  end_block{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if {{[^,]*}}, 0{{$}}
+; OPT:       br_if {{[^,]+}}, 0{{$}}
 ; OPT-NEXT:  end_loop{{$}}
 ; OPT-NOT:   block
 ; OPT:       unreachable
@@ -735,14 +735,14 @@ u1:
 ; CHECK-NEXT:  loop{{$}}
 ; CHECK-NEXT:  block{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if    {{[^,]*}}, 0{{$}}
+; CHECK:       br_if    {{[^,]+}}, 0{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if    {{[^,]*}}, 1{{$}}
+; CHECK:       br_if    {{[^,]+}}, 1{{$}}
 ; CHECK-NEXT:  .LBB17_3:
 ; CHECK-NEXT:  end_block{{$}}
 ; CHECK-NEXT:  loop{{$}}
-; CHECK-NEXT:  i32.const $push{{[^,]*}}, 0{{$}}
-; CHECK-NEXT:  br_if    {{[^,]*}}, 0{{$}}
+; CHECK-NEXT:  i32.const $push{{[^,]+}}, 0{{$}}
+; CHECK-NEXT:  br_if    {{[^,]+}}, 0{{$}}
 ; CHECK-NEXT:  br       2{{$}}
 ; CHECK-NEXT:  .LBB17_4:
 ; OPT-LABEL: test8:
@@ -750,14 +750,14 @@ u1:
 ; OPT-NEXT:  loop{{$}}
 ; OPT-NEXT:  block{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if    {{[^,]*}}, 0{{$}}
+; OPT:       br_if    {{[^,]+}}, 0{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if    {{[^,]*}}, 1{{$}}
+; OPT:       br_if    {{[^,]+}}, 1{{$}}
 ; OPT-NEXT:  .LBB17_3:
 ; OPT-NEXT:  end_block{{$}}
 ; OPT-NEXT:  loop{{$}}
-; OPT-NEXT:  i32.const $push{{[^,]*}}, 0{{$}}
-; OPT-NEXT:  br_if    {{[^,]*}}, 0{{$}}
+; OPT-NEXT:  i32.const $push{{[^,]+}}, 0{{$}}
+; OPT-NEXT:  br_if    {{[^,]+}}, 0{{$}}
 ; OPT-NEXT:  br       2{{$}}
 ; OPT-NEXT:  .LBB17_4:
 define i32 @test8() {
@@ -784,20 +784,20 @@ bb3:
 ; CHECK:       .LBB18_1:
 ; CHECK-NEXT:  loop{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if     {{[^,]*}}, 1{{$}}
+; CHECK:       br_if     {{[^,]+}}, 1{{$}}
 ; CHECK-NEXT:  .LBB18_2:
 ; CHECK-NEXT:  loop{{$}}
 ; CHECK-NOT:   block
 ; CHECK:       block{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if     {{[^,]*}}, 0{{$}}
+; CHECK:       br_if     {{[^,]+}}, 0{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if     {{[^,]*}}, 1{{$}}
+; CHECK:       br_if     {{[^,]+}}, 1{{$}}
 ; CHECK-NEXT:  br        3{{$}}
 ; CHECK-NEXT:  .LBB18_4:
 ; CHECK-NEXT:  end_block{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if     {{[^,]*}}, 0{{$}}
+; CHECK:       br_if     {{[^,]+}}, 0{{$}}
 ; CHECK-NEXT:  br        2{{$}}
 ; CHECK-NEXT:  .LBB18_5:
 ; CHECK-NOT:   block
@@ -806,20 +806,20 @@ bb3:
 ; OPT:       .LBB18_1:
 ; OPT-NEXT:  loop{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if     {{[^,]*}}, 1{{$}}
+; OPT:       br_if     {{[^,]+}}, 1{{$}}
 ; OPT-NEXT:  .LBB18_2:
 ; OPT-NEXT:  loop{{$}}
 ; OPT-NOT:   block
 ; OPT:       block{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if     {{[^,]*}}, 0{{$}}
+; OPT:       br_if     {{[^,]+}}, 0{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if     {{[^,]*}}, 1{{$}}
+; OPT:       br_if     {{[^,]+}}, 1{{$}}
 ; OPT-NEXT:  br        3{{$}}
 ; OPT-NEXT:  .LBB18_4:
 ; OPT-NEXT:  end_block{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if     {{[^,]*}}, 0{{$}}
+; OPT:       br_if     {{[^,]+}}, 0{{$}}
 ; OPT-NEXT:  br        2{{$}}
 ; OPT-NEXT:  .LBB18_5:
 ; OPT-NOT:   block
@@ -862,7 +862,7 @@ end:
 ; CHECK:       .LBB19_1:
 ; CHECK-NEXT:  loop{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if    {{[^,]*}}, 0{{$}}
+; CHECK:       br_if    {{[^,]+}}, 0{{$}}
 ; CHECK-NEXT:  .LBB19_2:
 ; CHECK-NEXT:  block{{$}}
 ; CHECK-NEXT:  loop{{$}}
@@ -870,9 +870,9 @@ end:
 ; CHECK:       .LBB19_3:
 ; CHECK-NEXT:  loop{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if    {{[^,]*}}, 5{{$}}
+; CHECK:       br_if    {{[^,]+}}, 5{{$}}
 ; CHECK-NOT:   block
-; CHECK:       tableswitch  {{[^,]*}}, 0, 0, 1, 5, 2, 4{{$}}
+; CHECK:       tableswitch  {{[^,]+}}, 0, 0, 1, 5, 2, 4{{$}}
 ; CHECK-NEXT:  .LBB19_5:
 ; CHECK-NEXT:  end_loop{{$}}
 ; CHECK-NEXT:  end_loop{{$}}
@@ -886,7 +886,7 @@ end:
 ; OPT:       .LBB19_1:
 ; OPT-NEXT:  loop{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if    {{[^,]*}}, 0{{$}}
+; OPT:       br_if    {{[^,]+}}, 0{{$}}
 ; OPT-NEXT:  .LBB19_2:
 ; OPT-NEXT:  block{{$}}
 ; OPT-NEXT:  loop{{$}}
@@ -894,9 +894,9 @@ end:
 ; OPT:       .LBB19_3:
 ; OPT-NEXT:  loop{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if    {{[^,]*}}, 5{{$}}
+; OPT:       br_if    {{[^,]+}}, 5{{$}}
 ; OPT-NOT:   block
-; OPT:       tableswitch  {{[^,]*}}, 0, 0, 1, 5, 2, 4{{$}}
+; OPT:       tableswitch  {{[^,]+}}, 0, 0, 1, 5, 2, 4{{$}}
 ; OPT-NEXT:  .LBB19_5:
 ; OPT-NEXT:  end_loop{{$}}
 ; OPT-NEXT:  end_loop{{$}}
@@ -948,12 +948,12 @@ bb6:
 ; CHECK-NEXT:  block{{$}}
 ; CHECK-NEXT:  block{{$}}
 ; CHECK-NEXT:  block{{$}}
-; CHECK:       br_if        {{[^,]*}}, 0{{$}}
+; CHECK:       br_if        {{[^,]+}}, 0{{$}}
 ; CHECK-NEXT:  block{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if        {{[^,]*}}, 0{{$}}
+; CHECK:       br_if        {{[^,]+}}, 0{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if        {{[^,]*}}, 2{{$}}
+; CHECK:       br_if        {{[^,]+}}, 2{{$}}
 ; CHECK-NEXT:  .LBB20_3:
 ; CHECK-NEXT:  end_block{{$}}
 ; CHECK-NOT:   block
@@ -961,9 +961,9 @@ bb6:
 ; CHECK-NEXT:  .LBB20_4:
 ; CHECK-NEXT:  end_block{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if        {{[^,]*}}, 2{{$}}
+; CHECK:       br_if        {{[^,]+}}, 2{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if        {{[^,]*}}, 1{{$}}
+; CHECK:       br_if        {{[^,]+}}, 1{{$}}
 ; CHECK-NEXT:  .LBB20_6:
 ; CHECK-NEXT:  end_block{{$}}
 ; CHECK-NOT:   block
@@ -984,7 +984,7 @@ bb6:
 ; OPT-NOT:   block
 ; OPT:       br_if        $0, 0{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if        {{[^,]*}}, 2{{$}}
+; OPT:       br_if        {{[^,]+}}, 2{{$}}
 ; OPT-NEXT:  .LBB20_3:
 ; OPT-NEXT:  end_block{{$}}
 ; OPT-NOT:   block
@@ -1044,18 +1044,18 @@ bb8:
 ; CHECK:       block{{$}}
 ; CHECK-NEXT:  block{{$}}
 ; CHECK-NEXT:  block{{$}}
-; CHECK:       br_if       {{[^,]*}}, 0{{$}}
+; CHECK:       br_if       {{[^,]+}}, 0{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if       {{[^,]*}}, 2{{$}}
+; CHECK:       br_if       {{[^,]+}}, 2{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if       {{[^,]*}}, 2{{$}}
+; CHECK:       br_if       {{[^,]+}}, 2{{$}}
 ; CHECK-NEXT:  br          1{{$}}
 ; CHECK-NEXT:  .LBB21_4:
 ; CHECK-NEXT:  end_block{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if       {{[^,]*}}, 1{{$}}
+; CHECK:       br_if       {{[^,]+}}, 1{{$}}
 ; CHECK-NOT:   block
-; CHECK:       br_if       {{[^,]*}}, 1{{$}}
+; CHECK:       br_if       {{[^,]+}}, 1{{$}}
 ; CHECK-NEXT:  .LBB21_6:
 ; CHECK-NEXT:  end_block{{$}}
 ; CHECK-NEXT:  return{{$}}
@@ -1071,18 +1071,18 @@ bb8:
 ; OPT:       block{{$}}
 ; OPT-NEXT:  block{{$}}
 ; OPT-NEXT:  block{{$}}
-; OPT:       br_if       {{[^,]*}}, 0{{$}}
+; OPT:       br_if       {{[^,]+}}, 0{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if       {{[^,]*}}, 2{{$}}
+; OPT:       br_if       {{[^,]+}}, 2{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if       {{[^,]*}}, 2{{$}}
+; OPT:       br_if       {{[^,]+}}, 2{{$}}
 ; OPT-NEXT:  br          1{{$}}
 ; OPT-NEXT:  .LBB21_4:
 ; OPT-NEXT:  end_block{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if       {{[^,]*}}, 1{{$}}
+; OPT:       br_if       {{[^,]+}}, 1{{$}}
 ; OPT-NOT:   block
-; OPT:       br_if       {{[^,]*}}, 1{{$}}
+; OPT:       br_if       {{[^,]+}}, 1{{$}}
 ; OPT-NEXT:  .LBB21_6:
 ; OPT-NEXT:  end_block{{$}}
 ; OPT-NEXT:  return{{$}}
diff --git a/llvm/test/CodeGen/WebAssembly/cpus.ll b/llvm/test/CodeGen/WebAssembly/cpus.ll
index 51856fcd12c..78aee0f59d9 100644
--- a/llvm/test/CodeGen/WebAssembly/cpus.ll
+++ b/llvm/test/CodeGen/WebAssembly/cpus.ll
@@ -9,8 +9,8 @@
 ; RUN: llc < %s -asm-verbose=false -mtriple=wasm32-unknown-unknown -mcpu=invalidcpu 2>&1 | FileCheck %s --check-prefix=INVALID
 ; RUN: llc < %s -asm-verbose=false -mtriple=wasm64-unknown-unknown -mcpu=invalidcpu 2>&1 | FileCheck %s --check-prefix=INVALID
 
-; CHECK-NOT: {{.*}} is not a recognized processor for this target
-; INVALID: {{.*}} is not a recognized processor for this target
+; CHECK-NOT: is not a recognized processor for this target
+; INVALID: {{.+}} is not a recognized processor for this target
 
 define i32 @f(i32 %i_like_the_web) {
   ret i32 %i_like_the_web
diff --git a/llvm/test/CodeGen/WebAssembly/store-results.ll b/llvm/test/CodeGen/WebAssembly/store-results.ll
index 5fa424a12d4..488579a756e 100644
--- a/llvm/test/CodeGen/WebAssembly/store-results.ll
+++ b/llvm/test/CodeGen/WebAssembly/store-results.ll
@@ -7,7 +7,7 @@ target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
 ; CHECK-LABEL: single_block:
-; CHECK-NOT: .local
+; CHECK-NOT: local
 ; CHECK: i32.const $push{{[0-9]+}}=, 0{{$}}
 ; CHECK: i32.store $push[[STORE:[0-9]+]]=, 0($0), $pop{{[0-9]+}}{{$}}
 ; CHECK: return $pop[[STORE]]{{$}}
diff --git a/llvm/test/CodeGen/WebAssembly/switch.ll b/llvm/test/CodeGen/WebAssembly/switch.ll
index 3df5e7f9cf6..998df9a2c4b 100644
--- a/llvm/test/CodeGen/WebAssembly/switch.ll
+++ b/llvm/test/CodeGen/WebAssembly/switch.ll
@@ -21,7 +21,7 @@ declare void @foo5()
 ; CHECK: block{{$}}
 ; CHECK: block{{$}}
 ; CHECK: block{{$}}
-; CHECK: tableswitch {{[^,]*}}, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 4, 5{{$}}
+; CHECK: tableswitch {{[^,]+}}, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 4, 5{{$}}
 ; CHECK: .LBB0_2:
 ; CHECK:   call foo0@FUNCTION{{$}}
 ; CHECK: .LBB0_3:
@@ -101,7 +101,7 @@ sw.epilog:                                        ; preds = %entry, %sw.bb.5, %s
 ; CHECK: block{{$}}
 ; CHECK: block{{$}}
 ; CHECK: block{{$}}
-; CHECK: tableswitch {{[^,]*}}, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 4, 5{{$}}
+; CHECK: tableswitch {{[^,]+}}, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 4, 5{{$}}
 ; CHECK: .LBB1_2:
 ; CHECK:   call foo0@FUNCTION{{$}}
 ; CHECK: .LBB1_3: