Update tests to add merge flag

Author: thurstond

llvm/test/Instrumentation/BoundsChecking/many-trap.ll

@@ -1,5 +1,5 @@
-; RUN: opt < %s -passes=bounds-checking -S | FileCheck %s
-; RUN: opt < %s -passes=bounds-checking -bounds-checking-single-trap -S | FileCheck -check-prefix=SINGLE %s
+; RUN: opt < %s -passes='bounds-checking<merge>' -S | FileCheck %s
+; RUN: opt < %s -passes='bounds-checking<merge>' -bounds-checking-single-trap -S | FileCheck -check-prefix=SINGLE %s
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 
 ; CHECK: @f1

llvm/test/Instrumentation/BoundsChecking/simple-32.ll

@@ -1,4 +1,4 @@
-; RUN: opt < %s -passes=bounds-checking -S | FileCheck %s
+; RUN: opt < %s -passes='bounds-checking<merge>' -S | FileCheck %s
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
 

llvm/test/Instrumentation/BoundsChecking/simple.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -passes=bounds-checking -S | FileCheck %s
+; RUN: opt < %s -passes='bounds-checking<merge>' -S | FileCheck %s
 target datalayout = "e-p:64:64:64-p1:16:16:16-p2:64:64:64:48-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
 
 @.str = private constant [8 x i8] c"abcdefg\00"

llvm/test/Instrumentation/BoundsChecking/ubsan-unique-traps.ll

@@ -1,7 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -passes='bounds-checking<merge=false>'  -S | FileCheck %s
-; RUN: opt < %s -passes='bounds-checking<merge=true>'   -S | not FileCheck %s
-; RUN: opt < %s -passes=bounds-checking                 -S | not FileCheck %s
+; RUN: opt < %s -passes=bounds-checking          -S | FileCheck %s
+; RUN: opt < %s -passes='bounds-checking<merge>' -S | not FileCheck %s
 
 target datalayout = "e-p:64:64:64-p1:16:16:16-p2:64:64:64:48-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"