<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Marge Bot pushed to branch master
at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/-/commit/8a816e5fbe02c476f51ec92563cad8247ffc90ba">8a816e5f</a></strong>
<div>
<span>by Krzysztof Gogolewski</span>
<i>at 2020-05-21T12:23:55-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Sort deterministically metric output
Previously, we sorted according to the test name and way,
but the metrics (max_bytes_used/peak_megabytes_allocated etc.)
were appearing in nondeterministic order.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#326e115e015c04db679ca1d9dbc1092906bef3a6">
testsuite/driver/runtests.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="326e115e015c04db679ca1d9dbc1092906bef3a6">
<a href="https://gitlab.haskell.org/ghc/ghc/-/commit/8a816e5fbe02c476f51ec92563cad8247ffc90ba#326e115e015c04db679ca1d9dbc1092906bef3a6"><strong>testsuite/driver/runtests.py</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="339" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="339" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -339,7 +339,7 @@ def cleanup_and_exit(exitcode):</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="339" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
339
</td>
<td class="diff-line-num new_line" data-linenumber="339" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
339
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC339" class="line" lang="python"> <span class="nb" style="color: #0086b3;">exit</span><span class="p">(</span><span class="n" style="color: #333;">exitcode</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="340" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
340
</td>
<td class="diff-line-num new_line" data-linenumber="340" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
340
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC340" class="line" lang="python"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="341" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
341
</td>
<td class="diff-line-num new_line" data-linenumber="341" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
341
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC341" class="line" lang="python"><span class="k" style="font-weight: 600;">def</span> <span class="nf" style="color: #900; font-weight: 600;">tabulate_metrics</span><span class="p">(</span><span class="n" style="color: #333;">metrics</span><span class="p">:</span> <span class="n" style="color: #333;">List</span><span class="p">[</span><span class="n" style="color: #333;">PerfMetric</span><span class="p">])</span> <span class="o" style="font-weight: 600;">-></span> <span class="bp" style="color: #999;">None</span><span class="p">:</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="342" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
342
</td>
<td class="diff-line-num new_line old" data-linenumber="342" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC342" class="line" lang="python"> <span class="k" style="font-weight: 600;">for</span> <span class="n" style="color: #333;">metric</span> <span class="ow" style="font-weight: 600;">in</span> <span class="nb" style="color: #0086b3;">sorted</span><span class="p">(</span><span class="n" style="color: #333;">metrics</span><span class="p">,</span> <span class="n" style="color: #333;">key</span><span class="o" style="font-weight: 600;">=</span><span class="k" style="font-weight: 600;">lambda</span> <span class="n" style="color: #333;">m</span><span class="p">:</span> <span class="p">(</span><span class="n" style="color: #333;">m</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">test</span><span class="p">,</span> <span class="n" style="color: #333;">m</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">way</span><span class="p">)):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="343" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="342" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
342
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC342" class="line" lang="python"> <span class="k" style="font-weight: 600;">for</span> <span class="n" style="color: #333;">metric</span> <span class="ow" style="font-weight: 600;">in</span> <span class="nb" style="color: #0086b3;">sorted</span><span class="p">(</span><span class="n" style="color: #333;">metrics</span><span class="p">,</span> <span class="n" style="color: #333;">key</span><span class="o" style="font-weight: 600;">=</span><span class="k" style="font-weight: 600;">lambda</span> <span class="n" style="color: #333;">m</span><span class="p">:</span> <span class="p">(</span><span class="n" style="color: #333;">m</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">test</span><span class="p">,</span> <span class="n" style="color: #333;">m</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">way</span><span class="p"><span class="idiff left">,</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff">m</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff">stat</span></span><span class="o" style="font-weight: 600;"><span class="idiff">.</span></span><span class="n" style="color: #333;"><span class="idiff right">metric</span></span><span class="p">)):</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="343" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
343
</td>
<td class="diff-line-num new_line" data-linenumber="343" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
343
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC343" class="line" lang="python"> <span class="k" style="font-weight: 600;">print</span><span class="p">(</span><span class="s" style="color: #d14;">"{test:24} {metric:40} {value:15.3f}"</span><span class="o" style="font-weight: 600;">.</span><span class="nb" style="color: #0086b3;">format</span><span class="p">(</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="344" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
344
</td>
<td class="diff-line-num new_line" data-linenumber="344" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
344
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC344" class="line" lang="python"> <span class="n" style="color: #333;">test</span> <span class="o" style="font-weight: 600;">=</span> <span class="s" style="color: #d14;">"{}({})"</span><span class="o" style="font-weight: 600;">.</span><span class="nb" style="color: #0086b3;">format</span><span class="p">(</span><span class="n" style="color: #333;">metric</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">test</span><span class="p">,</span> <span class="n" style="color: #333;">metric</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">way</span><span class="p">),</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="345" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
345
</td>
<td class="diff-line-num new_line" data-linenumber="345" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
345
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC345" class="line" lang="python"> <span class="n" style="color: #333;">metric</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">metric</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">stat</span><span class="o" style="font-weight: 600;">.</span><span class="n" style="color: #333;">metric</span><span class="p">,</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/-/commit/8a816e5fbe02c476f51ec92563cad8247ffc90ba">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.haskell.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.haskell.org/ghc/ghc/-/commit/8a816e5fbe02c476f51ec92563cad8247ffc90ba"}}</script>
</p>
</div>
</body>
</html>