Simplify Clash.Primitives.DSL.unsafeToActive[High,Low]

You don't need to provide a KnownDomain anymore

Author: leonschoorl

clash-cores/src/Clash/Cores/Xilinx/DcFifo/Internal/BlackBoxes.hs

@@ -178,7 +178,7 @@ dcFifoBBTF DcConfig{..} bbCtx
       let domty = DSL.ety knownDomainWrite
       in case stripVoid domty of
            N.KnownDomain _ _ _ Synchronous _ _ ->
-             DSL.unsafeToActiveHigh "wr_rst_high" domty wRst
+             DSL.unsafeToActiveHigh "wr_rst_high" wRst
            N.KnownDomain _ _ _ Asynchronous _ _ ->
              error $
                show 'dcFifoTF <> ": dcFifo only supports synchronous resets"
@@ -190,7 +190,7 @@ dcFifoBBTF DcConfig{..} bbCtx
       let domty = DSL.ety knownDomainRead
       in case stripVoid domty of
            N.KnownDomain _ _ _ Synchronous _ _ ->
-             DSL.unsafeToActiveHigh "rd_rst_high" domty rRst
+             DSL.unsafeToActiveHigh "rd_rst_high" rRst
            N.KnownDomain _ _ _ Asynchronous _ _ ->
              error $
                show 'dcFifoTF <> ": dcFifo only supports synchronous resets"

clash-lib/src/Clash/Primitives/DSL.hs

@@ -118,8 +118,8 @@ import           Clash.Annotations.Primitive     (HDL (..), Primitive (..))
 import           Clash.Annotations.SynthesisAttributes (Attr)
 import           Clash.Backend                   hiding (Usage, fromBV, toBV)
 import           Clash.Backend.VHDL              (VHDLState)
-import           Clash.Explicit.Signal           (ResetPolarity(..))
-import           Clash.Netlist.BlackBox.Util     (exprToString, renderElem)
+import           Clash.Explicit.Signal           (ResetPolarity(..), vResetPolarity)
+import           Clash.Netlist.BlackBox.Util     (exprToString, getDomainConf, renderElem)
 import           Clash.Netlist.BlackBox.Types
   (BlackBoxTemplate, Element(Component, Text), Decl(..))
 import qualified Clash.Netlist.Id                as Id
@@ -204,6 +204,17 @@ instance Backend backend => HasIdentifierSet (BlockState backend) where
 instance HasUsageMap backend => HasUsageMap (BlockState backend) where
   usageMap = bsBackend.usageMap
 
+liftToBlockState
+  :: forall backend a. Backend backend
+   => State backend a -> State (BlockState backend) a
+liftToBlockState (StateT f) = StateT g
+ where
+  g :: BlockState backend -> Identity (a, BlockState backend)
+  g sbsIn = do
+    let sIn = _bsBackend sbsIn
+    (res,sOut) <- f sIn
+    pure (res, sbsIn{_bsBackend = sOut})
+
 -- | A typed expression.
 data TExpr = TExpr
   { ety :: HWType
@@ -1012,32 +1023,26 @@ unsafeToActiveHigh
   :: Backend backend
   => Text
   -- ^ Name hint
-  -> HWType
-  -- ^ 'KnownDomain'
   -> TExpr
   -- ^ Reset signal
   -> State (BlockState backend) TExpr
-unsafeToActiveHigh nm dom rExpr =
-  case extrResetPolarity dom of
+unsafeToActiveHigh nm rExpr = do
+  resetLevel <- vResetPolarity <$> liftToBlockState (getDomainConf (ety rExpr))
+  case resetLevel of
     ActiveHigh -> pure rExpr
     ActiveLow -> notExpr nm rExpr
 
-extrResetPolarity :: HWType -> ResetPolarity
-extrResetPolarity (Void (Just (KnownDomain _ _ _ _ _ p))) = p
-extrResetPolarity p = error ("Internal error: expected KnownDomain, got: " <> show p)
-
 -- | Massage a reset to work as active-low reset.
 unsafeToActiveLow
   :: Backend backend
   => Text
   -- ^ Name hint
-  -> HWType
-  -- ^ 'KnownDomain'
   -> TExpr
   -- ^ Reset signal
   -> State (BlockState backend) TExpr
-unsafeToActiveLow nm dom rExpr =
-  case extrResetPolarity dom of
+unsafeToActiveLow nm rExpr = do
+  resetLevel <- vResetPolarity <$> liftToBlockState (getDomainConf (ety rExpr))
+  case resetLevel of
     ActiveLow -> pure rExpr
     ActiveHigh -> notExpr nm rExpr
 

clash-lib/src/Clash/Primitives/Intel/ClockGen.hs

@@ -36,9 +36,9 @@ import qualified Prettyprinter.Interpolate as I
 data Variant = Altpll | AlteraPll
 
 hdlUsed :: [Int]
-hdlUsed = [ knownDomIn, clk, rst ]
+hdlUsed = [ clk, rst ]
  where
-  knownDomIn
+  _knownDomIn
     :< _clocksClass
     :< _clocksCxt
     :< _numOutClocks
@@ -81,7 +81,7 @@ hdlTemplate ::
   BlackBoxContext ->
   State s Doc
 hdlTemplate variant bbCtx
-  | [ knownDomIn
+  | [ _knownDomIn
     , _clocksClass
     , _clocksCxt
     , _numOutClocks
@@ -110,7 +110,7 @@ hdlTemplate variant bbCtx
 
     DSL.declarationReturn bbCtx (stdName variant <> "_block") $ do
 
-      rstHigh <- DSL.unsafeToActiveHigh "reset" (DSL.ety knownDomIn) rst
+      rstHigh <- DSL.unsafeToActiveHigh "reset" rst
       pllOuts <- DSL.declareN "pllOut" pllOutTys
       locked <- DSL.declare "locked" Bit
       pllLock <- DSL.boolFromBit "pllLock" locked

clash-lib/src/Clash/Primitives/Xilinx/ClockGen.hs

@@ -65,7 +65,7 @@ clockWizardTemplate
   -> BlackBoxContext
   -> State s Doc
 clockWizardTemplate isDifferential bbCtx
-  | [ knownDomIn
+  | [ _knownDomIn
     , _clocksClass
     , _clocksCxt
     , _numOutClocks
@@ -79,7 +79,7 @@ clockWizardTemplate isDifferential bbCtx
       clkWizInstName <- Id.makeBasic $ fromMaybe "clk_wiz" $ bbCtxName bbCtx
       DSL.declarationReturn bbCtx blockName $ do
 
-        rstHigh <- DSL.unsafeToActiveHigh "reset" (DSL.ety knownDomIn) rst
+        rstHigh <- DSL.unsafeToActiveHigh "reset" rst
         pllOuts <- DSL.declareN "pllOut" pllOutTys
         locked <- DSL.declare "locked" Bit
         pllLock <- DSL.boolFromBit "pllLock" locked