From 316547a7ed4e7a0d974d846e677059a2237f7ad5 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@ymhg.org>
Date: Mon, 15 Apr 2019 19:44:04 +0100
Subject: Replace Env by Fuzz

---
 src/VeriFuzz/Fuzz.hs    | 113 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/VeriFuzz/Sim/Env.hs |  58 -------------------------
 2 files changed, 113 insertions(+), 58 deletions(-)
 create mode 100644 src/VeriFuzz/Fuzz.hs
 delete mode 100644 src/VeriFuzz/Sim/Env.hs

(limited to 'src')

diff --git a/src/VeriFuzz/Fuzz.hs b/src/VeriFuzz/Fuzz.hs
new file mode 100644
index 0000000..470d8a8
--- /dev/null
+++ b/src/VeriFuzz/Fuzz.hs
@@ -0,0 +1,113 @@
+{-|
+Module      : VeriFuzz.Sim.Env
+Description : Environment to run the simulator and synthesisers in a matrix.
+Copyright   : (c) 2019, Yann Herklotz
+License     : GPL-3
+Maintainer  : ymherklotz [at] gmail [dot] com
+Stability   : experimental
+Portability : POSIX
+
+Environment to run the simulator and synthesisers in a matrix.
+-}
+
+{-# LANGUAGE AllowAmbiguousTypes    #-}
+{-# LANGUAGE ConstraintKinds        #-}
+{-# LANGUAGE FlexibleContexts       #-}
+{-# LANGUAGE FlexibleInstances      #-}
+{-# LANGUAGE FunctionalDependencies #-}
+{-# LANGUAGE LambdaCase             #-}
+{-# LANGUAGE MultiParamTypeClasses  #-}
+{-# LANGUAGE ScopedTypeVariables    #-}
+{-# LANGUAGE TupleSections          #-}
+{-# LANGUAGE TypeApplications       #-}
+{-# LANGUAGE TypeSynonymInstances   #-}
+
+module VeriFuzz.Sim.Env
+    ( SynthTool(..)
+    , SimTool(..)
+    , FuzzResult(..)
+    , Fuzz
+    , fuzz
+    )
+where
+
+import           Control.Monad.IO.Class
+import           Control.Monad.Trans.Class        (lift)
+import           Control.Monad.Trans.Reader       hiding (local)
+import           Control.Monad.Trans.State.Strict
+import           Prelude                          hiding (FilePath)
+import           VeriFuzz.Sim.Icarus
+import           VeriFuzz.Sim.Internal
+import           VeriFuzz.Sim.Quartus
+import           VeriFuzz.Sim.Vivado
+import           VeriFuzz.Sim.XST
+import           VeriFuzz.Sim.Yosys
+
+data Result = Pass
+            | EquivFail
+            | SimFail
+            | TimeoutFail
+            deriving (Eq, Show)
+
+data SynthTool = XSTSynth {-# UNPACK #-} !XST
+               | VivadoSynth {-# UNPACK #-} !Vivado
+               | YosysSynth {-# UNPACK #-} !Yosys
+               | QuartusSynth {-# UNPACK #-} !Quartus
+               deriving (Eq, Show)
+
+instance Tool SynthTool where
+    toText (XSTSynth xst)     = toText xst
+    toText (YosysSynth yosys) = toText yosys
+
+instance Synthesiser SynthTool where
+    runSynth (XSTSynth xst)     = runSynth xst
+    runSynth (YosysSynth yosys) = runSynth yosys
+
+newtype SimTool = IcarusSim Icarus
+                deriving (Eq, Show)
+
+instance Tool SimTool where
+    toText (IcarusSim icarus) = toText icarus
+
+instance Simulator SimTool where
+    runSim (IcarusSim icarus) = runSim icarus
+    runSimWithFile (IcarusSim icarus) = runSimWithFile icarus
+
+data FuzzEnv = FuzzEnv { getSynthesisers :: ![SynthTool]
+                       , getSimulators   :: ![SimTool]
+                       }
+               deriving (Eq, Show)
+
+data SimResult = SimResult !SynthTool !SimTool !Result
+               deriving (Eq, Show)
+
+data SynthResult = SynthResult !SynthTool !SynthTool !Result
+                 deriving (Eq, Show)
+
+data FuzzResult = FuzzResult { getSynthResults :: ![SynthResult]
+                             , getSimResults   :: ![SimResult]
+                             }
+                deriving (Eq, Show)
+
+instance Semigroup FuzzResult where
+    FuzzResult a1 b1 <> FuzzResult a2 b2 = FuzzResult (a1 <> a2) (b1 <> b2)
+
+instance Monoid FuzzResult where
+    mempty = FuzzResult [] []
+
+type Fuzz m = StateT FuzzResult (ReaderT FuzzEnv m)
+
+runFuzz :: (Monad m) => [SynthTool] -> [SimTool] -> Fuzz m a -> m a
+runFuzz synth sim m =  runReaderT (evalStateT m (FuzzResult [] [])) (FuzzEnv synth sim)
+
+synthesisers :: (Monad m) => Fuzz m [SynthTool]
+synthesisers = lift $ asks getSynthesisers
+
+simulators :: (Monad m) => Fuzz m [SimTool]
+simulators = lift $ asks getSimulators
+
+fuzz :: (MonadIO m) => Fuzz m FuzzResult
+fuzz = do
+    synths <- synthesisers
+    sims <- simulators
+    return mempty
diff --git a/src/VeriFuzz/Sim/Env.hs b/src/VeriFuzz/Sim/Env.hs
deleted file mode 100644
index 187afb3..0000000
--- a/src/VeriFuzz/Sim/Env.hs
+++ /dev/null
@@ -1,58 +0,0 @@
-{-|
-Module      : VeriFuzz.Sim.Env
-Description : Environment to run the simulator and synthesisers in a matrix.
-Copyright   : (c) 2019, Yann Herklotz
-License     : GPL-3
-Maintainer  : ymherklotz [at] gmail [dot] com
-Stability   : experimental
-Portability : POSIX
-
-Environment to run the simulator and synthesisers in a matrix.
--}
-
-module VeriFuzz.Sim.Env
-    ( SynthTool(..)
-    , SimTool(..)
-    , SimEnv(..)
-    , SynthEnv(..)
-    )
-where
-
-import           Prelude               hiding (FilePath)
-import           Shelly
-import           VeriFuzz.Sim.Icarus
-import           VeriFuzz.Sim.Internal
-import           VeriFuzz.Sim.XST
-import           VeriFuzz.Sim.Yosys
-
-data SynthTool = XSTSynth {-# UNPACK #-} !XST
-               | YosysSynth {-# UNPACK #-} !Yosys
-               deriving (Eq, Show)
-
-instance Tool SynthTool where
-    toText (XSTSynth xst)     = toText xst
-    toText (YosysSynth yosys) = toText yosys
-
-instance Synthesisor SynthTool where
-    runSynth (XSTSynth xst)     = runSynth xst
-    runSynth (YosysSynth yosys) = runSynth yosys
-
-newtype SimTool = IcarusSim Icarus
-                deriving (Eq, Show)
-
-instance Tool SimTool where
-    toText (IcarusSim icarus) = toText icarus
-
-instance Simulator SimTool where
-    runSim (IcarusSim icarus) = runSim icarus
-    runSimWithFile (IcarusSim icarus) = runSimWithFile icarus
-
-data SimEnv = SimEnv { simTools :: [SimTool]
-                     , simDir   :: FilePath
-                     }
-
-data SynthEnv = SynthEnv { synthTools :: [SynthTool]
-                         , synthDir   :: FilePath
-                         }
-
-
-- 
cgit