From 554658ed5fb1c08d9842d8255e23567be45f9ebb Mon Sep 17 00:00:00 2001 From: Jasper Vinkenvleugel Date: Mon, 1 Jul 2024 15:17:22 +0200 Subject: [PATCH] Fixes for FPGA tests --- clash-cores/src/Clash/Cores/Sgmii.hs | 6 ++--- clash-cores/src/Clash/Cores/Sgmii/BitSlip.hs | 26 +++++++++---------- .../src/Clash/Cores/Sgmii/PcsReceive.hs | 4 +-- clash-cores/src/Clash/Cores/Sgmii/Sync.hs | 15 +++-------- clash-cores/test/Test/Cores/Sgmii/BitSlip.hs | 2 +- 5 files changed, 22 insertions(+), 31 deletions(-) diff --git a/clash-cores/src/Clash/Cores/Sgmii.hs b/clash-cores/src/Clash/Cores/Sgmii.hs index 4825edfd21..32fb6ddfdb 100644 --- a/clash-cores/src/Clash/Cores/Sgmii.hs +++ b/clash-cores/src/Clash/Cores/Sgmii.hs @@ -28,7 +28,7 @@ sgmiiCdc :: Signal txDom Bool -> Signal txDom (BitVector 8) -> Signal rxDom (BitVector 10) -> - ( Signal rxDom (Bool, Bool, BitVector 8, BitVector 8, BitVector 10, Bool) + ( Signal rxDom (Bool, Bool, BitVector 8, BitVector 10) , Signal txDom (BitVector 10) ) sgmiiCdc autoNegCdc rxClk txClk rxRst txRst txEn txEr dw1 cg1 = @@ -36,9 +36,7 @@ sgmiiCdc autoNegCdc rxClk txClk rxRst txRst txEn txEr dw1 cg1 = ( exposeClockResetEnable regMaybe rxClk rxRst enableGen False rxDv , exposeClockResetEnable regMaybe rxClk rxRst enableGen False rxEr , exposeClockResetEnable regMaybe rxClk rxRst enableGen 0 dw4 - , fromDw . head <$> dw2 , cg2 - , ok ) , cg4 ) @@ -70,7 +68,7 @@ sgmiiCdc autoNegCdc rxClk txClk rxRst txRst txEn txEr dw1 cg1 = where sync' = exposeClockResetEnable sync - (cg2, ok) = unbundle $ bitSlip' rxClk rxRst enableGen cg1 + (cg2, _) = unbundle $ bitSlip' rxClk rxRst enableGen cg1 where bitSlip' = exposeClockResetEnable bitSlip diff --git a/clash-cores/src/Clash/Cores/Sgmii/BitSlip.hs b/clash-cores/src/Clash/Cores/Sgmii/BitSlip.hs index 3bad9459d1..070fc6c2c3 100644 --- a/clash-cores/src/Clash/Cores/Sgmii/BitSlip.hs +++ b/clash-cores/src/Clash/Cores/Sgmii/BitSlip.hs @@ -7,13 +7,13 @@ import Clash.Prelude import Data.Maybe (fromJust, isNothing) -- | State variable for 'bitSlip' -data BitSlipState n +data BitSlipState = BSFail - { _s :: BitVector (2 * n) - , _ns :: Vec 8 (Index n) - , _hist :: Vec 10 (BitVector 7) + { _s :: BitVector 20 + , _ns :: Vec 8 (Index 14) + , _hist :: Vec 14 (BitVector 7) } - | BSOk {_s :: BitVector (2 * n), _n :: Index n} + | BSOk {_s :: BitVector 20, _n :: Index 14} deriving (Generic, NFDataX, Eq, Show) -- | State transition function for 'bitSlip', where the initial state is the @@ -22,11 +22,11 @@ data BitSlipState n -- 'BitVector' bitSlipT :: -- | Current state - BitSlipState 10 -> + BitSlipState -> -- | New input value BitVector 10 -> -- | New state - BitSlipState 10 + BitSlipState bitSlipT BSFail{..} cg = nextState where nextState @@ -36,11 +36,11 @@ bitSlipT BSFail{..} cg = nextState s = resize $ _s ++# cg ns = maybe _ns (_ns <<+) n - hist = map pack $ take d10 $ windows1d d7 $ bv2v s + hist = map pack $ windows1d d7 $ bv2v s n = elemIndex True $ map f _hist where - f a = a == 0b0011111 || a == 0b1100000 + f a = a == 0b1111100 || a == 0b0000011 bitSlipT BSOk{..} cg = nextState where nextState = BSOk s _n @@ -51,15 +51,15 @@ bitSlipT BSOk{..} cg = nextState -- rotates the state vector to create the new output value bitSlipO :: -- | Current state - BitSlipState 10 -> + BitSlipState -> -- | New output value - (BitSlipState 10, BitVector 10, Bool) + (BitSlipState, BitVector 10, Bool) bitSlipO self@BSFail{..} = out where - out = (self, resize _s, False) + out = (self, resize $ rotateR _s 10, False) bitSlipO self@BSOk{..} = out where - out = (self, resize $ rotateR _s (10 - fromEnum _n), True) + out = (self, resize $ rotateR _s (13 - fromEnum _n), True) -- | Function that takes a code word and returns the same code word, but if a -- comma is detected the code words is shifted such that the comma is at the diff --git a/clash-cores/src/Clash/Cores/Sgmii/PcsReceive.hs b/clash-cores/src/Clash/Cores/Sgmii/PcsReceive.hs index 76d3ba9803..31e9f4e465 100644 --- a/clash-cores/src/Clash/Cores/Sgmii/PcsReceive.hs +++ b/clash-cores/src/Clash/Cores/Sgmii/PcsReceive.hs @@ -95,8 +95,8 @@ carrierDetect cg rd rxEven True | otherwise = False where - cgK28_5N = 0b0011111010 - cgK28_5P = 0b1100000101 + cgK28_5N = 0b0101111100 + cgK28_5P = 0b1010000011 cgK28_5 = if rd then cgK28_5P else cgK28_5N -- | Take the running disparity, the current and next two input data words and diff --git a/clash-cores/src/Clash/Cores/Sgmii/Sync.hs b/clash-cores/src/Clash/Cores/Sgmii/Sync.hs index 8ac3c048b7..02af537448 100644 --- a/clash-cores/src/Clash/Cores/Sgmii/Sync.hs +++ b/clash-cores/src/Clash/Cores/Sgmii/Sync.hs @@ -83,17 +83,10 @@ data SyncState } deriving (Generic, NFDataX, Eq, Show) --- | Vector containing the 3 code groups that contain a comma (K28.1, K28.5 and --- K28.7) and their alternative forms (with opposite running disparity) -commas :: Vec 6 (BitVector 10) -commas = - 0b0011111001 - :> 0b1100000110 - :> 0b0011111010 - :> 0b1100000101 - :> 0b0011111000 - :> 0b1100000111 - :> Nil +-- | Vector containing the two alternative forms (with opposite running +-- disparity) of K28.5 +commas :: Vec 2 (BitVector 10) +commas = 0b0101111100 :> 0b1010000011 :> Nil -- | State transition function for 'sync'. Takes the state as defined in -- 'SyncState', a the new incoming code group from the SerDes-block and diff --git a/clash-cores/test/Test/Cores/Sgmii/BitSlip.hs b/clash-cores/test/Test/Cores/Sgmii/BitSlip.hs index 0f660e8deb..0c23a10a7b 100644 --- a/clash-cores/test/Test/Cores/Sgmii/BitSlip.hs +++ b/clash-cores/test/Test/Cores/Sgmii/BitSlip.hs @@ -19,7 +19,7 @@ import Prelude bitSlipSim :: (C.HiddenClockResetEnable dom) => C.Signal dom (C.BitVector 10) -> - C.Signal dom (BitSlipState 10, C.BitVector 10, Bool) + C.Signal dom (BitSlipState, C.BitVector 10, Bool) bitSlipSim cg = C.bundle $ C.mooreB bitSlipT bitSlipO (BSFail 0 (C.repeat 0) (C.repeat 0)) cg