Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flow: actor busy signal

This commit is contained in:
Sebastien Bourdeauducq 2012-01-09 14:21:45 +01:00
parent d2d55372d8
commit d26ded93d8
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
migen/flow/actor.py
View File

@ -1,4 +1,5 @@
from migen.fhdl.structure import * from migen.fhdl.structure import *
from migen.corelogic.misc import optree
class SchedulingModel: class SchedulingModel:
COMBINATORIAL, SEQUENTIAL, PIPELINE, DYNAMIC = range(4) COMBINATORIAL, SEQUENTIAL, PIPELINE, DYNAMIC = range(4)
@ -49,10 +50,10 @@ class Source(Endpoint):
def __repr__(self): def __repr__(self):
return "<Source " + str(self.token) + ">" return "<Source " + str(self.token) + ">"
def _control_fragment_comb(stb_i, ack_o, stb_o, ack_i): def _control_fragment_comb(stb_i, ack_o, stb_o, ack_i, busy):
return Fragment([stb_o.eq(stb_i), ack_o.eq(ack_i)]) return Fragment([stb_o.eq(stb_i), ack_o.eq(ack_i), busy.eq(0)])
def _control_fragment_seq(latency, stb_i, ack_o, stb_o, ack_i, trigger): def _control_fragment_seq(latency, stb_i, ack_o, stb_o, ack_i, busy, trigger):
ready = Signal() ready = Signal()
timer = Signal(BV(bits_for(latency))) timer = Signal(BV(bits_for(latency)))
comb = [ready.eq(timer == 0)] comb = [ready.eq(timer == 0)]
@ -69,6 +70,7 @@ def _control_fragment_seq(latency, stb_i, ack_o, stb_o, ack_i, trigger):
stb_o.eq(ready & mask), stb_o.eq(ready & mask),
trigger.eq(stb_i & (ack_i | ~mask) & ready), trigger.eq(stb_i & (ack_i | ~mask) & ready),
ack_o.eq(trigger), ack_o.eq(trigger),
busy.eq(~ready)
] ]
sync += [ sync += [
If(trigger, mask.eq(1)), If(trigger, mask.eq(1)),
@ -77,7 +79,7 @@ def _control_fragment_seq(latency, stb_i, ack_o, stb_o, ack_i, trigger):
return Fragment(comb, sync) return Fragment(comb, sync)
def _control_fragment_pipe(latency, stb_i, ack_o, stb_o, ack_i, pipe_ce): def _control_fragment_pipe(latency, stb_i, ack_o, stb_o, ack_i, busy, pipe_ce):
valid = Signal(BV(latency)) valid = Signal(BV(latency))
if latency > 1: if latency > 1:
sync = [If(pipe_ce, valid.eq(Cat(stb_i, valid[:latency-1])))] sync = [If(pipe_ce, valid.eq(Cat(stb_i, valid[:latency-1])))]
@ -88,7 +90,8 @@ def _control_fragment_pipe(latency, stb_i, ack_o, stb_o, ack_i, pipe_ce):
comb = [ comb = [
pipe_ce.eq(ack_i | ~last_valid), pipe_ce.eq(ack_i | ~last_valid),
ack_o.eq(pipe_ce), ack_o.eq(pipe_ce),
stb_o.eq(last_valid) stb_o.eq(last_valid),
busy.eq(optree('|', [valid[i] for i in range(latency)]))
] ]
return Fragment(comb, sync) return Fragment(comb, sync)
@ -107,6 +110,7 @@ class Actor:
self.endpoints.append(Source(sources)) self.endpoints.append(Source(sources))
else: else:
self.endpoints = endpoints self.endpoints = endpoints
self.busy = Signal()
if self.scheduling_model.model == SchedulingModel.SEQUENTIAL: if self.scheduling_model.model == SchedulingModel.SEQUENTIAL:
self.trigger = Signal() self.trigger = Signal()
elif self.scheduling_model.model == SchedulingModel.PIPELINE: elif self.scheduling_model.model == SchedulingModel.PIPELINE:
@ -136,11 +140,11 @@ class Actor:
stb_o = source.stb stb_o = source.stb
ack_i = source.ack ack_i = source.ack
if self.scheduling_model.model == SchedulingModel.COMBINATORIAL: if self.scheduling_model.model == SchedulingModel.COMBINATORIAL:
return _control_fragment_comb(stb_i, ack_o, stb_o, ack_i) return _control_fragment_comb(stb_i, ack_o, stb_o, ack_i, self.busy)
elif self.scheduling_model.model == SchedulingModel.SEQUENTIAL: elif self.scheduling_model.model == SchedulingModel.SEQUENTIAL:
return _control_fragment_seq(self.scheduling_model.latency, stb_i, ack_o, stb_o, ack_i, self.trigger) return _control_fragment_seq(self.scheduling_model.latency, stb_i, ack_o, stb_o, ack_i, self.busy, self.trigger)
elif self.scheduling_model.model == SchedulingModel.PIPELINE: elif self.scheduling_model.model == SchedulingModel.PIPELINE:
return _control_fragment_pipe(self.scheduling_model.latency, stb_i, ack_o, stb_o, ack_i, self.pipe_ce) return _control_fragment_pipe(self.scheduling_model.latency, stb_i, ack_o, stb_o, ack_i, self.busy, self.pipe_ce)
elif self.scheduling_model.model == SchedulingModel.DYNAMIC: elif self.scheduling_model.model == SchedulingModel.DYNAMIC:
raise NotImplementedError("Actor classes with dynamic scheduling must overload get_control_fragment") raise NotImplementedError("Actor classes with dynamic scheduling must overload get_control_fragment")

5
migen/flow/network.py
View File

@ -1,6 +1,8 @@
import networkx as nx import networkx as nx
from migen.fhdl.structure import *
from migen.flow.actor import * from migen.flow.actor import *
from migen.corelogic.misc import optree
class CompositeActor(Actor): class CompositeActor(Actor):
def __init__(self, dfg): def __init__(self, dfg):
@ -22,7 +24,8 @@ class CompositeActor(Actor):
this = sum([get_conn_control_fragment(x[2]['source'], x[2]['sink']) this = sum([get_conn_control_fragment(x[2]['source'], x[2]['sink'])
for x in self.dfg.edges(data=True)], Fragment()) for x in self.dfg.edges(data=True)], Fragment())
others = sum([node.get_control_fragment() for node in self.dfg], Fragment()) others = sum([node.get_control_fragment() for node in self.dfg], Fragment())
return this + others busy = Fragment([self.busy.eq(optree('|', [node.busy for node in self.dfg]))])
return this + others + busy
def get_process_fragment(self): def get_process_fragment(self):
this = sum([get_conn_process_fragment(x[2]['source'], x[2]['sink']) this = sum([get_conn_process_fragment(x[2]['source'], x[2]['sink'])