Skip to content

Commit 5dff051

Browse files
committed
Merge branch 'rc-1.4.0'
2 parents 7117d56 + ad7e2ec commit 5dff051

File tree

26 files changed

+711
-212
lines changed

26 files changed

+711
-212
lines changed

tests/extension/thread_/fixed_const/test_thread_fixed_const.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
th_blink <= th_blink_2;
9696
end
9797
th_blink_2: begin
98-
_th_blink_next_val_1 <= 0;
98+
_th_blink_next_val_1 <= 'sd0;
9999
th_blink <= th_blink_3;
100100
end
101101
th_blink_3: begin
@@ -114,7 +114,7 @@
114114
th_blink <= th_blink_6;
115115
end
116116
th_blink_6: begin
117-
LED <= _th_blink_next_val_1 >> 8;
117+
LED <= _th_blink_next_val_1 >>> 8;
118118
th_blink <= th_blink_7;
119119
end
120120
th_blink_7: begin

tests/extension/thread_/fixed_fifo/test_thread_fixed_fifo.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
th_blink <= th_blink_2;
205205
end
206206
th_blink_7: begin
207-
_th_blink_sum_3 <= 0;
207+
_th_blink_sum_3 <= 'sd0;
208208
th_blink <= th_blink_8;
209209
end
210210
th_blink_8: begin
@@ -243,15 +243,15 @@
243243
th_blink <= th_blink_15;
244244
end
245245
th_blink_15: begin
246-
$display("rdata = %d", (_th_blink_rdata_4 >> 8));
246+
$display("rdata = %d (%f)", (_th_blink_rdata_4 >>> 8), ($itor(_th_blink_rdata_4) / 256.0));
247247
th_blink <= th_blink_16;
248248
end
249249
th_blink_16: begin
250250
_th_blink_i_1 <= _th_blink_i_1 + 1;
251251
th_blink <= th_blink_9;
252252
end
253253
th_blink_17: begin
254-
$display("sum = %d", (_th_blink_sum_3 >> 8));
254+
$display("sum = %d (%f)", (_th_blink_sum_3 >>> 8), ($itor(_th_blink_sum_3) / 256.0));
255255
th_blink <= th_blink_18;
256256
end
257257
endcase

tests/extension/thread_/fixed_fifo/thread_fixed_fifo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ def blink(times):
3131
for i in range(times):
3232
rdata = myfifo.deq()
3333
sum += rdata
34-
print('rdata = %d' % rdata.int_part)
34+
print('rdata = %d (%f)' % (rdata.int_part, rdata))
3535

36-
print('sum = %d' % sum.int_part)
36+
print('sum = %d (%f)' % (sum.int_part, sum))
3737

3838
th = vthread.Thread(m, 'th_blink', clk, rst, blink)
3939
fsm = th.start(10)

tests/extension/thread_/fixed_fifo_try/test_thread_fixed_fifo_try.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
th_blink <= th_blink_3;
232232
end
233233
th_blink_11: begin
234-
_th_blink_sum_3 <= 0;
234+
_th_blink_sum_3 <= 'sd0;
235235
th_blink <= th_blink_12;
236236
end
237237
th_blink_12: begin
@@ -273,14 +273,14 @@
273273
th_blink <= th_blink_20;
274274
end
275275
th_blink_20: begin
276-
$display("rdata = %d", (_th_blink_rdata_5 >> 8));
276+
$display("rdata = %d (%f)", (_th_blink_rdata_5 >>> 8), ($itor(_th_blink_rdata_5) / 256.0));
277277
th_blink <= th_blink_21;
278278
end
279279
th_blink_21: begin
280280
th_blink <= th_blink_13;
281281
end
282282
th_blink_22: begin
283-
$display("sum = %d", (_th_blink_sum_3 >> 8));
283+
$display("sum = %d (%f)", (_th_blink_sum_3 >>> 8), ($itor(_th_blink_sum_3) / 256.0));
284284
th_blink <= th_blink_23;
285285
end
286286
endcase

tests/extension/thread_/fixed_fifo_try/thread_fixed_fifo_try.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ def blink(times):
3838
rdata, rvalid = myfifo.try_deq()
3939
if rvalid:
4040
sum += rdata
41-
print('rdata = %d' % rdata.int_part)
41+
print('rdata = %d (%f)' % (rdata.int_part, rdata))
4242

43-
print('sum = %d' % sum.int_part)
43+
print('sum = %d (%f)' % (sum.int_part, sum))
4444

4545
th = vthread.Thread(m, 'th_blink', clk, rst, blink)
4646
fsm = th.start(10)

tests/extension/thread_/fixed_ram/test_thread_fixed_ram.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
th_blink <= th_blink_2;
176176
end
177177
th_blink_7: begin
178-
_th_blink_sum_3 <= 0;
178+
_th_blink_sum_3 <= 'sd0;
179179
th_blink <= th_blink_8;
180180
end
181181
th_blink_8: begin
@@ -206,15 +206,15 @@
206206
th_blink <= th_blink_13;
207207
end
208208
th_blink_13: begin
209-
$display("rdata = %d", (_th_blink_rdata_4 >> 8));
209+
$display("rdata = %d (%f)", (_th_blink_rdata_4 >>> 8), ($itor(_th_blink_rdata_4) / 256.0));
210210
th_blink <= th_blink_14;
211211
end
212212
th_blink_14: begin
213213
_th_blink_i_1 <= _th_blink_i_1 + 1;
214214
th_blink <= th_blink_9;
215215
end
216216
th_blink_15: begin
217-
$display("sum = %d", (_th_blink_sum_3 >> 8));
217+
$display("sum = %d (%f)", (_th_blink_sum_3 >>> 8), ($itor(_th_blink_sum_3) / 256.0));
218218
th_blink <= th_blink_16;
219219
end
220220
endcase

tests/extension/thread_/fixed_ram/thread_fixed_ram.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ def blink(times):
3131
for i in range(times):
3232
rdata = myram.read(i)
3333
sum += rdata
34-
print('rdata = %d' % rdata.int_part)
34+
print('rdata = %d (%f)' % (rdata.int_part, rdata))
3535

36-
print('sum = %d' % sum.int_part)
36+
print('sum = %d (%f)' % (sum.int_part, sum))
3737

3838
th = vthread.Thread(m, 'th_blink', clk, rst, blink)
3939
fsm = th.start(10)

tests/extension/thread_/fixed_read/test_thread_fixed_read.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
end
104104
end
105105
th_blink_4: begin
106-
LED <= count >> 3;
106+
LED <= count >>> 3;
107107
th_blink <= th_blink_5;
108108
end
109109
th_blink_5: begin

tests/extension/thread_/fixed_tmp_variable/test_thread_fixed_tmp_variable.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
th_blink <= th_blink_5;
110110
end
111111
th_blink_5: begin
112-
LED <= _th_blink_next_val_2 >> 3;
112+
LED <= _th_blink_next_val_2 >>> 3;
113113
th_blink <= th_blink_6;
114114
end
115115
th_blink_6: begin

tests/extension/thread_/stream_dump_selective/thread_stream_dump_selective.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ def mkLed():
3232
c.dump = True
3333
strm.sink(c, 'c')
3434

35+
ram_c.dump = True
36+
3537
def comp_stream(size, offset):
3638
strm.set_source('a', ram_a, offset, size)
3739
strm.set_source('b', ram_b, offset, size)

0 commit comments

Comments
 (0)