Add Simulate instance for AXI4Lite

Author: PietPtr

src/Protocols/Axi4/Lite/Axi4Lite.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE RecordWildCards #-}
 {-|
 Defines datatypes for all five channels of the AXI4 Lite protocol. For more
 information on AXI4 Lite, see chapter B of the AMBA AXI specification.
@@ -9,13 +10,16 @@ information on AXI4 Lite, see chapter B of the AMBA AXI specification.
 module Protocols.Axi4.Lite.Axi4Lite where
 
 import Protocols
+import Protocols.Internal
 import Protocols.Axi4.Common
 import Clash.Prelude as C
+import qualified Prelude as P
+import qualified Clash.Explicit.Prelude as CE
 
 import Control.DeepSeq
 
 -- | AXI4 Lite busses are always either 32 bit or 64 bit.
-data BusWidth = Width32 | Width64 deriving (Show, Eq)
+data BusWidth = Width32 | Width64 deriving (Show, Eq, Generic, NFDataX)
 
 type instance Width 'Width32 = 32
 type instance Width 'Width64 = 64
@@ -32,7 +36,6 @@ type family ReadBusWidthType (bw :: BusWidth) where
   ReadBusWidthType 'Width32 = C.Vec 4 (C.BitVector 8)
   ReadBusWidthType 'Width64 = C.Vec 8 (C.BitVector 8)
 
-
 ---------------------------
 --- Write address types ---
 ---------------------------
@@ -130,6 +133,8 @@ data M2S_ReadAddress
     _arprot :: PermissionsType 'KeepPermissions
   } deriving (Generic)
 
+deriving instance (KnownNat (Width aw)) => NFDataX (M2S_ReadAddress aw)
+
 deriving instance
   (C.KnownNat (Width aw))
   => Show (M2S_ReadAddress aw)
@@ -138,7 +143,7 @@ deriving instance
 data S2M_ReadAddress
   = S2M_ReadAddress {
     _arready :: Bool
-  } deriving (Show, Generic)
+  } deriving (Show, Generic, NFDataX)
 
 
 -----------------------
@@ -180,6 +185,11 @@ data M2S_Axi4Lite
     m2s_ra :: M2S_ReadAddress aw,
     m2s_rd :: M2S_ReadData bw
   }
+  deriving (Generic)
+
+deriving instance
+  (NFDataX (ReadBusWidthType bw), NFDataX (WriteBusWidthType bw), KnownNat (Width aw))
+  => NFDataX (M2S_Axi4Lite aw bw)
 
 deriving instance
   ( Show (ReadBusWidthType bw)
@@ -199,6 +209,10 @@ data S2M_Axi4Lite
     s2m_ra :: S2M_ReadAddress,
     s2m_rd :: S2M_ReadData bw
   }
+  deriving (Generic)
+
+-- this breaks when e.g. fromList is used on an unconstrained value :: S2MAxi4Lite aw bw.
+deriving instance (NFDataX (ReadBusWidthType bw)) => NFDataX (S2M_Axi4Lite aw bw)
 
 deriving instance
   ( Show (ReadBusWidthType bw)
@@ -219,3 +233,17 @@ instance Protocol (Axi4Lite dom aw bw) where
   type Fwd (Axi4Lite dom aw bw) = C.Signal dom (M2S_Axi4Lite aw bw)
   type Bwd (Axi4Lite dom aw bw) = C.Signal dom (S2M_Axi4Lite aw bw)
 
+
+instance Backpressure (Axi4Lite dom aw bw) where
+  boolsToBwd = error "Cannot construct arbitrary S2M AXI type from boolean."
+
+instance (NFDataX (S2M_Axi4Lite aw bw)) => Simulate (Axi4Lite dom aw bw) where
+  type SimulateFwdType (Axi4Lite dom aw bw) = [M2S_Axi4Lite aw bw]
+  type SimulateBwdType (Axi4Lite dom aw bw) = [S2M_Axi4Lite aw bw]
+  type SimulateChannels (Axi4Lite dom aw bw) = 1
+
+  simToSigFwd Proxy = C.fromList_lazy
+  simToSigBwd Proxy = C.fromList_lazy
+  sigToSimFwd Proxy = C.sample_lazy
+  sigToSimBwd Proxy = C.sample_lazy
+

src/Protocols/Df.hs

@@ -185,28 +185,6 @@ instance (C.KnownDomain dom, C.NFDataX a, C.ShowX a, Show a) => Drivable (Df dom
 
 
 
-  simulateManager SimulationConfig{..} acks circ =
-    P.take timeoutAfter $
-    CE.sample_lazy $
-    P.snd $
-    toSignals circ ((), resetAndAcks)
-    where
-      resetAndAcks = C.fromList $ (P.map Ack (replicate resetCycles False) <> acks)
-
-  -- TODO: apply simulation config
-  simulateSubordinate SimulationConfig{..} fwds circ = CE.sample_lazy ackSig
-    where
-      (ackSig, ()) = toSignals circ (dataSig, ())
-      dataSig = C.fromList_lazy (ackedData resetCycles fwds (C.sample ackSig))
-
-      ackedData resetN _ (_:acks) | resetN > 0 =
-        NoData : ackedData (resetN - 1) fwds acks
-      ackedData _ [] (_:acks) = NoData : ackedData 0 [] acks
-      ackedData _ (dat:datas) (ack:acks) = case ack of
-        Ack True -> dat : ackedData 0 (datas) acks
-        Ack False -> dat : ackedData 0 (dat:datas) acks
-
-
 
 instance DfLike dom (Df dom) a where
   type Data (Df dom) a = Data a

src/Protocols/Internal.hs

@@ -145,10 +145,6 @@ newtype Circuit a b =
 -- | Protocol-agnostic acknowledgement
 newtype Ack = Ack Bool
   deriving (Generic, C.NFDataX, Show)
-<<<<<<< HEAD
-=======
-
->>>>>>> 744b99a... Add AXI4 Lite types
 
 -- | Acknowledge. Used in circuit-notation plugin to drive ignore components.
 instance Default Ack where
@@ -514,9 +510,6 @@ instance Drivable () where
   simulateRight _ _ _ = ()
   simulateLeft _ _ _ = ()
 
-  simulateManager _ _ _ = ()
-  simulateSubordinate _ _ _ = ()
-
 
 instance (Simulate a, Simulate b) => Simulate (a, b) where
   type SimulateFwdType (a, b) = (SimulateFwdType a, SimulateFwdType b)