mirrors/sby
3
0
Fork 0
mirror of https://github.com/YosysHQ/sby.git synced 2025-04-05 22:14:08 +00:00
Code Activity

Slightly change tasks syntax

Browse source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-03-06 00:01:55 +01:00
parent 231d06b7c5
commit d736fb14f9
2 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docs/source/reference.rst
View file

@ -10,8 +10,8 @@ is for the most part irrelevant, but by convention the usual order is
Tasks section Tasks section
------------- -------------
The ``[tasks]`` section can be used to configure multiple verification tasks in only The optional ``[tasks]`` section can be used to configure multiple verification tasks in
one ``.sby`` file. Each line in the ``[tasks]`` section configures one task. For example: a single ``.sby`` file. Each line in the ``[tasks]`` section configures one task. For example:
.. code-block:: text .. code-block:: text
@ -43,8 +43,8 @@ tasks or task groups:
task_1_or_2: depth 100 task_1_or_2: depth 100
task3: mode prove task3: mode prove
If the tag ``<taskname>:`` is used on a line by itself then the following block If the tag ``<taskname>:`` is used on a line by itself then the conditional string
until the next blank line is conditional. extends until the next conditional block or ``--`` on a line by itself.
.. code-block:: text .. code-block:: text
@ -55,6 +55,7 @@ until the next blank line is conditional.
task3: task3:
mode prove mode prove
--
The tag ``~<taskname>:`` can be used for a line or block that should not be used when The tag ``~<taskname>:`` can be used for a line or block that should not be used when
the given task is active: the given task is active:
@ -68,6 +69,7 @@ the given task is active:
task3: task3:
mode prove mode prove
--
The following example demonstrates how to configure safety and liveness checks for all The following example demonstrates how to configure safety and liveness checks for all
combinations of some host implementations A and B and device implementations X and Y: combinations of some host implementations A and B and device implementations X and Y:

46
sbysrc/sby_core.py
View file

@ -173,6 +173,7 @@ class SbyJob:
task_tags_active = set() task_tags_active = set()
task_tags_all = set() task_tags_all = set()
task_skip_block = False task_skip_block = False
task_skiping_blocks = False
for line in f: for line in f:
line = line.rstrip("\n") line = line.rstrip("\n")
line = line.rstrip("\r") line = line.rstrip("\r")
@ -180,28 +181,33 @@ class SbyJob:
if tasks_section and line.startswith("["): if tasks_section and line.startswith("["):
tasks_section = False tasks_section = False
tasks_skip = False if task_skiping_blocks:
if task_skip_block: if line == "--":
if line == "":
task_skip_block = False task_skip_block = False
else: task_skiping_blocks = False
for t in task_tags_all: continue
if line.startswith(t+":"):
line = line[len(t)+1:].lstrip()
if t not in task_tags_active:
if line == "":
task_skip_block = True
tasks_skip = True
break
if line.startswith("~"+t+":"):
line = line[len(t)+2:].lstrip()
if t in task_tags_active:
if line == "":
task_skip_block = True
tasks_skip = True
break
if tasks_skip or task_skip_block: task_skip_line = False
for t in task_tags_all:
if line.startswith(t+":"):
line = line[len(t)+1:].lstrip()
match = t in task_tags_active
elif line.startswith("~"+t+":"):
line = line[len(t)+2:].lstrip()
match = t not in task_tags_active
else:
continue
if line == "":
task_skiping_blocks = True
task_skip_block = not match
task_skip_line = True
else:
task_skip_line = not match
break
if task_skip_line or task_skip_block:
continue continue
if tasks_section: if tasks_section: