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`
This commit is contained in:
bors
commit
953f33c5cb
77 changed files with 215 additions and 4 deletions
10
src/test/mir-opt/graphviz.main.mir_map.0.dot.mir
Normal file
10
src/test/mir-opt/graphviz.main.mir_map.0.dot.mir
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
digraph Mir_0_3 {
|
||||||
|
graph [fontname="Courier, monospace"];
|
||||||
|
node [fontname="Courier, monospace"];
|
||||||
|
edge [fontname="Courier, monospace"];
|
||||||
|
label=<fn main() -> ()<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=""];
|
||||||
|
}
|
||||||
67
src/test/mir-opt/spanview_block.main.mir_map.0.html.mir
Normal file
67
src/test/mir-opt/spanview_block.main.mir_map.0.html.mir
Normal file
|
|
@ -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 -> 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>
|
||||||
67
src/test/mir-opt/spanview_statement.main.mir_map.0.html.mir
Normal file
67
src/test/mir-opt/spanview_statement.main.mir_map.0.html.mir
Normal file
|
|
@ -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 -> 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>
|
||||||
66
src/test/mir-opt/spanview_terminator.main.mir_map.0.html.mir
Normal file
66
src/test/mir-opt/spanview_terminator.main.mir_map.0.html.mir
Normal file
|
|
@ -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 -> 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>
|
||||||
|
|
@ -3156,12 +3156,12 @@ impl<'test> TestCx<'test> {
|
||||||
|
|
||||||
if self.config.bless {
|
if self.config.bless {
|
||||||
for e in
|
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();
|
std::fs::remove_file(e.unwrap()).unwrap();
|
||||||
}
|
}
|
||||||
for e in
|
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();
|
std::fs::remove_file(e.unwrap()).unwrap();
|
||||||
}
|
}
|
||||||
|
|
@ -3181,7 +3181,7 @@ impl<'test> TestCx<'test> {
|
||||||
let trimmed = test_name.trim_end_matches(".diff");
|
let trimmed = test_name.trim_end_matches(".diff");
|
||||||
let test_against = format!("{}.after.mir", trimmed);
|
let test_against = format!("{}.after.mir", trimmed);
|
||||||
from_file = format!("{}.before.mir", trimmed);
|
from_file = format!("{}.before.mir", trimmed);
|
||||||
expected_file = format!("{}{}", test_name, bit_width);
|
expected_file = format!("{}{}.diff", trimmed, bit_width);
|
||||||
assert!(
|
assert!(
|
||||||
test_names.next().is_none(),
|
test_names.next().is_none(),
|
||||||
"two mir pass names specified for MIR diff"
|
"two mir pass names specified for MIR diff"
|
||||||
|
|
@ -3199,7 +3199,8 @@ impl<'test> TestCx<'test> {
|
||||||
from_file = format!("{}.{}.mir", test_name, first_pass);
|
from_file = format!("{}.{}.mir", test_name, first_pass);
|
||||||
to_file = Some(second_file);
|
to_file = Some(second_file);
|
||||||
} else {
|
} 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();
|
from_file = test_name.to_string();
|
||||||
assert!(
|
assert!(
|
||||||
test_names.next().is_none(),
|
test_names.next().is_none(),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue