Argument order of Thread and ThreadPool is changed.

shtaxxx · shtaxxx · commit 6bd05070244b · 2017-03-03T12:06:31.000+09:00
diff --git a/examples/thread_matmul/thread_matmul.py b/examples/thread_matmul/thread_matmul.py
@@ -69,7 +69,7 @@ def check(matrix_size, a_offset, b_offset, c_offset):
         else:
             print("NG")
 
-    th = vthread.Thread(m, clk, rst, 'th_matmul', matmul)
+    th = vthread.Thread(m, 'th_matmul', clk, rst, matmul)
     fsm = th.start(16, 0, 1024, 2048)
 
     return m
diff --git a/tests/extension/thread_/attribute/thread_attribute.py b/tests/extension/thread_/attribute/thread_attribute.py
@@ -42,7 +42,7 @@ def blink(times):
             led.value = my_counter.count
             print("led = ", led)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/axi_dma/thread_axi_dma.py b/tests/extension/thread_/axi_dma/thread_axi_dma.py
@@ -81,7 +81,7 @@ def body(size, offset):
                 print('rdata[%d] = %d' % (i, rdata))
                 all_ok.value = False
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(16)
 
     return m
diff --git a/tests/extension/thread_/barrier/thread_barrier.py b/tests/extension/thread_/barrier/thread_barrier.py
@@ -38,8 +38,8 @@ def blink():
         for tid in range(numthreads):
             pool.join(tid)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/call_from_different_point/thread_call_from_different_point.py b/tests/extension/thread_/call_from_different_point/thread_call_from_different_point.py
@@ -36,8 +36,8 @@ def func_a(a, b=1000):
             pass
         return a + b
 
-    th_blink = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    th_func_a = vthread.Thread(m, clk, rst, 'th_func_a', func_a)
+    th_blink = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    th_func_a = vthread.Thread(m, 'th_func_a', clk, rst, func_a)
     fsm = th_blink.start(20)
 
     return m
diff --git a/tests/extension/thread_/child_thread/thread_child_thread.py b/tests/extension/thread_/child_thread/thread_child_thread.py
@@ -40,8 +40,8 @@ def subth(a, b, c):
         print('# subth end: %d' % ret)
         return ret
 
-    th_blink = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    th_subth = vthread.Thread(m, clk, rst, 'th_subth', subth)
+    th_blink = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    th_subth = vthread.Thread(m, 'th_subth', clk, rst, subth)
     fsm = th_blink.start(20)
 
     return m
diff --git a/tests/extension/thread_/extend/thread_extend.py b/tests/extension/thread_/extend/thread_extend.py
@@ -33,7 +33,7 @@ def blink(times):
             led.value += 1
             print("led = ", led)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.extend(fsm, 10)
 
     return m
diff --git a/tests/extension/thread_/fifo/thread_fifo.py b/tests/extension/thread_/fifo/thread_fifo.py
@@ -34,7 +34,7 @@ def blink(times):
 
         print('sum = %d' % sum)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/fifo_multithread/thread_fifo_multithread.py b/tests/extension/thread_/fifo_multithread/thread_fifo_multithread.py
@@ -60,8 +60,8 @@ def blink():
         led.value = read_data
         print("result fifo.out = %d" % read_data)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/fifo_try/thread_fifo_try.py b/tests/extension/thread_/fifo_try/thread_fifo_try.py
@@ -41,7 +41,7 @@ def blink(times):
 
         print('sum = %d' % sum)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/function/thread_function.py b/tests/extension/thread_/function/thread_function.py
@@ -28,7 +28,7 @@ def blink(times):
             led.value = plus(led, 1)
             print("led = ", led)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
 
     # add closure
     add_func(th)
diff --git a/tests/extension/thread_/implicit_function/thread_implicit_function.py b/tests/extension/thread_/implicit_function/thread_implicit_function.py
@@ -26,7 +26,7 @@ def blink(times):
             led.value = plus(led, 1)
             print("led = ", led)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/intrinsic_function/thread_intrinsic_function.py b/tests/extension/thread_/intrinsic_function/thread_intrinsic_function.py
