[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: haddock/doc: Drop version and release

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
3ccb56c0 by Ben Gamari at 2025-02-26T22:38:18-05:00
haddock/doc: Drop version and release

We currently have no way of keeping this up-to-date with the project version
- - - - -
45230fa6 by Matthew Pickering at 2025-02-26T22:38:19-05:00
testsuite: Add test for :steplocal performance

This adds a simple test which exercises #25779

- - - - -


5 changed files:

- testsuite/tests/perf/compiler/all.T
- + testsuite/tests/perf/compiler/interpreter_steplocal.hs
- + testsuite/tests/perf/compiler/interpreter_steplocal.script
- + testsuite/tests/perf/compiler/interpreter_steplocal.stdout
- utils/haddock/doc/conf.py


Changes:

=====================================
testsuite/tests/perf/compiler/all.T
=====================================
@@ -788,3 +788,9 @@ test ('T24984',
       [ collect_compiler_stats('bytes allocated',5) ],
       compile,
       ['-O'])
+
+test('interpreter_steplocal',
+     [ collect_compiler_stats('bytes allocated', 5)
+     ],
+     ghci_script,
+     ['interpreter_steplocal.script'])


=====================================
testsuite/tests/perf/compiler/interpreter_steplocal.hs
=====================================
@@ -0,0 +1,7 @@
+module Main where
+
+main = print $ fib 20
+
+fib 0 = 0
+fib 1 = 1
+fib n = fib (n-1) + fib (n-2)


=====================================
testsuite/tests/perf/compiler/interpreter_steplocal.script
=====================================
@@ -0,0 +1,5 @@
+:l interpreter_steplocal.hs
+:break main
+main
+:steplocal
+:steplocal


=====================================
testsuite/tests/perf/compiler/interpreter_steplocal.stdout
=====================================
@@ -0,0 +1,6 @@
+Breakpoint 0 activated at interpreter_steplocal.hs:3:8-21
+Stopped in Main.main, interpreter_steplocal.hs:3:8-21
+_result :: IO () = _
+Stopped in Main.main, interpreter_steplocal.hs:3:16-21
+_result :: Integer = _
+6765


=====================================
utils/haddock/doc/conf.py
=====================================
@@ -13,8 +13,8 @@ master_doc = 'index'
 project = u'Haddock'
 copyright = u'2016, Simon Marlow'
 author = u'Simon Marlow'
-version = '1.0'
-release = '1.0'
+version = ''
+release = ''
 
 language = 'en'
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2400c42fe138cca40e9574296b261f3fb7e6b17c...45230fa6827f3a1e4652052ae1f73d58c7e352f1

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/2400c42fe138cca40e9574296b261f3fb7e6b17c...45230fa6827f3a1e4652052ae1f73d58c7e352f1
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/20250226/59b25aba/attachment-0001.html>