From a056ff5ec91f95aab7cb502b20530d935d1774a8 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Wed, 22 May 2019 11:05:51 +0100 Subject: Add hat sampling to config --- experiments/config_all.toml | 2 ++ experiments/config_large.toml | 2 ++ experiments/config_medium.toml | 2 ++ experiments/config_size_l.toml | 2 ++ experiments/config_size_m.toml | 2 ++ experiments/config_size_s.toml | 2 ++ experiments/config_size_xl.toml | 2 ++ experiments/config_small.toml | 2 ++ experiments/config_tiny.toml | 2 ++ src/VeriFuzz/Fuzz.hs | 6 ++++-- 10 files changed, 22 insertions(+), 2 deletions(-) diff --git a/experiments/config_all.toml b/experiments/config_all.toml index cbe828c..06d399e 100644 --- a/experiments/config_all.toml +++ b/experiments/config_all.toml @@ -23,6 +23,8 @@ module.max = 5 size = 20 statement.depth = 7 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/experiments/config_large.toml b/experiments/config_large.toml index cbe828c..06d399e 100644 --- a/experiments/config_large.toml +++ b/experiments/config_large.toml @@ -23,6 +23,8 @@ module.max = 5 size = 20 statement.depth = 7 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/experiments/config_medium.toml b/experiments/config_medium.toml index 683e74f..1f3ae0d 100644 --- a/experiments/config_medium.toml +++ b/experiments/config_medium.toml @@ -23,6 +23,8 @@ module.max = 5 size = 20 statement.depth = 5 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/experiments/config_size_l.toml b/experiments/config_size_l.toml index c0d0659..535d745 100644 --- a/experiments/config_size_l.toml +++ b/experiments/config_size_l.toml @@ -23,6 +23,8 @@ module.max = 5 size = 25 statement.depth = 2 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/experiments/config_size_m.toml b/experiments/config_size_m.toml index 372f92a..e0d1333 100644 --- a/experiments/config_size_m.toml +++ b/experiments/config_size_m.toml @@ -23,6 +23,8 @@ module.max = 5 size = 20 statement.depth = 2 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/experiments/config_size_s.toml b/experiments/config_size_s.toml index bbd307a..c512253 100644 --- a/experiments/config_size_s.toml +++ b/experiments/config_size_s.toml @@ -23,6 +23,8 @@ module.max = 5 size = 15 statement.depth = 2 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/experiments/config_size_xl.toml b/experiments/config_size_xl.toml index f2db851..52906c2 100644 --- a/experiments/config_size_xl.toml +++ b/experiments/config_size_xl.toml @@ -23,6 +23,8 @@ module.max = 5 size = 30 statement.depth = 2 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/experiments/config_small.toml b/experiments/config_small.toml index aed7cfd..9cad0a0 100644 --- a/experiments/config_small.toml +++ b/experiments/config_small.toml @@ -23,6 +23,8 @@ module.max = 5 size = 20 statement.depth = 3 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/experiments/config_tiny.toml b/experiments/config_tiny.toml index aed7cfd..9cad0a0 100644 --- a/experiments/config_tiny.toml +++ b/experiments/config_tiny.toml @@ -23,6 +23,8 @@ module.max = 5 size = 20 statement.depth = 3 + sample.method = "hat" + sample.size = 10 [[synthesiser]] description = "yosys" diff --git a/src/VeriFuzz/Fuzz.hs b/src/VeriFuzz/Fuzz.hs index 7626968..b3d76ad 100644 --- a/src/VeriFuzz/Fuzz.hs +++ b/src/VeriFuzz/Fuzz.hs @@ -296,9 +296,11 @@ fuzz gen conf = do seed = conf ^. configProperty . propSeed bname = T.pack . takeBaseName . T.unpack . toTextIgnore genMethod = case conf ^. configProperty . propSampleMethod of - "hat" -> + "hat" -> do + logT "Using the hat function" sampleVerilogHat (conf ^. configProperty . propSampleSize) seed gen - _ -> + _ -> do + logT "Using first seed" sampleSeed seed gen relativeFuzzReport :: (MonadSh m) => FuzzReport -> m FuzzReport -- cgit