Skip to content

Benchmark: Enable 9.6, 9.8 #4118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ jobs:
ghc:
- '9.2'
- '9.4'
- '9.6'
- '9.8'
os:
- ubuntu-latest

Expand Down Expand Up @@ -115,13 +117,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['9.2', '9.4']
ghc: ['9.2', '9.4', '9.6', '9.8']
os: [ubuntu-latest]
cabal: ['3.10']
example: ['cabal', 'lsp-types']

steps:
- uses: haskell-actions/setup@v2.6.2
- uses: haskell-actions/setup@v2.6.1
with:
ghc-version : ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
Expand Down
12 changes: 6 additions & 6 deletions bench/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ examples:
# Medium-sized project without TH
- name: cabal
package: Cabal
version: 3.6.3.0
version: 3.10.2.1
modules:
- src/Distribution/Simple.hs
- src/Distribution/Types/Module.hs
- src/Distribution/Types/ComponentLocalBuildInfo.hs
extra-args: [] # extra HLS command line args
# Small-sized project with TH
- name: lsp-types
package: lsp-types
version: 1.5.0.0
version: 2.1.1.0
modules:
- src/Language/LSP/Types/WatchedFiles.hs
- src/Language/LSP/Types/CallHierarchy.hs
- generated/Language/LSP/Protocol/Internal/Types/DidChangeWatchedFilesParams.hs
- src/Language/LSP/Protocol/Types/SemanticTokens.hs

- name: MultiLayerModules
path: bench/MultiLayerModules.sh
Expand Down Expand Up @@ -129,7 +129,7 @@ versions:
# WARNING: Currently bench versions later than e4234a3a5e347db249fccefb8e3fb36f89e8eafb
# will be unable to send plugin configurations to earlier HLS versions. This causes
# all plugins in those versions to always be enabled.
# In addition bench proactively disables all plugins it knows about besides the
# In addition bench proactively disables all plugins it knows about besides the
# ones in the following list. However because it can only disable plugins it
# knows about, any plugins that are in old versions but were removed from HLS
# before the current bench will not be disabled.
Expand Down
2 changes: 0 additions & 2 deletions haskell-language-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -1835,8 +1835,6 @@ test-suite wrapper-test
benchmark benchmark
import: defaults, warnings
-- Depends on shake-bench which is unbuildable after this point
if impl(ghc >= 9.5)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment above belongs to this if, so I think it should be removed too.

Copy link
Collaborator Author

@soulomoon soulomoon Mar 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed

buildable: False
type: exitcode-stdio-1.0
ghc-options: -threaded
main-is: Main.hs
Expand Down
2 changes: 0 additions & 2 deletions shake-bench/shake-bench.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ source-repository head

library
-- Depends on Chart which is unbuildable after this point
if impl(ghc >= 9.5)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this comment still true? Is chart now buildable?

Copy link
Collaborator Author

@soulomoon soulomoon Mar 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not true, we can build chart, I forget to delete them.

buildable: False
exposed-modules: Development.Benchmark.Rules
hs-source-dirs: src
build-depends:
Expand Down
2 changes: 1 addition & 1 deletion shake-bench/src/Development/Benchmark/Rules.hs
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ benchRules build MkBenchRules{..} = do
++ concat
[[ "-h"
, "-i" <> show i
, "-po" <> outHp
, "-po" <> dropExtension outHp
, "-qg"]
| CheapHeapProfiling i <- [prof]]
++ ["-RTS"]
Expand Down