diff options
author | Yann Herklotz <ymherklotz@gmail.com> | 2019-01-10 15:48:13 +0000 |
---|---|---|
committer | Yann Herklotz <ymherklotz@gmail.com> | 2019-01-10 15:48:21 +0000 |
commit | 3f1190cd7fc873449a1fd430386aa4b773d010ac (patch) | |
tree | ba9efed7478213d56c5b2ee5699225d684824373 /src/Test/VeriFuzz/Simulator | |
parent | 9f829c41651cd2872b1c6e666b5bceeebf829aee (diff) | |
download | verismith-3f1190cd7fc873449a1fd430386aa4b773d010ac.tar.gz verismith-3f1190cd7fc873449a1fd430386aa4b773d010ac.zip |
Rename module names so that I can move them
Diffstat (limited to 'src/Test/VeriFuzz/Simulator')
-rw-r--r-- | src/Test/VeriFuzz/Simulator/General.hs | 31 | ||||
-rw-r--r-- | src/Test/VeriFuzz/Simulator/Icarus.hs | 24 | ||||
-rw-r--r-- | src/Test/VeriFuzz/Simulator/Xst.hs | 20 | ||||
-rw-r--r-- | src/Test/VeriFuzz/Simulator/Yosys.hs | 22 |
4 files changed, 42 insertions, 55 deletions
diff --git a/src/Test/VeriFuzz/Simulator/General.hs b/src/Test/VeriFuzz/Simulator/General.hs index 8c5c7ec..a024029 100644 --- a/src/Test/VeriFuzz/Simulator/General.hs +++ b/src/Test/VeriFuzz/Simulator/General.hs @@ -1,5 +1,5 @@ {-| -Module : Test.VeriFuzz.Simulator.General +Module : VeriFuzz.Simulator.General Description : Class of the simulator. Copyright : (c) 2018-2019, Yann Herklotz Grave License : BSD-3 @@ -10,22 +10,15 @@ Portability : POSIX Class of the simulator and the synthesize tool. -} -module Test.VeriFuzz.Simulator.General where - -import Data.Bits (shiftL) -import Data.ByteString (ByteString) -import qualified Data.ByteString as B -import Data.ByteString.Builder (byteStringHex, toLazyByteString) -import qualified Data.ByteString.Lazy as BL -import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import Data.Text.Lazy.Builder (toLazyText) -import Data.Text.Lazy.Builder.Int (hexadecimal) -import Prelude hiding (FilePath) +module VeriFuzz.Simulator.General where + +import Data.Bits (shiftL) +import Data.ByteString (ByteString) +import qualified Data.ByteString as B +import Data.Text (Text) +import Prelude hiding (FilePath) import Shelly -import Test.VeriFuzz.Internal.Shared -import Test.VeriFuzz.Verilog.AST +import VeriFuzz.Verilog.AST -- | Simulator class. class Simulator a where @@ -51,12 +44,6 @@ timeout = command1 "timeout" ["180"] . toTextIgnore timeout_ :: FilePath -> [Text] -> Sh () timeout_ = command1_ "timeout" ["180"] . toTextIgnore -synthesizers :: [Text] -synthesizers = ["yosys", "xst"] - -simulators :: [Text] -simulators = ["yosim", "iverilog"] - -- | Helper function to convert bytestrings to integers bsToI :: ByteString -> Integer bsToI = B.foldl' (\i b -> (i `shiftL` 8) + fromIntegral b) 0 diff --git a/src/Test/VeriFuzz/Simulator/Icarus.hs b/src/Test/VeriFuzz/Simulator/Icarus.hs index f2da676..744deb8 100644 --- a/src/Test/VeriFuzz/Simulator/Icarus.hs +++ b/src/Test/VeriFuzz/Simulator/Icarus.hs @@ -1,5 +1,5 @@ {-| -Module : Test.VeriFuzz.Simulator.Icarus +Module : VeriFuzz.Simulator.Icarus Description : Icarus verilog module. Copyright : (c) 2018-2019, Yann Herklotz Grave License : BSD-3 @@ -10,21 +10,21 @@ Portability : POSIX Icarus verilog module. -} -module Test.VeriFuzz.Simulator.Icarus where +module VeriFuzz.Simulator.Icarus where import Control.Lens -import Data.ByteString (ByteString) -import qualified Data.ByteString as B -import Data.Foldable (fold) +import Data.ByteString (ByteString) +import qualified Data.ByteString as B +import Data.Foldable (fold) import Data.Hashable -import Data.List (transpose) -import Data.Text (Text) -import qualified Data.Text as T -import Prelude hiding (FilePath) +import Data.List (transpose) +import Data.Text (Text) +import qualified Data.Text as T +import Prelude hiding (FilePath) import Shelly -import Test.VeriFuzz.Simulator.General -import Test.VeriFuzz.Verilog -import Text.Shakespeare.Text (st) +import Text.Shakespeare.Text (st) +import VeriFuzz.Simulator.General +import VeriFuzz.Verilog data Icarus = Icarus { icarusPath :: FilePath , vvpPath :: FilePath diff --git a/src/Test/VeriFuzz/Simulator/Xst.hs b/src/Test/VeriFuzz/Simulator/Xst.hs index dbc307b..902b244 100644 --- a/src/Test/VeriFuzz/Simulator/Xst.hs +++ b/src/Test/VeriFuzz/Simulator/Xst.hs @@ -1,5 +1,5 @@ {-| -Module : Test.VeriFuzz.Simulator.Xst +Module : VeriFuzz.Simulator.Xst Description : Xst (ise) simulator implementation. Copyright : (c) 2018-2019, Yann Herklotz Grave License : BSD-3 @@ -12,17 +12,17 @@ Xst (ise) simulator implementation. {-# LANGUAGE QuasiQuotes #-} -module Test.VeriFuzz.Simulator.Xst where +module VeriFuzz.Simulator.Xst where -import Control.Lens hiding ((<.>)) -import Data.Text (Text) -import qualified Data.Text as T -import Prelude hiding (FilePath) +import Control.Lens hiding ((<.>)) +import Data.Text (Text) +import qualified Data.Text as T +import Prelude hiding (FilePath) import Shelly -import Test.VeriFuzz.Simulator.General -import Test.VeriFuzz.Verilog.AST -import Test.VeriFuzz.Verilog.CodeGen -import Text.Shakespeare.Text (st) +import Text.Shakespeare.Text (st) +import VeriFuzz.Simulator.General +import VeriFuzz.Verilog.AST +import VeriFuzz.Verilog.CodeGen data Xst = Xst { xstPath :: FilePath , netgenPath :: FilePath diff --git a/src/Test/VeriFuzz/Simulator/Yosys.hs b/src/Test/VeriFuzz/Simulator/Yosys.hs index e96edad..3ac732d 100644 --- a/src/Test/VeriFuzz/Simulator/Yosys.hs +++ b/src/Test/VeriFuzz/Simulator/Yosys.hs @@ -1,5 +1,5 @@ {-| -Module : Test.VeriFuzz.Simulator.Yosys +Module : VeriFuzz.Simulator.Yosys Description : Yosys simulator implementation. Copyright : (c) 2018-2019, Yann Herklotz Grave License : BSD-3 @@ -12,19 +12,19 @@ Yosys simulator implementation. {-# LANGUAGE QuasiQuotes #-} -module Test.VeriFuzz.Simulator.Yosys where +module VeriFuzz.Simulator.Yosys where import Control.Lens -import Data.ByteString (ByteString) -import qualified Data.ByteString as B -import Data.Maybe (fromMaybe) -import Data.Text (Text) -import qualified Data.Text as T -import Prelude hiding (FilePath) +import Data.ByteString (ByteString) +import qualified Data.ByteString as B +import Data.Maybe (fromMaybe) +import Data.Text (Text) +import qualified Data.Text as T +import Prelude hiding (FilePath) import Shelly -import Test.VeriFuzz.Simulator.General -import Test.VeriFuzz.Verilog -import Text.Shakespeare.Text (st) +import Text.Shakespeare.Text (st) +import VeriFuzz.Simulator.General +import VeriFuzz.Verilog newtype Yosys = Yosys { yosysPath :: FilePath } |