Convert an OCaml binding grep test to FileCheck

I shaved this yak because I mistakenly thought that this was one of the
last grep tests.  Turns out my search was skipping .ll files, for which
there are ~1200 more tests using grep.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185819 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 340 insertions, 329 deletions

diff --git a/test/Bindings/Ocaml/vmcore.ml b/test/Bindings/Ocaml/vmcore.ml
index b49bab9..c01882f 100644
--- a/test/Bindings/Ocaml/vmcore.ml
+++ b/test/Bindings/Ocaml/vmcore.ml
@@ -1,6 +1,9 @@
 (* RUN: %ocamlopt -warn-error A llvm.cmxa llvm_analysis.cmxa llvm_bitwriter.cmxa %s -o %t
  * RUN: %t %t.bc
- * RUN: llvm-dis < %t.bc > %t.ll
+ * RUN: llvm-dis < %t.bc > t.ll
+ * RUN: FileCheck %s < t.ll
+ * Do a second pass for things that shouldn't be anywhere.
+ * RUN: FileCheck -check-prefix=CHECK-NOWHERE %s < t.ll
  * XFAIL: vg_leak
  *)
 
@@ -65,26 +68,25 @@ let m = create_module context filename
 
 let test_target () =
   begin group "triple";
-    (* RUN: grep "i686-apple-darwin8" < %t.ll
-     *)
     let trip = "i686-apple-darwin8" in
     set_target_triple trip m;
     insist (trip = target_triple m)
   end;
   
   begin group "layout";
-    (* RUN: grep "bogus" < %t.ll
-     *)
     let layout = "bogus" in
     set_data_layout layout m;
     insist (layout = data_layout m)
   end
+  (* CHECK: target datalayout = "bogus"
+   * CHECK: target triple = "i686-apple-darwin8"
+   *)
 
 
 (*===-- Constants ---------------------------------------------------------===*)
 
 let test_constants () =
