Remove use-gauge build flag

benchmark/NanoBenchmarks.hs

@@ -18,7 +18,7 @@ import qualified Streamly.Data.Fold as FL
 import qualified Streamly.Internal.Data.Stream as S
 import qualified Streamly.Internal.Data.Stream.IsStream as Internal
 
-import Gauge
+import Test.Tasty.Bench
 import System.Random
 
 maxValue :: Int

benchmark/Streamly/Benchmark/Data/Array/CommonImports.hs

@@ -9,7 +9,7 @@ import qualified Streamly.Data.Fold as Fold
 import qualified Streamly.Data.Stream as S
 import qualified Streamly.Internal.Data.Stream as Stream
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common hiding (benchPureSrc)
 import qualified Stream.Common as P
 

benchmark/Streamly/Benchmark/Data/Array/Stream.hs

@@ -47,7 +47,7 @@ import qualified Streamly.Internal.Data.StreamK as StreamK
 import qualified Streamly.Internal.FileSystem.Handle as Handle
 import qualified Streamly.Internal.Unicode.Stream as Unicode
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Common.Handle
 import Control.Monad.IO.Class (MonadIO)

benchmark/Streamly/Benchmark/Data/Fold.hs

@@ -41,7 +41,7 @@ import qualified Streamly.Internal.Data.Unfold as Unfold
 import qualified Streamly.Internal.Data.Pipe as Pipe
 import qualified Streamly.Internal.Data.Stream as Stream
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common
 import Prelude hiding (all, any, take, unzip, sequence_, filter)
 

benchmark/Streamly/Benchmark/Data/Fold/Window.hs

@@ -13,7 +13,7 @@ import qualified Streamly.Internal.Data.Ring as Ring
 import qualified Streamly.Internal.Data.Stream as Stream
 
 import Streamly.Benchmark.Common
-import Gauge
+import Test.Tasty.Bench
 
 {-# INLINE source #-}
 source :: (Monad m, Num a, Stream.Enumerable a) =>

benchmark/Streamly/Benchmark/Data/MutArray.hs

@@ -49,7 +49,7 @@ import qualified Streamly.Internal.Data.MutArray as MArray
 import qualified Streamly.Internal.Data.Fold as Fold
 import qualified Streamly.Internal.Data.Stream as Stream
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common hiding (benchPureSrc)
 
 type Stream = MutArray

benchmark/Streamly/Benchmark/Data/Parser.hs

@@ -49,7 +49,7 @@ import qualified Streamly.Data.Stream as Stream
 import qualified Streamly.Internal.Data.Producer as Producer
 import qualified Streamly.Internal.Data.Stream as Stream
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Common.Handle
 

benchmark/Streamly/Benchmark/Data/ParserK.hs

@@ -48,7 +48,7 @@ import qualified Streamly.Data.Parser as PRD
 import qualified Streamly.Internal.Data.ParserK as PR
 import qualified Streamly.Internal.Data.StreamK as StreamK
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common
 
 -------------------------------------------------------------------------------

benchmark/Streamly/Benchmark/Data/Ring/Unboxed.hs

@@ -16,7 +16,7 @@ import qualified Streamly.Internal.Data.Array as Array
 import qualified Streamly.Internal.Data.Ring as Ring
 import qualified Data.Foldable as P
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common
 
 import Prelude as P

benchmark/Streamly/Benchmark/Data/Serialize.hs

@@ -42,7 +42,7 @@ import Streamly.Internal.Data.Serialize.TH
 #endif
 #endif
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common
 
 #ifndef USE_UNBOX

benchmark/Streamly/Benchmark/Data/Stream/Common.hs

@@ -104,7 +104,7 @@ import qualified Streamly.Internal.Data.Stream as StreamK
 #endif
 #endif
 
-import Gauge
+import Test.Tasty.Bench
 import Prelude hiding (Foldable(..), mapM, replicate)
 
 #ifdef USE_STREAMK

benchmark/Streamly/Benchmark/Data/Stream/ConcurrentCommon.hs

@@ -21,7 +21,7 @@ import qualified Streamly.Data.Fold as Fold
 import qualified Streamly.Data.Stream as Stream
 import qualified Streamly.Internal.Data.Stream.Concurrent as Async
 
-import Gauge
+import Test.Tasty.Bench
 import Prelude hiding (mapM)
 import Streamly.Benchmark.Common
 

benchmark/Streamly/Benchmark/Data/Stream/Eliminate.hs

@@ -57,7 +57,7 @@ import qualified Streamly.Internal.Data.Stream as StreamK
 #endif
 #endif
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common
 import Prelude hiding (length, sum, or, and, any, all, notElem, elem, (!!),
     lookup, repeat, minimum, maximum, product, last, mapM_, init)

benchmark/Streamly/Benchmark/Data/Stream/Exceptions.hs

@@ -45,7 +45,7 @@ import qualified Streamly.Internal.Data.Stream as Stream
 import qualified Streamly.Internal.Data.Stream.Exception.Lifted as Stream
 #endif
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Prelude hiding (last, length)
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Common.Handle

benchmark/Streamly/Benchmark/Data/Stream/Expand.hs

@@ -54,7 +54,7 @@ import qualified Streamly.Internal.Data.Stream as StreamK
 #endif
 #endif
 
-import Gauge
+import Test.Tasty.Bench
 import Stream.Common
 import Streamly.Benchmark.Common
 import Prelude hiding (concatMap)

benchmark/Streamly/Benchmark/Data/Stream/Generate.hs

@@ -40,7 +40,7 @@ import qualified Stream.Common as Common
 #endif
 #endif
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common
 import qualified Prelude
 

benchmark/Streamly/Benchmark/Data/Stream/Lift.hs

@@ -37,7 +37,7 @@ import qualified Control.Monad.State.Strict as State
 #endif
 #endif
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common
 import Prelude hiding (reverse, tail)
 

benchmark/Streamly/Benchmark/Data/Stream/Reduce.hs

@@ -61,7 +61,7 @@ import qualified Streamly.Internal.Data.Stream as K
 
 #endif
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Benchmark.Common
 import Stream.Common
 import Prelude hiding (reverse, tail)

benchmark/Streamly/Benchmark/Data/Stream/Split.hs

@@ -35,7 +35,7 @@ import qualified Streamly.Internal.FileSystem.Handle as IFH
 import qualified Streamly.Internal.Unicode.Stream as IUS
 import qualified Streamly.Prelude as S
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Prelude hiding (last, length)
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Common.Handle

benchmark/Streamly/Benchmark/Data/Stream/StreamD.hs

@@ -27,7 +27,7 @@ import Control.Applicative (liftA2)
 #endif
 import Control.Monad (when)
 import Data.Maybe (isJust)
-import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)
+import Test.Tasty.Bench (bench, nfIO, bgroup, Benchmark, defaultMain)
 import System.Random (randomRIO)
 import Prelude hiding (tail, mapM_, foldl, last, map, mapM, concatMap, zip)
 

benchmark/Streamly/Benchmark/Data/Stream/StreamK.hs

@@ -37,7 +37,7 @@ import qualified Data.List as List
 
 import qualified Streamly.Internal.Data.StreamK as S
 
-import Gauge (bench, nfIO, bgroup, Benchmark, defaultMain)
+import Test.Tasty.Bench (bench, nfIO, bgroup, Benchmark, defaultMain)
 
 import Streamly.Benchmark.Common
 

benchmark/Streamly/Benchmark/Data/Stream/StreamKAlt.hs

@@ -23,7 +23,7 @@ import qualified Streamly.Internal.Data.StreamK.Alt as S
 -- import qualified Streamly.Internal.Data.SVar as S
 
 import Streamly.Benchmark.Common
-import Gauge (bgroup, Benchmark, defaultMain)
+import Test.Tasty.Bench (bgroup, Benchmark, defaultMain)
 
 value :: Int
 value = 100000

benchmark/Streamly/Benchmark/Data/Stream/ToStreamK.hs

@@ -37,7 +37,7 @@ import qualified Streamly.Internal.Data.StreamK as S
 import qualified Streamly.Internal.Data.Stream as D
 import qualified Streamly.Internal.Data.Fold as Fold
 
-import Gauge (bgroup, Benchmark, defaultMain)
+import Test.Tasty.Bench (bgroup, Benchmark, defaultMain)
 
 import Streamly.Benchmark.Common
 

benchmark/Streamly/Benchmark/Data/Stream/Transform.hs

@@ -58,7 +58,7 @@ import qualified Streamly.Internal.Data.StreamK as StreamK
 #endif
 #endif
 
