[Git][ghc/ghc][wip/keepAlive-optionB] 2 commits: testsuite: A few minor perf notes fixes

[Ben Gamari]

Ben Gamari pushed to branch wip/keepAlive-optionB at Glasgow Haskell Compiler / GHC


Commits:
4a883917 by GHC GitLab CI at 2020-09-11T12:41:34+00:00
testsuite: A few minor perf notes fixes

- - - - -
ad5a0272 by GHC GitLab CI at 2020-09-11T13:00:19+00:00
simplify

- - - - -


3 changed files:

- compiler/GHC/Core/Opt/Simplify.hs
- testsuite/driver/perf_notes.py
- testsuite/driver/runtests.py


Changes:

=====================================
compiler/GHC/Core/Opt/Simplify.hs
=====================================
@@ -2060,7 +2060,7 @@ rebuildContOpCall
     env
     (ArgInfo { ai_fun = fun_id, ai_args = rev_args })
     (ApplyToVal { sc_arg = k, sc_env = k_se
-                , sc_cont = cont, sc_hole_ty = fun_ty })
+                , sc_cont = cont })
   | Just KeepAliveOp <- isPrimOpId_maybe fun_id
   , [ ValArg {as_arg=s0}
     , ValArg {as_arg=x}


=====================================
testsuite/driver/perf_notes.py
=====================================
@@ -311,7 +311,7 @@ def append_perf_stat(stats: List[PerfStat],
                      max_tries: int=5
                      ) -> bool:
     # Append to git note
-    print('Appending ' + str(len(stats)) + ' stats to git notes.')
+    print('Appending %d stats to git note namespace %s.' % (len(stats), namespace))
     stats_str = format_perf_stat(stats)
     def try_append():
             try:


=====================================
testsuite/driver/runtests.py
=====================================
@@ -512,10 +512,11 @@ else:
     # Write perf stats if any exist or if a metrics file is specified.
     stats_metrics = [stat for (_, stat, __) in t.metrics] # type: List[PerfStat]
     if hasMetricsFile:
-        print('Appending ' + str(len(stats_metrics)) + ' stats to file: ' + config.metrics_file)
+        print('Appending %d stats to file: %s' % (len(stats_metrics), config.metrics_file))
         with open(config.metrics_file, 'a') as f:
             f.write("\n" + Perf.format_perf_stat(stats_metrics))
-    elif inside_git_repo() and any(stats_metrics):
+
+    if inside_git_repo() and any(stats_metrics):
         if is_worktree_dirty():
             print()
             print(str_warn('Performance Metrics NOT Saved') + \



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dcc48ecdcd4cd01d289593f0831e8db8ebdb697c...ad5a0272c76ddd89e1c9ed335cb5bed460121d19

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/dcc48ecdcd4cd01d289593f0831e8db8ebdb697c...ad5a0272c76ddd89e1c9ed335cb5bed460121d19
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200911/a6712452/attachment-0001.html>