-  (* RUN: grep "const_int.*i32.*-1" < %t.ll
+  (* CHECK: const_int{{.*}}i32{{.*}}-1
    *)
   group "int";
   let c = const_int i32_type (-1) in
@@ -92,44 +94,44 @@ let test_constants () =
   insist (i32_type = type_of c);
   insist (is_constant c);
 
-  (* RUN: grep "const_sext_int.*i64.*-1" < %t.ll
+  (* CHECK: const_sext_int{{.*}}i64{{.*}}-1
    *)
   group "sext int";
   let c = const_int i64_type (-1) in
   ignore (define_global "const_sext_int" c m);
   insist (i64_type = type_of c);
 
-  (* RUN: grep "const_zext_int64.*i64.*4294967295" < %t.ll
+  (* CHECK: const_zext_int64{{.*}}i64{{.*}}4294967295
    *)
   group "zext int64";
   let c = const_of_int64 i64_type (Int64.of_string "4294967295") false in
   ignore (define_global "const_zext_int64" c m);
   insist (i64_type = type_of c);
 
-  (* RUN: grep "const_int_string.*i32.*-1" < %t.ll
+  (* CHECK: const_int_string{{.*}}i32{{.*}}-1
    *)
   group "int string";
   let c = const_int_of_string i32_type "-1" 10 in
   ignore (define_global "const_int_string" c m);
   insist (i32_type = type_of c);
 
-  (* RUN: grep 'const_string.*"cruel\\00world"' < %t.ll
+  (* CHECK: @const_string = global {{.*}}c"cruel\00world"
    *)
   group "string";
   let c = const_string context "cruel\000world" in
   ignore (define_global "const_string" c m);
   insist ((array_type i8_type 11) = type_of c);
 
-  (* RUN: grep 'const_stringz.*"hi\\00again\\00"' < %t.ll
+  (* CHECK: const_stringz{{.*}}"hi\00again\00"
    *)
   group "stringz";
   let c = const_stringz context "hi\000again" in
   ignore (define_global "const_stringz" c m);
   insist ((array_type i8_type 9) = type_of c);
 
-  (* RUN: grep "const_single.*2.75" < %t.ll
-   * RUN: grep "const_double.*3.1459" < %t.ll
-   * RUN: grep "const_double_string.*1.25" < %t.ll
+  (* CHECK: const_single{{.*}}2.75
+   * CHECK: const_double{{.*}}3.1459
+   * CHECK: const_double_string{{.*}}1.25
    *)
   begin group "real";
     let cs = const_float float_type 2.75 in
@@ -150,14 +152,14 @@ let test_constants () =
   let three = const_int i32_type 3 in
   let four = const_int i32_type 4 in
   
-  (* RUN: grep "const_array.*[i32 3, i32 4]" < %t.ll
+  (* CHECK: const_array{{.*}}[i32 3, i32 4]
    *)
   group "array";
   let c = const_array i32_type [| three; four |] in
   ignore (define_global "const_array" c m);
   insist ((array_type i32_type 2) = (type_of c));
   
-  (* RUN: grep "const_vector.*<i16 1, i16 2.*>" < %t.ll
+  (* CHECK: const_vector{{.*}}<i16 1, i16 2{{.*}}>
    *)
   group "vector";
   let c = const_vector [| one; two; one; two;
@@ -165,7 +167,7 @@ let test_constants () =
   ignore (define_global "const_vector" c m);
   insist ((vector_type i16_type 8) = (type_of c));
 
-  (* RUN: grep "const_structure.*.i16 1, i16 2, i32 3, i32 4" < %t.ll
+  (* CHECK: const_structure{{.*.}}i16 1, i16 2, i32 3, i32 4
    *)
   group "structure";
   let c = const_struct context [| one; two; three; four |] in
@@ -173,27 +175,27 @@ let test_constants () =
   insist ((struct_type context [| i16_type; i16_type; i32_type; i32_type |])
         = (type_of c));
 
-  (* RUN: grep "const_null.*zeroinit" < %t.ll
+  (* CHECK: const_null{{.*}}zeroinit
    *)
   group "null";
   let c = const_null (packed_struct_type context [| i1_type; i8_type; i64_type;
                                                     double_type |]) in
   ignore (define_global "const_null" c m);
   
-  (* RUN: grep "const_all_ones.*-1" < %t.ll
+  (* CHECK: const_all_ones{{.*}}-1
    *)
   group "all ones";
   let c = const_all_ones i64_type in
   ignore (define_global "const_all_ones" c m);
 
   group "pointer null"; begin
-    (* RUN: grep "const_pointer_null = global i64\* null" < %t.ll
+    (* CHECK: const_pointer_null = global i64* null
      *)
     let c = const_pointer_null (pointer_type i64_type) in
     ignore (define_global "const_pointer_null" c m);
   end;
   
-  (* RUN: grep "const_undef.*undef" < %t.ll
+  (* CHECK: const_undef{{.*}}undef
    *)
   group "undef";
   let c = undef i1_type in
@@ -202,35 +204,35 @@ let test_constants () =
   insist (is_undef c);
   
   group "constant arithmetic";
-  (* RUN: grep "@const_neg = global i64 sub" < %t.ll
-   * RUN: grep "@const_nsw_neg = global i64 sub nsw " < %t.ll
-   * RUN: grep "@const_nuw_neg = global i64 sub nuw " < %t.ll
-   * RUN: grep "@const_fneg = global double fsub " < %t.ll
-   * RUN: grep "@const_not = global i64 xor " < %t.ll
-   * RUN: grep "@const_add = global i64 add " < %t.ll
-   * RUN: grep "@const_nsw_add = global i64 add nsw " < %t.ll
-   * RUN: grep "@const_nuw_add = global i64 add nuw " < %t.ll
-   * RUN: grep "@const_fadd = global double fadd " < %t.ll
-   * RUN: grep "@const_sub = global i64 sub " < %t.ll
-   * RUN: grep "@const_nsw_sub = global i64 sub nsw " < %t.ll
-   * RUN: grep "@const_nuw_sub = global i64 sub nuw " < %t.ll
-   * RUN: grep "@const_fsub = global double fsub " < %t.ll
-   * RUN: grep "@const_mul = global i64 mul " < %t.ll
-   * RUN: grep "@const_nsw_mul = global i64 mul nsw " < %t.ll
-   * RUN: grep "@const_nuw_mul = global i64 mul nuw " < %t.ll
-   * RUN: grep "@const_fmul = global double fmul " < %t.ll
-   * RUN: grep "@const_udiv = global i64 udiv " < %t.ll
-   * RUN: grep "@const_sdiv = global i64 sdiv " < %t.ll
-   * RUN: grep "@const_exact_sdiv = global i64 sdiv exact " < %t.ll
-   * RUN: grep "@const_fdiv = global double fdiv " < %t.ll
-   * RUN: grep "@const_urem = global i64 urem " < %t.ll
-   * RUN: grep "@const_srem = global i64 srem " < %t.ll
-   * RUN: grep "@const_frem = global double frem " < %t.ll
-   * RUN: grep "@const_and = global i64 and " < %t.ll
-   * RUN: grep "@const_or = global i64 or " < %t.ll
-   * RUN: grep "@const_xor = global i64 xor " < %t.ll
-   * RUN: grep "@const_icmp = global i1 icmp sle " < %t.ll
-   * RUN: grep "@const_fcmp = global i1 fcmp ole " < %t.ll
+  (* CHECK: @const_neg = global i64 sub
+   * CHECK: @const_nsw_neg = global i64 sub nsw
+   * CHECK: @const_nuw_neg = global i64 sub nuw
+   * CHECK: @const_fneg = global double fsub
+   * CHECK: @const_not = global i64 xor
+   * CHECK: @const_add = global i64 add
+   * CHECK: @const_nsw_add = global i64 add nsw
+   * CHECK: @const_nuw_add = global i64 add nuw
+   * CHECK: @const_fadd = global double fadd
+   * CHECK: @const_sub = global i64 sub
+   * CHECK: @const_nsw_sub = global i64 sub nsw
+   * CHECK: @const_nuw_sub = global i64 sub nuw
+   * CHECK: @const_fsub = global double fsub
+   * CHECK: @const_mul = global i64 mul
+   * CHECK: @const_nsw_mul = global i64 mul nsw
+   * CHECK: @const_nuw_mul = global i64 mul nuw
+   * CHECK: @const_fmul = global double fmul
+   * CHECK: @const_udiv = global i64 udiv
+   * CHECK: @const_sdiv = global i64 sdiv
+   * CHECK: @const_exact_sdiv = global i64 sdiv exact
+   * CHECK: @const_fdiv = global double fdiv
+   * CHECK: @const_urem = global i64 urem
+   * CHECK: @const_srem = global i64 srem
+   * CHECK: @const_frem = global double frem
+   * CHECK: @const_and = global i64 and
+   * CHECK: @const_or = global i64 or
+   * CHECK: @const_xor = global i64 xor
+   * CHECK: @const_icmp = global i1 icmp sle
+   * CHECK: @const_fcmp = global i1 fcmp ole
    *)
   let void_ptr = pointer_type i8_type in
   let five = const_int i64_type 5 in
@@ -269,18 +271,18 @@ let test_constants () =
   ignore (define_global "const_fcmp" (const_fcmp Fcmp.Ole ffoldbomb ffive) m);
   
   group "constant casts";
-  (* RUN: grep "const_trunc.*trunc" < %t.ll
-   * RUN: grep "const_sext.*sext" < %t.ll
-   * RUN: grep "const_zext.*zext" < %t.ll
-   * RUN: grep "const_fptrunc.*fptrunc" < %t.ll
-   * RUN: grep "const_fpext.*fpext" < %t.ll
-   * RUN: grep "const_uitofp.*uitofp" < %t.ll
-   * RUN: grep "const_sitofp.*sitofp" < %t.ll
-   * RUN: grep "const_fptoui.*fptoui" < %t.ll
-   * RUN: grep "const_fptosi.*fptosi" < %t.ll
-   * RUN: grep "const_ptrtoint.*ptrtoint" < %t.ll
-   * RUN: grep "const_inttoptr.*inttoptr" < %t.ll
-   * RUN: grep "const_bitcast.*bitcast" < %t.ll
+  (* CHECK: const_trunc{{.*}}trunc
+   * CHECK: const_sext{{.*}}sext
+   * CHECK: const_zext{{.*}}zext
+   * CHECK: const_fptrunc{{.*}}fptrunc
+   * CHECK: const_fpext{{.*}}fpext
+   * CHECK: const_uitofp{{.*}}uitofp
+   * CHECK: const_sitofp{{.*}}sitofp
+   * CHECK: const_fptoui{{.*}}fptoui
+   * CHECK: const_fptosi{{.*}}fptosi
+   * CHECK: const_ptrtoint{{.*}}ptrtoint
+   * CHECK: const_inttoptr{{.*}}inttoptr
+   * CHECK: const_bitcast{{.*}}bitcast
    *)
   let i128_type = integer_type context 128 in
   ignore (define_global "const_trunc" (const_trunc (const_add foldbomb five)
@@ -302,12 +304,12 @@ let test_constants () =
   ignore (define_global "const_bitcast" (const_bitcast ffoldbomb i64_type) m);
   
   group "misc constants";
-  (* RUN: grep "const_size_of.*getelementptr.*null" < %t.ll
-   * RUN: grep "const_gep.*getelementptr" < %t.ll
-   * RUN: grep "const_select.*select" < %t.ll
-   * RUN: grep "const_extractelement.*extractelement" < %t.ll
-   * RUN: grep "const_insertelement.*insertelement" < %t.ll
-   * RUN: grep "const_shufflevector = global <4 x i32> <i32 0, i32 1, i32 1, i32 0>" < %t.ll
+  (* CHECK: const_size_of{{.*}}getelementptr{{.*}}null
+   * CHECK: const_gep{{.*}}getelementptr
+   * CHECK: const_select{{.*}}select
+   * CHECK: const_extractelement{{.*}}extractelement
+   * CHECK: const_insertelement{{.*}}insertelement
+   * CHECK: const_shufflevector = global <4 x i32> <i32 0, i32 1, i32 1, i32 0>
    *)
   ignore (define_global "const_size_of" (size_of (pointer_type i8_type)) m);
   ignore (define_global "const_gep" (const_gep foldbomb_gv [| five |]) m);
@@ -356,7 +358,7 @@ let test_global_values () =
   let (++) x f = f x; x in
   let zero32 = const_null i32_type in
 
-  (* RUN: grep "GVal01" < %t.ll
+  (* CHECK: GVal01
    *)
   group "naming";
   let g = define_global "TEMPORARY" zero32 m in
@@ -364,28 +366,28 @@ let test_global_values () =
   set_value_name "GVal01" g;
   insist ("GVal01" = value_name g);
 
-  (* RUN: grep "GVal02.*linkonce" < %t.ll
+  (* CHECK: GVal02{{.*}}linkonce
    *)
   group "linkage";
   let g = define_global "GVal02" zero32 m ++
           set_linkage Linkage.Link_once in
   insist (Linkage.Link_once = linkage g);
 
-  (* RUN: grep "GVal03.*Hanalei" < %t.ll
+  (* CHECK: GVal03{{.*}}Hanalei
    *)
   group "section";
   let g = define_global "GVal03" zero32 m ++
           set_section "Hanalei" in
   insist ("Hanalei" = section g);
   
-  (* RUN: grep "GVal04.*hidden" < %t.ll
+  (* CHECK: GVal04{{.*}}hidden
    *)
   group "visibility";
   let g = define_global "GVal04" zero32 m ++
           set_visibility Visibility.Hidden in
   insist (Visibility.Hidden = visibility g);
   
-  (* RUN: grep "GVal05.*align 128" < %t.ll
+  (* CHECK: GVal05{{.*}}align 128
    *)
   group "alignment";
   let g = define_global "GVal05" zero32 m ++
@@ -400,7 +402,7 @@ let test_global_variables () =
   let fourty_two32 = const_int i32_type 42 in
 
   group "declarations"; begin
-    (* RUN: grep "GVar01.*external" < %t.ll
+    (* CHECK: GVar01{{.*}}external
      *)
     insist (None == lookup_global "GVar01" m);
     let g = declare_global i32_type "GVar01" m in
@@ -422,8 +424,8 @@ let test_global_variables () =
   end;
   
   group "definitions"; begin
-    (* RUN: grep "GVar02.*42" < %t.ll
-     * RUN: grep "GVar03.*42" < %t.ll
+    (* CHECK: GVar02{{.*}}42
+     * CHECK: GVar03{{.*}}42
      *)
     let g = define_global "GVar02" fourty_two32 m in
     let g2 = declare_global i32_type "GVar03" m ++
@@ -440,20 +442,20 @@ let test_global_variables () =
     insist ((global_initializer g) == (global_initializer g2));
   end;
 
-  (* RUN: grep "GVar04.*thread_local" < %t.ll
+  (* CHECK: GVar04{{.*}}thread_local
    *)
   group "threadlocal";
   let g = define_global "GVar04" fourty_two32 m ++
           set_thread_local true in
   insist (is_thread_local g);
 
-  (* RUN: grep -v "GVar05" < %t.ll
+  (* CHECK-NOWHERE-NOT: GVar05
    *)
   group "delete";
   let g = define_global "GVar05" fourty_two32 m in
   delete_global g;
 
-  (* RUN: grep -v "ConstGlobalVar.*constant" < %t.ll
+  (* CHECK: ConstGlobalVar{{.*}}constant
    *)
   group "constant";
   let g = define_global "ConstGlobalVar" fourty_two32 m in
@@ -487,6 +489,10 @@ let test_global_variables () =
     dispose_module m
   end
 
+(* String globals built below are emitted here.
+ * CHECK: build_global_string{{.*}}stringval
+ *)
+
 
 (*===-- Uses --------------------------------------------------------------===*)
 
@@ -542,7 +548,7 @@ let test_users () =
 (*===-- Aliases -----------------------------------------------------------===*)
 
 let test_aliases () =
-  (* RUN: grep "@alias = alias i32\* @aliasee" < %t.ll
+  (* CHECK: @alias = alias i32* @aliasee
    *)
   let v = declare_global i32_type "aliasee" m in
   ignore (add_alias m (pointer_type i32_type) v "alias")
@@ -554,7 +560,7 @@ let test_functions () =
   let ty = function_type i32_type [| i32_type; i64_type |] in
   let ty2 = function_type i8_type [| i8_type; i64_type |] in
   
-  (* RUN: grep 'declare i32 @Fn1(i32, i64)' < %t.ll
+  (* CHECK: declare i32 @Fn1(i32, i64)
    *)
   begin group "declare";
     insist (None = lookup_function "Fn1" m);
@@ -570,13 +576,13 @@ let test_functions () =
     insist (m == global_parent fn)
   end;
   
-  (* RUN: grep -v "Fn2" < %t.ll
+  (* CHECK-NOWHERE-NOT: Fn2
    *)
   group "delete";
   let fn = declare_function "Fn2" ty m in
   delete_function fn;
   
-  (* RUN: grep "define.*Fn3" < %t.ll
+  (* CHECK: define{{.*}}Fn3
    *)
   group "define";
   let fn = define_function "Fn3" ty m in
@@ -584,7 +590,7 @@ let test_functions () =
   insist (1 = Array.length (basic_blocks fn));
   ignore (build_unreachable (builder_at_end context (entry_block fn)));
   
-  (* RUN: grep "define.*Fn4.*Param1.*Param2" < %t.ll
+  (* CHECK: define{{.*}}Fn4{{.*}}Param1{{.*}}Param2
    *)
   group "params";
   let fn = define_function "Fn4" ty m in
@@ -598,7 +604,7 @@ let test_functions () =
   set_value_name "Param2" params.(1);
   ignore (build_unreachable (builder_at_end context (entry_block fn)));
   
-  (* RUN: grep "fastcc.*Fn5" < %t.ll
+  (* CHECK: fastcc{{.*}}Fn5
    *)
   group "callconv";
   let fn = define_function "Fn5" ty m in
@@ -608,7 +614,7 @@ let test_functions () =
   ignore (build_unreachable (builder_at_end context (entry_block fn)));
   
   begin group "gc";
-    (* RUN: grep "Fn6.*gc.*shadowstack" < %t.ll
+    (* CHECK: Fn6{{.*}}gc{{.*}}shadowstack
      *)
     let fn = define_function "Fn6" ty m in
     insist (None = gc fn);
@@ -694,7 +700,7 @@ let test_params () =
 let test_basic_blocks () =
   let ty = function_type void_type [| |] in
   
-  (* RUN: grep "Bb1" < %t.ll
+  (* CHECK: Bb1
    *)
   group "entry";
   let fn = declare_function "X" ty m in
@@ -702,7 +708,7 @@ let test_basic_blocks () =
   insist (bb = entry_block fn);
   ignore (build_unreachable (builder_at_end context bb));
   
-  (* RUN: grep -v Bb2 < %t.ll
+  (* CHECK-NOWHERE-NOT: Bb2
    *)
   group "delete";
   let fn = declare_function "X2" ty m in
@@ -717,7 +723,7 @@ let test_basic_blocks () =
   ignore (build_unreachable (builder_at_end context bba));
   ignore (build_unreachable (builder_at_end context bbb));
   
-  (* RUN: grep Bb3 < %t.ll
+  (* CHECK: Bb3
    *)
   group "name/value";
   let fn = define_function "X4" ty m in
@@ -825,7 +831,7 @@ let test_builder () =
   
   group "ret void";
   begin
-    (* RUN: grep "ret void" < %t.ll
+    (* CHECK: ret void
      *)
     let fty = function_type void_type [| |] in
     let fn = declare_function "X6" fty m in
@@ -835,7 +841,7 @@ let test_builder () =
 
   group "ret aggregate";
   begin
-      (* RUN: grep "ret { i8, i64 } { i8 4, i64 5 }" < %t.ll
+      (* CHECK: ret { i8, i64 } { i8 4, i64 5 }
        *)
       let sty = struct_type context [| i8_type; i64_type |] in
       let fty = function_type sty [| |] in
@@ -860,12 +866,192 @@ let test_builder () =
   group "function attribute";
   begin
       ignore (add_function_attr fn Attribute.UWTable);
-      (* RUN: grep "X7.*#0" < %t.ll
-       * RUN: grep "attributes #0 = .*uwtable.*" < %t.ll
+      (* CHECK: X7{{.*}}#0
+       * #0 is uwtable, defined at EOF.
        *)
       insist ([Attribute.UWTable] = function_attr fn);
   end;
 
+  group "casts"; begin
+    let void_ptr = pointer_type i8_type in
+
+    (* CHECK-DAG: %build_trunc = trunc i32 %P1 to i8
+     * CHECK-DAG: %build_trunc2 = trunc i32 %P1 to i8
+     * CHECK-DAG: %build_trunc3 = trunc i32 %P1 to i8
+     * CHECK-DAG: %build_zext = zext i8 %build_trunc to i32
+     * CHECK-DAG: %build_zext2 = zext i8 %build_trunc to i32
+     * CHECK-DAG: %build_sext = sext i32 %build_zext to i64
+     * CHECK-DAG: %build_sext2 = sext i32 %build_zext to i64
+     * CHECK-DAG: %build_sext3 = sext i32 %build_zext to i64
+     * CHECK-DAG: %build_uitofp = uitofp i64 %build_sext to float
+     * CHECK-DAG: %build_sitofp = sitofp i32 %build_zext to double
+     * CHECK-DAG: %build_fptoui = fptoui float %build_uitofp to i32
+     * CHECK-DAG: %build_fptosi = fptosi double %build_sitofp to i64
+     * CHECK-DAG: %build_fptrunc = fptrunc double %build_sitofp to float
+     * CHECK-DAG: %build_fptrunc2 = fptrunc double %build_sitofp to float
+     * CHECK-DAG: %build_fpext = fpext float %build_fptrunc to double
+     * CHECK-DAG: %build_fpext2 = fpext float %build_fptrunc to double
+     * CHECK-DAG: %build_inttoptr = inttoptr i32 %P1 to i8*
+     * CHECK-DAG: %build_ptrtoint = ptrtoint i8* %build_inttoptr to i64
+     * CHECK-DAG: %build_ptrtoint2 = ptrtoint i8* %build_inttoptr to i64
+     * CHECK-DAG: %build_bitcast = bitcast i64 %build_ptrtoint to double
+     * CHECK-DAG: %build_bitcast2 = bitcast i64 %build_ptrtoint to double
+     * CHECK-DAG: %build_bitcast3 = bitcast i64 %build_ptrtoint to double
+     * CHECK-DAG: %build_bitcast4 = bitcast i64 %build_ptrtoint to double
+     * CHECK-DAG: %build_pointercast = bitcast i8* %build_inttoptr to i16*
+     *)
+    let inst28 = build_trunc p1 i8_type "build_trunc" atentry in
+    let inst29 = build_zext inst28 i32_type "build_zext" atentry in
+    let inst30 = build_sext inst29 i64_type "build_sext" atentry in
+    let inst31 = build_uitofp inst30 float_type "build_uitofp" atentry in
+    let inst32 = build_sitofp inst29 double_type "build_sitofp" atentry in
+    ignore(build_fptoui inst31 i32_type "build_fptoui" atentry);
+    ignore(build_fptosi inst32 i64_type "build_fptosi" atentry);
+    let inst35 = build_fptrunc inst32 float_type "build_fptrunc" atentry in
+    ignore(build_fpext inst35 double_type "build_fpext" atentry);
+    let inst37 = build_inttoptr p1 void_ptr "build_inttoptr" atentry in
+    let inst38 = build_ptrtoint inst37 i64_type "build_ptrtoint" atentry in
+    ignore(build_bitcast inst38 double_type "build_bitcast" atentry);
+    ignore(build_zext_or_bitcast inst38 double_type "build_bitcast2" atentry);
+    ignore(build_sext_or_bitcast inst38 double_type "build_bitcast3" atentry);
+    ignore(build_trunc_or_bitcast inst38 double_type "build_bitcast4" atentry);
+    ignore(build_pointercast inst37 (pointer_type i16_type) "build_pointercast" atentry);
+
+    ignore(build_zext_or_bitcast inst28 i32_type "build_zext2" atentry);
+    ignore(build_sext_or_bitcast inst29 i64_type "build_sext2" atentry);
+    ignore(build_trunc_or_bitcast p1 i8_type "build_trunc2" atentry);
+    ignore(build_pointercast inst37 i64_type "build_ptrtoint2" atentry);
+    ignore(build_intcast inst29 i64_type "build_sext3" atentry);
+    ignore(build_intcast p1 i8_type "build_trunc3" atentry);
+    ignore(build_fpcast inst35 double_type "build_fpext2" atentry);
+    ignore(build_fpcast inst32 float_type "build_fptrunc2" atentry);
+  end;
+
+  group "comparisons"; begin
+    (* CHECK: %build_icmp_ne = icmp ne i32 %P1, %P2
+     * CHECK: %build_icmp_sle = icmp sle i32 %P2, %P1
+     * CHECK: %build_fcmp_false = fcmp false float %F1, %F2
+     * CHECK: %build_fcmp_true = fcmp true float %F2, %F1
+     * CHECK: %build_is_null{{.*}}= icmp eq{{.*}}%X0,{{.*}}null
+     * CHECK: %build_is_not_null = icmp ne i8* %X1, null
+     * CHECK: %build_ptrdiff
+     *)
+    ignore (build_icmp Icmp.Ne    p1 p2 "build_icmp_ne" atentry);
+    ignore (build_icmp Icmp.Sle   p2 p1 "build_icmp_sle" atentry);
+    ignore (build_fcmp Fcmp.False f1 f2 "build_fcmp_false" atentry);
+    ignore (build_fcmp Fcmp.True  f2 f1 "build_fcmp_true" atentry);
+    let g0 = declare_global (pointer_type i8_type) "g0" m in
+    let g1 = declare_global (pointer_type i8_type) "g1" m in
+    let p0 = build_load g0 "X0" atentry in
+    let p1 = build_load g1 "X1" atentry in
+    ignore (build_is_null p0 "build_is_null" atentry);
+    ignore (build_is_not_null p1 "build_is_not_null" atentry);
+    ignore (build_ptrdiff p1 p0 "build_ptrdiff" atentry);
+  end;
+
+  group "miscellaneous"; begin
+    (* CHECK: %build_call = tail call cc63 i32 @{{.*}}(i32 signext %P2, i32 %P1)
+     * CHECK: %build_select = select i1 %build_icmp, i32 %P1, i32 %P2
+     * CHECK: %build_va_arg = va_arg i8** null, i32
+     * CHECK: %build_extractelement = extractelement <4 x i32> %Vec1, i32 %P2
+     * CHECK: %build_insertelement = insertelement <4 x i32> %Vec1, i32 %P1, i32 %P2
+     * CHECK: %build_shufflevector = shufflevector <4 x i32> %Vec1, <4 x i32> %Vec2, <4 x i32> <i32 1, i32 1, i32 0, i32 0>
+     * CHECK: %build_insertvalue0 = insertvalue{{.*}}%bl, i32 1, 0
+     * CHECK: %build_extractvalue = extractvalue{{.*}}%build_insertvalue1, 1
+     *)
+    let ci = build_call fn [| p2; p1 |] "build_call" atentry in
+    insist (CallConv.c = instruction_call_conv ci);
+    set_instruction_call_conv 63 ci;
+    insist (63 = instruction_call_conv ci);
+    insist (not (is_tail_call ci));
+    set_tail_call true ci;
+    insist (is_tail_call ci);
+    add_instruction_param_attr ci 1 Attribute.Sext;
+    add_instruction_param_attr ci 2 Attribute.Noalias;
+    remove_instruction_param_attr ci 2 Attribute.Noalias;
+
+    let inst46 = build_icmp Icmp.Eq p1 p2 "build_icmp" atentry in
+    ignore (build_select inst46 p1 p2 "build_select" atentry);
+    ignore (build_va_arg
+      (const_null (pointer_type (pointer_type i8_type)))
+      i32_type "build_va_arg" atentry);
+
+    (* Set up some vector vregs. *)
+    let one  = const_int i32_type 1 in
+    let zero = const_int i32_type 0 in
+    let t1 = const_vector [| one; zero; one; zero |] in
+    let t2 = const_vector [| zero; one; zero; one |] in
+    let t3 = const_vector [| one; one; zero; zero |] in
+    let vec1 = build_insertelement t1 p1 p2 "Vec1" atentry in
+    let vec2 = build_insertelement t2 p1 p2 "Vec2" atentry in
+    let sty = struct_type context [| i32_type; i8_type |] in
+
+    ignore (build_extractelement vec1 p2 "build_extractelement" atentry);
+    ignore (build_insertelement vec1 p1 p2 "build_insertelement" atentry);
+    ignore (build_shufflevector vec1 vec2 t3 "build_shufflevector" atentry);
+
+    let p = build_alloca sty "ba" atentry in
+    let agg = build_load p "bl" atentry in
+    let agg0 = build_insertvalue agg (const_int i32_type 1) 0
+                 "build_insertvalue0" atentry in
+    let agg1 = build_insertvalue agg0 (const_int i8_type 2) 1
+                 "build_insertvalue1" atentry in
+    ignore (build_extractvalue agg1 1 "build_extractvalue" atentry)
+  end;
+
+  group "metadata"; begin
+    (* CHECK: %metadata = add i32 %P1, %P2, !test !0
+     * !0 is metadata emitted at EOF.
+     *)
+    let i = build_add p1 p2 "metadata" atentry in
+    insist ((has_metadata i) = false);
+
+    let m1 = const_int i32_type 1 in
+    let m2 = mdstring context "metadata test" in
+    let md = mdnode context [| m1; m2 |] in
+
+    let kind = mdkind_id context "test" in
+    set_metadata i kind md;
+
+    insist ((has_metadata i) = true);
+    insist ((metadata i kind) = Some md);
+
+    clear_metadata i kind;
+
+    insist ((has_metadata i) = false);
+    insist ((metadata i kind) = None);
+
+    set_metadata i kind md
+  end;
+
+  group "dbg"; begin
+    (* CHECK: %dbg = add i32 %P1, %P2, !dbg !1
+     * !1 is metadata emitted at EOF.
+     *)
+    insist ((current_debug_location atentry) = None);
+
+    let m_line = const_int i32_type 2 in
+    let m_col = const_int i32_type 3 in
+    let m_scope = mdnode context [| |] in
+    let m_inlined = mdnode context [| |] in
+    let md = mdnode context [| m_line; m_col; m_scope; m_inlined |] in
+    set_current_debug_location atentry md;
+
+    insist ((current_debug_location atentry) = Some md);
+
+    let i = build_add p1 p2 "dbg" atentry in
+    insist ((has_metadata i) = true);
+
+    clear_current_debug_location atentry
+  end;
+
+  group "ret"; begin
+    (* CHECK: ret{{.*}}P1
+     *)
+    let ret = build_ret p1 atentry in
+    position_before ret atentry
+  end;
+
   (* see test/Feature/exception.ll *)
   let bblpad = append_block context "Bblpad" fn in
   let rt = struct_type context [| pointer_type i8_type; i32_type |] in
@@ -887,23 +1073,16 @@ let test_builder () =
            add_clause lp (const_array ety [| ztipkc; ztid |]);
            ignore (build_resume lp (builder_at_end context bblpad));
       end;
-      (* RUN: grep "landingpad.*personality.*__gxx_personality_v0" < %t.ll
-       * RUN: grep "cleanup" < %t.ll
-       * RUN: grep "catch.*i8\*\*.*@_ZTIc" < %t.ll
-       * RUN: grep "filter.*@_ZTIPKc.*@_ZTId" < %t.ll
-       * RUN: grep "resume " < %t.ll
+      (* CHECK: landingpad{{.*}}personality{{.*}}__gxx_personality_v0
+       * CHECK: cleanup
+       * CHECK: catch{{.*}}i8**{{.*}}@_ZTIc
+       * CHECK: filter{{.*}}@_ZTIPKc{{.*}}@_ZTId
+       * CHECK: resume
        * *)
   end;
 
-  group "ret"; begin
-    (* RUN: grep "ret.*P1" < %t.ll
-     *)
-    let ret = build_ret p1 atentry in
-    position_before ret atentry
-  end;
-  
   group "br"; begin
-    (* RUN: grep "br.*Bb02" < %t.ll
+    (* CHECK: br{{.*}}Bb02
      *)
     let bb02 = append_block context "Bb02" fn in
     let b = builder_at_end context bb02 in
@@ -911,7 +1090,7 @@ let test_builder () =
   end;
   
   group "cond_br"; begin
-    (* RUN: grep "br.*build_br.*Bb03.*Bb00" < %t.ll
+    (* CHECK: br{{.*}}build_br{{.*}}Bb03{{.*}}Bb00
      *)
     let bb03 = append_block context "Bb03" fn in
     let b = builder_at_end context bb03 in
@@ -920,8 +1099,8 @@ let test_builder () =
   end;
   
   group "switch"; begin
-    (* RUN: grep "switch.*P1.*SwiBlock3" < %t.ll
-     * RUN: grep "2,.*SwiBlock2" < %t.ll
+    (* CHECK: switch{{.*}}P1{{.*}}SwiBlock3
+     * CHECK: 2,{{.*}}SwiBlock2
      *)
     let bb1 = append_block context "SwiBlock1" fn in
     let bb2 = append_block context "SwiBlock2" fn in
@@ -935,9 +1114,9 @@ let test_builder () =
   end;
 
   group "malloc/free"; begin
-      (* RUN: grep "call.*@malloc(i32 ptrtoint" < %t.ll
-       * RUN: grep "call.*@free(i8\*" < %t.ll
-       * RUN: grep "call.*@malloc(i32 %" < %t.ll
+      (* CHECK: call{{.*}}@malloc(i32 ptrtoint
+       * CHECK: call{{.*}}@free(i8*
+       * CHECK: call{{.*}}@malloc(i32 %
        *)
       let bb1 = append_block context "MallocBlock1" fn in
       let m1 = (build_malloc (pointer_type i32_type) "m1"
@@ -948,7 +1127,7 @@ let test_builder () =
   end;
 
   group "indirectbr"; begin
-    (* RUN: grep "indirectbr i8\* blockaddress(@X7, %IBRBlock2), \[label %IBRBlock2, label %IBRBlock3\]" < %t.ll
+    (* CHECK: indirectbr i8* blockaddress(@X7, %IBRBlock2), [label %IBRBlock2, label %IBRBlock3]
      *)
     let bb1 = append_block context "IBRBlock1" fn in
 
@@ -965,8 +1144,8 @@ let test_builder () =
   end;
   
   group "invoke"; begin
-    (* RUN: grep "build_invoke.*invoke.*P1.*P2" < %t.ll
-     * RUN: grep "to.*Bb04.*unwind.*Bblpad" < %t.ll
+    (* CHECK: build_invoke{{.*}}invoke{{.*}}P1{{.*}}P2
+     * CHECK: to{{.*}}Bb04{{.*}}unwind{{.*}}Bblpad
      *)
     let bb04 = append_block context "Bb04" fn in
     let b = builder_at_end context bb04 in
@@ -974,7 +1153,7 @@ let test_builder () =
   end;
   
   group "unreachable"; begin
-    (* RUN: grep "unreachable" < %t.ll
+    (* CHECK: unreachable
      *)
     let bb06 = append_block context "Bb06" fn in
     let b = builder_at_end context bb06 in
@@ -985,36 +1164,36 @@ let test_builder () =
     let bb07 = append_block context "Bb07" fn in
     let b = builder_at_end context bb07 in
     
-    (* RUN: grep "%build_add = add i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_nsw_add = add nsw i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_nuw_add = add nuw i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_fadd = fadd float %F1, %F2" < %t.ll
-     * RUN: grep "%build_sub = sub i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_nsw_sub = sub nsw i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_nuw_sub = sub nuw i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_fsub = fsub float %F1, %F2" < %t.ll
-     * RUN: grep "%build_mul = mul i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_nsw_mul = mul nsw i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_nuw_mul = mul nuw i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_fmul = fmul float %F1, %F2" < %t.ll
-     * RUN: grep "%build_udiv = udiv i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_sdiv = sdiv i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_exact_sdiv = sdiv exact i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_fdiv = fdiv float %F1, %F2" < %t.ll
-     * RUN: grep "%build_urem = urem i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_srem = srem i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_frem = frem float %F1, %F2" < %t.ll
-     * RUN: grep "%build_shl = shl i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_lshl = lshr i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_ashl = ashr i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_and = and i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_or = or i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_xor = xor i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_neg = sub i32 0, %P1" < %t.ll
-     * RUN: grep "%build_nsw_neg = sub nsw i32 0, %P1" < %t.ll
-     * RUN: grep "%build_nuw_neg = sub nuw i32 0, %P1" < %t.ll
-     * RUN: grep "%build_fneg = fsub float .*0.*, %F1" < %t.ll
-     * RUN: grep "%build_not = xor i32 %P1, -1" < %t.ll
+    (* CHECK: %build_add = add i32 %P1, %P2
+     * CHECK: %build_nsw_add = add nsw i32 %P1, %P2
+     * CHECK: %build_nuw_add = add nuw i32 %P1, %P2
+     * CHECK: %build_fadd = fadd float %F1, %F2
+     * CHECK: %build_sub = sub i32 %P1, %P2
+     * CHECK: %build_nsw_sub = sub nsw i32 %P1, %P2
+     * CHECK: %build_nuw_sub = sub nuw i32 %P1, %P2
+     * CHECK: %build_fsub = fsub float %F1, %F2
+     * CHECK: %build_mul = mul i32 %P1, %P2
+     * CHECK: %build_nsw_mul = mul nsw i32 %P1, %P2
+     * CHECK: %build_nuw_mul = mul nuw i32 %P1, %P2
+     * CHECK: %build_fmul = fmul float %F1, %F2
+     * CHECK: %build_udiv = udiv i32 %P1, %P2
+     * CHECK: %build_sdiv = sdiv i32 %P1, %P2
+     * CHECK: %build_exact_sdiv = sdiv exact i32 %P1, %P2
+     * CHECK: %build_fdiv = fdiv float %F1, %F2
+     * CHECK: %build_urem = urem i32 %P1, %P2
+     * CHECK: %build_srem = srem i32 %P1, %P2
+     * CHECK: %build_frem = frem float %F1, %F2
+     * CHECK: %build_shl = shl i32 %P1, %P2
+     * CHECK: %build_lshl = lshr i32 %P1, %P2
+     * CHECK: %build_ashl = ashr i32 %P1, %P2
+     * CHECK: %build_and = and i32 %P1, %P2
+     * CHECK: %build_or = or i32 %P1, %P2
+     * CHECK: %build_xor = xor i32 %P1, %P2
+     * CHECK: %build_neg = sub i32 0, %P1
+     * CHECK: %build_nsw_neg = sub nsw i32 0, %P1
+     * CHECK: %build_nuw_neg = sub nuw i32 0, %P1
+     * CHECK: %build_fneg = fsub float {{.*}}0{{.*}}, %F1
+     * CHECK: %build_not = xor i32 %P1, -1
      *)
     ignore (build_add p1 p2 "build_add" b);
     ignore (build_nsw_add p1 p2 "build_nsw_add" b);
@@ -1053,13 +1232,13 @@ let test_builder () =
     let bb08 = append_block context "Bb08" fn in
     let b = builder_at_end context bb08 in
 
-    (* RUN: grep "%build_alloca = alloca i32" < %t.ll
-     * RUN: grep "%build_array_alloca = alloca i32, i32 %P2" < %t.ll
-     * RUN: grep "%build_load = load i32\* %build_array_alloca" < %t.ll
-     * RUN: grep "store i32 %P2, i32\* %build_alloca" < %t.ll
-     * RUN: grep "%build_gep = getelementptr i32\* %build_array_alloca, i32 %P2" < %t.ll
-     * RUN: grep "%build_in_bounds_gep = getelementptr inbounds i32\* %build_array_alloca, i32 %P2" < %t.ll
-     * RUN: grep "%build_struct_gep = getelementptr inbounds.*%build_alloca2, i32 0, i32 1" < %t.ll
+    (* CHECK: %build_alloca = alloca i32
+     * CHECK: %build_array_alloca = alloca i32, i32 %P2
+     * CHECK: %build_load = load i32* %build_array_alloca
+     * CHECK: store i32 %P2, i32* %build_alloca
+     * CHECK: %build_gep = getelementptr i32* %build_array_alloca, i32 %P2
+     * CHECK: %build_in_bounds_gep = getelementptr inbounds i32* %build_array_alloca, i32 %P2
+     * CHECK: %build_struct_gep = getelementptr inbounds{{.*}}%build_alloca2, i32 0, i32 1
      *)
     let alloca = build_alloca i32_type "build_alloca" b in
     let array_alloca = build_array_alloca i32_type p2 "build_array_alloca" b in
@@ -1079,8 +1258,8 @@ let test_builder () =
     let bb09 = append_block context "Bb09" fn in
     let b = builder_at_end context bb09 in
     let p = build_alloca (pointer_type i8_type) "p" b in
-    (* RUN: grep "build_global_string.*stringval" < %t.ll
-     * RUN: grep "store.*build_global_string1.*p" < %t.ll
+    (* build_global_string is emitted above.
+     * CHECK: store{{.*}}build_global_string1{{.*}}p
      * *)
     ignore (build_global_string "stringval" "build_global_string" b);
     let g = build_global_stringptr "stringval" "build_global_string1" b in
@@ -1088,181 +1267,8 @@ let test_builder () =
     ignore(build_unreachable b);
   end;
 
-  group "casts"; begin
-    let void_ptr = pointer_type i8_type in
-    
-    (* RUN: grep "%build_trunc = trunc i32 %P1 to i8" < %t.ll
-     * RUN: grep "%build_trunc2 = trunc i32 %P1 to i8" < %t.ll
-     * RUN: grep "%build_trunc3 = trunc i32 %P1 to i8" < %t.ll
-     * RUN: grep "%build_zext = zext i8 %build_trunc to i32" < %t.ll
-     * RUN: grep "%build_zext2 = zext i8 %build_trunc to i32" < %t.ll
-     * RUN: grep "%build_sext = sext i32 %build_zext to i64" < %t.ll
-     * RUN: grep "%build_sext2 = sext i32 %build_zext to i64" < %t.ll
-     * RUN: grep "%build_sext3 = sext i32 %build_zext to i64" < %t.ll
-     * RUN: grep "%build_uitofp = uitofp i64 %build_sext to float" < %t.ll
-     * RUN: grep "%build_sitofp = sitofp i32 %build_zext to double" < %t.ll
-     * RUN: grep "%build_fptoui = fptoui float %build_uitofp to i32" < %t.ll
-     * RUN: grep "%build_fptosi = fptosi double %build_sitofp to i64" < %t.ll
-     * RUN: grep "%build_fptrunc = fptrunc double %build_sitofp to float" < %t.ll
-     * RUN: grep "%build_fptrunc2 = fptrunc double %build_sitofp to float" < %t.ll
-     * RUN: grep "%build_fpext = fpext float %build_fptrunc to double" < %t.ll
-     * RUN: grep "%build_fpext2 = fpext float %build_fptrunc to double" < %t.ll
-     * RUN: grep "%build_inttoptr = inttoptr i32 %P1 to i8\*" < %t.ll
-     * RUN: grep "%build_ptrtoint = ptrtoint i8\* %build_inttoptr to i64" < %t.ll
-     * RUN: grep "%build_ptrtoint2 = ptrtoint i8\* %build_inttoptr to i64" < %t.ll
-     * RUN: grep "%build_bitcast = bitcast i64 %build_ptrtoint to double" < %t.ll
-     * RUN: grep "%build_bitcast2 = bitcast i64 %build_ptrtoint to double" < %t.ll
-     * RUN: grep "%build_bitcast3 = bitcast i64 %build_ptrtoint to double" < %t.ll
-     * RUN: grep "%build_bitcast4 = bitcast i64 %build_ptrtoint to double" < %t.ll
-     * RUN: grep "%build_pointercast = bitcast i8\* %build_inttoptr to i16*" < %t.ll
-     *)
-    let inst28 = build_trunc p1 i8_type "build_trunc" atentry in
-    let inst29 = build_zext inst28 i32_type "build_zext" atentry in
-    let inst30 = build_sext inst29 i64_type "build_sext" atentry in
-    let inst31 = build_uitofp inst30 float_type "build_uitofp" atentry in
-    let inst32 = build_sitofp inst29 double_type "build_sitofp" atentry in
-    ignore(build_fptoui inst31 i32_type "build_fptoui" atentry);
-    ignore(build_fptosi inst32 i64_type "build_fptosi" atentry);
-    let inst35 = build_fptrunc inst32 float_type "build_fptrunc" atentry in
-    ignore(build_fpext inst35 double_type "build_fpext" atentry);
-    let inst37 = build_inttoptr p1 void_ptr "build_inttoptr" atentry in
-    let inst38 = build_ptrtoint inst37 i64_type "build_ptrtoint" atentry in
-    ignore(build_bitcast inst38 double_type "build_bitcast" atentry);
-    ignore(build_zext_or_bitcast inst38 double_type "build_bitcast2" atentry);
-    ignore(build_sext_or_bitcast inst38 double_type "build_bitcast3" atentry);
-    ignore(build_trunc_or_bitcast inst38 double_type "build_bitcast4" atentry);
-    ignore(build_pointercast inst37 (pointer_type i16_type) "build_pointercast" atentry);
-
-    ignore(build_zext_or_bitcast inst28 i32_type "build_zext2" atentry);
-    ignore(build_sext_or_bitcast inst29 i64_type "build_sext2" atentry);
-    ignore(build_trunc_or_bitcast p1 i8_type "build_trunc2" atentry);
-    ignore(build_pointercast inst37 i64_type "build_ptrtoint2" atentry);
-    ignore(build_intcast inst29 i64_type "build_sext3" atentry);
-    ignore(build_intcast p1 i8_type "build_trunc3" atentry);
-    ignore(build_fpcast inst35 double_type "build_fpext2" atentry);
-    ignore(build_fpcast inst32 float_type "build_fptrunc2" atentry);
-  end;
-  
-  group "comparisons"; begin
-    (* RUN: grep "%build_icmp_ne = icmp ne i32 %P1, %P2" < %t.ll
-     * RUN: grep "%build_icmp_sle = icmp sle i32 %P2, %P1" < %t.ll
-     * RUN: grep "%build_fcmp_false = fcmp false float %F1, %F2" < %t.ll
-     * RUN: grep "%build_fcmp_true = fcmp true float %F2, %F1" < %t.ll
-     * RUN: grep "%build_is_null.*= icmp eq.*%X0,.*null" < %t.ll
-     * RUN: grep "%build_is_not_null = icmp ne i8\* %X1, null" < %t.ll
-     * RUN: grep "%build_ptrdiff" < %t.ll
-     *)
-    ignore (build_icmp Icmp.Ne    p1 p2 "build_icmp_ne" atentry);
-    ignore (build_icmp Icmp.Sle   p2 p1 "build_icmp_sle" atentry);
-    ignore (build_fcmp Fcmp.False f1 f2 "build_fcmp_false" atentry);
-    ignore (build_fcmp Fcmp.True  f2 f1 "build_fcmp_true" atentry);
-    let g0 = declare_global (pointer_type i8_type) "g0" m in
-    let g1 = declare_global (pointer_type i8_type) "g1" m in
-    let p0 = build_load g0 "X0" atentry in
-    let p1 = build_load g1 "X1" atentry in
-    ignore (build_is_null p0 "build_is_null" atentry);
-    ignore (build_is_not_null p1 "build_is_not_null" atentry);
-    ignore (build_ptrdiff p1 p0 "build_ptrdiff" atentry);
-  end;
-  
-  group "miscellaneous"; begin
-    (* RUN: grep "%build_call = tail call cc63 i32 @.*(i32 signext %P2, i32 %P1)" < %t.ll
-     * RUN: grep "%build_select = select i1 %build_icmp, i32 %P1, i32 %P2" < %t.ll
-     * RUN: grep "%build_va_arg = va_arg i8\*\* null, i32" < %t.ll
-     * RUN: grep "%build_extractelement = extractelement <4 x i32> %Vec1, i32 %P2" < %t.ll
-     * RUN: grep "%build_insertelement = insertelement <4 x i32> %Vec1, i32 %P1, i32 %P2" < %t.ll
-     * RUN: grep "%build_shufflevector = shufflevector <4 x i32> %Vec1, <4 x i32> %Vec2, <4 x i32> <i32 1, i32 1, i32 0, i32 0>" < %t.ll
-     * RUN: grep "%build_insertvalue0 = insertvalue.*%bl, i32 1, 0" < %t.ll
-     * RUN: grep "%build_extractvalue = extractvalue.*%build_insertvalue1, 1" < %t.ll
-     *)
-    let ci = build_call fn [| p2; p1 |] "build_call" atentry in
-    insist (CallConv.c = instruction_call_conv ci);
-    set_instruction_call_conv 63 ci;
-    insist (63 = instruction_call_conv ci);
-    insist (not (is_tail_call ci));
-    set_tail_call true ci;
-    insist (is_tail_call ci);
-    add_instruction_param_attr ci 1 Attribute.Sext;
-    add_instruction_param_attr ci 2 Attribute.Noalias;
-    remove_instruction_param_attr ci 2 Attribute.Noalias;
-    
-    let inst46 = build_icmp Icmp.Eq p1 p2 "build_icmp" atentry in
-    ignore (build_select inst46 p1 p2 "build_select" atentry);
-    ignore (build_va_arg
-      (const_null (pointer_type (pointer_type i8_type)))
-      i32_type "build_va_arg" atentry);
-    
-    (* Set up some vector vregs. *)
-    let one  = const_int i32_type 1 in
-    let zero = const_int i32_type 0 in
-    let t1 = const_vector [| one; zero; one; zero |] in
-    let t2 = const_vector [| zero; one; zero; one |] in
-    let t3 = const_vector [| one; one; zero; zero |] in
-    let vec1 = build_insertelement t1 p1 p2 "Vec1" atentry in
-    let vec2 = build_insertelement t2 p1 p2 "Vec2" atentry in
-    let sty = struct_type context [| i32_type; i8_type |] in
-    
-    ignore (build_extractelement vec1 p2 "build_extractelement" atentry);
-    ignore (build_insertelement vec1 p1 p2 "build_insertelement" atentry);
-    ignore (build_shufflevector vec1 vec2 t3 "build_shufflevector" atentry);
-
-    let p = build_alloca sty "ba" atentry in
-    let agg = build_load p "bl" atentry in
-    let agg0 = build_insertvalue agg (const_int i32_type 1) 0
-                 "build_insertvalue0" atentry in
-    let agg1 = build_insertvalue agg0 (const_int i8_type 2) 1
-                 "build_insertvalue1" atentry in
-    ignore (build_extractvalue agg1 1 "build_extractvalue" atentry)
-  end;
-
-  group "metadata"; begin
-    (* RUN: grep '%metadata = add i32 %P1, %P2, !test !0' < %t.ll
-     * RUN: grep '!0 = metadata !{i32 1, metadata !"metadata test"}' < %t.ll
-     *)
-    let i = build_add p1 p2 "metadata" atentry in
-    insist ((has_metadata i) = false);
-
-    let m1 = const_int i32_type 1 in
-    let m2 = mdstring context "metadata test" in
-    let md = mdnode context [| m1; m2 |] in
-
-    let kind = mdkind_id context "test" in
-    set_metadata i kind md;
-
-    insist ((has_metadata i) = true);
-    insist ((metadata i kind) = Some md);
-
-    clear_metadata i kind;
-
-    insist ((has_metadata i) = false);
-    insist ((metadata i kind) = None);
-
-    set_metadata i kind md
-  end;
-
-  group "dbg"; begin
-    (* RUN: grep '%dbg = add i32 %P1, %P2, !dbg !1' < %t.ll
-     * RUN: grep '!1 = metadata !{i32 2, i32 3, metadata !2, metadata !2}' < %t.ll
-     *)
-    insist ((current_debug_location atentry) = None);
-
-    let m_line = const_int i32_type 2 in
-    let m_col = const_int i32_type 3 in
-    let m_scope = mdnode context [| |] in
-    let m_inlined = mdnode context [| |] in
-    let md = mdnode context [| m_line; m_col; m_scope; m_inlined |] in
-    set_current_debug_location atentry md;
-
-    insist ((current_debug_location atentry) = Some md);
-
-    let i = build_add p1 p2 "dbg" atentry in
-    insist ((has_metadata i) = true);
-
-    clear_current_debug_location atentry
-  end;
-  
   group "phi"; begin
-    (* RUN: grep "PhiNode.*P1.*PhiBlock1.*P2.*PhiBlock2" < %t.ll
+    (* CHECK: PhiNode{{.*}}P1{{.*}}PhiBlock1{{.*}}P2{{.*}}PhiBlock2
      *)
     let b1 = append_block context "PhiBlock1" fn in
     let b2 = append_block context "PhiBlock2" fn in
@@ -1281,6 +1287,11 @@ let test_builder () =
     ignore (build_unreachable at_jb);
   end
 
+(* End-of-file checks for things like metdata and attributes.
+ * CHECK: attributes #0 = {{.*}}uwtable{{.*}}
+ * CHECK: !0 = metadata !{i32 1, metadata !"metadata test"}
+ * CHECK: !1 = metadata !{i32 2, i32 3, metadata !2, metadata !2}
+ *)
 
 (*===-- Pass Managers -----------------------------------------------------===*)