Merge Refactor module with Steps module

related #155

nitta.cabal

@@ -97,7 +97,6 @@ library
       NITTA.Synthesis.Steps.ConstantFolding
       NITTA.Synthesis.Steps.Dataflow
       NITTA.Synthesis.Steps.OptimizeAccum
-      NITTA.Synthesis.Steps.Refactor
       NITTA.Synthesis.Steps.ResolveDeadlock
       NITTA.Synthesis.Types
       NITTA.UIBackend

src/NITTA/Model/Microarchitecture/Builder.hs

@@ -1,6 +1,4 @@
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE PartialTypeSignatures #-}
 
 {- |

src/NITTA/Model/Networks/Bus.hs

@@ -1,9 +1,5 @@
 {-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE MultiWayIf #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
@@ -208,6 +204,10 @@ instance (UnitTag tag, VarValTime v x t) => DataflowProblem (BusNetwork tag v x
 instance (UnitTag tag, VarValTime v x t) => ProcessorUnit (BusNetwork tag v x t) v x t where
     tryBind f net@BusNetwork{bnRemains, bnPus, bnPUPrototypes}
         | any (allowToProcess f) (M.elems bnPus) = Right net{bnRemains = f : bnRemains}
+        -- TODO
+        -- There are several issues that need to be addressed: see https://github.com/ryukzak/nitta/pull/195#discussion_r853486450
+        -- 1) Now the binding of functions to the network is hardcoded, that prevents use of an empty uarch at the start
+        -- 2) If Allocation options are independent of the bnRemains, then they are present in all synthesis states, which means no leaves in the synthesis tree
         | any (\PUPrototype{pProto} -> allowToProcess f pProto) (M.elems bnPUPrototypes) = Right net{bnRemains = f : bnRemains}
     tryBind f BusNetwork{bnPus} =
         Left [i|All sub process units reject the functional block: #{ f }; rejects: #{ rejects }|]
@@ -861,10 +861,7 @@ addCustom tag pu ioPorts = do
         st
             { signalBusWidth = signalBusWidth + usedPortsLen
             , availSignals = drop usedPortsLen availSignals
-            , pus =
-                if M.member tag pus
-                    then error "every PU must has uniq tag"
-                    else M.insert tag pu' pus
+            , pus = M.insertWith (\_ _ -> error "every PU must has uniq tag") tag pu' pus
             }
 
 -- |Add PU with the default initial state. Type specify by IOPorts.
@@ -877,10 +874,7 @@ addCustomPrototype tag pu ioports
         st@BuilderSt{prototypes} <- get
         put
             st
-                { prototypes =
-                    if M.member tag prototypes
-                        then error "every prototype must has uniq tag"
-                        else M.insert tag (PUPrototype tag pu ioports) prototypes
+                { prototypes = M.insertWith (\_ _ -> error "every prototype must has uniq tag") tag (PUPrototype tag pu ioports) prototypes
                 }
 
 -- |Add PU to prototypes with the default initial state. Type specify by IOPorts.

src/NITTA/Model/Problems/Allocation.hs

@@ -1,9 +1,5 @@
 {-# LANGUAGE ConstraintKinds #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE UndecidableInstances #-}
 

src/NITTA/Synthesis/Steps.hs

@@ -10,10 +10,27 @@ module NITTA.Synthesis.Steps (
     module NITTA.Synthesis.Steps.Allocation,
     module NITTA.Synthesis.Steps.Bind,
     module NITTA.Synthesis.Steps.Dataflow,
-    module NITTA.Synthesis.Steps.Refactor,
+    module NITTA.Synthesis.Steps.BreakLoop,
+    module NITTA.Synthesis.Steps.OptimizeAccum,
+    module NITTA.Synthesis.Steps.ResolveDeadlock,
+    module NITTA.Synthesis.Steps.ConstantFolding,
+    isRefactor,
 ) where
 
+import Data.Maybe (isJust)
+import Data.Typeable (cast)
 import NITTA.Synthesis.Steps.Allocation
 import NITTA.Synthesis.Steps.Bind
+import NITTA.Synthesis.Steps.BreakLoop
+import NITTA.Synthesis.Steps.ConstantFolding
 import NITTA.Synthesis.Steps.Dataflow
-import NITTA.Synthesis.Steps.Refactor
+import NITTA.Synthesis.Steps.OptimizeAccum
+import NITTA.Synthesis.Steps.ResolveDeadlock
+import NITTA.Synthesis.Types (SynthesisDecision (SynthesisDecision, metrics))
+
+isRefactor SynthesisDecision{metrics}
+    | isJust (cast metrics :: Maybe BreakLoopMetrics) = True
+    | isJust (cast metrics :: Maybe OptimizeAccumMetrics) = True
+    | isJust (cast metrics :: Maybe ResolveDeadlockMetrics) = True
+    | isJust (cast metrics :: Maybe ConstantFoldingMetrics) = True
+isRefactor _ = False

src/NITTA/Synthesis/Steps/Allocation.hs

@@ -1,9 +1,5 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE FlexibleContexts #-}
-{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE NoMonomorphismRestriction #-}