Merge pull request #7 from ktok07b6/devel

version 0.3.3

Author: Hiroaki Kataoka

.gitignore

@@ -3,3 +3,4 @@ __pycache__
 debug*
 tmp/
 out/
+.suite_ignores

error.py

@@ -31,6 +31,8 @@ def error_test(casefile_path, output=True):
     options.verbose_level = 0
     options.quiet_level = 3
     options.debug_mode = output
+    options.verilog_dump = False
+    options.verilog_monitor = False
     try:
         compile_main(casefile_path, options)
     except AssertionError:

polyphony.pyproj

@@ -127,7 +127,9 @@ def _module_start(self, reentrance=False):
         _is_worker_running = True
         io._enable()
     for w in self._workers:
-        w.start()
+        th = _WorkerThread(w)
+        self._worker_threads.append(th)
+        th.start()
     for sub in self._submodules:
         sub._start(True)
     time.sleep(0.001)
@@ -139,18 +141,19 @@ def _module_stop(self, reentrance=False):
         if not _is_worker_running:
             return
         _is_worker_running = False
-    for w in self._workers:
-        w.prejoin()
+    for th in self._worker_threads:
+        th.prejoin()
     for sub in self._submodules:
         sub._stop()
     if not reentrance:
         io._disable()
-    for w in self._workers:
-        w.join()
+    for th in self._worker_threads:
+        th.join()
+    self._worker_threads.clear()
 
 
 def _module_append_worker(self, fn, *args):
-    self._workers.append(_Worker(fn, *args))
+    self._workers.append(_Worker(fn, args))
 
 
 def _module_deepcopy(self, memo):
@@ -176,6 +179,7 @@ def _module_decorator(*args, **kwargs):
             instance._module_decorator = self
             io._enable()
             setattr(instance, '_workers', [])
+            setattr(instance, '_worker_threads', [])
             setattr(instance, '_submodules', [])
             instance.__init__(*args, **kwargs)
             io._disable()
@@ -248,19 +252,25 @@ def __init__(self, param0, param1):
 '''
 
 
-class _Worker(threading.Thread):
-    def __init__(self, func, *args):
+class _Worker(object):
+    def __init__(self, func, args):
         super().__init__()
         self.func = func
         self.args = args
+
+
+class _WorkerThread(threading.Thread):
+    def __init__(self, w):
+        super().__init__()
+        self.worker = w
         self.daemon = True
 
     def run(self):
         try:
-            if self.args:
-                self.func(*self.args)
+            if self.worker.args:
+                self.worker.func(*self.worker.args)
             else:
-                self.func()
+                self.worker.func()
         except io.PolyphonyIOException as e:
             module.abort()
         except Exception as e:
@@ -277,20 +287,26 @@ def __init__(self, **kwargs):
             self.rules = kwargs
 
         def __enter__(self):
-            print('with rules=', self.rules)
             return self
 
         def __exit__(self, exc_type, exc_value, traceback):
             return False
 
         def __call__(self, func):
             def wrapper(*args, **kwargs):
-                func(*args, **kwargs)
-            print('decorator rules=', self.rules)
+                return func(*args, **kwargs)
             return wrapper
 
     def __call__(self, **kwargs):
         return _Rule._Stub(**kwargs)
 
 
 rule = _Rule()
+
+
+def pipelined(seq):
+    return seq
+
+
+def unroll(seq, factor='full'):
+    return seq

polyphony.sln

@@ -20,7 +20,7 @@ def __call__(self, v=None) -> generic:
 
 
 class Queue:
-    def __init__(self, dtype:generic, direction:str='', maxsize:int=1) -> object:
+    def __init__(self, dtype:generic, direction:str, maxsize:int=1) -> object:
         pass
 
     def rd(self) -> generic:
@@ -32,8 +32,10 @@ def wr(self, v:generic) -> None:
     def __call__(self, v=None) -> generic:
         pass
 
+    @predicate
     def empty(self) -> bool:
         pass
 
+    @predicate
     def full(self) -> bool:
         pass

polyphony/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.3.2'  # type: str
+__version__ = '0.3.3'  # type: str
 __all__ = [
     'testbench',
     'pure',
@@ -29,3 +29,13 @@ def module() -> None:
 @decorator
 def rule(kwargs) -> None:
     pass
+
+
+@builtin
+def unroll(seq, factor='full') -> list:
+    pass
+
+
+@builtin
+def pipelined(seq) -> list:
+    pass