Artturin/riscv-bluespec-classic
1
0
Fork 0
forked from ReferenceProjects/riscv-bluespec-classic
Code Pull requests Activity

WIP : client request should handle unmapped case

Browse source
This commit is contained in:
Yehowshua Immanuel 2025-04-11 07:54:47 -04:00
parent cffbadd1cc
commit 45191a2abd
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bs/Bus.bs
View file

@ -32,12 +32,14 @@ mkBus serverMap = do
tagEngineByClientVec :: Vector numClients (TagEngine inFlightTransactions) tagEngineByClientVec :: Vector numClients (TagEngine inFlightTransactions)
tagEngineByClientVec <- replicateM mkTagEngine tagEngineByClientVec <- replicateM mkTagEngine
-- each -- There are `numClients` clients, each of which needs its own
clientArbiters :: Arbiter.Arbiter_IFC numServers -- arbiter as there are up to `numServer` servers that may wish
clientArbiters <- mkArbiter False -- to submit a response to a given client.
clientArbiters :: Vector numClients (Arbiter.Arbiter_IFC numServers)
clientArbiters <- replicateM (mkArbiter False)
serverArbiters :: Arbiter.Arbiter_IFC numClients serverArbiters :: Vector numServers (Arbiter.Arbiter_IFC numClients)
serverArbiters <- mkArbiter False serverArbiters <- replicateM (mkArbiter False)
dummyVar :: Reg(Bool) dummyVar :: Reg(Bool)
dummyVar <- mkReg False dummyVar <- mkReg False
@ -50,27 +52,28 @@ mkBus serverMap = do
clientResponseQueues :: Vector numClients (FIFOF (TaggedBusResponse inFlightTransactions)) clientResponseQueues :: Vector numClients (FIFOF (TaggedBusResponse inFlightTransactions))
clientResponseQueues <- replicateM (mkSizedBypassFIFOF (valueOf inFlightTransactions)) clientResponseQueues <- replicateM (mkSizedBypassFIFOF (valueOf inFlightTransactions))
let clientRouter :: Vector numClients (Rules) let clientRules :: Vector numClients (Rules)
clientRouter = genWith $ \clientIdx -> clientRules = genWith $ \clientIdx ->
let let
selectedClientRequestQueue :: FIFOF (TaggedBusRequest inFlightTransactions) selectedClientRequestQueue :: FIFOF (TaggedBusRequest inFlightTransactions)
selectedClientRequestQueue = (select clientRequestQueues clientIdx) selectedClientRequestQueue = (select clientRequestQueues clientIdx)
in in
rules rules
"route request": when True ==> do "request": when True ==> do
let let
clientRequest :: (TaggedBusRequest inFlightTransactions) clientRequest :: TaggedBusRequest inFlightTransactions
clientRequest = selectedClientRequestQueue.first clientRequest = selectedClientRequestQueue.first
-- targetAddr :: Addr = busRequestToAddr clientRequest targetAddr :: Addr = busRequestToAddr |> clientRequest.busRequest
-- targetServerIdx :: (Maybe ServerIdx) = serverMap targetAddr targetServerIdx :: (Maybe ServerIdx) = serverMap targetAddr
-- case targetServerIdx of -- case targetServerIdx of
-- Just serverIdx -> do -- Just serverIdx -> do
-- targetServerArbiter :: -- targetServerArbiter :: Arbiter.Arbiter_IFC numClients
-- targetServerArbiter = (select serverArbiters serverIdx)
$display "client test rule " (fromInteger clientIdx) $display "client test rule " (fromInteger clientIdx)
addRules |> foldr (<+>) (rules {}) clientRouter addRules |> foldr (<+>) (rules {}) clientRules
addRules |> addRules |>
rules rules
@ -95,7 +98,8 @@ mkBus serverMap = do
-> ActionValue (MkTagType inFlightTransactions) -> ActionValue (MkTagType inFlightTransactions)
submitRequest busRequest = do submitRequest busRequest = do
tag <- selectedTagEngine.requestTag tag <- selectedTagEngine.requestTag
selectedClientRequestQueue.enq (TaggedBusRequest tag busRequest) let taggedReuqest = TaggedBusRequest {tag = tag; busRequest = busRequest}
selectedClientRequestQueue.enq taggedReuqest
return tag return tag
consumeResponse :: ActionValue (TaggedBusResponse inFlightTransactions) consumeResponse :: ActionValue (TaggedBusResponse inFlightTransactions)

12
bs/BusTypes.bs
View file

@ -56,12 +56,16 @@ data BusResponse
| BusWriteResponse WriteResponse | BusWriteResponse WriteResponse
deriving (Bits, Eq, FShow) deriving (Bits, Eq, FShow)
data TaggedBusRequest inFlightTransactions = struct TaggedBusRequest inFlightTransactions =
TaggedBusRequest (MkTagType inFlightTransactions) BusRequest { tag :: (MkTagType inFlightTransactions);
busRequest :: BusRequest
}
deriving (Bits, Eq, FShow) deriving (Bits, Eq, FShow)
data TaggedBusResponse inFlightTransactions = struct TaggedBusResponse inFlightTransactions =
TaggedBusResponse (MkTagType inFlightTransactions) BusResponse { tag :: (MkTagType inFlightTransactions);
busResponse :: BusResponse
}
deriving (Bits, Eq, FShow) deriving (Bits, Eq, FShow)
-- # BusClient.submitRequest -- # BusClient.submitRequest