Skip to content

Commit 8cb6663

Browse files
committed
Drop benchmark SVG generation
1 parent 5a5a837 commit 8cb6663

6 files changed

Lines changed: 46 additions & 342 deletions

File tree

bench/Main.hs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@
2020
| └── <HLS plugin>
2121
│   ├── <experiment>.gcStats.log - RTS -s output
2222
│   ├── <experiment>.csv - stats for the experiment
23-
│   ├── <experiment>.svg - Graph of bytes over elapsed time
24-
│   ├── <experiment>.diff.svg - idem, including the previous version
2523
│   ├── <experiment>.log - ghcide-bench output
2624
│   └── results.csv - results of all the experiments for the example
2725
├── results.csv - aggregated results of all the experiments and versions
28-
└── <experiment>.svg - graph of bytes over elapsed time, for all the included versions
26+
└── resultDiff.csv - diff of aggregated results compared with previous version
2927
30-
For diff graphs, the "previous version" is the preceding entry in the list of versions
28+
For diff results, the "previous version" is the preceding entry in the list of versions
3129
in the config file. A possible improvement is to obtain this info via `git rev-list`.
3230
3331
To execute the script:
@@ -36,8 +34,8 @@
3634
3735
To build a specific analysis, enumerate the desired file artifacts
3836
39-
> stack bench --ba "bench-results/HEAD/results.csv bench-results/HEAD/edit.diff.svg"
40-
> cabal bench --benchmark-options "bench-results/HEAD/results.csv bench-results/HEAD/edit.diff.svg"
37+
> stack bench --ba "bench-results/HEAD/results.csv"
38+
> cabal bench --benchmark-options "bench-results/HEAD/results.csv"
4139
4240
-}
4341
{-# LANGUAGE DeriveAnyClass #-}
@@ -165,8 +163,6 @@ createBuildSystem config = do
165163
benchRules build (MkBenchRules (askOracle $ GetSamples ()) benchHls warmupHls "haskell-language-server" (parallelism configStatic))
166164
addGetParentOracle
167165
csvRules build
168-
svgRules build
169-
heapProfileRules build
170166
phonyRules "" binaryName NoProfiling build (examples configStatic)
171167

172168
whenJust (profileInterval configStatic) $ \i -> do

bench/README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,30 @@ The Shake script supports a number of phony targets that allow running a subset
4141
```
4242
Targets:
4343
- bench-results/binaries/*/commitid
44-
- bench-results/binaries/HEAD/ghcide
44+
- bench-results/binaries/HEAD/haskell-language-server
4545
- bench-results/binaries/HEAD/ghc.path
46-
- bench-results/binaries/*/ghcide
46+
- bench-results/binaries/*/haskell-language-server
4747
- bench-results/binaries/*/ghc.path
4848
- bench-results/binaries/*/*.warmup
49-
- bench-results/*/*/*/*.csv
50-
- bench-results/*/*/*/*.gcStats.log
51-
- bench-results/*/*/*/*.output.log
52-
- bench-results/*/*/*/*.eventlog
53-
- bench-results/*/*/*/*.hp
49+
- bench-results/*/*/*/*/*.csv
50+
- bench-results/*/*/*/*/*.gcStats.log
51+
- bench-results/*/*/*/*/*.output.log
52+
- bench-results/*/*/*/*/*.eventlog
53+
- bench-results/*/*/*/*/*.hp
54+
- bench-results/*/*/*/*/results.csv
55+
- bench-results/*/*/*/*/resultDiff.csv
5456
- bench-results/*/*/*/results.csv
55-
- bench-results/*/*/results.csv
56-
- bench-results/*/results.csv
5757
- bench-results/*/*/*/resultDiff.csv
58+
- bench-results/*/*/results.csv
5859
- bench-results/*/*/resultDiff.csv
60+
- bench-results/*/results.csv
5961
- bench-results/*/resultDiff.csv
60-
- bench-results/*/*/*/*.svg
61-
- bench-results/*/*/*/*.diff.svg
62-
- bench-results/*/*/*.svg
63-
- bench-results/*/*/*/*.heap.svg
64-
- Cabal-3.0.0.0
65-
- lsp-types-1.0.0.1
62+
- cabal
63+
- lsp-types
6664
- all
67-
- profiled-Cabal-3.0.0.0
68-
- profiled-lsp-types-1.0.0.1
65+
- all-binaries
66+
- profiled-cabal
67+
- profiled-lsp-types
6968
- profiled-all
69+
- profiled-all-binaries
7070
```

cabal.project

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,33 +61,16 @@ if impl(ghc >= 9.13)
6161

6262
if impl(ghc >= 9.14)
6363
allow-newer:
64-
SVGFonts:containers,
65-
active:base,
6664
aeson:containers,
6765
aeson:template-haskell,
6866
aeson:time,
6967
binary-instances:base,
7068
binary-instances:tagged,
7169
binary-orphans:base,
72-
blaze-svg:base,
7370
boring:base,
7471
cabal-install-parsers:containers,
7572
constraints-extras:template-haskell,
7673
dependent-map:containers,
77-
diagrams-contrib:base,
78-
diagrams-contrib:containers,
79-
diagrams-core:base,
80-
diagrams-core:containers,
81-
diagrams-lib:base,
82-
diagrams-lib:containers,
83-
diagrams-postscript:base,
84-
diagrams-svg:base,
85-
diagrams-svg:containers,
86-
dual-tree:base,
87-
eventlog2html:containers,
88-
eventlog2html:optparse-applicative,
89-
force-layout:base,
90-
ghc-events:base,
9174
ghc-trace-events:base,
9275
hie-compat:base,
9376
indexed-traversable:base,
@@ -96,17 +79,13 @@ if impl(ghc >= 9.14)
9679
lukko:base,
9780
microstache:base,
9881
microstache:containers,
99-
monoid-extras:base,
10082
monad-control:transformers-compat,
101-
newtype-generics:base,
10283
quickcheck-instances:base,
10384
quickcheck-instances:containers,
10485
random-fu:random,
10586
semialign:base,
10687
semialign:containers,
107-
statestack:base,
10888
string-interpolate:template-haskell,
109-
svg-builder:base,
11089
tasty-hspec:QuickCheck,
11190
tasty-hspec:base,
11291
text-iso8601:time,

haskell-language-server.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,8 +1979,7 @@ benchmark benchmark
19791979
main-is: Main.hs
19801980
hs-source-dirs: bench
19811981
build-tool-depends:
1982-
haskell-language-server:ghcide-bench,
1983-
eventlog2html:eventlog2html,
1982+
haskell-language-server:ghcide-bench
19841983
default-extensions:
19851984
LambdaCase
19861985
RecordWildCards

shake-bench/shake-bench.cabal

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@ library
2424
aeson,
2525
base == 4.*,
2626
bytestring,
27-
Chart,
28-
Chart-diagrams,
29-
diagrams-contrib,
30-
diagrams-core,
31-
diagrams-lib,
32-
diagrams-svg,
3327
directory,
3428
extra >= 1.7.2,
3529
filepath,

0 commit comments

Comments
 (0)