replace toml to yaml

README.md

@@ -217,8 +217,8 @@ nitta v0.0.0.1 - tool for hard real-time CGRA processors
 nitta [OPTIONS] FILE
 
 Target system configuration:
-         --uarch=PATH                   Microarchitecture configuration file
-  -a     --auto-uarch                   Use empty microarchitecture and
+         --march=PATH                   Microarchitecture configuration file
+  -a     --auto-march                   Use empty microarchitecture and
                                         allocate PUs during synthesis process.
   -t     --type=fxM.B                   Overrides data type specified in
                                         config file

app/Main.hs

@@ -21,6 +21,7 @@ import Control.Exception
 import Control.Monad (when)
 import Data.ByteString.Lazy.Char8 qualified as BS
 import Data.Default (def)
+import Data.Foldable (forM_)
 import Data.Maybe
 import Data.Proxy
 import Data.String.Utils qualified as S
@@ -32,15 +33,14 @@ import NITTA.Frontends
 import NITTA.Intermediate.Simulation
 import NITTA.Intermediate.Types
 import NITTA.Model.Microarchitecture.Config
-import NITTA.Model.Networks.Bus
+import NITTA.Model.Networks.Bus hiding (ioSync)
 import NITTA.Model.Networks.Types
 import NITTA.Model.ProcessorUnits
 import NITTA.Project (TestbenchReport (..), defProjectTemplates, runTestbench)
 import NITTA.Synthesis (TargetSynthesis (..), mlScoreKeyPrefix, noSynthesis, stateOfTheArtSynthesisIO, synthesizeTargetSystem, topDownByScoreSynthesisIO)
 import NITTA.Synthesis.MlBackend.ServerInstance
 import NITTA.UIBackend
 import NITTA.UIBackend.Types (BackendCtx, mlBackendGetter, nodeScores, outputPath, receivedValues, root)
-import NITTA.Utils
 import Paths_nitta
 import System.Console.CmdArgs hiding (def)
 import System.Exit
