usb-tools/amaranth
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

back.pysim: simplify. NFC.

Browse source
This commit is contained in:
whitequark 2020-07-08 03:55:09 +00:00
parent 659b0e8189
commit e435a21715
1 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
nmigen/back/pysim.py
View file

@ -191,10 +191,6 @@ class _SignalState:
self.next = value self.next = value
self.pending.add(self) self.pending.add(self)
def wait(self, task, *, trigger=None):
assert task not in self.waiters
self.waiters[task] = trigger
def commit(self): def commit(self):
if self.curr == self.next: if self.curr == self.next:
return False return False
@ -233,16 +229,16 @@ class _SimulatorState:
self.signals[signal] = index self.signals[signal] = index
return index return index
def get_in_signal(self, signal, *, trigger=None): def add_trigger(self, process, signal, *, trigger=None):
index = self.get_signal(signal) index = self.get_signal(signal)
self.slots[index].waiters[self] = trigger assert (process not in self.slots[index].waiters or
return index self.slots[index].waiters[process] == trigger)
self.slots[index].waiters[process] = trigger
def get_out_signal(self, signal): def remove_trigger(self, process, signal):
return self.get_signal(signal) index = self.get_signal(signal)
assert process in self.slots[index].waiters
def for_signal(self, signal): del self.slots[index].waiters[process]
return self.slots[self.get_signal(signal)]
def commit(self): def commit(self):
converged = True converged = True
@ -521,7 +517,7 @@ class _LHSValueCompiler(_ValueCompiler):
value_sign = f"sign({arg} & {value_mask}, {-1 << (len(value) - 1)})" value_sign = f"sign({arg} & {value_mask}, {-1 << (len(value) - 1)})"
else: # unsigned else: # unsigned
value_sign = f"{arg} & {value_mask}" value_sign = f"{arg} & {value_mask}"
self.emitter.append(f"next_{self.state.get_out_signal(value)} = {value_sign}") self.emitter.append(f"next_{self.state.get_signal(value)} = {value_sign}")
return gen return gen
def on_Operator(self, value): def on_Operator(self, value):
@ -693,7 +689,7 @@ class _FragmentCompiler:
_StatementCompiler(domain_process.state, emitter, inputs=inputs)(domain_stmts) _StatementCompiler(domain_process.state, emitter, inputs=inputs)(domain_stmts)
for input in inputs: for input in inputs:
self.state.for_signal(input).wait(domain_process) self.state.add_trigger(domain_process, input)
else: else:
domain = fragment.domains[domain_name] domain = fragment.domains[domain_name]
@ -702,10 +698,10 @@ class _FragmentCompiler:
add_signal_name(domain.rst) add_signal_name(domain.rst)
clk_trigger = 1 if domain.clk_edge == "pos" else 0 clk_trigger = 1 if domain.clk_edge == "pos" else 0
self.state.for_signal(domain.clk).wait(domain_process, trigger=clk_trigger) self.state.add_trigger(domain_process, domain.clk, trigger=clk_trigger)
if domain.rst is not None and domain.async_reset: if domain.rst is not None and domain.async_reset:
rst_trigger = 1 rst_trigger = 1
self.state.for_signal(domain.rst).wait(domain_process, trigger=rst_trigger) self.state.add_trigger(domain_process, domain.rst, trigger=rst_trigger)
gen_asserts = [] gen_asserts = []
clk_index = domain_process.state.get_signal(domain.clk) clk_index = domain_process.state.get_signal(domain.clk)
@ -782,20 +778,13 @@ class _CoroutineProcess(_Process):
frame = coroutine.cr_frame frame = coroutine.cr_frame
return "{}:{}".format(inspect.getfile(frame), inspect.getlineno(frame)) return "{}:{}".format(inspect.getfile(frame), inspect.getlineno(frame))
def get_in_signal(self, signal, *, trigger=None):
signal_state = self.state.for_signal(signal)
assert self not in signal_state.waiters
signal_state.waiters[self] = trigger
self.waits_on.add(signal_state)
return signal_state
def run(self): def run(self):
if self.coroutine is None: if self.coroutine is None:
return return
if self.waits_on: if self.waits_on:
for signal_state in self.waits_on: for signal in self.waits_on:
del signal_state.waiters[self] self.state.remove_trigger(self, signal)
self.waits_on.clear() self.waits_on.clear()
response = None response = None
@ -825,9 +814,10 @@ class _CoroutineProcess(_Process):
raise NameError("Received command {!r} that refers to a nonexistent " raise NameError("Received command {!r} that refers to a nonexistent "
"domain {!r} from process {!r}" "domain {!r} from process {!r}"
.format(command, command.domain, self.src_loc())) .format(command, command.domain, self.src_loc()))
self.get_in_signal(domain.clk, trigger=1 if domain.clk_edge == "pos" else 0) self.state.add_trigger(self, domain.clk,
trigger=1 if domain.clk_edge == "pos" else 0)
if domain.rst is not None and domain.async_reset: if domain.rst is not None and domain.async_reset:
self.get_in_signal(domain.rst, trigger=1) self.state.add_trigger(self, domain.rst, trigger=1)
return return
elif type(command) is Settle: elif type(command) is Settle: