aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2018-12-30 18:50:33 +0100
committerYann Herklotz <ymherklotz@gmail.com>2018-12-30 18:50:33 +0100
commit932485fd843830b83ac1086a4e3d3a59223accf0 (patch)
treebd3d9df6962be3babdb67714884f99d339a17e4c
parent2de15f8f32d48b09a9a2c92c25b6b0b3bb4492e0 (diff)
downloadverismith-932485fd843830b83ac1086a4e3d3a59223accf0.tar.gz
verismith-932485fd843830b83ac1086a4e3d3a59223accf0.zip
Upgrade stack version
-rw-r--r--app/Main.hs10
m---------lib/fgl0
-rw-r--r--stack.yaml5
-rw-r--r--verifuzz.cabal4
4 files changed, 8 insertions, 11 deletions
diff --git a/app/Main.hs b/app/Main.hs
index 35c202f..2154760 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -3,24 +3,18 @@ module Main where
import qualified Data.Graph.Inductive as G
import qualified Data.Graph.Inductive.Arbitrary as G
import qualified Data.Graph.Inductive.PatriciaTree as G
-import qualified Data.GraphViz as Gviz
-import qualified Data.GraphViz.Attributes.Complete as Gviz
import qualified Data.Text.IO as T
import qualified Data.Text.Lazy as T
import qualified Test.QuickCheck as QC
import Test.VeriFuzz
import qualified Test.VeriFuzz.Graph.RandomAlt as V
-instance Gviz.Labellable Gate where
- toLabelValue gate = Gviz.StrLabel . T.pack $ show gate
-
main :: IO ()
--main = sample (arbitrary :: Gen (Circuit Input))
main = do
gr <- QC.generate $ rDups <$> QC.resize 15 (randomDAG :: QC.Gen (G.Gr Gate ()))
- let dot = Gviz.graphToDot Gviz.nonClusteredParams . G.emap (const "") $ gr
- _ <- Gviz.runGraphviz dot Gviz.Png "output.png"
- return ()
+ -- let dot = Gviz.graphToDot Gviz.nonClusteredParams . G.emap (const "") $ gr
+ -- _ <- Gviz.runGraphviz dot Gviz.Png "output.png"
-- T.putStrLn $ generate gr
-- g <- QC.generate (QC.resize 5 (QC.arbitrary :: QC.Gen VerilogSrc))
render . genVerilogSrc . addTestBench . nestUpTo 5 . generateAST $ Circuit gr
diff --git a/lib/fgl b/lib/fgl
new file mode 160000
+Subproject aa50a612706761a060598a84bae450ba2a575ad
diff --git a/stack.yaml b/stack.yaml
index 54ba941..261ba3d 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -2,6 +2,9 @@ flags: {}
packages:
- .
extra-deps:
+ - DRBG-0.5.5@sha256:3b8040bed356e2b63927a27fb6d5adbd19d70c9e1d1bb66111bbeb33e56900eb
- QuickCheck-2.9.2@sha256:93cebf9f9c55e8a941bd3166272680d67b80d9b5d95bd836765e3d4a4ef278d0
+ - fgl-5.7.0.1@sha256:92f2e8769ae12232727d7d8b773f9aac924f3c9324935690a5096efc6289fe35
- fgl-arbitrary-0.2.0.3@sha256:d80598d16963ba151bf5dfaed5cfb8bb1cf441ce9b60bccce82367cc575c1622
-resolver: lts-12.20
+ - fgl-visualize-0.1.0.1@sha256:e682066053a6e75478a08fd6822dd0143a3b8ea23244bdb01dd389a266447c5e
+resolver: lts-13.0
diff --git a/verifuzz.cabal b/verifuzz.cabal
index ad8a39d..837a613 100644
--- a/verifuzz.cabal
+++ b/verifuzz.cabal
@@ -45,6 +45,7 @@ library
, text
, bytestring
, hashable
+ , DRBG
default-extensions: OverloadedStrings
executable yosys
@@ -62,12 +63,11 @@ executable verifuzz
default-language: Haskell2010
build-depends: base >= 4.7 && < 5
, verifuzz
- , graphviz
, fgl
, fgl-arbitrary
+ , fgl-visualize
, text
, QuickCheck
- , DRBG
, bytestring
default-extensions: OverloadedStrings