Turn benchHist into a benchmark and ghcide-bench into an exe

This works out nicely because:

1. benchHist already runs ghcide-bench,
2. benchHist has additional deps, but ghcide-bench does not
3. This is the only way I've found to get ghcide-bench in the PATH for benchHist

Author: pepeiborra

bench/exe/Main.hs

@@ -23,8 +23,8 @@
      - Analyisis of performance over the commit history of the project
 
   How to run:
-     1. `cabal bench`
-     2. `cabal exec cabal run ghcide-bench -- -- ghcide-bench-options`
+     1. `cabal exec cabal run ghcide-bench -- -- ghcide-bench-options`
+     1. `stack build ghcide:ghcide-bench && stack exec ghcide-bench -- -- ghcide-bench-options`
 
   Note that the package database influences the response times of certain actions,
   e.g. code actions, and therefore the two methods above do not necessarily

bench/hist/Main.hs

@@ -29,11 +29,11 @@
 
    To execute the script:
 
-   > stack build --flag ghcide:bench-hist ghcide:exe:benchHist && stack exec benchHist all
+   > stack bench
 
    To build a specific analysis, enumerate the desired file artifacts
 
-   > stack exec benchHist bench-hist/HEAD/results.csv bench-hist/HEAD/edit.diff.svg
+   > stack bench --ba "bench-hist/HEAD/results.csv bench-hist/HEAD/edit.diff.svg"
 
  -}
 {-# LANGUAGE DeriveAnyClass    #-}

ghcide.cabal

@@ -32,11 +32,6 @@ flag ghc-lib
   default: False
   manual: True
 
-flag bench-hist
-  description: build the benchHist benchmark runner
-  default: False
-  manual: False
-
 library
     default-language:   Haskell2010
     build-depends:
@@ -178,14 +173,13 @@ executable ghcide-test-preprocessor
     build-depends:
         base == 4.*
 
-executable benchHist
+benchmark benchHist
+    type: exitcode-stdio-1.0
     default-language: Haskell2010
-    if flag(bench-hist)
-        buildable: True
-    else
-        buildable: False
     ghc-options: -Wall -Wno-name-shadowing -threaded
     main-is: bench/hist/Main.hs
+    build-tool-depends:
+        ghcide:ghcide
     default-extensions:
         BangPatterns
         DeriveFunctor
@@ -350,12 +344,10 @@ test-suite ghcide-tests
         TypeApplications
         ViewPatterns
 
-benchmark ghcide-bench
-    type: exitcode-stdio-1.0
+executable ghcide-bench
     default-language: Haskell2010
     build-tool-depends:
-        ghcide:ghcide,
-        ghcide:ghcide-test-preprocessor
+        ghcide:ghcide
     build-depends:
         aeson,
         base,