Auto merge of #76854 - aDotInTheVoid:mir-opt-32-64-diff-name, r=oli-obk

Rename mir-opt diff tests with 32/64 bit Now syntax highlighting should work. I've tested that `--bless` works localy, but I'm not sure it's possible on CI Fixes #75746 r? `@oli-obk`
rust-lang · Sep 18, 2020 · 953f33c · 953f33c
2 parents a0925fb + 735776d
commit 953f33c
Show file tree

Hide file tree

Showing 77 changed files with 215 additions and 4 deletions.
diff --git a/...mplifyCfg-elaborate-drops.after.mir.32bit → ...mplifyCfg-elaborate-drops.after.32bit.mir b/...mplifyCfg-elaborate-drops.after.mir.32bit → ...mplifyCfg-elaborate-drops.after.32bit.mir
diff --git a/...mplifyCfg-elaborate-drops.after.mir.64bit → ...mplifyCfg-elaborate-drops.after.64bit.mir b/...mplifyCfg-elaborate-drops.after.mir.64bit → ...mplifyCfg-elaborate-drops.after.64bit.mir
diff --git a/...ne_array_len.norm2.InstCombine.diff.32bit → ...ne_array_len.norm2.InstCombine.32bit.diff b/...ne_array_len.norm2.InstCombine.diff.32bit → ...ne_array_len.norm2.InstCombine.32bit.diff
diff --git a/...ne_array_len.norm2.InstCombine.diff.64bit → ...ne_array_len.norm2.InstCombine.64bit.diff b/...ne_array_len.norm2.InstCombine.diff.64bit → ...ne_array_len.norm2.InstCombine.64bit.diff
diff --git a/...allocation.main.ConstProp.after.mir.32bit → ...allocation.main.ConstProp.after.32bit.mir b/...allocation.main.ConstProp.after.mir.32bit → ...allocation.main.ConstProp.after.32bit.mir
diff --git a/...allocation.main.ConstProp.after.mir.64bit → ...allocation.main.ConstProp.after.64bit.mir b/...allocation.main.ConstProp.after.mir.64bit → ...allocation.main.ConstProp.after.64bit.mir
diff --git a/...llocation2.main.ConstProp.after.mir.32bit → ...llocation2.main.ConstProp.after.32bit.mir b/...llocation2.main.ConstProp.after.mir.32bit → ...llocation2.main.ConstProp.after.32bit.mir
diff --git a/...llocation2.main.ConstProp.after.mir.64bit → ...llocation2.main.ConstProp.after.64bit.mir b/...llocation2.main.ConstProp.after.mir.64bit → ...llocation2.main.ConstProp.after.64bit.mir
diff --git a/...llocation3.main.ConstProp.after.mir.32bit → ...llocation3.main.ConstProp.after.32bit.mir b/...llocation3.main.ConstProp.after.mir.32bit → ...llocation3.main.ConstProp.after.32bit.mir
diff --git a/...llocation3.main.ConstProp.after.mir.64bit → ...llocation3.main.ConstProp.after.64bit.mir b/...llocation3.main.ConstProp.after.mir.64bit → ...llocation3.main.ConstProp.after.64bit.mir
diff --git a/...rop/array_index.main.ConstProp.diff.32bit → ...rop/array_index.main.ConstProp.32bit.diff b/...rop/array_index.main.ConstProp.diff.32bit → ...rop/array_index.main.ConstProp.32bit.diff
diff --git a/...rop/array_index.main.ConstProp.diff.64bit → ...rop/array_index.main.ConstProp.64bit.diff b/...rop/array_index.main.ConstProp.diff.64bit → ...rop/array_index.main.ConstProp.64bit.diff
diff --git a/..._oob_for_slices.main.ConstProp.diff.32bit → ..._oob_for_slices.main.ConstProp.32bit.diff b/..._oob_for_slices.main.ConstProp.diff.32bit → ..._oob_for_slices.main.ConstProp.32bit.diff
diff --git a/..._oob_for_slices.main.ConstProp.diff.64bit → ..._oob_for_slices.main.ConstProp.64bit.diff b/..._oob_for_slices.main.ConstProp.diff.64bit → ..._oob_for_slices.main.ConstProp.64bit.diff
diff --git a/...op/discriminant.main.ConstProp.diff.32bit → ...op/discriminant.main.ConstProp.32bit.diff b/...op/discriminant.main.ConstProp.diff.32bit → ...op/discriminant.main.ConstProp.32bit.diff
diff --git a/...op/discriminant.main.ConstProp.diff.64bit → ...op/discriminant.main.ConstProp.64bit.diff b/...op/discriminant.main.ConstProp.diff.64bit → ...op/discriminant.main.ConstProp.64bit.diff
diff --git a/...rge_array_index.main.ConstProp.diff.32bit → ...rge_array_index.main.ConstProp.32bit.diff b/...rge_array_index.main.ConstProp.diff.32bit → ...rge_array_index.main.ConstProp.32bit.diff
diff --git a/...rge_array_index.main.ConstProp.diff.64bit → ...rge_array_index.main.ConstProp.64bit.diff b/...rge_array_index.main.ConstProp.diff.64bit → ...rge_array_index.main.ConstProp.64bit.diff
diff --git a/...s_into_variable.main.ConstProp.diff.32bit → ...s_into_variable.main.ConstProp.32bit.diff b/...s_into_variable.main.ConstProp.diff.32bit → ...s_into_variable.main.ConstProp.32bit.diff
diff --git a/...s_into_variable.main.ConstProp.diff.64bit → ...s_into_variable.main.ConstProp.64bit.diff b/...s_into_variable.main.ConstProp.diff.64bit → ...s_into_variable.main.ConstProp.64bit.diff
diff --git a/...iable.main.SimplifyLocals.after.mir.32bit → ...iable.main.SimplifyLocals.after.32bit.mir b/...iable.main.SimplifyLocals.after.mir.32bit → ...iable.main.SimplifyLocals.after.32bit.mir
diff --git a/...iable.main.SimplifyLocals.after.mir.64bit → ...iable.main.SimplifyLocals.after.64bit.mir b/...iable.main.SimplifyLocals.after.mir.64bit → ...iable.main.SimplifyLocals.after.64bit.mir
diff --git a/...nst_prop/repeat.main.ConstProp.diff.32bit → ...nst_prop/repeat.main.ConstProp.32bit.diff b/...nst_prop/repeat.main.ConstProp.diff.32bit → ...nst_prop/repeat.main.ConstProp.32bit.diff
diff --git a/...nst_prop/repeat.main.ConstProp.diff.64bit → ...nst_prop/repeat.main.ConstProp.64bit.diff b/...nst_prop/repeat.main.ConstProp.diff.64bit → ...nst_prop/repeat.main.ConstProp.64bit.diff
diff --git a/..._prop/slice_len.main.ConstProp.diff.32bit → ..._prop/slice_len.main.ConstProp.32bit.diff b/..._prop/slice_len.main.ConstProp.diff.32bit → ..._prop/slice_len.main.ConstProp.32bit.diff
diff --git a/..._prop/slice_len.main.ConstProp.diff.64bit → ..._prop/slice_len.main.ConstProp.64bit.diff b/..._prop/slice_len.main.ConstProp.diff.64bit → ..._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
@@ -0,0 +1,10 @@
+digraph Mir_0_3 {
+    graph [fontname="Courier, monospace"];
+    node [fontname="Courier, monospace"];
+    edge [fontname="Courier, monospace"];
+    label=<fn main() -&gt; ()<br align="left"/>>;
+    bb0__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">0</td></tr><tr><td align="left" balign="left">_0 = const ()<br/></td></tr><tr><td align="left">goto</td></tr></table>>];
+    bb1__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">1</td></tr><tr><td align="left">resume</td></tr></table>>];
+    bb2__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">2</td></tr><tr><td align="left">return</td></tr></table>>];
+    bb0__0_3 -> bb2__0_3 [label=""];
+}
diff --git a/...ine_into_box_place.main.Inline.diff.32bit → ...ine_into_box_place.main.Inline.32bit.diff b/...ine_into_box_place.main.Inline.diff.32bit → ...ine_into_box_place.main.Inline.32bit.diff
diff --git a/...ine_into_box_place.main.Inline.diff.64bit → ...ine_into_box_place.main.Inline.64bit.diff b/...ine_into_box_place.main.Inline.diff.64bit → ...ine_into_box_place.main.Inline.64bit.diff
diff --git a/...implifyCfg-promote-consts.after.mir.32bit → ...implifyCfg-promote-consts.after.32bit.mir b/...implifyCfg-promote-consts.after.mir.32bit → ...implifyCfg-promote-consts.after.32bit.mir
diff --git a/...implifyCfg-promote-consts.after.mir.64bit → ...implifyCfg-promote-consts.after.64bit.mir b/...implifyCfg-promote-consts.after.mir.64bit → ...implifyCfg-promote-consts.after.64bit.mir
diff --git a/...r-opt/issue_72181.bar.mir_map.0.mir.32bit → ...r-opt/issue_72181.bar.mir_map.0.32bit.mir b/...r-opt/issue_72181.bar.mir_map.0.mir.32bit → ...r-opt/issue_72181.bar.mir_map.0.32bit.mir
diff --git a/...r-opt/issue_72181.bar.mir_map.0.mir.64bit → ...r-opt/issue_72181.bar.mir_map.0.64bit.mir b/...r-opt/issue_72181.bar.mir_map.0.mir.64bit → ...r-opt/issue_72181.bar.mir_map.0.64bit.mir
diff --git a/...r-opt/issue_72181.foo.mir_map.0.mir.32bit → ...r-opt/issue_72181.foo.mir_map.0.32bit.mir b/...r-opt/issue_72181.foo.mir_map.0.mir.32bit → ...r-opt/issue_72181.foo.mir_map.0.32bit.mir
diff --git a/...r-opt/issue_72181.foo.mir_map.0.mir.64bit → ...r-opt/issue_72181.foo.mir_map.0.64bit.mir b/...r-opt/issue_72181.foo.mir_map.0.mir.64bit → ...r-opt/issue_72181.foo.mir_map.0.64bit.mir
diff --git a/...-opt/issue_72181.main.mir_map.0.mir.32bit → ...-opt/issue_72181.main.mir_map.0.32bit.mir b/...-opt/issue_72181.main.mir_map.0.mir.32bit → ...-opt/issue_72181.main.mir_map.0.32bit.mir
diff --git a/...-opt/issue_72181.main.mir_map.0.mir.64bit → ...-opt/issue_72181.main.mir_map.0.64bit.mir b/...-opt/issue_72181.main.mir_map.0.mir.64bit → ...-opt/issue_72181.main.mir_map.0.64bit.mir
diff --git a/...pt/issue_73223.main.PreCodegen.diff.32bit → ...pt/issue_73223.main.PreCodegen.32bit.diff b/...pt/issue_73223.main.PreCodegen.diff.32bit → ...pt/issue_73223.main.PreCodegen.32bit.diff
diff --git a/...pt/issue_73223.main.PreCodegen.diff.64bit → ...pt/issue_73223.main.PreCodegen.64bit.diff b/...pt/issue_73223.main.PreCodegen.diff.64bit → ...pt/issue_73223.main.PreCodegen.64bit.diff
diff --git a/...73223.main.SimplifyArmIdentity.diff.32bit → ...73223.main.SimplifyArmIdentity.32bit.diff b/...73223.main.SimplifyArmIdentity.diff.32bit → ...73223.main.SimplifyArmIdentity.32bit.diff
diff --git a/...73223.main.SimplifyArmIdentity.diff.64bit → ...73223.main.SimplifyArmIdentity.64bit.diff b/...73223.main.SimplifyArmIdentity.diff.64bit → ...73223.main.SimplifyArmIdentity.64bit.diff
diff --git a/....bar.MatchBranchSimplification.diff.32bit → ....bar.MatchBranchSimplification.32bit.diff b/....bar.MatchBranchSimplification.diff.32bit → ....bar.MatchBranchSimplification.32bit.diff
diff --git a/....bar.MatchBranchSimplification.diff.64bit → ....bar.MatchBranchSimplification.64bit.diff b/....bar.MatchBranchSimplification.diff.64bit → ....bar.MatchBranchSimplification.64bit.diff
diff --git a/....foo.MatchBranchSimplification.diff.32bit → ....foo.MatchBranchSimplification.32bit.diff b/....foo.MatchBranchSimplification.diff.32bit → ....foo.MatchBranchSimplification.32bit.diff
diff --git a/....foo.MatchBranchSimplification.diff.64bit → ....foo.MatchBranchSimplification.64bit.diff b/....foo.MatchBranchSimplification.diff.64bit → ....foo.MatchBranchSimplification.64bit.diff
diff --git a/...atch.MatchBranchSimplification.diff.32bit → ...atch.MatchBranchSimplification.32bit.diff b/...atch.MatchBranchSimplification.diff.32bit → ...atch.MatchBranchSimplification.32bit.diff
diff --git a/...atch.MatchBranchSimplification.diff.64bit → ...atch.MatchBranchSimplification.64bit.diff b/...atch.MatchBranchSimplification.diff.64bit → ...atch.MatchBranchSimplification.64bit.diff
diff --git a/...h_i8.MatchBranchSimplification.diff.32bit → ...h_i8.MatchBranchSimplification.32bit.diff b/...h_i8.MatchBranchSimplification.diff.32bit → ...h_i8.MatchBranchSimplification.32bit.diff
diff --git a/...h_i8.MatchBranchSimplification.diff.64bit → ...h_i8.MatchBranchSimplification.64bit.diff b/...h_i8.MatchBranchSimplification.diff.64bit → ...h_i8.MatchBranchSimplification.64bit.diff
diff --git a/...gion_subtyping_basic.main.nll.0.mir.32bit → ...gion_subtyping_basic.main.nll.0.32bit.mir b/...gion_subtyping_basic.main.nll.0.mir.32bit → ...gion_subtyping_basic.main.nll.0.32bit.mir
diff --git a/...gion_subtyping_basic.main.nll.0.mir.64bit → ...gion_subtyping_basic.main.nll.0.64bit.mir b/...gion_subtyping_basic.main.nll.0.mir.64bit → ...gion_subtyping_basic.main.nll.0.64bit.mir
diff --git a/...mplifyCfg-elaborate-drops.after.mir.32bit → ...mplifyCfg-elaborate-drops.after.32bit.mir b/...mplifyCfg-elaborate-drops.after.mir.32bit → ...mplifyCfg-elaborate-drops.after.32bit.mir
diff --git a/...mplifyCfg-elaborate-drops.after.mir.64bit → ...mplifyCfg-elaborate-drops.after.64bit.mir b/...mplifyCfg-elaborate-drops.after.mir.64bit → ...mplifyCfg-elaborate-drops.after.64bit.mir
diff --git a/...mple_match.match_bool.mir_map.0.mir.32bit → ...mple_match.match_bool.mir_map.0.32bit.mir b/...mple_match.match_bool.mir_map.0.mir.32bit → ...mple_match.match_bool.mir_map.0.32bit.mir
diff --git a/...mple_match.match_bool.mir_map.0.mir.64bit → ...mple_match.match_bool.mir_map.0.64bit.mir b/...mple_match.match_bool.mir_map.0.mir.64bit → ...mple_match.match_bool.mir_map.0.64bit.mir
diff --git a/...ntity.main.SimplifyArmIdentity.diff.32bit → ...ntity.main.SimplifyArmIdentity.32bit.diff b/...ntity.main.SimplifyArmIdentity.diff.32bit → ...ntity.main.SimplifyArmIdentity.32bit.diff
diff --git a/...ntity.main.SimplifyArmIdentity.diff.64bit → ...ntity.main.SimplifyArmIdentity.64bit.diff b/...ntity.main.SimplifyArmIdentity.diff.64bit → ...ntity.main.SimplifyArmIdentity.64bit.diff
diff --git a/...inant_reads.map.SimplifyLocals.diff.32bit → ...inant_reads.map.SimplifyLocals.32bit.diff b/...inant_reads.map.SimplifyLocals.diff.32bit → ...inant_reads.map.SimplifyLocals.32bit.diff
diff --git a/...inant_reads.map.SimplifyLocals.diff.64bit → ...inant_reads.map.SimplifyLocals.64bit.diff b/...inant_reads.map.SimplifyLocals.diff.64bit → ...inant_reads.map.SimplifyLocals.64bit.diff
diff --git a/...].AddMovesForPackedDrops.before.mir.32bit → ...].AddMovesForPackedDrops.before.32bit.mir b/...].AddMovesForPackedDrops.before.mir.32bit → ...].AddMovesForPackedDrops.before.32bit.mir
diff --git a/...].AddMovesForPackedDrops.before.mir.64bit → ...].AddMovesForPackedDrops.before.64bit.mir b/...].AddMovesForPackedDrops.before.mir.64bit → ...].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
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>coverage_of_if_else - Code Regions</title>
+    <style>
+    .line {
+        counter-increment: line;
+    }
+    .line:before {
+        content: counter(line) ": ";
+        font-family: Menlo, Monaco, monospace;
+        font-style: italic;
+        width: 3.8em;
+        display: inline-block;
+        text-align: right;
+        filter: opacity(50%);
+        -webkit-user-select: none;
+    }
+    .code {
+        color: #dddddd;
+        background-color: #222222;
+        font-family: Menlo, Monaco, monospace;
+        line-height: 1.4em;
+        border-bottom: 2px solid #222222;
+        white-space: pre;
+        display: inline-block;
+    }
+    .odd {
+        background-color: #55bbff;
+        color: #223311;
+    }
+    .even {
+        background-color: #ee7756;
+        color: #551133;
+    }
+    .code {
+        --index: calc(var(--layer) - 1);
+        padding-top: calc(var(--index) * 0.15em);
+        filter:
+            hue-rotate(calc(var(--index) * 25deg))
+            saturate(calc(100% - (var(--index) * 2%)))
+            brightness(calc(100% - (var(--index) * 1.5%)));
+    }
+    .annotation {
+        color: #4444ff;
+        font-family: monospace;
+        font-style: italic;
+        display: none;
+        -webkit-user-select: none;
+    }
+    body:active .annotation {
+        /* requires holding mouse down anywhere on the page */
+        display: inline-block;
+    }
+    span:hover .annotation {
+        /* requires hover over a span ONLY on its first line */
+        display: inline-block;
+    }
+    </style>
+</head>
+<body>
+<div class="code" style="counter-reset: line 4"><span class="line"><span class="code" style="--layer: 0">fn main() </span><span><span class="code even" style="--layer: 1" title="0: $DIR/spanview-block.rs:5:11: 5:13:
+    5:11-5:13: Assign: _0 = const ()
+    5:13-5:13: Goto: goto -&gt; bb2"><span class="annotation">0⦊</span>{}<span class="annotation">⦉0</span></span></span><span><span class="code odd" style="--layer: 1" title="2: $DIR/spanview-block.rs:5:13: 5:13:
+    5:13-5:13: Return: return"><span class="annotation">2⦊</span>‸<span class="annotation">⦉2</span></span></span></span></div>
+</body>
+</html>
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
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>coverage_of_if_else - Code Regions</title>
+    <style>
+    .line {
+        counter-increment: line;
+    }
+    .line:before {
+        content: counter(line) ": ";
+        font-family: Menlo, Monaco, monospace;
+        font-style: italic;
+        width: 3.8em;
+        display: inline-block;
+        text-align: right;
+        filter: opacity(50%);
+        -webkit-user-select: none;
+    }
+    .code {
+        color: #dddddd;
+        background-color: #222222;
+        font-family: Menlo, Monaco, monospace;
+        line-height: 1.4em;
+        border-bottom: 2px solid #222222;
+        white-space: pre;
+        display: inline-block;
+    }
+    .odd {
+        background-color: #55bbff;
+        color: #223311;
+    }
+    .even {
+        background-color: #ee7756;
+        color: #551133;
+    }
+    .code {
+        --index: calc(var(--layer) - 1);
+        padding-top: calc(var(--index) * 0.15em);
+        filter:
+            hue-rotate(calc(var(--index) * 25deg))
+            saturate(calc(100% - (var(--index) * 2%)))
+            brightness(calc(100% - (var(--index) * 1.5%)));
+    }
+    .annotation {
+        color: #4444ff;
+        font-family: monospace;
+        font-style: italic;
+        display: none;
+        -webkit-user-select: none;
+    }
+    body:active .annotation {
+        /* requires holding mouse down anywhere on the page */
+        display: inline-block;
+    }
+    span:hover .annotation {
+        /* requires hover over a span ONLY on its first line */
+        display: inline-block;
+    }
+    </style>
+</head>
+<body>
+<div class="code" style="counter-reset: line 4"><span class="line"><span class="code" style="--layer: 0">fn main() </span><span><span class="code even" style="--layer: 1" title="0[0]: $DIR/spanview-statement.rs:5:11: 5:13:
+    5:11-5:13: Assign: _0 = const ()"><span class="annotation">0[0]⦊</span>{}<span class="annotation">⦉0[0]</span></span></span><span><span class="code odd" style="--layer: 1" title="0:Goto: $DIR/spanview-statement.rs:5:13: 5:13:
+    5:13-5:13: Goto: goto -&gt; bb2"><span class="annotation">0:Goto⦊</span>‸<span class="annotation">⦉0:Goto</span></span></span><span><span class="code even" style="--layer: 1" title="2:Return: $DIR/spanview-statement.rs:5:13: 5:13:
+    5:13-5:13: Return: return"><span class="annotation">2:Return⦊</span>‸<span class="annotation">⦉2:Return</span></span></span></span></div>
+</body>
+</html>
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
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>coverage_of_if_else - Code Regions</title>
+    <style>
+    .line {
+        counter-increment: line;
+    }
+    .line:before {
+        content: counter(line) ": ";
+        font-family: Menlo, Monaco, monospace;
+        font-style: italic;
+        width: 3.8em;
+        display: inline-block;
+        text-align: right;
+        filter: opacity(50%);
+        -webkit-user-select: none;
+    }
+    .code {
+        color: #dddddd;
+        background-color: #222222;
+        font-family: Menlo, Monaco, monospace;
+        line-height: 1.4em;
+        border-bottom: 2px solid #222222;
+        white-space: pre;
+        display: inline-block;
+    }
+    .odd {
+        background-color: #55bbff;
+        color: #223311;
+    }
+    .even {
+        background-color: #ee7756;
+        color: #551133;
+    }
+    .code {
+        --index: calc(var(--layer) - 1);
+        padding-top: calc(var(--index) * 0.15em);
+        filter:
+            hue-rotate(calc(var(--index) * 25deg))
+            saturate(calc(100% - (var(--index) * 2%)))
+            brightness(calc(100% - (var(--index) * 1.5%)));
+    }
+    .annotation {
+        color: #4444ff;
+        font-family: monospace;
+        font-style: italic;
+        display: none;
+        -webkit-user-select: none;
+    }
+    body:active .annotation {
+        /* requires holding mouse down anywhere on the page */
+        display: inline-block;
+    }
+    span:hover .annotation {
+        /* requires hover over a span ONLY on its first line */
+        display: inline-block;
+    }
+    </style>
+</head>
+<body>
+<div class="code" style="counter-reset: line 4"><span class="line"><span class="code" style="--layer: 0">fn main() {}</span><span><span class="code even" style="--layer: 1" title="0:Goto: $DIR/spanview-terminator.rs:5:13: 5:13:
+    5:13-5:13: Goto: goto -&gt; bb2"><span class="annotation">0:Goto⦊</span>‸<span class="annotation">⦉0:Goto</span></span></span><span><span class="code odd" style="--layer: 1" title="2:Return: $DIR/spanview-terminator.rs:5:13: 5:13:
+    5:13-5:13: Return: return"><span class="annotation">2:Return⦊</span>‸<span class="annotation">⦉2:Return</span></span></span></span></div>
+</body>
+</html>
diff --git a/...ypes.E-V-{{constant}}.mir_map.0.mir.32bit → ...ypes.E-V-{{constant}}.mir_map.0.32bit.mir b/...ypes.E-V-{{constant}}.mir_map.0.mir.32bit → ...ypes.E-V-{{constant}}.mir_map.0.32bit.mir
diff --git a/...ypes.E-V-{{constant}}.mir_map.0.mir.64bit → ...ypes.E-V-{{constant}}.mir_map.0.64bit.mir b/...ypes.E-V-{{constant}}.mir_map.0.mir.64bit → ...ypes.E-V-{{constant}}.mir_map.0.64bit.mir
diff --git a/...est-X-{{constructor}}.mir_map.0.mir.32bit → ...est-X-{{constructor}}.mir_map.0.32bit.mir b/...est-X-{{constructor}}.mir_map.0.mir.32bit → ...est-X-{{constructor}}.mir_map.0.32bit.mir
diff --git a/...est-X-{{constructor}}.mir_map.0.mir.64bit → ...est-X-{{constructor}}.mir_map.0.64bit.mir b/...est-X-{{constructor}}.mir_map.0.mir.64bit → ...est-X-{{constructor}}.mir_map.0.64bit.mir
diff --git a/..._.AddMovesForPackedDrops.before.mir.32bit → ..._.AddMovesForPackedDrops.before.32bit.mir b/..._.AddMovesForPackedDrops.before.mir.32bit → ..._.AddMovesForPackedDrops.before.32bit.mir
diff --git a/..._.AddMovesForPackedDrops.before.mir.64bit → ..._.AddMovesForPackedDrops.before.64bit.mir b/..._.AddMovesForPackedDrops.before.mir.64bit → ..._.AddMovesForPackedDrops.before.64bit.mir
diff --git a/...}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit → ...}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir b/...}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit → ...}-ASSOCIATED_CONSTANT.mir_map.0.32bit.mir
diff --git a/...}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit → ...}-ASSOCIATED_CONSTANT.mir_map.0.64bit.mir b/...}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit → ...}-ASSOCIATED_CONSTANT.mir_map.0.64bit.mir
diff --git a/...ops.change_loop_body.ConstProp.diff.32bit → ...ops.change_loop_body.ConstProp.32bit.diff b/...ops.change_loop_body.ConstProp.diff.32bit → ...ops.change_loop_body.ConstProp.32bit.diff
diff --git a/...ops.change_loop_body.ConstProp.diff.64bit → ...ops.change_loop_body.ConstProp.64bit.diff b/...ops.change_loop_body.ConstProp.diff.64bit → ...ops.change_loop_body.ConstProp.64bit.diff
diff --git a/...ange_loop_body.PreCodegen.after.mir.32bit → ...ange_loop_body.PreCodegen.after.32bit.mir b/...ange_loop_body.PreCodegen.after.mir.32bit → ...ange_loop_body.PreCodegen.after.32bit.mir
diff --git a/...ange_loop_body.PreCodegen.after.mir.64bit → ...ange_loop_body.PreCodegen.after.64bit.mir b/...ange_loop_body.PreCodegen.after.mir.64bit → ...ange_loop_body.PreCodegen.after.64bit.mir
diff --git 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();
             }
@@ -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,8 @@ 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(),