Merge branch 'fix_fixed' into develop

Author: shtaxxx

tests/extension/thread_/fixed_const/test_thread_fixed_const.py

@@ -95,7 +95,7 @@
           th_blink <= th_blink_2;
         end
         th_blink_2: begin
-          _th_blink_next_val_1 <= 0;
+          _th_blink_next_val_1 <= 'sd0;
           th_blink <= th_blink_3;
         end
         th_blink_3: begin
@@ -114,7 +114,7 @@
           th_blink <= th_blink_6;
         end
         th_blink_6: begin
-          LED <= _th_blink_next_val_1 >> 8;
+          LED <= _th_blink_next_val_1 >>> 8;
           th_blink <= th_blink_7;
         end
         th_blink_7: begin

tests/extension/thread_/fixed_fifo/test_thread_fixed_fifo.py

@@ -204,7 +204,7 @@
           th_blink <= th_blink_2;
         end
         th_blink_7: begin
-          _th_blink_sum_3 <= 0;
+          _th_blink_sum_3 <= 'sd0;
           th_blink <= th_blink_8;
         end
         th_blink_8: begin
@@ -243,15 +243,15 @@
           th_blink <= th_blink_15;
         end
         th_blink_15: begin
-          $display("rdata = %d", (_th_blink_rdata_4 >> 8));
+          $display("rdata = %d (%f)", (_th_blink_rdata_4 >>> 8), ($itor(_th_blink_rdata_4) / 256.0));
           th_blink <= th_blink_16;
         end
         th_blink_16: begin
           _th_blink_i_1 <= _th_blink_i_1 + 1;
           th_blink <= th_blink_9;
         end
         th_blink_17: begin
-          $display("sum = %d", (_th_blink_sum_3 >> 8));
+          $display("sum = %d (%f)", (_th_blink_sum_3 >>> 8), ($itor(_th_blink_sum_3) / 256.0));
           th_blink <= th_blink_18;
         end
       endcase

tests/extension/thread_/fixed_fifo/thread_fixed_fifo.py

@@ -31,9 +31,9 @@ def blink(times):
         for i in range(times):
             rdata = myfifo.deq()
             sum += rdata
-            print('rdata = %d' % rdata.int_part)
+            print('rdata = %d (%f)' % (rdata.int_part, rdata))
 
-        print('sum = %d' % sum.int_part)
+        print('sum = %d (%f)' % (sum.int_part, sum))
 
     th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)

tests/extension/thread_/fixed_fifo_try/test_thread_fixed_fifo_try.py

@@ -231,7 +231,7 @@
           th_blink <= th_blink_3;
         end
         th_blink_11: begin
-          _th_blink_sum_3 <= 0;
+          _th_blink_sum_3 <= 'sd0;
           th_blink <= th_blink_12;
         end
         th_blink_12: begin
@@ -273,14 +273,14 @@
           th_blink <= th_blink_20;
         end
         th_blink_20: begin
-          $display("rdata = %d", (_th_blink_rdata_5 >> 8));
+          $display("rdata = %d (%f)", (_th_blink_rdata_5 >>> 8), ($itor(_th_blink_rdata_5) / 256.0));
           th_blink <= th_blink_21;
         end
         th_blink_21: begin
           th_blink <= th_blink_13;
         end
         th_blink_22: begin
-           $display("sum = %d", (_th_blink_sum_3 >> 8));
+          $display("sum = %d (%f)", (_th_blink_sum_3 >>> 8), ($itor(_th_blink_sum_3) / 256.0));
           th_blink <= th_blink_23;
         end
       endcase

tests/extension/thread_/fixed_fifo_try/thread_fixed_fifo_try.py

@@ -38,9 +38,9 @@ def blink(times):
             rdata, rvalid = myfifo.try_deq()
             if rvalid:
                 sum += rdata
-                print('rdata = %d' % rdata.int_part)
+                print('rdata = %d (%f)' % (rdata.int_part, rdata))
 
-        print('sum = %d' % sum.int_part)
+        print('sum = %d (%f)' % (sum.int_part, sum))
 
     th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)

tests/extension/thread_/fixed_ram/test_thread_fixed_ram.py

@@ -175,7 +175,7 @@
           th_blink <= th_blink_2;
         end
         th_blink_7: begin
-          _th_blink_sum_3 <= 0;
+          _th_blink_sum_3 <= 'sd0;
           th_blink <= th_blink_8;
         end
         th_blink_8: begin
@@ -206,15 +206,15 @@
           th_blink <= th_blink_13;
         end
         th_blink_13: begin
-          $display("rdata = %d", (_th_blink_rdata_4 >> 8));
+          $display("rdata = %d (%f)", (_th_blink_rdata_4 >>> 8), ($itor(_th_blink_rdata_4) / 256.0));
           th_blink <= th_blink_14;
         end
         th_blink_14: begin
           _th_blink_i_1 <= _th_blink_i_1 + 1;
           th_blink <= th_blink_9;
         end
         th_blink_15: begin
-          $display("sum = %d", (_th_blink_sum_3 >> 8));
+          $display("sum = %d (%f)", (_th_blink_sum_3 >>> 8), ($itor(_th_blink_sum_3) / 256.0));
           th_blink <= th_blink_16;
         end
       endcase

tests/extension/thread_/fixed_ram/thread_fixed_ram.py

@@ -31,9 +31,9 @@ def blink(times):
         for i in range(times):
             rdata = myram.read(i)
             sum += rdata
-            print('rdata = %d' % rdata.int_part)
+            print('rdata = %d (%f)' % (rdata.int_part, rdata))
 
-        print('sum = %d' % sum.int_part)
+        print('sum = %d (%f)' % (sum.int_part, sum))
 
     th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)

tests/extension/thread_/fixed_read/test_thread_fixed_read.py

@@ -103,7 +103,7 @@
           end
         end
         th_blink_4: begin
-          LED <= count >> 3;
+          LED <= count >>> 3;
           th_blink <= th_blink_5;
         end
         th_blink_5: begin

tests/extension/thread_/fixed_tmp_variable/test_thread_fixed_tmp_variable.py

@@ -109,7 +109,7 @@
           th_blink <= th_blink_5;
         end
         th_blink_5: begin
-          LED <= _th_blink_next_val_2 >> 3;
+          LED <= _th_blink_next_val_2 >>> 3;
           th_blink <= th_blink_6;
         end
         th_blink_6: begin

tests/extension/thread_/stream_fixed/Makefile

@@ -0,0 +1,29 @@
+TARGET=$(shell ls *.py | grep -v test | grep -v parsetab.py)
+ARGS=
+
+PYTHON=python3
+#PYTHON=python
+#OPT=-m pdb
+#OPT=-m cProfile -s time
+#OPT=-m cProfile -o profile.rslt
+
+.PHONY: all
+all: test
+
+.PHONY: run
+run:
+	$(PYTHON) $(OPT) $(TARGET) $(ARGS)
+
+.PHONY: test
+test:
+	$(PYTHON) -m pytest -vv
+
+.PHONY: check
+check:
+	$(PYTHON) $(OPT) $(TARGET) $(ARGS) > tmp.v
+	iverilog -tnull -Wall tmp.v
+	rm -f tmp.v
+
+.PHONY: clean
+clean:
+	rm -rf *.pyc __pycache__ parsetab.py .cache *.out *.png *.dot tmp.v uut.vcd