Merge pull request #11 from ktok07b6/devel

version 0.3.4

Author: ktok07b6

.travis.yml

@@ -0,0 +1,13 @@
+language: python
+sudo: false
+python:
+  - "3.6"
+  - "nightly"
+addons:
+  apt:
+    packages:
+    - iverilog
+install: 
+  - pip install -r requirements.txt
+script:
+  - python suite.py -j -f

README.rst

@@ -1,19 +1,25 @@
+.. image:: https://travis-ci.org/ktok07b6/polyphony.svg?branch=devel
+    :target: https://travis-ci.org/ktok07b6/polyphony
+.. image:: https://badge.fury.io/py/polyphony.svg
+    :target: https://badge.fury.io/py/polyphony
+
 polyphony
 =========
-
 Polyphony is Python based High-Level Synthesis compiler.
 
 Requirements
 ------------
-Python 3.4
+Python 3.6 or later
 
 Installation
 ------------
 $ pip3 install polyphony
 
 Usage
 -----
-usage: polyphony [-h] [-o FILE] [-d DIR] [-v] [-D] [-q] [-V] source
+usage: polyphony [-h] [-o FILE] [-d DIR] [-c CONFIG] [-v] [-D] [-q] [-vd]
+                 [-vm] [-V]
+                 source
 
 positional arguments:
   source                Python source file
@@ -23,9 +29,14 @@ optional arguments:
   -o FILE, --output FILE
                         output filename (default is "polyphony_out")
   -d DIR, --dir DIR     output directory
+  -c CONFIG, --config CONFIG
+                        set configration(json literal or file)
   -v, --verbose         verbose output
   -D, --debug           enable debug mode
   -q, --quiet           suppress warning/error messages
+  -vd, --verilog_dump   output vcd file in testbench
+  -vm, --verilog_monitor
+                        enable $monitor in testbench
   -V, --version         print the Polyphony version number
 
 Examples

error.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import argparse
 import sys
 import os
 import traceback
@@ -16,7 +17,33 @@
 from polyphony.compiler.env import env
 
 
-def error_test(casefile_path, output=True):
+def parse_options():
+    if not os.path.exists(TMP_DIR):
+        os.mkdir(TMP_DIR)
+    parser = argparse.ArgumentParser(prog='simu')
+    parser.add_argument('-c', '--config', dest='config',
+                        metavar='CONFIG', help='set configration(json literal or file)')
+    parser.add_argument('-d', '--enable_debug', dest='debug_mode',
+                        action='store_true', help='enable debug mode')
+    parser.add_argument('-w', dest='warn_test', action='store_true')
+    parser.add_argument('source', help='Python source file')
+    return parser.parse_args()
+
+
+def make_compile_options(casename, err_options, quiet_level):
+    options = types.SimpleNamespace()
+    options.config = err_options.config
+    options.output_name = casename
+    options.output_dir = TMP_DIR
+    options.verbose_level = 0
+    options.quiet_level = quiet_level
+    options.debug_mode = err_options.debug_mode
+    options.verilog_dump = False
+    options.verilog_monitor = False
+    return options
+
+
+def error_test(casefile_path, err_options):
     casefile = os.path.basename(casefile_path)
     casename, _ = os.path.splitext(casefile)
     with open(casefile_path, 'r') as f:
@@ -25,31 +52,25 @@ def error_test(casefile_path, output=True):
             print('The file is not error test file')
             sys.exit(0)
         expected_msg = first_line.split('#')[1].rstrip('\n')
-    options = types.SimpleNamespace()
-    options.output_name = casename
-    options.output_dir = TMP_DIR
-    options.verbose_level = 0
-    options.quiet_level = 3
-    options.debug_mode = output
-    options.verilog_dump = False
-    options.verilog_monitor = False
+    options = make_compile_options(casename, err_options, env.QUIET_ERROR)
     try:
         compile_main(casefile_path, options)
     except AssertionError:
         raise
     except Exception as e:
         if e.args[0] == expected_msg:
-            return
-        if env.dev_debug_mode:
+            return True
+        if err_options.debug_mode:
             traceback.print_exc()
         print(casefile_path)
         print('[ERROR TEST] FAILED: actual "{}", expected "{}"'.format(e.args[0], expected_msg))
-        return
+        return False
     print(casefile_path)
     print('[ERROR TEST] FAILED: No exception was raised')
+    return False
 
 
-def warn_test(casefile_path, output=True):
+def warn_test(casefile_path, err_options):
     casefile = os.path.basename(casefile_path)
     casename, _ = os.path.splitext(casefile)
     with open(casefile_path, 'r') as f:
@@ -59,30 +80,32 @@ def warn_test(casefile_path, output=True):
             sys.exit(0)
         expected_msg = first_line.split('#')[1].rstrip('\n')
     f = io.StringIO()
+    err_options.debug_mode = False
+    options = make_compile_options(casename, err_options, 0)
     with redirect_stdout(f):
         try:
-            compile_main(casefile_path, casename, TMP_DIR, debug_mode=output)
+            compile_main(casefile_path, options)
         except Exception as e:
             print(casefile_path)
             print('[WARNING TEST] FAILED')
     msg = f.getvalue()
+    #print(msg)
     header = 'Warning: '
     for line in msg.split('\n'):
         if line.startswith(header):
             actual_msg = line[len(header):]
             if actual_msg != expected_msg:
                 print(casefile_path)
                 print('[WARNING TEST] FAILED: actual "{}", expected "{}"'.format(actual_msg, expected_msg))
-            return
+            return True
     print(casefile_path)
     print('[WARNING TEST] FAILED: No warning messages')
+    return False
 
 
 if __name__ == '__main__':
-    if not os.path.exists(TMP_DIR):
-        os.mkdir(TMP_DIR)
-    if len(sys.argv) > 1:
-        if sys.argv[1] == 'w':
-            warn_test(sys.argv[2])
-        else:
-            error_test(sys.argv[1])
+    options = parse_options()
+    if not options.warn_test:
+        error_test(options.source, options)
+    else:
+        warn_test(options.source, options)

polyphony/__init__.py

@@ -304,7 +304,7 @@ def __call__(self, **kwargs):
 rule = _Rule()
 
 
-def pipelined(seq):
+def pipelined(seq, ii=-1):
     return seq
 
 

polyphony/_internal/_polyphony.py

@@ -1,4 +1,4 @@
-__version__ = '0.3.3'  # type: str
+__version__ = '0.3.4'  # type: str
 __all__ = [
     'testbench',
     'pure',
@@ -37,5 +37,5 @@ def unroll(seq, factor='full') -> list:
 
 
 @builtin
-def pipelined(seq) -> list:
+def pipelined(seq, ii=-1) -> list:
     pass

polyphony/_internal/_verilog.py

@@ -0,0 +1,8 @@
+@builtin
+def write(fmt:str, *args) -> None:
+    pass
+
+
+@builtin
+def display(fmt:str, *args) -> None:
+    pass