diff options
| author | Yann Herklotz <git@yannherklotz.com> | 2019-05-20 17:00:56 +0100 |
|---|---|---|
| committer | Yann Herklotz <git@yannherklotz.com> | 2019-05-20 17:00:56 +0100 |
| commit | d9258cd3d7cf8474436134a75cfc5ff48b5beff0 (patch) | |
| tree | f06329969da3a81a698ce7ca7225ea559d8144e4 /src | |
| parent | a6c69c67a9d3923443fccad77293c365f4bbc0d3 (diff) | |
| download | verismith-d9258cd3d7cf8474436134a75cfc5ff48b5beff0.tar.gz verismith-d9258cd3d7cf8474436134a75cfc5ff48b5beff0.zip | |
Only compare against the identity synth
Diffstat (limited to 'src')
| -rw-r--r-- | src/VeriFuzz.hs | 4 | ||||
| -rw-r--r-- | src/VeriFuzz/Fuzz.hs | 5 | ||||
| -rw-r--r-- | src/VeriFuzz/Sim/Quartus.hs | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/VeriFuzz.hs b/src/VeriFuzz.hs index 7b79633..6a63fe0 100644 --- a/src/VeriFuzz.hs +++ b/src/VeriFuzz.hs @@ -326,11 +326,11 @@ randomise config@(Config a _ c d e) = do ce = config ^. configProbability . probExpr handleOpts :: Opts -> IO () -handleOpts (Fuzz _ configF _ _ n) = do +handleOpts (Fuzz o configF _ _ n) = do config <- getConfig configF _ <- runFuzz config defaultYosys - (fuzzMultiple n Nothing (proceduralSrc "top" config)) + (fuzzMultiple n (Just $ fromText o) (proceduralSrc "top" config)) return () handleOpts (Generate f c) = do config <- getConfig c diff --git a/src/VeriFuzz/Fuzz.hs b/src/VeriFuzz/Fuzz.hs index f9ac5e1..19f9dce 100644 --- a/src/VeriFuzz/Fuzz.hs +++ b/src/VeriFuzz/Fuzz.hs @@ -152,8 +152,9 @@ toSynthResult a b = flip applyList b $ uncurry SynthResult <$> a equivalence :: (MonadBaseControl IO m, MonadSh m) => SourceInfo -> Fuzz m () equivalence src = do synth <- passedSynthesis - let synthComb = - nubBy tupEq . filter (uncurry (/=)) $ combinations synth synth +-- let synthComb = +-- nubBy tupEq . filter (uncurry (/=)) $ combinations synth synth + let synthComb = nubBy tupEq . filter (uncurry (/=)) $ (,) defaultIdentitySynth <$> synth results <- liftSh $ mapM (uncurry equiv) synthComb synthResults .= toSynthResult synthComb results liftSh $ inspect results diff --git a/src/VeriFuzz/Sim/Quartus.hs b/src/VeriFuzz/Sim/Quartus.hs index c93603e..ece00eb 100644 --- a/src/VeriFuzz/Sim/Quartus.hs +++ b/src/VeriFuzz/Sim/Quartus.hs @@ -57,7 +57,7 @@ runSynthQuartus sim (SourceInfo top src) = do logger "Running Quartus synthesis" ex (exec "quartus_map") [top, "--source=" <> toTextIgnore inpf, "--family=Cyclone V"] - ex (exec "quartus_fit") [top, "--part=5CGXFC7D6F31C6"] + ex (exec "quartus_fit") [top, "--part=5CGTFD9E5F35C7N"] ex (exec "quartus_eda") [top, "--simulation", "--tool=vcs"] liftSh $ do cp (fromText "simulation/vcs" </> fromText top <.> "vo") |