@@ -44,7 +44,7 @@ def blink(times):
             send(data)
             wait()
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
 
     # add intrinsics
     th.add_intrinsics(send, wait)
diff --git a/tests/extension/thread_/intrinsic_method/thread_intrinsic_method.py b/tests/extension/thread_/intrinsic_method/thread_intrinsic_method.py
@@ -55,7 +55,7 @@ def blink(times):
             my_sender.send(data)
             my_sender.wait()
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/intrinsic_method_prefix/thread_intrinsic_method_prefix.py b/tests/extension/thread_/intrinsic_method_prefix/thread_intrinsic_method_prefix.py
@@ -54,7 +54,7 @@ def blink(times):
             my_sender.intrinsic_send(data)
             my_sender.intrinsic_wait()
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     th.add_intrinsic_method_prefix(my_sender, 'intrinsic_')
     fsm = th.start(10)
 
diff --git a/tests/extension/thread_/lock/thread_lock.py b/tests/extension/thread_/lock/thread_lock.py
@@ -37,8 +37,8 @@ def blink():
         for tid in range(numthreads):
             pool.join(tid)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/method/thread_method.py b/tests/extension/thread_/method/thread_method.py
@@ -46,7 +46,7 @@ def blink(times):
             led.value = my_counter.plus_value(10)
             print("led = ", led)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/multithread/thread_multithread.py b/tests/extension/thread_/multithread/thread_multithread.py
@@ -30,8 +30,8 @@ def blink(times, inc=1):
             led.value += inc
             print("  led = %d" % led)
 
-    th_countup = vthread.Thread(m, clk, rst, 'th_countup', countup)
-    th_blink = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th_countup = vthread.Thread(m, 'th_countup', clk, rst, countup)
+    th_blink = vthread.Thread(m, 'th_blink', clk, rst, blink)
 
     fsm_countup = th_countup.start(20)
     fsm_blink = th_blink.start(10)
diff --git a/tests/extension/thread_/mutex/thread_mutex.py b/tests/extension/thread_/mutex/thread_mutex.py
@@ -37,8 +37,8 @@ def blink():
         for tid in range(numthreads):
             pool.join(tid)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/mutex_ram/thread_mutex_ram.py b/tests/extension/thread_/mutex_ram/thread_mutex_ram.py
@@ -52,8 +52,8 @@ def blink():
             led.value = read_data
             print("result ram[%d] = %d" % (i, read_data))
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/mutex_shared/thread_mutex_shared.py b/tests/extension/thread_/mutex_shared/thread_mutex_shared.py
@@ -45,8 +45,8 @@ def blink():
 
         print("result count = %d" % count.value)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/mutex_try_lock/thread_mutex_try_lock.py b/tests/extension/thread_/mutex_try_lock/thread_mutex_try_lock.py
@@ -44,8 +44,8 @@ def blink():
         for tid in range(numthreads):
             pool.join(tid)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/property/thread_property.py b/tests/extension/thread_/property/thread_property.py
@@ -46,7 +46,7 @@ def blink(times):
             led.value = my_counter.plus_100_value
             print("led = ", led)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/ram/thread_ram.py b/tests/extension/thread_/ram/thread_ram.py
@@ -34,7 +34,7 @@ def blink(times):
 
         print('sum = %d' % sum)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/ram_dma/thread_ram_dma.py b/tests/extension/thread_/ram_dma/thread_ram_dma.py
@@ -81,7 +81,7 @@ def body(size, offset):
                 print('rdata[%d] = %d' % (i, rdata))
                 all_ok.value = False
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(16)
 
     return m
diff --git a/tests/extension/thread_/ram_dma_long/thread_ram_dma_long.py b/tests/extension/thread_/ram_dma_long/thread_ram_dma_long.py
@@ -75,7 +75,7 @@ def blink():
         if all_ok:
             print('ALL OK')
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/ram_own_mutex/thread_ram_own_mutex.py b/tests/extension/thread_/ram_own_mutex/thread_ram_own_mutex.py
@@ -50,8 +50,8 @@ def blink():
             led.value = read_data
             print("result ram[%d] = %d" % (i, read_data))
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
     fsm = th.start()
 
     return m
