Skip to content

Commit ed4bf1d

Browse files
committed
Merge branch 'fix_stream_enable' into develop
2 parents 2924e82 + 3fabd1a commit ed4bf1d

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

tests/extension/stream_/div_validready/test_stream_div_validready.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
.CLK(CLK),
275275
.RST(RST),
276276
.update(_divide_div_update_2),
277-
.enable(1),
277+
.enable(1'd1),
278278
.in_a(_divide_div_abs_ldata_2),
279279
.in_b(_divide_div_abs_rdata_2),
280280
.rslt(_divide_div_abs_odata_2)

tests/extension/stream_/substream/test_stream_substream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
wire signed [32-1:0] _times_data_2;
178178
assign _times_data_2 = _times_mul_odata_reg_2;
179179
wire _times_mul_update_2;
180-
assign _times_mul_update_2 = 1;
180+
assign _times_mul_update_2 = 1'd1;
181181
182182
multiplier_0
183183
_times_mul_2

veriloggen/stream/stypes.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ def _implement(self, m, seq, svalid=None, senable=None):
620620
if senable is not None:
621621
m.Assign(update(senable))
622622
else:
623-
m.Assign(update(1))
623+
m.Assign(update(vtypes.Int(1, 1)))
624624

625625
ports = [('CLK', clk), ('update', update),
626626
('a', ldata), ('b', rdata), ('c', odata)]
@@ -715,10 +715,10 @@ def _implement(self, m, seq, svalid=None, senable=None):
715715
if senable is not None:
716716
m.Assign(update(senable))
717717
else:
718-
m.Assign(update(1))
718+
m.Assign(update(vtypes.Int(1, 1)))
719719

720720
params = [('W_D', width)]
721-
ports = [('CLK', clk), ('RST', rst), ('update', update), ('enable', 1),
721+
ports = [('CLK', clk), ('RST', rst), ('update', update), ('enable', vtypes.Int(1, 1)),
722722
('in_a', abs_ldata), ('in_b', abs_rdata), ('rslt', abs_odata)]
723723

724724
m.Instance(inst, self.name('div'), params, ports)
@@ -807,10 +807,10 @@ def _implement(self, m, seq, svalid=None, senable=None):
807807
if senable is not None:
808808
m.Assign(update(senable))
809809
else:
810-
m.Assign(update(1))
810+
m.Assign(update(vtypes.Int(1, 1)))
811811

812812
params = [('W_D', width)]
813-
ports = [('CLK', clk), ('RST', rst), ('update', update), ('enable', 1),
813+
ports = [('CLK', clk), ('RST', rst), ('update', update), ('enable', vtypes.Int(1, 1)),
814814
('in_a', abs_ldata), ('in_b', abs_rdata), ('mod', abs_odata)]
815815

816816
m.Instance(inst, self.name('div'), params, ports)
@@ -1804,7 +1804,7 @@ def _implement(self, m, seq, svalid=None, senable=None):
18041804
if senable is not None:
18051805
m.Assign(update(senable))
18061806
else:
1807-
m.Assign(update(1))
1807+
m.Assign(update(vtypes.Int(1, 1)))
18081808

18091809
ports = [('CLK', clk), ('update', update),
18101810
('a', adata), ('b', bdata), ('c', cdata), ('d', odata)]

0 commit comments

Comments
 (0)