-import Gauge
+import Test.Tasty.Bench
 import Stream.Common hiding (scanl')
 import Streamly.Benchmark.Common
 import Prelude hiding (sequence, mapM)

benchmark/Streamly/Benchmark/Data/Unfold.hs

@@ -36,7 +36,7 @@ import qualified Streamly.Internal.Data.Stream as S
 import qualified Streamly.Internal.Data.Stream as D
 import qualified Streamly.Internal.Data.StreamK as K
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Prelude hiding (take, filter, zipWith, map, mapM, takeWhile)
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Common.Handle

benchmark/Streamly/Benchmark/FileSystem/Handle.hs

@@ -22,7 +22,7 @@ import Streamly.Benchmark.Common.Handle (mkHandleBenchEnv)
 import qualified Handle.ReadWrite as RW
 import qualified Handle.Read as RO
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Prelude hiding (last, length)
 import Streamly.Benchmark.Common
 

benchmark/Streamly/Benchmark/FileSystem/Handle/Read.hs

@@ -41,7 +41,7 @@ import qualified Streamly.Internal.Unicode.Stream as IUS
 import qualified Streamly.Data.Stream.Prelude as S
 import qualified Streamly.Unicode.Stream as SS
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Prelude hiding (last, length)
 import Streamly.Benchmark.Common.Handle
 

benchmark/Streamly/Benchmark/FileSystem/Handle/ReadWrite.hs

@@ -34,7 +34,7 @@ import qualified Streamly.Internal.FileSystem.Handle as IFH
 import qualified Streamly.Data.Array as A
 import qualified Streamly.Data.Stream.Prelude as S
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Streamly.Benchmark.Common.Handle
 
 #ifdef INSPECTION

benchmark/Streamly/Benchmark/Prelude/Adaptive.hs

@@ -10,7 +10,7 @@
 import Control.Concurrent (threadDelay)
 import Control.Monad (when)
 import Control.Monad.IO.Class (liftIO)
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Prelude as S
 import System.Random (randomRIO)
 

benchmark/Streamly/Benchmark/Prelude/Ahead.hs

@@ -15,7 +15,7 @@ import qualified Streamly.Prelude as S
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude
 
-import Gauge
+import Test.Tasty.Bench
 
 moduleName :: String
 moduleName = "Prelude.Ahead"

benchmark/Streamly/Benchmark/Prelude/Async.hs

@@ -16,7 +16,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream.Transform as Transform
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude
 
-import Gauge
+import Test.Tasty.Bench
 
 moduleName :: String
 moduleName = "Prelude.Async"

benchmark/Streamly/Benchmark/Prelude/Concurrent.hs

@@ -15,7 +15,7 @@ import Streamly.Prelude
     , fromWAsync, parallel, fromParallel
     )
 
-import Gauge
+import Test.Tasty.Bench
 import qualified Streamly.Prelude as S
 
 -------------------------------------------------------------------------------

benchmark/Streamly/Benchmark/Prelude/Merge.hs

@@ -30,7 +30,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream as Stream
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude
 
-import Gauge
+import Test.Tasty.Bench
 
 #ifdef INSPECTION
 import GHC.Types (SPEC(..))

benchmark/Streamly/Benchmark/Prelude/Parallel.hs

@@ -22,7 +22,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream as Internal
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude
 
-import Gauge
+import Test.Tasty.Bench
 
 moduleName :: String
 moduleName = "Prelude.Parallel"

benchmark/Streamly/Benchmark/Prelude/Rate.hs

@@ -14,7 +14,7 @@ import qualified Streamly.Prelude as S
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude
 
-import Gauge
+import Test.Tasty.Bench
 
 moduleName :: String
 moduleName = "Prelude.Rate"

benchmark/Streamly/Benchmark/Prelude/WAsync.hs

@@ -15,7 +15,7 @@ import qualified Streamly.Prelude as S
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude
 
-import Gauge
+import Test.Tasty.Bench
 
 moduleName :: String
 moduleName = "Prelude.WAsync"

benchmark/Streamly/Benchmark/Prelude/WSerial.hs

@@ -29,7 +29,7 @@ import qualified Streamly.Internal.Data.Unfold as UF
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude
 
-import Gauge
+import Test.Tasty.Bench
 
 #ifdef INSPECTION
 import GHC.Types (SPEC(..))

benchmark/Streamly/Benchmark/Prelude/ZipAsync.hs

@@ -15,7 +15,7 @@ import qualified Streamly.Prelude  as S
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude
 
-import Gauge
+import Test.Tasty.Bench
 
 moduleName :: String
 moduleName = "Prelude.ZipAsync"

benchmark/Streamly/Benchmark/Prelude/ZipSerial.hs

@@ -29,7 +29,7 @@ import qualified Streamly.Prelude  as S
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Prelude hiding (sourceUnfoldrM)
 
-import Gauge
+import Test.Tasty.Bench
 
 #ifdef INSPECTION
 import GHC.Types (SPEC(..))

benchmark/Streamly/Benchmark/Unicode/Char.hs

@@ -16,7 +16,7 @@ import Control.DeepSeq (NFData(..))
 import Streamly.Internal.Data.Array (Array)
 import System.FilePath (dropExtensions, takeFileName)
 import System.FilePath.Posix ((</>))
-import Gauge.Main (Benchmark, bench, bgroup, defaultMain, env, nfIO)
+import Test.Tasty.Bench (Benchmark, bench, bgroup, defaultMain, env, nfIO)
 import Streamly.Internal.Unicode.Char
     ( NormalizationMode(NFC, NFD, NFKC, NFKD)
     , normalize

benchmark/Streamly/Benchmark/Unicode/Parser.hs

@@ -31,7 +31,7 @@ import qualified Streamly.Data.Array as Array
 import qualified Streamly.Data.Stream as Stream
 import qualified Streamly.Internal.Unicode.Parser as PRU
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Streamly.Benchmark.Common
 
 runParser :: Int -> (Stream IO Char -> IO a) -> IO ()

benchmark/Streamly/Benchmark/Unicode/Stream.hs

@@ -33,7 +33,7 @@ import qualified Streamly.Internal.FileSystem.Handle as Handle
 import qualified Streamly.Internal.Unicode.Array as UnicodeArr
 import qualified Streamly.Internal.Unicode.Stream as Unicode
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Streamly.Benchmark.Common
 import Streamly.Benchmark.Common.Handle
 

benchmark/Streamly/Benchmark/Unicode/Utf8.hs

@@ -13,7 +13,7 @@
 import Data.Char (chr)
 import Streamly.Internal.Unicode.Utf8 (Utf8)
 
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 import Streamly.Benchmark.Common
 
 import qualified Streamly.Internal.Unicode.Utf8 as Utf8

benchmark/lib/Streamly/Benchmark/Common.hs

@@ -56,7 +56,7 @@ import System.Random (randomRIO)
 import qualified Streamly.Internal.Data.Fold as Fold
 import qualified Streamly.Internal.Data.Stream as S
 
-import Gauge
+import Test.Tasty.Bench
 
 -------------------------------------------------------------------------------
 -- Benchmark Prefixes

benchmark/lib/Streamly/Benchmark/Common/Handle.hs

@@ -46,7 +46,7 @@ import System.Process (callCommand)
 
 import Data.IORef
 import Prelude hiding (last, length)
-import Gauge hiding (env)
+import Test.Tasty.Bench hiding (env)
 
 
 scratchDir :: String

benchmark/lib/Streamly/Benchmark/Prelude.hs

@@ -82,7 +82,7 @@ import qualified Streamly.Internal.Data.Stream.IsStream.Type as IsStream
 import qualified Streamly.Internal.Data.Pipe as Pipe
 import qualified Streamly.Internal.Data.Stream.Serial as Serial
 
-import Gauge
+import Test.Tasty.Bench
 import Streamly.Internal.Data.Time.Units
 
 -- Common polymorphic stream APIs used across multiple stream modules

benchmark/streamly-benchmarks.cabal

@@ -54,11 +54,6 @@ flag opt
   manual: True
   default: True
 
-flag use-gauge
-  description: Use gauge instead of tasty-bench for benchmarking
-  manual: True
-  default: False
-
 flag use-streamly-core
   description: Benchmark only core package
   manual: True
@@ -195,22 +190,12 @@ common bench-depends
     , directory         >= 1.2.2 && < 1.4
     , filepath          >= 1.4.1 && < 1.5
     , ghc-prim          >= 0.4   && < 0.12
+    , tasty-bench       >= 0.3 && < 0.4
+    , tasty             >= 1.4.1 && < 1.6
+    , streamly-core
 
-  if flag(use-streamly-core)
-    build-depends: streamly-core
-  else
+  if !flag(use-streamly-core)
     build-depends: streamly
-        , streamly-core
-
-  if flag(use-gauge)
-    build-depends:  gauge >= 0.2.4 && < 0.3
-  else
-    build-depends:    tasty-bench >= 0.3 && < 0.4
-                    , tasty     >= 1.4.1 && < 1.6
-    mixins: tasty-bench
-      (Test.Tasty.Bench as Gauge
-      , Test.Tasty.Bench as Gauge.Main
-      )
 
   if flag(fusion-plugin) && !impl(ghcjs) && !impl(ghc < 8.6)
     build-depends: