Add a distinct semir file separator. (#3438)

This removes the filename from the file-scoped block, and places it
above to make it clear where the full SemIR begins (with multifile,
providing a barrier between).

toolchain/check/testdata/array/array_in_place.carbon

@@ -10,6 +10,8 @@ fn G() {
   var v: [(i32, i32, i32); 2] = (F(), F());
 }
 
+// CHECK:STDOUT: --- array_in_place.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7_25.1: type = tuple_type (type, type, type)
 // CHECK:STDOUT:   %.loc7_25.2: type = tuple_type (i32, i32, i32)
@@ -18,7 +20,7 @@ fn G() {
 // CHECK:STDOUT:   %.loc10_42: type = tuple_type ((i32, i32, i32), (i32, i32, i32))
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "array_in_place.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
 // CHECK:STDOUT: }
@@ -51,3 +53,4 @@ fn G() {
 // CHECK:STDOUT:   assign %v.var, %.loc10_42.9
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/assign_return_value.carbon

@@ -10,13 +10,15 @@ fn Run() {
   var t: [i32; 1] = F();
 }
 
+// CHECK:STDOUT: --- assign_return_value.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7_16.1: type = tuple_type (type)
 // CHECK:STDOUT:   %.loc7_16.2: type = tuple_type (i32)
 // CHECK:STDOUT:   %.loc10: type = ptr_type [i32; 1]
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "assign_return_value.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
 // CHECK:STDOUT: }
@@ -50,3 +52,4 @@ fn Run() {
 // CHECK:STDOUT:   assign %t.var, %.loc10_22.10
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/assign_var.carbon

@@ -7,6 +7,8 @@
 var a: (i32, i32, i32) = (1, 2, 3);
 var b: [i32; 3] = a;
 
+// CHECK:STDOUT: --- assign_var.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7_22.1: type = tuple_type (type, type, type)
 // CHECK:STDOUT:   %.loc7_22.2: type = tuple_type (i32, i32, i32)
@@ -14,7 +16,7 @@ var b: [i32; 3] = a;
 // CHECK:STDOUT:   %.loc8: type = ptr_type [i32; 3]
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "assign_var.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc7_22.1: (type, type, type) = tuple_literal (i32, i32, i32)
 // CHECK:STDOUT:   %.loc7_22.2: type = converted %.loc7_22.1, constants.%.loc7_22.2
 // CHECK:STDOUT:   %a.var: ref (i32, i32, i32) = var a
@@ -56,3 +58,4 @@ var b: [i32; 3] = a;
 // CHECK:STDOUT:   %.loc8_19.17: init [i32; 3] = converted %a.ref, %.loc8_19.16
 // CHECK:STDOUT:   assign %b.var, %.loc8_19.17
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/base.carbon

@@ -8,6 +8,8 @@ var a: [i32; 1] = (1,);
 var b: [f64; 2] = (11.1, 2.2,);
 var c: [(); 5] = ((), (), (), (), (),);
 
+// CHECK:STDOUT: --- base.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7_15: type = ptr_type [i32; 1]
 // CHECK:STDOUT:   %.loc7_22: type = tuple_type (i32)
@@ -18,7 +20,7 @@ var c: [(); 5] = ((), (), (), (), (),);
 // CHECK:STDOUT:   %.loc9_38: type = tuple_type ((), (), (), (), ())
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "base.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc7_14: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc7_15: type = array_type %.loc7_14, i32
 // CHECK:STDOUT:   %a.var: ref [i32; 1] = var a
@@ -83,3 +85,4 @@ var c: [(); 5] = ((), (), (), (), (),);
 // CHECK:STDOUT:   %.loc9_38.13: init [(); 5] = converted %.loc9_38.1, %.loc9_38.12
 // CHECK:STDOUT:   assign %c.var, %.loc9_38.13
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/fail_bound_overflow.carbon

@@ -9,9 +9,12 @@
 // CHECK:STDERR:                                ^
 var a: [1; 39999999999999999993];
 
-// CHECK:STDOUT: file "fail_bound_overflow.carbon" {
+// CHECK:STDOUT: --- fail_bound_overflow.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc10_9: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_12: i32 = int_literal 39999999999999999993
 // CHECK:STDOUT:   %a.var: ref <error> = var a
 // CHECK:STDOUT:   %a: ref <error> = bind_name a, %a.var
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/fail_incomplete_element.carbon

@@ -19,11 +19,13 @@ var a: [Incomplete; 1];
 // CHECK:STDERR:                           ^
 var p: Incomplete* = &a[0];
 
+// CHECK:STDOUT: --- fail_incomplete_element.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc20: type = ptr_type <error>
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_incomplete_element.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Incomplete, ()
 // CHECK:STDOUT:   %Incomplete: type = class_type @Incomplete
 // CHECK:STDOUT:   %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete
@@ -42,3 +44,4 @@ var p: Incomplete* = &a[0];
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: class @Incomplete;
+// CHECK:STDOUT:

toolchain/check/testdata/array/fail_invalid_type.carbon

@@ -9,14 +9,17 @@
 // CHECK:STDERR:             ^
 var a: [1; 1];
 
+// CHECK:STDOUT: --- fail_invalid_type.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = ptr_type [<error>; 1]
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_invalid_type.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc10_9: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_12: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_13: type = array_type %.loc10_12, <error>
 // CHECK:STDOUT:   %a.var: ref [<error>; 1] = var a
 // CHECK:STDOUT:   %a: ref [<error>; 1] = bind_name a, %a.var
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/fail_out_of_bound.carbon

@@ -9,12 +9,14 @@
 // CHECK:STDERR:                           ^
 var a: [i32; 1] = (1, 2, 3);
 
+// CHECK:STDOUT: --- fail_out_of_bound.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_15: type = ptr_type [i32; 1]
 // CHECK:STDOUT:   %.loc10_27: type = tuple_type (i32, i32, i32)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_out_of_bound.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc10_14: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_15: type = array_type %.loc10_14, i32
 // CHECK:STDOUT:   %a.var: ref [i32; 1] = var a
@@ -25,3 +27,4 @@ var a: [i32; 1] = (1, 2, 3);
 // CHECK:STDOUT:   %.loc10_27: (i32, i32, i32) = tuple_literal (%.loc10_20, %.loc10_23, %.loc10_26)
 // CHECK:STDOUT:   assign %a.var, <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/fail_type_mismatch.carbon

@@ -26,6 +26,8 @@ var t2: (i32, i32);
 // CHECK:STDERR:                   ^~
 var d: [i32; 3] = t2;
 
+// CHECK:STDOUT: --- fail_type_mismatch.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_15: type = ptr_type [i32; 3]
 // CHECK:STDOUT:   %.1: type = ptr_type String
@@ -38,7 +40,7 @@ var d: [i32; 3] = t2;
 // CHECK:STDOUT:   %.loc21_24.2: type = ptr_type (i32, i32)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_type_mismatch.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc10_14: i32 = int_literal 3
 // CHECK:STDOUT:   %.loc10_15: type = array_type %.loc10_14, i32
 // CHECK:STDOUT:   %a.var: ref [i32; 3] = var a
@@ -86,3 +88,4 @@ var d: [i32; 3] = t2;
 // CHECK:STDOUT:   %t2.ref: ref (i32, i32) = name_ref t2, %t2
 // CHECK:STDOUT:   assign %d.var, <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/fail_undefined_bound.carbon

@@ -9,5 +9,8 @@
 // CHECK:STDERR:              ^
 var a: [i32; ];
 
-// CHECK:STDOUT: file "fail_undefined_bound.carbon" {
+// CHECK:STDOUT: --- fail_undefined_bound.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/function_param.carbon

@@ -12,12 +12,14 @@ fn G() -> i32 {
   return F((1, 2, 3), 1);
 }
 
+// CHECK:STDOUT: --- function_param.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7: type = ptr_type [i32; 3]
 // CHECK:STDOUT:   %.loc12: type = tuple_type (i32, i32, i32)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "function_param.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
 // CHECK:STDOUT: }
@@ -59,3 +61,4 @@ fn G() -> i32 {
 // CHECK:STDOUT:   %.loc12_25.2: i32 = converted %.loc12_11, %.loc12_25.1
 // CHECK:STDOUT:   return %.loc12_25.2
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/array/nine_elements.carbon

@@ -6,12 +6,14 @@
 
 var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9);
 
+// CHECK:STDOUT: --- nine_elements.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7_15: type = ptr_type [i32; 9]
 // CHECK:STDOUT:   %.loc7_45: type = tuple_type (i32, i32, i32, i32, i32, i32, i32, i32, i32)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "nine_elements.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc7_14: i32 = int_literal 9
 // CHECK:STDOUT:   %.loc7_15: type = array_type %.loc7_14, i32
 // CHECK:STDOUT:   %a.var: ref [i32; 9] = var a
@@ -57,3 +59,4 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9);
 // CHECK:STDOUT:   %.loc7_45.30: init [i32; 9] = converted %.loc7_45.1, %.loc7_45.29
 // CHECK:STDOUT:   assign %a.var, %.loc7_45.30
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/as/as_type.carbon

@@ -6,13 +6,16 @@
 
 let t: type = (i32, i32) as type;
 
+// CHECK:STDOUT: --- as_type.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7_24: type = tuple_type (type, type)
 // CHECK:STDOUT:   %.loc7_26: type = tuple_type (i32, i32)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "as_type.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc7_24: (type, type) = tuple_literal (i32, i32)
 // CHECK:STDOUT:   %.loc7_26: type = converted %.loc7_24, constants.%.loc7_26
 // CHECK:STDOUT:   %t: type = bind_name t, %.loc7_26
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/as/basic.carbon

@@ -8,7 +8,9 @@ fn Main() -> i32 {
   return 1 as i32;
 }
 
-// CHECK:STDOUT: file "basic.carbon" {
+// CHECK:STDOUT: --- basic.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -17,3 +19,4 @@ fn Main() -> i32 {
 // CHECK:STDOUT:   %.loc8: i32 = int_literal 1
 // CHECK:STDOUT:   return %.loc8
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/as/fail_no_conversion.carbon

@@ -9,13 +9,15 @@
 // CHECK:STDERR:                       ^~
 let n: (i32, i32) = 1 as (i32, i32);
 
+// CHECK:STDOUT: --- fail_no_conversion.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_17.1: type = tuple_type (type, type)
 // CHECK:STDOUT:   %.loc10_17.2: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %.loc10_17.3: type = ptr_type (i32, i32)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_no_conversion.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc10_17.1: (type, type) = tuple_literal (i32, i32)
 // CHECK:STDOUT:   %.loc10_17.2: type = converted %.loc10_17.1, constants.%.loc10_17.2
 // CHECK:STDOUT:   %.loc10_21: i32 = int_literal 1
@@ -23,3 +25,4 @@ let n: (i32, i32) = 1 as (i32, i32);
 // CHECK:STDOUT:   %.loc10_17.3: type = converted %.loc10_35, constants.%.loc10_17.2
 // CHECK:STDOUT:   %n: (i32, i32) = bind_name n, <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/as/fail_not_type.carbon

@@ -9,8 +9,11 @@
 // CHECK:STDERR:                   ^
 let n: i32 = 1 as 2;
 
-// CHECK:STDOUT: file "fail_not_type.carbon" {
+// CHECK:STDOUT: --- fail_not_type.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %.loc10_14: i32 = int_literal 1
 // CHECK:STDOUT:   %.loc10_19: i32 = int_literal 2
 // CHECK:STDOUT:   %n: i32 = bind_name n, <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/as/identity.carbon

@@ -24,13 +24,15 @@ fn Initializing() {
   var x: X = (Make() as X);
 }
 
+// CHECK:STDOUT: --- identity.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11_1.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc11_1.2: type = tuple_type ()
 // CHECK:STDOUT:   %.loc9: type = ptr_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "identity.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @X, ()
 // CHECK:STDOUT:   %X: type = class_type @X
 // CHECK:STDOUT:   %Value: <function> = fn_decl @Value
@@ -79,3 +81,4 @@ fn Initializing() {
 // CHECK:STDOUT:   assign %x.var, %.loc24_19
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/as/tuple.carbon

@@ -20,6 +20,8 @@ fn Var() {
   var b: (X, X) = (Make(), Make()) as (X, X);
 }
 
+// CHECK:STDOUT: --- tuple.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc9_1.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc9_1.2: type = tuple_type ()
@@ -30,7 +32,7 @@ fn Var() {
 // CHECK:STDOUT:   %.loc15_15.4: type = ptr_type ({}*, {}*)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "tuple.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @X, ()
 // CHECK:STDOUT:   %X: type = class_type @X
 // CHECK:STDOUT:   %Make: <function> = fn_decl @Make
@@ -96,3 +98,4 @@ fn Var() {
 // CHECK:STDOUT:   assign %b.var, %.loc20_34.5
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/builtin_types.carbon

@@ -9,11 +9,13 @@ var test_f64: f64 = 0.1;
 let test_str: String = "Test";
 var test_type: type = i32;
 
+// CHECK:STDOUT: --- builtin_types.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.1: type = ptr_type String
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "builtin_types.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %test_i32.var: ref i32 = var test_i32
 // CHECK:STDOUT:   %test_i32: ref i32 = bind_name test_i32, %test_i32.var
 // CHECK:STDOUT:   %.loc7: i32 = int_literal 0
@@ -28,3 +30,4 @@ var test_type: type = i32;
 // CHECK:STDOUT:   %test_type: ref type = bind_name test_type, %test_type.var
 // CHECK:STDOUT:   assign %test_type.var, i32
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/empty.carbon

@@ -4,5 +4,8 @@
 //
 // AUTOUPDATE
 
-// CHECK:STDOUT: file "empty.carbon" {
+// CHECK:STDOUT: --- empty.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/empty_decl.carbon

@@ -6,5 +6,8 @@
 
 ;
 
-// CHECK:STDOUT: file "empty_decl.carbon" {
+// CHECK:STDOUT: --- empty_decl.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/fail_bad_run.carbon

@@ -12,15 +12,18 @@
 // CHECK:STDERR:                     ^
 fn Run() -> String {}
 
+// CHECK:STDOUT: --- fail_bad_run.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.1: type = ptr_type String
 // CHECK:STDOUT:   %.loc13: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_bad_run.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @Run() -> %return: String {
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/fail_bad_run_2.carbon

@@ -9,7 +9,9 @@
 // CHECK:STDERR: ^~
 fn Run(n: i32) {}
 
-// CHECK:STDOUT: file "fail_bad_run_2.carbon" {
+// CHECK:STDOUT: --- fail_bad_run_2.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -17,3 +19,4 @@ fn Run(n: i32) {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/fail_name_lookup.carbon

@@ -11,7 +11,9 @@ fn Main() {
   x;
 }
 
-// CHECK:STDOUT: file "fail_name_lookup.carbon" {
+// CHECK:STDOUT: --- fail_name_lookup.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -20,3 +22,4 @@ fn Main() {
 // CHECK:STDOUT:   %x.ref: <error> = name_ref x, <error>
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/fail_non_type_as_type.carbon

@@ -9,9 +9,12 @@
 // CHECK:STDERR:                 ^
 var x: type = 42;
 
-// CHECK:STDOUT: file "fail_non_type_as_type.carbon" {
+// CHECK:STDOUT: --- fail_non_type_as_type.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %x.var: ref type = var x
 // CHECK:STDOUT:   %x: ref type = bind_name x, %x.var
 // CHECK:STDOUT:   %.loc10: i32 = int_literal 42
 // CHECK:STDOUT:   assign %x.var, <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon

@@ -10,7 +10,9 @@ var x: i32;
 // CHECK:STDERR:               ^
 var y: i32 = x.b;
 
-// CHECK:STDOUT: file "fail_qualifier_unsupported.carbon" {
+// CHECK:STDOUT: --- fail_qualifier_unsupported.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %x.var: ref i32 = var x
 // CHECK:STDOUT:   %x: ref i32 = bind_name x, %x.var
 // CHECK:STDOUT:   %y.var: ref i32 = var y
@@ -18,3 +20,4 @@ var y: i32 = x.b;
 // CHECK:STDOUT:   %x.ref: ref i32 = name_ref x, %x
 // CHECK:STDOUT:   assign %y.var, <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/multifile.carbon

@@ -14,7 +14,9 @@ package B api;
 
 fn B() {}
 
-// CHECK:STDOUT: file "a.carbon" {
+// CHECK:STDOUT: --- a.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %A: <function> = fn_decl @A
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -22,7 +24,10 @@ fn B() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
-// CHECK:STDOUT: file "b.carbon" {
+// CHECK:STDOUT:
+// CHECK:STDOUT: --- b.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %B: <function> = fn_decl @B
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -30,3 +35,4 @@ fn B() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon

@@ -39,7 +39,9 @@ fn B() {}
 // CHECK:STDOUT:       0:               inst+0
 // CHECK:STDOUT: ...
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "a.carbon" {
+// CHECK:STDOUT: --- a.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %A: <function> = fn_decl @A
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -47,6 +49,7 @@ fn B() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:
 // CHECK:STDOUT: ---
 // CHECK:STDOUT: filename:        b.carbon
 // CHECK:STDOUT: sem_ir:
@@ -68,7 +71,9 @@ fn B() {}
 // CHECK:STDOUT:       0:               inst+0
 // CHECK:STDOUT: ...
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "b.carbon" {
+// CHECK:STDOUT: --- b.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %B: <function> = fn_decl @B
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -76,3 +81,4 @@ fn B() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/numeric_literals.carbon

@@ -25,6 +25,8 @@ fn F() {
   );
 }
 
+// CHECK:STDOUT: --- numeric_literals.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = ptr_type [i32; 5]
 // CHECK:STDOUT:   %.loc16: type = tuple_type (i32, i32, i32, i32, i32)
@@ -32,7 +34,7 @@ fn F() {
 // CHECK:STDOUT:   %.loc25: type = tuple_type (f64, f64, f64, f64, f64, f64, f64)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "numeric_literals.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -104,3 +106,4 @@ fn F() {
 // CHECK:STDOUT:   assign %floats.var, %.loc25_3.24
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/parens.carbon

@@ -6,7 +6,9 @@
 
 var test_i32: i32 = ((1) + (2));
 
-// CHECK:STDOUT: file "parens.carbon" {
+// CHECK:STDOUT: --- parens.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %test_i32.var: ref i32 = var test_i32
 // CHECK:STDOUT:   %test_i32: ref i32 = bind_name test_i32, %test_i32.var
 // CHECK:STDOUT:   %.loc7_23: i32 = int_literal 1
@@ -14,3 +16,4 @@ var test_i32: i32 = ((1) + (2));
 // CHECK:STDOUT:   %.loc7_26: i32 = add %.loc7_23, %.loc7_29
 // CHECK:STDOUT:   assign %test_i32.var, %.loc7_26
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/raw_and_textual_ir.carbon

@@ -89,13 +89,15 @@ fn Foo(n: i32) -> (i32, f64) {
 // CHECK:STDOUT:       0:               inst+7
 // CHECK:STDOUT: ...
 // CHECK:STDOUT:
+// CHECK:STDOUT: --- raw_and_textual_ir.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11_28.1: type = tuple_type (type, type)
 // CHECK:STDOUT:   %.loc11_28.2: type = tuple_type (i32, f64)
 // CHECK:STDOUT:   %.loc11_28.3: type = ptr_type (i32, f64)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "raw_and_textual_ir.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -114,3 +116,4 @@ fn Foo(n: i32) -> (i32, f64) {
 // CHECK:STDOUT:   %.loc12_21.7: init (i32, f64) = converted %.loc12_21.1, %.loc12_21.6
 // CHECK:STDOUT:   return %.loc12_21.7
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/raw_identifier.carbon

@@ -20,7 +20,9 @@ fn C(r#if: i32) -> i32 {
   return r#if;
 }
 
-// CHECK:STDOUT: file "raw_identifier.carbon" {
+// CHECK:STDOUT: --- raw_identifier.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %A: <function> = fn_decl @A
 // CHECK:STDOUT:   %B: <function> = fn_decl @B
 // CHECK:STDOUT:   %C: <function> = fn_decl @C
@@ -43,3 +45,4 @@ fn C(r#if: i32) -> i32 {
 // CHECK:STDOUT:   %if.ref: i32 = name_ref r#if, %if
 // CHECK:STDOUT:   return %if.ref
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/run.carbon

@@ -6,7 +6,9 @@
 
 fn Run() {}
 
-// CHECK:STDOUT: file "run.carbon" {
+// CHECK:STDOUT: --- run.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Run() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/run_i32.carbon

@@ -6,7 +6,9 @@
 
 fn Run() -> i32 { return 0; }
 
-// CHECK:STDOUT: file "run_i32.carbon" {
+// CHECK:STDOUT: --- run_i32.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -15,3 +17,4 @@ fn Run() -> i32 { return 0; }
 // CHECK:STDOUT:   %.loc7: i32 = int_literal 0
 // CHECK:STDOUT:   return %.loc7
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/basics/textual_ir.carbon

@@ -12,13 +12,15 @@ fn Foo(n: i32) -> (i32, f64) {
   return (n + 2, 3.4);
 }
 
+// CHECK:STDOUT: --- textual_ir.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11_28.1: type = tuple_type (type, type)
 // CHECK:STDOUT:   %.loc11_28.2: type = tuple_type (i32, f64)
 // CHECK:STDOUT:   %.loc11_28.3: type = ptr_type (i32, f64)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "textual_ir.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -37,3 +39,4 @@ fn Foo(n: i32) -> (i32, f64) {
 // CHECK:STDOUT:   %.loc12_21.7: init (i32, f64) = converted %.loc12_21.1, %.loc12_21.6
 // CHECK:STDOUT:   return %.loc12_21.7
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/basic.carbon

@@ -22,11 +22,13 @@ fn Run() -> i32 {
   return Class.F(4);
 }
 
+// CHECK:STDOUT: --- basic.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc15: type = struct_type {.k: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "basic.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
@@ -68,3 +70,4 @@ fn Run() -> i32 {
 // CHECK:STDOUT:   %.loc22_20.2: i32 = converted %.loc22_17, %.loc22_20.1
 // CHECK:STDOUT:   return %.loc22_20.2
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_abstract.carbon

@@ -15,12 +15,14 @@ fn Make() -> Class {
   return {.k = 1};
 }
 
+// CHECK:STDOUT: --- fail_abstract.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc9: type = struct_type {.k: i32}
 // CHECK:STDOUT:   %.loc7: type = ptr_type {.k: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_abstract.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %Make: <function> = fn_decl @Make
@@ -41,3 +43,4 @@ fn Make() -> Class {
 // CHECK:STDOUT:   %.loc15_17: {.k: i32} = struct_literal (%.loc15_16)
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_addr_not_self.carbon

@@ -16,11 +16,13 @@ class Class {
   fn G(addr b: Class*);
 }
 
+// CHECK:STDOUT: --- fail_addr_not_self.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc17: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_addr_not_self.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT: }
@@ -37,3 +39,4 @@ class Class {
 // CHECK:STDOUT: fn @F[%a: Class*]();
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @G(%b: Class*);
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_addr_self.carbon

@@ -38,13 +38,15 @@ fn F(c: Class, p: Class*) {
   (*p).G();
 }
 
+// CHECK:STDOUT: --- fail_addr_self.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc10_1.2: type = tuple_type ()
 // CHECK:STDOUT:   %.loc7: type = ptr_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_addr_self.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F.2
@@ -83,3 +85,4 @@ fn F(c: Class, p: Class*) {
 // CHECK:STDOUT:   %.loc38_9: init () = call %.loc38_7(<invalid>)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_incomplete.carbon

@@ -115,12 +115,14 @@ fn CallReturnIncomplete() {
   ReturnIncomplete();
 }
 
+// CHECK:STDOUT: --- fail_incomplete.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc41: type = struct_type {}
 // CHECK:STDOUT:   %.loc100: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_incomplete.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %.loc15: <function> = fn_decl @.1
@@ -203,3 +205,4 @@ fn CallReturnIncomplete() {
 // CHECK:STDOUT:   %.loc115: init <error> = call %ReturnIncomplete.ref()
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_init.carbon

@@ -24,6 +24,8 @@ fn F() {
   {.a = 1, .b = 2, .c = 3} as Class;
 }
 
+// CHECK:STDOUT: --- fail_init.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %.loc16: type = struct_type {.a: i32}
@@ -32,7 +34,7 @@ fn F() {
 // CHECK:STDOUT:   %.loc24: type = struct_type {.a: i32, .b: i32, .c: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_init.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -78,3 +80,4 @@ fn F() {
 // CHECK:STDOUT:   %.loc24_26.4: ref Class = converted %.loc24_26.1, %.loc24_26.3
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_init_as_inplace.carbon

@@ -22,13 +22,15 @@ fn F() {
   G(&c);
 }
 
+// CHECK:STDOUT: --- fail_init_as_inplace.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %.loc10_1.2: type = ptr_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %.loc22: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_init_as_inplace.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
@@ -75,3 +77,4 @@ fn F() {
 // CHECK:STDOUT:   %.loc22_4: init () = call %G.ref(%.loc22_5)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_memaccess_category.carbon

@@ -33,6 +33,8 @@ fn F(s: {.a: A}, b: B) {
   b.a.F();
 }
 
+// CHECK:STDOUT: --- fail_memaccess_category.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc9_1.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc9_1.2: type = tuple_type ()
@@ -42,7 +44,7 @@ fn F(s: {.a: A}, b: B) {
 // CHECK:STDOUT:   %.loc11: type = ptr_type {.a: A}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_memaccess_category.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @A, ()
 // CHECK:STDOUT:   %A: type = class_type @A
 // CHECK:STDOUT:   class_decl @B, ()
@@ -82,3 +84,4 @@ fn F(s: {.a: A}, b: B) {
 // CHECK:STDOUT:   %.loc33_8: init () = call %.loc33_6(<invalid>)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_member_of_let.carbon

@@ -21,11 +21,13 @@ let T: type = Class;
 // CHECK:STDERR:    ^
 fn T.F() {}
 
+// CHECK:STDOUT: --- fail_member_of_let.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc9: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_member_of_let.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %Class.ref: type = name_ref Class, %Class
@@ -46,3 +48,4 @@ fn T.F() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_method.carbon

@@ -30,13 +30,15 @@ fn F(c: Class) {
   Class.WithSelf(c);
 }
 
+// CHECK:STDOUT: --- fail_method.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc10_1.2: type = tuple_type ()
 // CHECK:STDOUT:   %.loc7: type = ptr_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_method.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -75,3 +77,4 @@ fn F(c: Class) {
 // CHECK:STDOUT:   %.loc30: init () = call %WithSelf.ref.loc30(<invalid>)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_redeclaration_introducer.carbon

@@ -74,11 +74,13 @@ abstract class G;
 // CHECK:STDERR: ^~~~~
 base class G;
 
+// CHECK:STDOUT: --- fail_redeclaration_introducer.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc14: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_redeclaration_introducer.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @A, ()
 // CHECK:STDOUT:   %A: type = class_type @A
 // CHECK:STDOUT:   class_decl @A, ()
@@ -137,3 +139,4 @@ base class G;
 // CHECK:STDOUT:
 // CHECK:STDOUT: !members:
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_redeclaration_scope.carbon

@@ -21,11 +21,13 @@ class Y {
   class A.B {}
 }
 
+// CHECK:STDOUT: --- fail_redeclaration_scope.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_redeclaration_scope.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @A.1, ()
 // CHECK:STDOUT:   %A: type = class_type @A.1
 // CHECK:STDOUT:   class_decl @X, ()
@@ -78,3 +80,4 @@ class Y {
 // CHECK:STDOUT:
 // CHECK:STDOUT: !members:
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_redefinition.carbon

@@ -24,11 +24,13 @@ fn Class.F() {}
 fn Class.G() {}
 fn Class.H() {}
 
+// CHECK:STDOUT: --- fail_redefinition.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_redefinition.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   class_decl @Class, ()
@@ -61,3 +63,4 @@ fn Class.H() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_reorder.carbon

@@ -25,11 +25,13 @@ class Class {
   }
 }
 
+// CHECK:STDOUT: --- fail_reorder.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc26: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_reorder.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT: }
@@ -55,3 +57,4 @@ class Class {
 // CHECK:STDOUT:   %.loc24: i32 = int_literal 1
 // CHECK:STDOUT:   return %.loc24
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_scope.carbon

@@ -17,11 +17,13 @@ fn G() -> i32 {
   return F();
 }
 
+// CHECK:STDOUT: --- fail_scope.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_scope.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
@@ -45,3 +47,4 @@ fn G() -> i32 {
 // CHECK:STDOUT:   %F.ref: <error> = name_ref F, <error>
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_self.carbon

@@ -50,13 +50,15 @@ fn CallWrongSelf(ws: WrongSelf) {
   ws.F();
 }
 
+// CHECK:STDOUT: --- fail_self.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc20_1.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc20_1.2: type = tuple_type ()
 // CHECK:STDOUT:   %.loc7: type = ptr_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_self.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F.1
@@ -104,3 +106,4 @@ fn CallWrongSelf(ws: WrongSelf) {
 // CHECK:STDOUT:   %.loc50_7: init () = call %.loc50_5(<invalid>)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_unbound_field.carbon

@@ -21,11 +21,13 @@ fn G() -> i32 {
   return Class.field;
 }
 
+// CHECK:STDOUT: --- fail_unbound_field.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc15: type = struct_type {.field: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_unbound_field.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
@@ -54,3 +56,4 @@ fn G() -> i32 {
 // CHECK:STDOUT:   %field.ref: <unbound field of class Class> = name_ref field, @Class.%field
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/fail_unknown_member.carbon

@@ -16,12 +16,14 @@ fn G(c: Class) -> i32 {
   return c.something;
 }
 
+// CHECK:STDOUT: --- fail_unknown_member.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc9: type = struct_type {.n: i32}
 // CHECK:STDOUT:   %.loc7: type = ptr_type {.n: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_unknown_member.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
@@ -42,3 +44,4 @@ fn G(c: Class) -> i32 {
 // CHECK:STDOUT:   %something.ref: <error> = name_ref something, <error>
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/field_access.carbon

@@ -16,12 +16,14 @@ fn Run() -> i32 {
   return c.j + c.k;
 }
 
+// CHECK:STDOUT: --- field_access.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {.j: i32, .k: i32}
 // CHECK:STDOUT:   %.loc10_1.2: type = ptr_type {.j: i32, .k: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "field_access.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
@@ -62,3 +64,4 @@ fn Run() -> i32 {
 // CHECK:STDOUT:   %.loc16_14: i32 = add %.loc16_11.2, %.loc16_17.2
 // CHECK:STDOUT:   return %.loc16_14
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/field_access_in_value.carbon

@@ -17,12 +17,14 @@ fn Run() -> i32 {
   return c.j + c.k;
 }
 
+// CHECK:STDOUT: --- field_access_in_value.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {.j: i32, .k: i32}
 // CHECK:STDOUT:   %.loc10_1.2: type = ptr_type {.j: i32, .k: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "field_access_in_value.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
@@ -67,3 +69,4 @@ fn Run() -> i32 {
 // CHECK:STDOUT:   %.loc17_14: i32 = add %.loc17_11.2, %.loc17_17.2
 // CHECK:STDOUT:   return %.loc17_14
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/forward_declared.carbon

@@ -8,7 +8,9 @@ class Class;
 
 fn F(p: Class*) -> Class* { return p; }
 
-// CHECK:STDOUT: file "forward_declared.carbon" {
+// CHECK:STDOUT: --- forward_declared.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -21,3 +23,4 @@ fn F(p: Class*) -> Class* { return p; }
 // CHECK:STDOUT:   %p.ref: Class* = name_ref p, %p
 // CHECK:STDOUT:   return %p.ref
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/init.carbon

@@ -17,13 +17,15 @@ fn MakeReorder(n: i32, next: Class*) -> Class {
   return {.next = next, .n = n};
 }
 
+// CHECK:STDOUT: --- init.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {.n: i32, .next: Class*}
 // CHECK:STDOUT:   %.loc10_1.2: type = ptr_type {.n: i32, .next: Class*}
 // CHECK:STDOUT:   %.loc17: type = struct_type {.next: Class*, .n: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "init.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %Make: <function> = fn_decl @Make
@@ -72,3 +74,4 @@ fn MakeReorder(n: i32, next: Class*) -> Class {
 // CHECK:STDOUT:   %.loc17_31.7: init Class = converted %.loc17_31.1, %.loc17_31.6
 // CHECK:STDOUT:   return %.loc17_31.7
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/init_as.carbon

@@ -13,12 +13,14 @@ fn F() -> i32 {
   return ({.a = 1, .b = 2} as Class).a;
 }
 
+// CHECK:STDOUT: --- init_as.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %.loc10_1.2: type = ptr_type {.a: i32, .b: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "init_as.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -55,3 +57,4 @@ fn F() -> i32 {
 // CHECK:STDOUT:   %.loc13_37.2: i32 = bind_value %.loc13_37.1
 // CHECK:STDOUT:   return %.loc13_37.2
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/init_nested.carbon

@@ -20,6 +20,8 @@ fn MakeOuter() -> Outer {
   return {.c = MakeInner(), .d = MakeInner()};
 }
 
+// CHECK:STDOUT: --- init_nested.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10_1.1: type = struct_type {.a: i32, .b: i32}
 // CHECK:STDOUT:   %.loc10_1.2: type = ptr_type {.a: i32, .b: i32}
@@ -29,7 +31,7 @@ fn MakeOuter() -> Outer {
 // CHECK:STDOUT:   %.loc14: type = ptr_type {.c: Inner, .d: Inner}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "init_nested.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Inner, ()
 // CHECK:STDOUT:   %Inner: type = class_type @Inner
 // CHECK:STDOUT:   %MakeInner: <function> = fn_decl @MakeInner
@@ -81,3 +83,4 @@ fn MakeOuter() -> Outer {
 // CHECK:STDOUT:   %.loc20_45.5: init Outer = converted %.loc20_45.3, %.loc20_45.4
 // CHECK:STDOUT:   return %.loc20_45.5
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/method.carbon

@@ -44,12 +44,14 @@ fn CallGOnInitializingExpr() -> i32 {
   return Make().G();
 }
 
+// CHECK:STDOUT: --- method.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc12: type = struct_type {.k: i32}
 // CHECK:STDOUT:   %.loc7: type = ptr_type {.k: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "method.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -162,3 +164,4 @@ fn CallGOnInitializingExpr() -> i32 {
 // CHECK:STDOUT:   %.loc44_20.2: i32 = converted %.loc44_18, %.loc44_20.1
 // CHECK:STDOUT:   return %.loc44_20.2
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/nested.carbon

@@ -28,6 +28,8 @@ fn F(a: Outer*) {
   (*(*a).pi).qi = (*a).pi;
 }
 
+// CHECK:STDOUT: --- nested.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc12_3.1: type = struct_type {.pi: Inner*, .po: Outer*, .qi: Inner*}
 // CHECK:STDOUT:   %.loc17_1.1: type = struct_type {.po: Outer*, .qo: Outer*, .pi: Inner*}
@@ -35,7 +37,7 @@ fn F(a: Outer*) {
 // CHECK:STDOUT:   %.loc12_3.2: type = ptr_type {.pi: Inner*, .po: Outer*, .qi: Inner*}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "nested.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Outer, ()
 // CHECK:STDOUT:   %Outer: type = class_type @Outer
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -142,3 +144,4 @@ fn F(a: Outer*) {
 // CHECK:STDOUT:   assign %.loc28_13, %.loc28_23.2
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/nested_name.carbon

@@ -18,6 +18,8 @@ fn G(o: Outer) {
   var i: o.Inner;
 }
 
+// CHECK:STDOUT: --- nested_name.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = struct_type {.n: i32}
 // CHECK:STDOUT:   %.loc11_1.1: type = struct_type {}
@@ -26,7 +28,7 @@ fn G(o: Outer) {
 // CHECK:STDOUT:   %.loc7: type = ptr_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "nested_name.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Outer, ()
 // CHECK:STDOUT:   %Outer: type = class_type @Outer
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -66,3 +68,4 @@ fn G(o: Outer) {
 // CHECK:STDOUT:   %i: ref Inner = bind_name i, %i.var
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/raw_self.carbon

@@ -18,6 +18,8 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) {
   return (self.n, r#self);
 }
 
+// CHECK:STDOUT: --- raw_self.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc9_46.1: type = tuple_type (type, type)
 // CHECK:STDOUT:   %.loc9_46.2: type = tuple_type (i32, i32)
@@ -26,7 +28,7 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) {
 // CHECK:STDOUT:   %.loc7: type = ptr_type {.n: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "raw_self.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -71,3 +73,4 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) {
 // CHECK:STDOUT:   %.loc18_25.7: init (i32, i32) = converted %.loc18_25.1, %.loc18_25.6
 // CHECK:STDOUT:   return %.loc18_25.7
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/raw_self_type.carbon

@@ -11,11 +11,13 @@ class Class {
   }
 }
 
+// CHECK:STDOUT: --- raw_self_type.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc12: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "raw_self_type.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT: }
@@ -42,3 +44,4 @@ class Class {
 // CHECK:STDOUT:   assign %p.var, %.loc10_20
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/redeclaration.carbon

@@ -12,11 +12,13 @@ class Class {
 
 fn Class.F() {}
 
+// CHECK:STDOUT: --- redeclaration.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "redeclaration.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   class_decl @Class, ()
@@ -34,3 +36,4 @@ fn Class.F() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/redeclaration_introducer.carbon

@@ -12,11 +12,13 @@ class A {}
 base class B {}
 abstract class C {}
 
+// CHECK:STDOUT: --- redeclaration_introducer.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "redeclaration_introducer.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @A, ()
 // CHECK:STDOUT:   %A: type = class_type @A
 // CHECK:STDOUT:   class_decl @B, ()
@@ -42,3 +44,4 @@ abstract class C {}
 // CHECK:STDOUT:
 // CHECK:STDOUT: !members:
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/reenter_scope.carbon

@@ -13,11 +13,13 @@ fn Class.F() -> i32 {
   return G();
 }
 
+// CHECK:STDOUT: --- reenter_scope.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "reenter_scope.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -42,3 +44,4 @@ fn Class.F() -> i32 {
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
 // CHECK:STDOUT: fn @G() -> i32;
+// CHECK:STDOUT:

toolchain/check/testdata/class/scope.carbon

@@ -22,11 +22,13 @@ fn Run() -> i32 {
   return F() + Class.F();
 }
 
+// CHECK:STDOUT: --- scope.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc15: type = struct_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "scope.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F.2
@@ -77,3 +79,4 @@ fn Run() -> i32 {
 // CHECK:STDOUT:   %.loc22_14.3: i32 = add %.loc22_14.2, %.loc22_23.3
 // CHECK:STDOUT:   return %.loc22_14.3
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/self.carbon

@@ -19,12 +19,14 @@ fn Class.G[addr self: Class*]() -> i32 {
   return (*self).n;
 }
 
+// CHECK:STDOUT: --- self.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc12: type = struct_type {.n: i32}
 // CHECK:STDOUT:   %.loc7: type = ptr_type {.n: i32}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "self.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -60,3 +62,4 @@ fn Class.G[addr self: Class*]() -> i32 {
 // CHECK:STDOUT:   %.loc19_17.2: i32 = bind_value %.loc19_17.1
 // CHECK:STDOUT:   return %.loc19_17.2
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/self_type.carbon

@@ -16,12 +16,14 @@ fn Class.F[self: Class]() -> i32 {
   return (*self.p).F();
 }
 
+// CHECK:STDOUT: --- self_type.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = struct_type {.p: Class*}
 // CHECK:STDOUT:   %.loc7: type = ptr_type {.p: Class*}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "self_type.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
@@ -53,3 +55,4 @@ fn Class.F[self: Class]() -> i32 {
 // CHECK:STDOUT:   %.loc16_23.2: i32 = converted %.loc16_21, %.loc16_23.1
 // CHECK:STDOUT:   return %.loc16_23.2
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/class/static_method.carbon

@@ -13,13 +13,15 @@ fn Run() -> i32 {
   return c.F();
 }
 
+// CHECK:STDOUT: --- static_method.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc9_1.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc9_1.2: type = tuple_type ()
 // CHECK:STDOUT:   %.loc7: type = ptr_type {}
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "static_method.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   class_decl @Class, ()
 // CHECK:STDOUT:   %Class: type = class_type @Class
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
@@ -46,3 +48,4 @@ fn Run() -> i32 {
 // CHECK:STDOUT:   %.loc13_15.2: i32 = converted %.loc13_13, %.loc13_15.1
 // CHECK:STDOUT:   return %.loc13_15.2
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/const/collapse.carbon

@@ -12,7 +12,9 @@ fn F(p: const i32**) -> const (const i32)** {
   return p;
 }
 
-// CHECK:STDOUT: file "collapse.carbon" {
+// CHECK:STDOUT: --- collapse.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -21,3 +23,4 @@ fn F(p: const i32**) -> const (const i32)** {
 // CHECK:STDOUT:   %p.ref: const i32** = name_ref p, %p
 // CHECK:STDOUT:   return %p.ref
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/const/fail_collapse.carbon

@@ -14,7 +14,9 @@ fn G(p: const (const i32)**) -> i32** {
   return p;
 }
 
-// CHECK:STDOUT: file "fail_collapse.carbon" {
+// CHECK:STDOUT: --- fail_collapse.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -23,3 +25,4 @@ fn G(p: const (const i32)**) -> i32** {
 // CHECK:STDOUT:   %p.ref: const i32** = name_ref p, %p
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/expr_category/in_place_tuple_init.carbon

@@ -16,13 +16,15 @@ fn H() -> i32 {
   return G()[0];
 }
 
+// CHECK:STDOUT: --- in_place_tuple_init.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7_20.1: type = tuple_type (type, type)
 // CHECK:STDOUT:   %.loc7_20.2: type = tuple_type (i32, i32)
 // CHECK:STDOUT:   %.loc7_20.3: type = ptr_type (i32, i32)
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "in_place_tuple_init.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
 // CHECK:STDOUT:   %H: <function> = fn_decl @H
@@ -62,3 +64,4 @@ fn H() -> i32 {
 // CHECK:STDOUT:   %.loc16_15.2: i32 = bind_value %.loc16_15.1
 // CHECK:STDOUT:   return %.loc16_15.2
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/empty_struct.carbon

@@ -12,12 +12,14 @@ fn Main() {
   Echo({});
 }
 
+// CHECK:STDOUT: --- empty_struct.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7_13.1: type = struct_type {}
 // CHECK:STDOUT:   %.loc7_13.2: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "empty_struct.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Echo: <function> = fn_decl @Echo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -37,3 +39,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc12_7: init {} = call %Echo.ref(%.loc12_9.3)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/empty_tuple.carbon

@@ -12,11 +12,13 @@ fn Main() {
   Echo(());
 }
 
+// CHECK:STDOUT: --- empty_tuple.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc7: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "empty_tuple.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Echo: <function> = fn_decl @Echo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -36,3 +38,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc12_7: init () = call %Echo.ref(%.loc12_9.3)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/fail_not_callable.carbon

@@ -11,11 +11,13 @@ fn Run() {
   var x: i32 = "hello"();
 }
 
+// CHECK:STDOUT: --- fail_not_callable.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.1: type = ptr_type String
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_not_callable.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -27,3 +29,4 @@ fn Run() {
 // CHECK:STDOUT:   assign %x.var, <error>
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/fail_param_count.carbon

@@ -55,11 +55,13 @@ fn Main() {
   Run2(0);
 }
 
+// CHECK:STDOUT: --- fail_param_count.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc18: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_param_count.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Run0: <function> = fn_decl @Run0
 // CHECK:STDOUT:   %Run1: <function> = fn_decl @Run1
 // CHECK:STDOUT:   %Run2: <function> = fn_decl @Run2
@@ -103,3 +105,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc55_7: init () = call %Run2.ref.loc55(<invalid>)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/fail_param_type.carbon

@@ -16,11 +16,13 @@ fn F() {
   G(1.0);
 }
 
+// CHECK:STDOUT: --- fail_param_type.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc16: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "fail_param_type.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT: }
@@ -37,3 +39,4 @@ fn F() {
 // CHECK:STDOUT:   %.loc16_4: init () = call %G.ref(<invalid>)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon

@@ -13,7 +13,9 @@ fn Run() {
   var x: i32 = Foo();
 }
 
-// CHECK:STDOUT: file "fail_return_type_mismatch.carbon" {
+// CHECK:STDOUT: --- fail_return_type_mismatch.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Run: <function> = fn_decl @Run
 // CHECK:STDOUT: }
@@ -33,3 +35,4 @@ fn Run() {
 // CHECK:STDOUT:   assign %x.var, <error>
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/i32.carbon

@@ -12,7 +12,9 @@ fn Main() {
   var b: i32 = Echo(1);
 }
 
-// CHECK:STDOUT: file "i32.carbon" {
+// CHECK:STDOUT: --- i32.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Echo: <function> = fn_decl @Echo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -33,3 +35,4 @@ fn Main() {
 // CHECK:STDOUT:   assign %b.var, %.loc12_20
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/more_param_ir.carbon

@@ -11,11 +11,13 @@ fn Main() {
   Foo(1 + 2 + 3, 4 + 5, 6);
 }
 
+// CHECK:STDOUT: --- more_param_ir.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "more_param_ir.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -40,3 +42,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc11_6: init () = call %Foo.ref(%.loc11_13, %.loc11_20, %.loc11_25)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/params_one.carbon

@@ -10,11 +10,13 @@ fn Main() {
   Foo(1);
 }
 
+// CHECK:STDOUT: --- params_one.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "params_one.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -31,3 +33,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc10_6: init () = call %Foo.ref(%.loc10_7)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/params_one_comma.carbon

@@ -11,11 +11,13 @@ fn Main() {
   Foo(1,);
 }
 
+// CHECK:STDOUT: --- params_one_comma.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "params_one_comma.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -35,3 +37,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc11_6: init () = call %Foo.ref.loc11(%.loc11_7)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/params_two.carbon

@@ -10,11 +10,13 @@ fn Main() {
   Foo(1, 2);
 }
 
+// CHECK:STDOUT: --- params_two.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "params_two.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -32,3 +34,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc10_6: init () = call %Foo.ref(%.loc10_7, %.loc10_10)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/params_two_comma.carbon

@@ -11,11 +11,13 @@ fn Main() {
   Foo(1, 2,);
 }
 
+// CHECK:STDOUT: --- params_two_comma.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "params_two_comma.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -37,3 +39,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc11_6: init () = call %Foo.ref.loc11(%.loc11_7, %.loc11_10)
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/params_zero.carbon

@@ -10,11 +10,13 @@ fn Main() {
   Foo();
 }
 
+// CHECK:STDOUT: --- params_zero.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc10: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "params_zero.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -30,3 +32,4 @@ fn Main() {
 // CHECK:STDOUT:   %.loc10: init () = call %Foo.ref()
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/call/return_implicit.carbon

@@ -11,11 +11,13 @@ fn Main() {
   var b: () = MakeImplicitEmptyTuple();
 }
 
+// CHECK:STDOUT: --- return_implicit.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc11: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "return_implicit.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %MakeImplicitEmptyTuple: <function> = fn_decl @MakeImplicitEmptyTuple
 // CHECK:STDOUT:   %Main: <function> = fn_decl @Main
 // CHECK:STDOUT: }
@@ -36,3 +38,4 @@ fn Main() {
 // CHECK:STDOUT:   assign %b.var, %.loc11_37
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/declaration/simple.carbon

@@ -8,11 +8,13 @@ fn F();
 
 fn G() { F(); }
 
+// CHECK:STDOUT: --- simple.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc9: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "simple.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
 // CHECK:STDOUT: }
@@ -25,3 +27,4 @@ fn G() { F(); }
 // CHECK:STDOUT:   %.loc9: init () = call %F.ref()
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon

@@ -12,7 +12,9 @@
 // CHECK:STDERR:        ^
 fn Bar(a: i32, a: i32) {}
 
-// CHECK:STDOUT: file "fail_param_name_conflict.carbon" {
+// CHECK:STDOUT: --- fail_param_name_conflict.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Bar: <function> = fn_decl @Bar
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -20,3 +22,4 @@ fn Bar(a: i32, a: i32) {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/definition/order.carbon

@@ -8,7 +8,9 @@ fn Foo() {}
 fn Bar() {}
 fn Baz() {}
 
-// CHECK:STDOUT: file "order.carbon" {
+// CHECK:STDOUT: --- order.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Bar: <function> = fn_decl @Bar
 // CHECK:STDOUT:   %Baz: <function> = fn_decl @Baz
@@ -28,3 +30,4 @@ fn Baz() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/definition/params_one.carbon

@@ -6,7 +6,9 @@
 
 fn Foo(a: i32) {}
 
-// CHECK:STDOUT: file "params_one.carbon" {
+// CHECK:STDOUT: --- params_one.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo(a: i32) {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/definition/params_one_comma.carbon

@@ -6,7 +6,9 @@
 
 fn Foo(a: i32,) {}
 
-// CHECK:STDOUT: file "params_one_comma.carbon" {
+// CHECK:STDOUT: --- params_one_comma.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo(a: i32,) {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/definition/params_two.carbon

@@ -6,7 +6,9 @@
 
 fn Foo(a: i32, b: i32) {}
 
-// CHECK:STDOUT: file "params_two.carbon" {
+// CHECK:STDOUT: --- params_two.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo(a: i32, b: i32) {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/definition/params_two_comma.carbon

@@ -6,7 +6,9 @@
 
 fn Foo(a: i32, b: i32,) {}
 
-// CHECK:STDOUT: file "params_two_comma.carbon" {
+// CHECK:STDOUT: --- params_two_comma.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo(a: i32, b: i32,) {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/definition/params_zero.carbon

@@ -6,7 +6,9 @@
 
 fn Foo() {}
 
-// CHECK:STDOUT: file "params_zero.carbon" {
+// CHECK:STDOUT: --- params_zero.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -14,3 +16,4 @@ fn Foo() {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/function/definition/same_param_name.carbon

@@ -7,7 +7,9 @@
 fn Foo(a: i32) {}
 fn Bar(a: i32) {}
 
-// CHECK:STDOUT: file "same_param_name.carbon" {
+// CHECK:STDOUT: --- same_param_name.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %Foo: <function> = fn_decl @Foo
 // CHECK:STDOUT:   %Bar: <function> = fn_decl @Bar
 // CHECK:STDOUT: }
@@ -21,3 +23,4 @@ fn Bar(a: i32) {}
 // CHECK:STDOUT: !entry:
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/if/else.carbon

@@ -17,11 +17,13 @@ fn If(b: bool) {
   H();
 }
 
+// CHECK:STDOUT: --- else.carbon
+// CHECK:STDOUT:
 // CHECK:STDOUT: constants {
 // CHECK:STDOUT:   %.loc13: type = tuple_type ()
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
-// CHECK:STDOUT: file "else.carbon" {
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %F: <function> = fn_decl @F
 // CHECK:STDOUT:   %G: <function> = fn_decl @G
 // CHECK:STDOUT:   %H: <function> = fn_decl @H
@@ -63,3 +65,4 @@ fn If(b: bool) {
 // CHECK:STDOUT:   %.loc17: init () = call %H.ref()
 // CHECK:STDOUT:   return
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/if/fail_reachable_fallthrough.carbon

@@ -33,7 +33,9 @@ fn If3(b: bool) -> i32 {
 // CHECK:STDERR: ^
 }
 
-// CHECK:STDOUT: file "fail_reachable_fallthrough.carbon" {
+// CHECK:STDOUT: --- fail_reachable_fallthrough.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %If1: <function> = fn_decl @If1
 // CHECK:STDOUT:   %If2: <function> = fn_decl @If2
 // CHECK:STDOUT:   %If3: <function> = fn_decl @If3
@@ -80,3 +82,4 @@ fn If3(b: bool) -> i32 {
 // CHECK:STDOUT:
 // CHECK:STDOUT: !if.else:
 // CHECK:STDOUT: }
+// CHECK:STDOUT:

toolchain/check/testdata/if/fail_scope.carbon

@@ -15,7 +15,9 @@ fn VarScope(b: bool) -> i32 {
   return n;
 }
 
-// CHECK:STDOUT: file "fail_scope.carbon" {
+// CHECK:STDOUT: --- fail_scope.carbon
+// CHECK:STDOUT:
+// CHECK:STDOUT: file {
 // CHECK:STDOUT:   %VarScope: <function> = fn_decl @VarScope
 // CHECK:STDOUT: }
 // CHECK:STDOUT:
@@ -37,3 +39,4 @@ fn VarScope(b: bool) -> i32 {
 // CHECK:STDOUT:   %n.ref.loc15: <error> = name_ref n, <error>
 // CHECK:STDOUT:   return <error>
 // CHECK:STDOUT: }
+// CHECK:STDOUT: