From 076e52d0c9cb7856186d33203e33e04a3db898c4 Mon Sep 17 00:00:00 2001 From: Nixon Enraght-Moony Date: Thu, 17 Sep 2020 21:32:02 +0100 Subject: [PATCH 1/4] Put bit qualifier before mir/diff --- src/tools/compiletest/src/runtest.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 965b20f5202e0..7fcbfe9bd0d5f 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -3181,7 +3181,7 @@ impl<'test> TestCx<'test> { let trimmed = test_name.trim_end_matches(".diff"); let test_against = format!("{}.after.mir", trimmed); from_file = format!("{}.before.mir", trimmed); - expected_file = format!("{}{}", test_name, bit_width); + expected_file = format!("{}{}.diff", trimmed, bit_width); assert!( test_names.next().is_none(), "two mir pass names specified for MIR diff" @@ -3199,7 +3199,7 @@ impl<'test> TestCx<'test> { from_file = format!("{}.{}.mir", test_name, first_pass); to_file = Some(second_file); } else { - expected_file = format!("{}{}", test_name, bit_width); + expected_file = format!("{}{}.mir", test_name.trim_end_matches(".mir"), bit_width); from_file = test_name.to_string(); assert!( test_names.next().is_none(), From 4f23cec3f917143c7d6c52825f867a21f642beec Mon Sep 17 00:00:00 2001 From: Nixon Enraght-Moony Date: Thu, 17 Sep 2020 21:35:21 +0100 Subject: [PATCH 2/4] Rename 64 bit mir files to be more tool friendly See #75746 --- ...mplifyCfg-elaborate-drops.after.64bit.mir} | 0 ...ne_array_len.norm2.InstCombine.64bit.diff} | 0 ...allocation.main.ConstProp.after.64bit.mir} | 0 ...llocation2.main.ConstProp.after.64bit.mir} | 0 ...llocation3.main.ConstProp.after.64bit.mir} | 0 ... => array_index.main.ConstProp.64bit.diff} | 0 ..._oob_for_slices.main.ConstProp.64bit.diff} | 0 ...=> discriminant.main.ConstProp.64bit.diff} | 0 ...rge_array_index.main.ConstProp.64bit.diff} | 0 ...s_into_variable.main.ConstProp.64bit.diff} | 0 ...iable.main.SimplifyLocals.after.64bit.mir} | 0 ...64bit => repeat.main.ConstProp.64bit.diff} | 0 ...it => slice_len.main.ConstProp.64bit.diff} | 0 .../mir-opt/graphviz.main.mir_map.0.dot.mir | 10 +++ ...ine_into_box_place.main.Inline.64bit.diff} | 0 ...implifyCfg-promote-consts.after.64bit.mir} | 0 ...it => issue_72181.bar.mir_map.0.64bit.mir} | 0 ...it => issue_72181.foo.mir_map.0.64bit.mir} | 0 ...t => issue_72181.main.mir_map.0.64bit.mir} | 0 ...=> issue_73223.main.PreCodegen.64bit.diff} | 0 ...73223.main.SimplifyArmIdentity.64bit.diff} | 0 ....bar.MatchBranchSimplification.64bit.diff} | 0 ....foo.MatchBranchSimplification.64bit.diff} | 0 ...atch.MatchBranchSimplification.64bit.diff} | 0 ...h_i8.MatchBranchSimplification.64bit.diff} | 0 ...gion_subtyping_basic.main.nll.0.64bit.mir} | 0 ...mplifyCfg-elaborate-drops.after.64bit.mir} | 0 ...mple_match.match_bool.mir_map.0.64bit.mir} | 0 ...ntity.main.SimplifyArmIdentity.64bit.diff} | 0 ...inant_reads.map.SimplifyLocals.64bit.diff} | 0 ...].AddMovesForPackedDrops.before.64bit.mir} | 0 .../spanview_block.main.mir_map.0.html.mir | 67 +++++++++++++++++++ ...spanview_statement.main.mir_map.0.html.mir | 67 +++++++++++++++++++ ...panview_terminator.main.mir_map.0.html.mir | 66 ++++++++++++++++++ ...ypes.E-V-{{constant}}.mir_map.0.64bit.mir} | 0 ...est-X-{{constructor}}.mir_map.0.64bit.mir} | 0 ..._.AddMovesForPackedDrops.before.64bit.mir} | 0 ...}-ASSOCIATED_CONSTANT.mir_map.0.64bit.mir} | 0 ...ops.change_loop_body.ConstProp.64bit.diff} | 0 ...ange_loop_body.PreCodegen.after.64bit.mir} | 0 40 files changed, 210 insertions(+) rename src/test/mir-opt/{array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.64bit => array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.64bit.mir} (100%) rename src/test/mir-opt/{combine_array_len.norm2.InstCombine.diff.64bit => combine_array_len.norm2.InstCombine.64bit.diff} (100%) rename src/test/mir-opt/{const_allocation.main.ConstProp.after.mir.64bit => const_allocation.main.ConstProp.after.64bit.mir} (100%) rename src/test/mir-opt/{const_allocation2.main.ConstProp.after.mir.64bit => const_allocation2.main.ConstProp.after.64bit.mir} (100%) rename src/test/mir-opt/{const_allocation3.main.ConstProp.after.mir.64bit => const_allocation3.main.ConstProp.after.64bit.mir} (100%) rename src/test/mir-opt/const_prop/{array_index.main.ConstProp.diff.64bit => array_index.main.ConstProp.64bit.diff} (100%) rename src/test/mir-opt/const_prop/{bad_op_unsafe_oob_for_slices.main.ConstProp.diff.64bit => bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff} (100%) rename src/test/mir-opt/const_prop/{discriminant.main.ConstProp.diff.64bit => discriminant.main.ConstProp.64bit.diff} (100%) rename src/test/mir-opt/const_prop/{large_array_index.main.ConstProp.diff.64bit => large_array_index.main.ConstProp.64bit.diff} (100%) rename src/test/mir-opt/const_prop/{optimizes_into_variable.main.ConstProp.diff.64bit => optimizes_into_variable.main.ConstProp.64bit.diff} (100%) rename src/test/mir-opt/const_prop/{optimizes_into_variable.main.SimplifyLocals.after.mir.64bit => optimizes_into_variable.main.SimplifyLocals.after.64bit.mir} (100%) rename src/test/mir-opt/const_prop/{repeat.main.ConstProp.diff.64bit => repeat.main.ConstProp.64bit.diff} (100%) rename src/test/mir-opt/const_prop/{slice_len.main.ConstProp.diff.64bit => slice_len.main.ConstProp.64bit.diff} (100%) create mode 100644 src/test/mir-opt/graphviz.main.mir_map.0.dot.mir rename src/test/mir-opt/inline/{inline_into_box_place.main.Inline.diff.64bit => inline_into_box_place.main.Inline.64bit.diff} (100%) rename src/test/mir-opt/{issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.64bit => issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.64bit.mir} (100%) rename src/test/mir-opt/{issue_72181.bar.mir_map.0.mir.64bit => issue_72181.bar.mir_map.0.64bit.mir} (100%) rename src/test/mir-opt/{issue_72181.foo.mir_map.0.mir.64bit => issue_72181.foo.mir_map.0.64bit.mir} (100%) rename src/test/mir-opt/{issue_72181.main.mir_map.0.mir.64bit => issue_72181.main.mir_map.0.64bit.mir} (100%) rename src/test/mir-opt/{issue_73223.main.PreCodegen.diff.64bit => issue_73223.main.PreCodegen.64bit.diff} (100%) rename src/test/mir-opt/{issue_73223.main.SimplifyArmIdentity.diff.64bit => issue_73223.main.SimplifyArmIdentity.64bit.diff} (100%) rename src/test/mir-opt/{matches_reduce_branches.bar.MatchBranchSimplification.diff.64bit => matches_reduce_branches.bar.MatchBranchSimplification.64bit.diff} (100%) rename src/test/mir-opt/{matches_reduce_branches.foo.MatchBranchSimplification.diff.64bit => matches_reduce_branches.foo.MatchBranchSimplification.64bit.diff} (100%) rename src/test/mir-opt/{matches_u8.exhaustive_match.MatchBranchSimplification.diff.64bit => matches_u8.exhaustive_match.MatchBranchSimplification.64bit.diff} (100%) rename src/test/mir-opt/{matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.64bit => matches_u8.exhaustive_match_i8.MatchBranchSimplification.64bit.diff} (100%) rename src/test/mir-opt/nll/{region_subtyping_basic.main.nll.0.mir.64bit => region_subtyping_basic.main.nll.0.64bit.mir} (100%) rename src/test/mir-opt/{packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.64bit => packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.64bit.mir} (100%) rename src/test/mir-opt/{simple_match.match_bool.mir_map.0.mir.64bit => simple_match.match_bool.mir_map.0.64bit.mir} (100%) rename src/test/mir-opt/{simplify_arm_identity.main.SimplifyArmIdentity.diff.64bit => simplify_arm_identity.main.SimplifyArmIdentity.64bit.diff} (100%) rename src/test/mir-opt/{simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.64bit => simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.64bit.diff} (100%) rename src/test/mir-opt/{slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.64bit => slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.64bit.mir} (100%) create mode 100644 src/test/mir-opt/spanview_block.main.mir_map.0.html.mir create mode 100644 src/test/mir-opt/spanview_statement.main.mir_map.0.html.mir create mode 100644 src/test/mir-opt/spanview_terminator.main.mir_map.0.html.mir rename src/test/mir-opt/{unusual_item_types.E-V-{{constant}}.mir_map.0.mir.64bit => unusual_item_types.E-V-{{constant}}.mir_map.0.64bit.mir} (100%) rename src/test/mir-opt/{unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.64bit => unusual_item_types.Test-X-{{constructor}}.mir_map.0.64bit.mir} (100%) rename src/test/mir-opt/{unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.64bit => unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.64bit.mir} (100%) rename src/test/mir-opt/{unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit => unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.64bit.mir} (100%) rename src/test/mir-opt/{while_let_loops.change_loop_body.ConstProp.diff.64bit => while_let_loops.change_loop_body.ConstProp.64bit.diff} (100%) rename src/test/mir-opt/{while_let_loops.change_loop_body.PreCodegen.after.mir.64bit => while_let_loops.change_loop_body.PreCodegen.after.64bit.mir} (100%) diff --git a/src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.64bit b/src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.64bit.mir similarity index 100% rename from src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.64bit rename to src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.64bit.mir diff --git a/src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.64bit b/src/test/mir-opt/combine_array_len.norm2.InstCombine.64bit.diff similarity index 100% rename from src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.64bit rename to src/test/mir-opt/combine_array_len.norm2.InstCombine.64bit.diff diff --git a/src/test/mir-opt/const_allocation.main.ConstProp.after.mir.64bit b/src/test/mir-opt/const_allocation.main.ConstProp.after.64bit.mir similarity index 100% rename from src/test/mir-opt/const_allocation.main.ConstProp.after.mir.64bit rename to src/test/mir-opt/const_allocation.main.ConstProp.after.64bit.mir diff --git a/src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.64bit b/src/test/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir similarity index 100% rename from src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.64bit rename to src/test/mir-opt/const_allocation2.main.ConstProp.after.64bit.mir diff --git a/src/test/mir-opt/const_allocation3.main.ConstProp.after.mir.64bit b/src/test/mir-opt/const_allocation3.main.ConstProp.after.64bit.mir similarity index 100% rename from src/test/mir-opt/const_allocation3.main.ConstProp.after.mir.64bit rename to src/test/mir-opt/const_allocation3.main.ConstProp.after.64bit.mir diff --git a/src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.64bit b/src/test/mir-opt/const_prop/array_index.main.ConstProp.64bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.64bit rename to src/test/mir-opt/const_prop/array_index.main.ConstProp.64bit.diff diff --git a/src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.64bit b/src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.64bit rename to src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff diff --git a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.64bit b/src/test/mir-opt/const_prop/discriminant.main.ConstProp.64bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.64bit rename to src/test/mir-opt/const_prop/discriminant.main.ConstProp.64bit.diff diff --git a/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.64bit b/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.64bit rename to src/test/mir-opt/const_prop/large_array_index.main.ConstProp.64bit.diff diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.64bit b/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.64bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.64bit rename to src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.64bit.diff diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.64bit b/src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.64bit.mir similarity index 100% rename from src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.64bit rename to src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.64bit.mir diff --git a/src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.64bit b/src/test/mir-opt/const_prop/repeat.main.ConstProp.64bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.64bit rename to src/test/mir-opt/const_prop/repeat.main.ConstProp.64bit.diff diff --git a/src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.64bit b/src/test/mir-opt/const_prop/slice_len.main.ConstProp.64bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.64bit rename to src/test/mir-opt/const_prop/slice_len.main.ConstProp.64bit.diff diff --git a/src/test/mir-opt/graphviz.main.mir_map.0.dot.mir b/src/test/mir-opt/graphviz.main.mir_map.0.dot.mir new file mode 100644 index 0000000000000..df4f11f0f2169 --- /dev/null +++ b/src/test/mir-opt/graphviz.main.mir_map.0.dot.mir @@ -0,0 +1,10 @@ +digraph Mir_0_3 { + graph [fontname="Courier, monospace"]; + node [fontname="Courier, monospace"]; + edge [fontname="Courier, monospace"]; + label=>; + bb0__0_3 [shape="none", label=<
0
_0 = const ()
goto
>]; + bb1__0_3 [shape="none", label=<
1
resume
>]; + bb2__0_3 [shape="none", label=<
2
return
>]; + bb0__0_3 -> bb2__0_3 [label=""]; +} diff --git a/src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.64bit b/src/test/mir-opt/inline/inline_into_box_place.main.Inline.64bit.diff similarity index 100% rename from src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.64bit rename to src/test/mir-opt/inline/inline_into_box_place.main.Inline.64bit.diff diff --git a/src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.64bit b/src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.64bit.mir similarity index 100% rename from src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.64bit rename to src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.64bit.mir diff --git a/src/test/mir-opt/issue_72181.bar.mir_map.0.mir.64bit b/src/test/mir-opt/issue_72181.bar.mir_map.0.64bit.mir similarity index 100% rename from src/test/mir-opt/issue_72181.bar.mir_map.0.mir.64bit rename to src/test/mir-opt/issue_72181.bar.mir_map.0.64bit.mir diff --git a/src/test/mir-opt/issue_72181.foo.mir_map.0.mir.64bit b/src/test/mir-opt/issue_72181.foo.mir_map.0.64bit.mir similarity index 100% rename from src/test/mir-opt/issue_72181.foo.mir_map.0.mir.64bit rename to src/test/mir-opt/issue_72181.foo.mir_map.0.64bit.mir diff --git a/src/test/mir-opt/issue_72181.main.mir_map.0.mir.64bit b/src/test/mir-opt/issue_72181.main.mir_map.0.64bit.mir similarity index 100% rename from src/test/mir-opt/issue_72181.main.mir_map.0.mir.64bit rename to src/test/mir-opt/issue_72181.main.mir_map.0.64bit.mir diff --git a/src/test/mir-opt/issue_73223.main.PreCodegen.diff.64bit b/src/test/mir-opt/issue_73223.main.PreCodegen.64bit.diff similarity index 100% rename from src/test/mir-opt/issue_73223.main.PreCodegen.diff.64bit rename to src/test/mir-opt/issue_73223.main.PreCodegen.64bit.diff diff --git a/src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.64bit b/src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.64bit.diff similarity index 100% rename from src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.64bit rename to src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.64bit.diff diff --git a/src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.64bit b/src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.64bit.diff similarity index 100% rename from src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.64bit rename to src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.64bit.diff diff --git a/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.64bit b/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.64bit.diff similarity index 100% rename from src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.64bit rename to src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.64bit.diff diff --git a/src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.64bit b/src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.64bit.diff similarity index 100% rename from src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.64bit rename to src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.64bit.diff diff --git a/src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.64bit b/src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.64bit.diff similarity index 100% rename from src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.64bit rename to src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.64bit.diff diff --git a/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.64bit b/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.64bit.mir similarity index 100% rename from src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.64bit rename to src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.64bit.mir diff --git a/src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.64bit b/src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.64bit.mir similarity index 100% rename from src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.64bit rename to src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.64bit.mir diff --git a/src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.64bit b/src/test/mir-opt/simple_match.match_bool.mir_map.0.64bit.mir similarity index 100% rename from src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.64bit rename to src/test/mir-opt/simple_match.match_bool.mir_map.0.64bit.mir diff --git a/src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.64bit b/src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.64bit.diff similarity index 100% rename from src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.64bit rename to src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.64bit.diff diff --git a/src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.64bit b/src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.64bit.diff similarity index 100% rename from src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.64bit rename to src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.64bit.diff diff --git a/src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.64bit b/src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.64bit.mir similarity index 100% rename from src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.64bit rename to src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.64bit.mir diff --git a/src/test/mir-opt/spanview_block.main.mir_map.0.html.mir b/src/test/mir-opt/spanview_block.main.mir_map.0.html.mir new file mode 100644 index 0000000000000..8f6b1307971b6 --- /dev/null +++ b/src/test/mir-opt/spanview_block.main.mir_map.0.html.mir @@ -0,0 +1,67 @@ + + + + coverage_of_if_else - Code Regions + + + +
fn main() 0⦊{}⦉02⦊‸⦉2
+ + diff --git a/src/test/mir-opt/spanview_statement.main.mir_map.0.html.mir b/src/test/mir-opt/spanview_statement.main.mir_map.0.html.mir new file mode 100644 index 0000000000000..072d22473a991 --- /dev/null +++ b/src/test/mir-opt/spanview_statement.main.mir_map.0.html.mir @@ -0,0 +1,67 @@ + + + + coverage_of_if_else - Code Regions + + + +
fn main() 0[0]⦊{}⦉0[0]0:Goto⦊‸⦉0:Goto2:Return⦊‸⦉2:Return
+ + diff --git a/src/test/mir-opt/spanview_terminator.main.mir_map.0.html.mir b/src/test/mir-opt/spanview_terminator.main.mir_map.0.html.mir new file mode 100644 index 0000000000000..e023f0f8aeac9 --- /dev/null +++ b/src/test/mir-opt/spanview_terminator.main.mir_map.0.html.mir @@ -0,0 +1,66 @@ + + + + coverage_of_if_else - Code Regions + + + +
fn main() {}0:Goto⦊‸⦉0:Goto2:Return⦊‸⦉2:Return
+ + diff --git a/src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.64bit b/src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.64bit.mir similarity index 100% rename from src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.64bit rename to src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.64bit.mir diff --git a/src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.64bit b/src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.64bit.mir similarity index 100% rename from src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.64bit rename to src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.64bit.mir diff --git a/src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.64bit b/src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.64bit.mir similarity index 100% rename from src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.64bit rename to src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.64bit.mir diff --git a/src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit b/src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.64bit.mir similarity index 100% rename from src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit rename to src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.64bit.mir diff --git a/src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.64bit b/src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.64bit.diff similarity index 100% rename from src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.64bit rename to src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.64bit.diff diff --git a/src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.64bit b/src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.64bit.mir similarity index 100% rename from src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.64bit rename to src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.64bit.mir From 3c7593e69ffaf3362a598f1c359829387365bd98 Mon Sep 17 00:00:00 2001 From: Nixon Enraght-Moony Date: Thu, 17 Sep 2020 21:49:21 +0100 Subject: [PATCH 3/4] Rename 32 bit mir files to be more tool friendly See #75746 --- ...is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir} | 0 ....diff.32bit => combine_array_len.norm2.InstCombine.32bit.diff} | 0 ....mir.32bit => const_allocation.main.ConstProp.after.32bit.mir} | 0 ...mir.32bit => const_allocation2.main.ConstProp.after.32bit.mir} | 0 ...mir.32bit => const_allocation3.main.ConstProp.after.32bit.mir} | 0 ...ConstProp.diff.32bit => array_index.main.ConstProp.32bit.diff} | 0 ...bit => bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff} | 0 ...onstProp.diff.32bit => discriminant.main.ConstProp.32bit.diff} | 0 ...rop.diff.32bit => large_array_index.main.ConstProp.32bit.diff} | 0 ...ff.32bit => optimizes_into_variable.main.ConstProp.32bit.diff} | 0 ...> optimizes_into_variable.main.SimplifyLocals.after.32bit.mir} | 0 ...main.ConstProp.diff.32bit => repeat.main.ConstProp.32bit.diff} | 0 ...n.ConstProp.diff.32bit => slice_len.main.ConstProp.32bit.diff} | 0 ...ne.diff.32bit => inline_into_box_place.main.Inline.32bit.diff} | 0 ...mpl}}-{{constant}}.SimplifyCfg-promote-consts.after.32bit.mir} | 0 ...ar.mir_map.0.mir.32bit => issue_72181.bar.mir_map.0.32bit.mir} | 0 ...oo.mir_map.0.mir.32bit => issue_72181.foo.mir_map.0.32bit.mir} | 0 ...n.mir_map.0.mir.32bit => issue_72181.main.mir_map.0.32bit.mir} | 0 ...eCodegen.diff.32bit => issue_73223.main.PreCodegen.32bit.diff} | 0 ...diff.32bit => issue_73223.main.SimplifyArmIdentity.32bit.diff} | 0 ...ches_reduce_branches.bar.MatchBranchSimplification.32bit.diff} | 0 ...ches_reduce_branches.foo.MatchBranchSimplification.32bit.diff} | 0 ...ches_u8.exhaustive_match.MatchBranchSimplification.32bit.diff} | 0 ...s_u8.exhaustive_match_i8.MatchBranchSimplification.32bit.diff} | 0 ...ll.0.mir.32bit => region_subtyping_basic.main.nll.0.32bit.mir} | 0 ...drop_aligned.main.SimplifyCfg-elaborate-drops.after.32bit.mir} | 0 ...ap.0.mir.32bit => simple_match.match_bool.mir_map.0.32bit.mir} | 0 ... => simplify_arm_identity.main.SimplifyArmIdentity.32bit.diff} | 0 ...moves_unused_discriminant_reads.map.SimplifyLocals.32bit.diff} | 0 ...rop_in_place.[String].AddMovesForPackedDrops.before.32bit.mir} | 0 ...it => unusual_item_types.E-V-{{constant}}.mir_map.0.32bit.mir} | 0 ...unusual_item_types.Test-X-{{constructor}}.mir_map.0.32bit.mir} | 0 ...rop_in_place.Vec_i32_.AddMovesForPackedDrops.before.32bit.mir} | 0 ...l_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir} | 0 ...2bit => while_let_loops.change_loop_body.ConstProp.32bit.diff} | 0 ...> while_let_loops.change_loop_body.PreCodegen.after.32bit.mir} | 0 36 files changed, 0 insertions(+), 0 deletions(-) rename src/test/mir-opt/{array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.32bit => array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir} (100%) rename src/test/mir-opt/{combine_array_len.norm2.InstCombine.diff.32bit => combine_array_len.norm2.InstCombine.32bit.diff} (100%) rename src/test/mir-opt/{const_allocation.main.ConstProp.after.mir.32bit => const_allocation.main.ConstProp.after.32bit.mir} (100%) rename src/test/mir-opt/{const_allocation2.main.ConstProp.after.mir.32bit => const_allocation2.main.ConstProp.after.32bit.mir} (100%) rename src/test/mir-opt/{const_allocation3.main.ConstProp.after.mir.32bit => const_allocation3.main.ConstProp.after.32bit.mir} (100%) rename src/test/mir-opt/const_prop/{array_index.main.ConstProp.diff.32bit => array_index.main.ConstProp.32bit.diff} (100%) rename src/test/mir-opt/const_prop/{bad_op_unsafe_oob_for_slices.main.ConstProp.diff.32bit => bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff} (100%) rename src/test/mir-opt/const_prop/{discriminant.main.ConstProp.diff.32bit => discriminant.main.ConstProp.32bit.diff} (100%) rename src/test/mir-opt/const_prop/{large_array_index.main.ConstProp.diff.32bit => large_array_index.main.ConstProp.32bit.diff} (100%) rename src/test/mir-opt/const_prop/{optimizes_into_variable.main.ConstProp.diff.32bit => optimizes_into_variable.main.ConstProp.32bit.diff} (100%) rename src/test/mir-opt/const_prop/{optimizes_into_variable.main.SimplifyLocals.after.mir.32bit => optimizes_into_variable.main.SimplifyLocals.after.32bit.mir} (100%) rename src/test/mir-opt/const_prop/{repeat.main.ConstProp.diff.32bit => repeat.main.ConstProp.32bit.diff} (100%) rename src/test/mir-opt/const_prop/{slice_len.main.ConstProp.diff.32bit => slice_len.main.ConstProp.32bit.diff} (100%) rename src/test/mir-opt/inline/{inline_into_box_place.main.Inline.diff.32bit => inline_into_box_place.main.Inline.32bit.diff} (100%) rename src/test/mir-opt/{issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.32bit => issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.32bit.mir} (100%) rename src/test/mir-opt/{issue_72181.bar.mir_map.0.mir.32bit => issue_72181.bar.mir_map.0.32bit.mir} (100%) rename src/test/mir-opt/{issue_72181.foo.mir_map.0.mir.32bit => issue_72181.foo.mir_map.0.32bit.mir} (100%) rename src/test/mir-opt/{issue_72181.main.mir_map.0.mir.32bit => issue_72181.main.mir_map.0.32bit.mir} (100%) rename src/test/mir-opt/{issue_73223.main.PreCodegen.diff.32bit => issue_73223.main.PreCodegen.32bit.diff} (100%) rename src/test/mir-opt/{issue_73223.main.SimplifyArmIdentity.diff.32bit => issue_73223.main.SimplifyArmIdentity.32bit.diff} (100%) rename src/test/mir-opt/{matches_reduce_branches.bar.MatchBranchSimplification.diff.32bit => matches_reduce_branches.bar.MatchBranchSimplification.32bit.diff} (100%) rename src/test/mir-opt/{matches_reduce_branches.foo.MatchBranchSimplification.diff.32bit => matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff} (100%) rename src/test/mir-opt/{matches_u8.exhaustive_match.MatchBranchSimplification.diff.32bit => matches_u8.exhaustive_match.MatchBranchSimplification.32bit.diff} (100%) rename src/test/mir-opt/{matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.32bit => matches_u8.exhaustive_match_i8.MatchBranchSimplification.32bit.diff} (100%) rename src/test/mir-opt/nll/{region_subtyping_basic.main.nll.0.mir.32bit => region_subtyping_basic.main.nll.0.32bit.mir} (100%) rename src/test/mir-opt/{packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.32bit => packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.32bit.mir} (100%) rename src/test/mir-opt/{simple_match.match_bool.mir_map.0.mir.32bit => simple_match.match_bool.mir_map.0.32bit.mir} (100%) rename src/test/mir-opt/{simplify_arm_identity.main.SimplifyArmIdentity.diff.32bit => simplify_arm_identity.main.SimplifyArmIdentity.32bit.diff} (100%) rename src/test/mir-opt/{simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.32bit => simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.32bit.diff} (100%) rename src/test/mir-opt/{slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.32bit => slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.32bit.mir} (100%) rename src/test/mir-opt/{unusual_item_types.E-V-{{constant}}.mir_map.0.mir.32bit => unusual_item_types.E-V-{{constant}}.mir_map.0.32bit.mir} (100%) rename src/test/mir-opt/{unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.32bit => unusual_item_types.Test-X-{{constructor}}.mir_map.0.32bit.mir} (100%) rename src/test/mir-opt/{unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.32bit => unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.32bit.mir} (100%) rename src/test/mir-opt/{unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit => unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir} (100%) rename src/test/mir-opt/{while_let_loops.change_loop_body.ConstProp.diff.32bit => while_let_loops.change_loop_body.ConstProp.32bit.diff} (100%) rename src/test/mir-opt/{while_let_loops.change_loop_body.PreCodegen.after.mir.32bit => while_let_loops.change_loop_body.PreCodegen.after.32bit.mir} (100%) diff --git a/src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.32bit b/src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir similarity index 100% rename from src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.32bit rename to src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir diff --git a/src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.32bit b/src/test/mir-opt/combine_array_len.norm2.InstCombine.32bit.diff similarity index 100% rename from src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.32bit rename to src/test/mir-opt/combine_array_len.norm2.InstCombine.32bit.diff diff --git a/src/test/mir-opt/const_allocation.main.ConstProp.after.mir.32bit b/src/test/mir-opt/const_allocation.main.ConstProp.after.32bit.mir similarity index 100% rename from src/test/mir-opt/const_allocation.main.ConstProp.after.mir.32bit rename to src/test/mir-opt/const_allocation.main.ConstProp.after.32bit.mir diff --git a/src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.32bit b/src/test/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir similarity index 100% rename from src/test/mir-opt/const_allocation2.main.ConstProp.after.mir.32bit rename to src/test/mir-opt/const_allocation2.main.ConstProp.after.32bit.mir diff --git a/src/test/mir-opt/const_allocation3.main.ConstProp.after.mir.32bit b/src/test/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir similarity index 100% rename from src/test/mir-opt/const_allocation3.main.ConstProp.after.mir.32bit rename to src/test/mir-opt/const_allocation3.main.ConstProp.after.32bit.mir diff --git a/src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.32bit rename to src/test/mir-opt/const_prop/array_index.main.ConstProp.32bit.diff diff --git a/src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.32bit rename to src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff diff --git a/src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.32bit rename to src/test/mir-opt/const_prop/discriminant.main.ConstProp.32bit.diff diff --git a/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.32bit rename to src/test/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.32bit rename to src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.32bit.diff diff --git a/src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.32bit b/src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.32bit.mir similarity index 100% rename from src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.32bit rename to src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.32bit.mir diff --git a/src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.32bit rename to src/test/mir-opt/const_prop/repeat.main.ConstProp.32bit.diff diff --git a/src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.32bit b/src/test/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff similarity index 100% rename from src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.32bit rename to src/test/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff diff --git a/src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.32bit b/src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff similarity index 100% rename from src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.32bit rename to src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff diff --git a/src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.32bit b/src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.32bit.mir similarity index 100% rename from src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.mir.32bit rename to src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-promote-consts.after.32bit.mir diff --git a/src/test/mir-opt/issue_72181.bar.mir_map.0.mir.32bit b/src/test/mir-opt/issue_72181.bar.mir_map.0.32bit.mir similarity index 100% rename from src/test/mir-opt/issue_72181.bar.mir_map.0.mir.32bit rename to src/test/mir-opt/issue_72181.bar.mir_map.0.32bit.mir diff --git a/src/test/mir-opt/issue_72181.foo.mir_map.0.mir.32bit b/src/test/mir-opt/issue_72181.foo.mir_map.0.32bit.mir similarity index 100% rename from src/test/mir-opt/issue_72181.foo.mir_map.0.mir.32bit rename to src/test/mir-opt/issue_72181.foo.mir_map.0.32bit.mir diff --git a/src/test/mir-opt/issue_72181.main.mir_map.0.mir.32bit b/src/test/mir-opt/issue_72181.main.mir_map.0.32bit.mir similarity index 100% rename from src/test/mir-opt/issue_72181.main.mir_map.0.mir.32bit rename to src/test/mir-opt/issue_72181.main.mir_map.0.32bit.mir diff --git a/src/test/mir-opt/issue_73223.main.PreCodegen.diff.32bit b/src/test/mir-opt/issue_73223.main.PreCodegen.32bit.diff similarity index 100% rename from src/test/mir-opt/issue_73223.main.PreCodegen.diff.32bit rename to src/test/mir-opt/issue_73223.main.PreCodegen.32bit.diff diff --git a/src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.32bit b/src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.32bit.diff similarity index 100% rename from src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.32bit rename to src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.32bit.diff diff --git a/src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.32bit b/src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.32bit.diff similarity index 100% rename from src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.32bit rename to src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.32bit.diff diff --git a/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.32bit b/src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff similarity index 100% rename from src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.32bit rename to src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.32bit.diff diff --git a/src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.32bit b/src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.32bit.diff similarity index 100% rename from src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.32bit rename to src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.32bit.diff diff --git a/src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.32bit b/src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.32bit.diff similarity index 100% rename from src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.32bit rename to src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.32bit.diff diff --git a/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.32bit b/src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir similarity index 100% rename from src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.32bit rename to src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir diff --git a/src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.32bit b/src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.32bit.mir similarity index 100% rename from src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.32bit rename to src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.32bit.mir diff --git a/src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.32bit b/src/test/mir-opt/simple_match.match_bool.mir_map.0.32bit.mir similarity index 100% rename from src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.32bit rename to src/test/mir-opt/simple_match.match_bool.mir_map.0.32bit.mir diff --git a/src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.32bit b/src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.32bit.diff similarity index 100% rename from src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.32bit rename to src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.32bit.diff diff --git a/src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.32bit b/src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.32bit.diff similarity index 100% rename from src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.32bit rename to src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.32bit.diff diff --git a/src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.32bit b/src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.32bit.mir similarity index 100% rename from src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir.32bit rename to src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.32bit.mir diff --git a/src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.32bit b/src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.32bit.mir similarity index 100% rename from src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.32bit rename to src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.32bit.mir diff --git a/src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.32bit b/src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.32bit.mir similarity index 100% rename from src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.mir.32bit rename to src/test/mir-opt/unusual_item_types.Test-X-{{constructor}}.mir_map.0.32bit.mir diff --git a/src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.32bit b/src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.32bit.mir similarity index 100% rename from src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.mir.32bit rename to src/test/mir-opt/unusual_item_types.core.ptr-drop_in_place.Vec_i32_.AddMovesForPackedDrops.before.32bit.mir diff --git a/src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit b/src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir similarity index 100% rename from src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit rename to src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir diff --git a/src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.32bit b/src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.32bit.diff similarity index 100% rename from src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.32bit rename to src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.32bit.diff diff --git a/src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.32bit b/src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.32bit.mir similarity index 100% rename from src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.32bit rename to src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.32bit.mir From 735776d115e7e842a0c52f70a181ac9211003d55 Mon Sep 17 00:00:00 2001 From: Nixon Enraght-Moony Date: Thu, 17 Sep 2020 22:25:33 +0100 Subject: [PATCH 4/4] Fix --bless for mir-opt 32/64 bit file --- src/tools/compiletest/src/runtest.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 7fcbfe9bd0d5f..acad316d807a3 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -3156,12 +3156,12 @@ impl<'test> TestCx<'test> { if self.config.bless { for e in - glob(&format!("{}/{}.*.mir{}", test_dir.display(), test_crate, bit_width)).unwrap() + glob(&format!("{}/{}.*{}.mir", test_dir.display(), test_crate, bit_width)).unwrap() { std::fs::remove_file(e.unwrap()).unwrap(); } for e in - glob(&format!("{}/{}.*.diff{}", test_dir.display(), test_crate, bit_width)).unwrap() + glob(&format!("{}/{}.*{}.diff", test_dir.display(), test_crate, bit_width)).unwrap() { std::fs::remove_file(e.unwrap()).unwrap(); } @@ -3199,7 +3199,8 @@ impl<'test> TestCx<'test> { from_file = format!("{}.{}.mir", test_name, first_pass); to_file = Some(second_file); } else { - expected_file = format!("{}{}.mir", test_name.trim_end_matches(".mir"), bit_width); + expected_file = + format!("{}{}.mir", test_name.trim_end_matches(".mir"), bit_width); from_file = test_name.to_string(); assert!( test_names.next().is_none(),