Skip to content

Commit 5f15e36

Browse files
committed
Merge branch 'fix_typo_stream' into develop
2 parents d96ba16 + 09c5000 commit 5f15e36

File tree

5 files changed

+63
-63
lines changed

5 files changed

+63
-63
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
import os
55
import veriloggen
6-
import thread_stream_reduce_iteration_interval
6+
import thread_stream_reduce_initiation_interval
77

88

99
def test(request):
1010
veriloggen.reset()
1111

1212
simtype = request.config.getoption('--sim')
1313

14-
rslt = thread_stream_reduce_iteration_interval.run(filename=None, simtype=simtype,
15-
outputfile=os.path.splitext(os.path.basename(__file__))[0] + '.out')
14+
rslt = thread_stream_reduce_initiation_interval.run(filename=None, simtype=simtype,
15+
outputfile=os.path.splitext(os.path.basename(__file__))[0] + '.out')
1616

1717
verify_rslt = rslt.splitlines()[-1]
1818
assert(verify_rslt == '# verify: PASSED')
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def mkLed():
2727
a = strm.source('a') + 1000
2828
size = strm.parameter('size')
2929
sum, sum_valid = strm.ReduceAddValid(a, size)
30-
sum.iteration_interval = 5
30+
sum.initiation_interval = 5
3131
strm.sink(sum, 'sum', when=sum_valid, when_name='sum_valid')
3232

3333
def comp_stream(size, offset):

veriloggen/stream/scheduler.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ def visit__BinaryOperator(self, node):
9090
node._set_start_stage(mine)
9191
if getattr(node, 'variable_latency', None):
9292
node.latency = getattr(node, node.variable_latency)()
93-
if getattr(node, 'variable_iteration_interval', None):
94-
node.iteration_interval = getattr(node, node.variable_iteration_interval)()
93+
if getattr(node, 'variable_initiation_interval', None):
94+
node.initiation_interval = getattr(node, node.variable_iteration_interval)()
9595
end = self.next_stage(node, mine)
9696
node._set_end_stage(end)
9797
return end
@@ -107,8 +107,8 @@ def visit__UnaryOperator(self, node):
107107
node._set_start_stage(mine)
108108
if getattr(node, 'variable_latency', None):
109109
node.latency = getattr(node, node.variable_latency)()
110-
if getattr(node, 'variable_iteration_interval', None):
111-
node.iteration_interval = getattr(node, node.variable_iteration_interval)()
110+
if getattr(node, 'variable_initiation_interval', None):
111+
node.initiation_interval = getattr(node, node.variable_iteration_interval)()
112112
end = self.next_stage(node, mine)
113113
node._set_end_stage(end)
114114
return end
@@ -127,8 +127,8 @@ def visit__SpecialOperator(self, node):
127127
node._set_start_stage(mine)
128128
if getattr(node, 'variable_latency', None):
129129
node.latency = getattr(node, node.variable_latency)()
130-
if getattr(node, 'variable_iteration_interval', None):
131-
node.iteration_interval = getattr(node, node.variable_iteration_interval)()
130+
if getattr(node, 'variable_initiation_interval', None):
131+
node.initiation_interval = getattr(node, node.variable_iteration_interval)()
132132
end = self.next_stage(node, mine)
133133
node._set_end_stage(end)
134134
return end
@@ -167,8 +167,8 @@ def visit__Accumulator(self, node):
167167
node._set_start_stage(mine)
168168
if getattr(node, 'variable_latency', None):
169169
node.latency = getattr(node, node.variable_latency)()
170-
if getattr(node, 'variable_iteration_interval', None):
171-
node.iteration_interval = getattr(node, node.variable_iteration_interval)()
170+
if getattr(node, 'variable_initiation_interval', None):
171+
node.initiation_interval = getattr(node, node.variable_iteration_interval)()
172172
end = self.next_stage(node, mine)
173173
node._set_end_stage(end)
174174
return end

0 commit comments

Comments
 (0)