@@ -62,8 +62,8 @@ data SynthesisMethodArg
 -- | Command line interface.
 data Nitta = Nitta
     { filename :: FilePath
-    , uarch :: Maybe FilePath
-    , auto_uarch :: Bool
+    , march :: Maybe FilePath
+    , auto_march :: Bool
     , type_ :: Maybe String
     , io_sync :: Maybe IOSynchronization
     , port :: Int
@@ -96,17 +96,17 @@ nittaArgs =
             -1
                 &= help "Run nitta server for UI on specific port (by default - not run)"
                 &= groupname "Common flags"
-        , uarch =
+        , march =
             Nothing
                 &= typ "PATH"
                 &= help "Microarchitecture configuration file"
                 &= explicit
-                &= name "uarch"
+                &= name "march"
                 &= groupname "Target system configuration"
-        , auto_uarch =
+        , auto_march =
             False
                 &= help "Use empty microarchitecture and allocate PUs during synthesis process."
-                &= name "auto-uarch"
+                &= name "auto-march"
                 &= groupname "Target system configuration"
         , type_ =
             Nothing
@@ -199,13 +199,11 @@ nittaArgs =
 getNittaArgs :: IO Nitta
 getNittaArgs = cmdArgs nittaArgs
 
-fromConf toml s = getFromTomlSection s =<< toml
-
 main = do
     ( Nitta
             filename
-            uarch
-            auto_uarch
+            march
+            auto_march
             type_
             io_sync
             port
@@ -229,10 +227,11 @@ main = do
     -- force line buffering (always, not just when stdout is connected to a tty),
     -- it's critical for successful parsing of NITTA's stdout in python scripts
     hSetBuffering stdout LineBuffering
-
-    toml <- case uarch of
+    conf <- case march of
         Nothing -> return Nothing
-        Just path -> Just . getToml <$> T.readFile path
+        Just path -> Just <$> parseConfig path
+
+    forM_ conf $ saveConfig output_path
 
     let exactFrontendType = identifyFrontendType filename frontend_language
 
@@ -241,17 +240,17 @@ main = do
             let frontendResult@FrontendResult{frDataFlow, frTrace, frPrettyLog} =
                     translate exactFrontendType src
                 received = [("u#0", map (\i -> read $ show $ sin ((2 :: Double) * 3.14 * 50 * 0.001 * i)) [0 .. toEnum n])]
-                ioSync = fromJust $ io_sync <|> fromConf toml "ioSync" <|> Just Sync
-                confMa = toml >>= Just . mkMicroarchitecture ioSync
+                ioSync_ = fromJust $ io_sync <|> ioSync <$> conf <|> Just Sync
+                confMa = mkMicroarchitecture <$> conf
                 ma :: BusNetwork T.Text T.Text (Attr (FX m b)) Int
                 ma
-                    | auto_uarch && isJust confMa =
+                    | auto_march && isJust confMa =
                         error $
-                            "auto_uarch flag means that an empty uarch with default prototypes will be used. "
-                                <> "Remove uarch flag or specify prototypes list in config file and remove auto_uarch."
-                    | auto_uarch = microarchWithProtos ioSync
+                            "auto_march flag means that an empty march with default prototypes will be used. "
+                                <> "Remove march flag or specify prototypes list in config file and remove auto_march."
+                    | auto_march = microarchWithProtos ioSync_
                     | isJust confMa = fromJust confMa
-                    | otherwise = defMicroarch ioSync
+                    | otherwise = defMicroarch ioSync_
 
             infoM "NITTA" $ "will trace: " <> S.join ", " (map (show . tvVar) frTrace)
 
@@ -302,7 +301,7 @@ main = do
                     exitSuccess
         )
         $ parseFX . fromJust
-        $ type_ <|> fromConf toml "type" <|> Just "fx32.32"
+        $ type_ <|> T.unpack . valueType <$> conf <|> Just "fx32.32"
 
 parseFX input =
     let typePattern = mkRegex "fx([0-9]+).([0-9]+)"

examples/microarch.yml

@@ -0,0 +1,30 @@
+mock: true
+ioSync: Sync
+valueType: fx32.32
+library:
+  fram{x}: # If you want a PU can be allocated only once, remove {x} from the PU name.
+    type: Fram
+    size: 32
+  accum{x}:
+    type: Accum
+networks:
+  net1:
+    pus:
+      spi:
+        type: SPI
+        mosi: mosi
+        miso: miso
+        sclk: sclk
+        cs: cs
+        isSlave: true
+        bufferSize: 6
+        bounceFilter: 0
+    protos:
+      shift{x}:
+        type: Shift
+        sRight: true
+      mul{x}:
+        type: Multiplier
+      div{x}:
+        type: Divider
+        pipeline: 4

nitta.cabal

@@ -148,7 +148,6 @@ library
     , hashable
     , heap
     , hslogger
-    , htoml
     , http-api-data
     , http-conduit
     , hxt
@@ -178,6 +177,7 @@ library
     , wai-app-static
     , wai-cors
     , warp
+    , yaml
   default-language: Haskell2010
 
 executable nitta
@@ -211,7 +211,6 @@ executable nitta
     , ginger
     , heap
     , hslogger
-    , htoml
     , intervals
     , mtl
     , nitta
@@ -223,6 +222,7 @@ executable nitta
     , tostring
     , unordered-containers
     , wai-app-static
+    , yaml
   default-language: Haskell2010
 
 executable nitta-api-gen
@@ -259,7 +259,6 @@ executable nitta-api-gen
     , ginger
     , heap
     , hslogger
-    , htoml
     , intervals
     , mtl
     , nitta
@@ -271,6 +270,7 @@ executable nitta-api-gen
     , tostring
     , unordered-containers
     , wai-app-static
+    , yaml
   default-language: Haskell2010
 
 test-suite nitta-test
@@ -285,6 +285,7 @@ test-suite nitta-test
       NITTA.Intermediate.Simulation.Tests
       NITTA.Intermediate.Tests.Functions
       NITTA.Intermediate.Value.Tests
+      NITTA.Model.Config.Tests
       NITTA.Model.Problems.Refactor.Accum.Tests
       NITTA.Model.Problems.Refactor.ConstantFolding.Tests
       NITTA.Model.Problems.Refactor.Tests
@@ -337,7 +338,6 @@ test-suite nitta-test
     , genvalidity-property
     , ginger
     , heap
-    , htoml
     , hxt
     , intervals
     , language-lua
@@ -359,4 +359,5 @@ test-suite nitta-test
     , tostring
     , unordered-containers
     , wai-app-static
+    , yaml
   default-language: Haskell2010

package.yaml

@@ -61,7 +61,7 @@ dependencies:
   - data-default
   - filepath
   - ginger
-  - htoml
+  - yaml
   - intervals
   - mtl
   - prettyprinter