diff --git a/tests/extension/thread_/read/thread_read.py b/tests/extension/thread_/read/thread_read.py
@@ -30,7 +30,7 @@ def blink(times):
             led.value = count
             print("led = ", led)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/select_thread/thread_select_thread.py b/tests/extension/thread_/select_thread/thread_select_thread.py
@@ -43,9 +43,9 @@ def func_a(v):
     def func_b(v):
         return v + 200
 
-    th_blink = vthread.Thread(m, clk, rst, 'th_blink', blink)
-    th_func_a = vthread.Thread(m, clk, rst, 'th_func_a', func_a)
-    th_func_b = vthread.Thread(m, clk, rst, 'th_func_b', func_b)
+    th_blink = vthread.Thread(m, 'th_blink', clk, rst, blink)
+    th_func_a = vthread.Thread(m, 'th_func_a', clk, rst, func_a)
+    th_func_b = vthread.Thread(m, 'th_func_b', clk, rst, func_b)
     fsm = th_blink.start(20)
 
     return m
diff --git a/tests/extension/thread_/slice/thread_slice.py b/tests/extension/thread_/slice/thread_slice.py
@@ -45,7 +45,7 @@ def blink(times):
             print("led = ", led)
             count.value += 1
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10)
 
     return m
diff --git a/tests/extension/thread_/thread_pool/thread_thread_pool.py b/tests/extension/thread_/thread_pool/thread_thread_pool.py
@@ -33,8 +33,8 @@ def myfunc(tid):
             pass
         return tid + 100
 
-    pool = vthread.ThreadPool(m, clk, rst, 'th_myfunc', myfunc, numthreads)
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    pool = vthread.ThreadPool(m, 'th_myfunc', clk, rst, myfunc, numthreads)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(20)
 
     return m
diff --git a/tests/extension/thread_/write/thread_write.py b/tests/extension/thread_/write/thread_write.py
@@ -23,7 +23,7 @@ def blink(times, inc=1):
             led.value += inc
             print("led = ", led)
 
-    th = vthread.Thread(m, clk, rst, 'th_blink', blink)
+    th = vthread.Thread(m, 'th_blink', clk, rst, blink)
     fsm = th.start(10, 10)
 
     return m
diff --git a/veriloggen/thread/pool.py b/veriloggen/thread/pool.py
@@ -12,15 +12,15 @@
 class ThreadPool(vtypes.VeriloggenNode):
     __intrinsics__ = ('run', 'join', 'done', 'reset', 'ret')
 
-    def __init__(self, m, clk, rst, name, targ, numthreads, datawidth=32):
+    def __init__(self, m, name, clk, rst, targ, numthreads, datawidth=32):
         self.m = m
+        self.name = name
         self.clk = clk
         self.rst = rst
-        self.name = name
         self.targ = targ
         self.numthreads = numthreads
         self.datawidth = datawidth
-        self.threads = [Thread(m, clk, rst, '_'.join([name, str(i)]), targ,
+        self.threads = [Thread(m, '_'.join([name, str(i)]), clk, rst, targ,
                                datawidth=datawidth, tid=i)
                         for i in range(numthreads)]
 
diff --git a/veriloggen/thread/thread.py b/veriloggen/thread/thread.py
@@ -20,12 +20,12 @@ def reset():
 class Thread(vtypes.VeriloggenNode):
     __intrinsics__ = ('run', 'join', 'done', 'reset', 'ret')
 
-    def __init__(self, m, clk, rst, name, targ, datawidth=32, tid=None):
+    def __init__(self, m, name, clk, rst, targ, datawidth=32, tid=None):
 
         self.m = m
+        self.name = name
         self.clk = clk
         self.rst = rst
-        self.name = name
         self.targ = targ
         self.datawidth = datawidth
         self.tid = tid
