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

305 commits

Author SHA1 Message Date
Jannis Harder 0fe8c223cf Decouple taskloop from task 2022-06-15 16:28:09 +02:00
Jannis Harder d1c04f79d6 Use monotonic clock for timeouts 2022-06-15 14:11:25 +02:00
Jannis Harder d0c59a3155 Don't use python asserts to handle unexpected solver output 2022-06-15 13:25:21 +02:00
Jannis Harder e99884e319 SbyProc: New error_callback instead of exit_callback for failing procs 2022-06-15 13:25:21 +02:00
Jannis Harder 141ffd34a5 btor pono: improve option handling
Fail on the unsupported skip option and pass solver args to pono.
2022-06-15 11:35:22 +02:00
Jannis Harder 05d963b0df aiger: check supported modes and aigbmc fixes 2022-06-14 17:41:06 +02:00
Jannis Harder 499371fd39 Use the test Makefile for all examples
* Rename and move sbysrc/demo[123].sby to docs/examples/demos
    * Make them use multiple tasks for multiple engines
* Scan docs/examples for sby files for make test
* `make ci` is now `NOSKIP` by default
* Skip scripts using `verific` w/o yosys verific support
    * This does not fail even with NOSKIP set
2022-06-13 13:42:58 +02:00
Jannis Harder 8e87b0f7f4 Suggest -f when the workdir already exists 2022-05-30 16:18:37 +02:00
Jannis Harder 6daa434d85 Add --dumptaskinfo option to output some .sby metadata as json 2022-04-11 17:44:10 +02:00
Jannis Harder a190994098 Add envvar to enable automatic .gitignore creation for workdirs 2022-04-11 17:44:10 +02:00
N. Engelhardt 8ce526c22d junit: use write_jny instead of write_json 2022-04-06 18:35:01 +02:00
Jannis Harder 25e982c238
Merge pull request #154 from jix/sby_design-fixes
sby_design fixes
2022-03-31 16:35:40 +02:00
Jannis Harder 4b512668b2 Fix design_hierarchy handling of $paramod cells 2022-03-31 15:51:58 +02:00
Jannis Harder a78eaa57db Fix variable name in find_property_by_cellname's error path 2022-03-31 13:12:15 +02:00
Jannis Harder b725bfed0c Prefer the first tracefile for each failing assertion 2022-03-30 13:47:14 +02:00
N. Engelhardt 2e0087fd2f
Merge pull request #150 from nakengelhardt/fix_junit_type_assignment
note unexpected return statuses in junit
2022-03-30 12:53:48 +02:00
Jannis Harder 81e8b6737b
Merge pull request #147 from jix/smtbmc-keepgoing
Support and tests for smtbmc `--keep-going`
2022-03-30 11:42:48 +02:00
N. Engelhardt 008d020c4d note unexpected return statuses in junit 2022-03-29 19:10:29 +02:00
N. Engelhardt 53abf14514
Merge pull request #145 from nakengelhardt/fix_junit_tracefile
junit: handle multiple asserts failing with the same trace
2022-03-28 16:32:54 +02:00
N. Engelhardt 3d8f56b89a
Merge pull request #142 from nakengelhardt/fix_backslash_smt2
translate backslashes in cell names the same way as smt2 backend does
2022-03-28 16:32:10 +02:00
Jannis Harder 079df4d95f Use -no-startoffset, avoiding index mismatch between aiger and smt2 2022-03-25 11:41:08 +01:00
Jannis Harder 7824460e27 Initial support for the new smtbmc --keep-going option
So far this only passes on the option and adjusts the trace_prefix to
support multiple numbered traces. Further changes are needed to
correctly associate individual traces with the assertions failing in
that trace.
2022-03-24 16:57:16 +01:00
N. Engelhardt c7e4785a8a junit: handle multiple asserts failing with the same trace 2022-03-22 16:16:02 +01:00
N. Engelhardt 5dc7fc9a4d translate backslashes in cell names the same way as smt2 backend does 2022-03-22 11:14:48 +01:00
N. Engelhardt 7142f790e4 add testcase for overall run result 2022-02-24 22:44:11 +01:00
N. Engelhardt 89ed843ff1 validate junit files (with extra attributes added to schema) 2022-02-22 16:16:37 +01:00
N. Engelhardt 7ee357fcc8 fix induction 2022-02-07 22:01:52 +01:00
N. Engelhardt 7d3545dc86 fix junit error/failure/skipped count 2022-02-07 19:20:29 +01:00
N. Engelhardt 53eb25fcae handle unreached cover properties 2022-02-07 15:29:36 +01:00
N. Engelhardt 5abaccab69 refactor junit print into own function 2022-02-07 12:29:27 +01:00
N. Engelhardt 9168b0163b handle status of cover properties 2022-02-06 09:15:44 +01:00
N. Engelhardt d7e7f2c530 refactor model to have single base 2022-01-31 12:35:56 +01:00
N. Engelhardt 1cf27e7c31 parse solver location output for assert failures (cover not functional yet) 2022-01-27 13:41:07 +01:00
N. Engelhardt a9d1972c47 add fallback if solver can't tell which property fails 2022-01-21 15:18:53 +01:00
N. Engelhardt 7f3c4137c1 create json export and read in properties 2022-01-19 19:34:11 +01:00
N. Engelhardt 6ec2df34e3 WIP change junit print to conform to schema; needs additional data, currently printing dummy info
Signed-off-by: N. Engelhardt <nak@yosyshq.com>
2022-01-13 13:45:54 +01:00
N. Engelhardt 257a57d8ed create only a single bad when using pono solver; workaround for #137 2022-01-12 13:18:54 +01:00
N. Engelhardt 5a04ac3fcc use --witness option when calling pono 2022-01-12 10:55:08 +01:00
N. Engelhardt 7c9e5b026b Rename SbyJob to SbyTask and SbyTask to SbyProc to reduce confusion. Config file tasks now correspond to SbyTasks. 2022-01-11 17:08:56 +01:00
Claire Xenia Wolf ac9001b22c Improvements and cleanups in tasks handling
Signed-off-by: Claire Xenia Wolf <claire@clairexen.net>
2021-12-18 11:36:34 +01:00
Claire Xenia Wolf f1d3be3914 Fixed [tasks] section parsing
Signed-off-by: Claire Xenia Wolf <claire@clairexen.net>
2021-12-17 20:57:19 +01:00
Claire Xenia Wolf ab9d4fd3cf Add ":"-syntax for [tasks] section
Signed-off-by: Claire Xenia Wolf <claire@clairexen.net>
2021-12-17 15:36:35 +01:00
Claire Xenia Wolf 5d19e4641a Add support for directories in [files] section
Signed-off-by: Claire Xenia Wolf <claire@clairexen.net>
2021-10-31 14:43:02 +01:00
Claire Xenia Wolf 1b3832cf92 Fixed names and links 2021-10-31 14:42:39 +01:00
Miodrag Milanovic 863a53b312 Fix regression 2021-08-25 12:10:18 +02:00
Miodrag Milanovic 156cc5d8c9 Initialize variable 2021-08-25 11:38:24 +02:00
piegames bb19bca77c fixup! Allow to set a working directory even when having multiple tasks 2021-07-12 16:14:48 +02:00
piegames 874d13ff89 Better error message when tasks failed 2021-06-26 19:46:30 +02:00
piegames 2d7d48885b Turn .format() strings into f-strings 2021-06-26 19:46:30 +02:00
piegames 1f6700f21d Allow to set a working directory even when having multiple tasks
Fixes #125.
2021-06-21 22:32:29 +02:00
piegames 99aca04638 Print paths as absolute
This generally makes debugging path issues easier.
2021-06-21 22:31:53 +02:00
Miodrag Milanovic ecf7b8f1b0 Windows specific fixes 2021-03-22 16:48:33 +01:00
Miodrag Milanovic 605db98382 Fix syntax errors 2021-01-26 09:09:43 +01:00
whitequark 287e33a47f Add a PROGRAM_PREFIX= Makefile option for packages with prefixed Yosys. 2020-08-22 14:45:47 +00:00
Marcelina Kościelnicka b172357161 Run dffunmap before writing the design with aiger/btor/smt2 backends. 2020-07-31 16:37:25 +02:00
N. Engelhardt 8c5b65cf97 add tests directory with additional tests 2020-07-24 13:51:39 +02:00
N. Engelhardt 7bae1b8bba fix error message formatting 2020-07-21 14:48:38 +02:00
Claire Wolf 494f84b0ab Include verilog source files for demo1.sby
Signed-off-by: Claire Wolf <claire@symbioticeda.com>
2020-07-21 13:01:36 +02:00
Claire Wolf 0d98201dc7 Add "Unexpected response" handling to smtbmc engine
Signed-off-by: Claire Wolf <claire@symbioticeda.com>
2020-07-20 19:42:10 +02:00
whitequark db0e5f3637
Inject executable dependencies from the environment 2020-07-05 10:20:35 +00:00
Miodrag Milanovic a62fded391 cosa2 -> pono rename 2020-07-03 11:25:55 +02:00
clairexen 72e84cb320
Merge pull request #97 from nakengelhardt/seed_arg
add --seed option to smtbmc and btor engines
2020-07-01 19:20:06 +02:00
clairexen 18ce85eb02
Merge pull request #94 from nakengelhardt/fix_93
ignore race condition in killing already-terminated process
2020-07-01 19:19:08 +02:00
N. Engelhardt ee5cfdef76 add --seed option to smtbmc and btor engines 2020-07-01 18:05:20 +02:00
Claire Wolf 655d9c6bcd Be more conservative in btor ys script
Signed-off-by: Claire Wolf <claire@symbioticeda.com>
2020-06-23 14:32:59 +02:00
N. Engelhardt 25502e16ef ignore race condition in killing already-terminated process 2020-06-16 12:41:26 +02:00
Claire Wolf c7668de077 Add support for cosa2 BTOR solver
Signed-off-by: Claire Wolf <claire@symbioticeda.com>
2020-05-18 16:59:36 +02:00
N. Engelhardt 9fdece3dab btor engine: handle models with 0 properties 2020-05-18 13:11:25 +02:00
N. Engelhardt 87eb47502d
Merge pull request #87 from nakengelhardt/cover_trace_summary
Trace generation improvements
2020-05-13 18:45:39 +02:00
N. Engelhardt 6a95ef33c8 fix trace summary printing 2020-05-13 18:15:33 +02:00
N. Engelhardt 842e9a121a call job.terminate at end of btor engine run to kill other engines in case of whoever-gets-there-first runs 2020-05-13 12:42:30 +02:00
N. Engelhardt b3d766bf89 start btorsim as soon as a witness is ready, print summary when multiple traces are produced 2020-05-12 16:48:58 +02:00
Claire Wolf ca9c188e3c Add silent mode to SbyTask
Signed-off-by: Claire Wolf <claire@symbioticeda.com>
2020-05-08 18:49:08 +02:00
N. Engelhardt cb01f8469c fix return code check in btor engine 2020-04-29 16:09:18 +02:00
N. Engelhardt 5d6323147d
Merge pull request #85 from nakengelhardt/new_btorsim
Note that the btor engine now requires changes not upstreamed to btor2tools yet, see btor2tools/pull/4
2020-04-29 11:47:20 +02:00
Claire Wolf 69ef444464 Add task pattern matching, closes #76
Signed-off-by: Claire Wolf <claire@symbioticeda.com>
2020-04-14 19:55:14 +02:00
Claire Wolf c91efe15a3 Add a status message when one or more tasks returned a non-zero return code, closes #78
Signed-off-by: Claire Wolf <claire@symbioticeda.com>
2020-04-14 19:54:24 +02:00
N. Engelhardt 8cd9191612 merge master 2020-04-08 17:23:52 +02:00
N. Engelhardt 1b8f3df8bd use info file for btorsim 2020-04-08 15:25:00 +02:00
Claire Wolf 1c92dff6ed
Merge pull request #74 from mattvenn/master
add --init-config option
2020-04-02 18:27:50 +02:00
N. Engelhardt e9af1a65f1 and another 2020-04-02 17:36:54 +02:00
N. Engelhardt 0c0215de91 fix formatting error 2020-04-02 17:21:48 +02:00
N. Engelhardt 9aff36a3fe fix callback functions 2020-03-30 21:24:06 +02:00
N. Engelhardt 180e07f9c4 add btor cover mode; use btorsim for vcd generation
Signed-off-by: N. Engelhardt <nak@symbioticeda.com>
2020-03-30 21:24:06 +02:00
N. Engelhardt 6a918fe102 remove stray braces 2020-03-30 21:23:11 +02:00
matt venn 5eee219127 use argument for name of .sby and .sv files 2020-03-26 18:24:56 +01:00
matt venn f22b6921c5 add --init-config option 2020-03-25 18:00:48 +01:00
N. Engelhardt 30d7c32ec6 Use .format() instead of %
Signed-off-by: N. Engelhardt <nak@symbioticeda.com>
2020-03-25 13:09:37 +01:00
Claire Wolf 0a7013017f Improve BTOR and AIG yosys scripts
Signed-off-by: Claire Wolf <clifford@clifford.at>
2020-02-11 17:33:46 +01:00
Diego H ff3296845c Fix typo in log message 2020-01-30 13:55:34 -06:00
Claire Wolf a5fce77344 Add special handling for command not found errors
Signed-off-by: Claire Wolf <clifford@clifford.at>
2020-01-27 17:59:33 +01:00
Miodrag Milanovic 3fd0c73e65 Added sleep for non-posix, allow supported signals 2020-01-15 08:09:11 +01:00
Miodrag Milanovic 196c3c779a Fix sby execution on Windows 2019-11-17 16:58:35 +01:00
Clifford Wolf 23f89011b6 Use lowercase for non-final smtbmc status, treat PREUNSAT as ERROR
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-10-03 15:00:11 +02:00
Serge Bazanski 511268cd18 sby_core: fix hardcoded /bin/bash path
Not all systems (eg. BSDs, NixOS) have a /bin/bash. The de-facto standard for maximum compatibility
these days is using /usr/bin/env bash.
2019-07-24 13:31:37 +02:00
Clifford Wolf 4b6bb4e418 Cleanup some command line option oddities
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-06-27 14:06:47 +02:00
Clifford Wolf cc37c497d5 Merge branch 'feature_file_paths' of https://github.com/gs-jgj/SymbiYosys into staging 2019-06-27 13:55:25 +02:00
Hans Anderson 597beb6380 Fix default argument for tasknames 2019-06-24 18:35:52 -06:00
Hans Anderson 9ad0ea3e78 Switch from getopt to argparse 2019-06-21 19:12:26 -06:00
Jeppe Johansen 021c3bb4c0 Add dumpfiles command line argument.
Signed-off-by: Jeppe Johansen <jgj@gomspace.com>
2019-05-08 17:16:34 +02:00
Jeppe Johansen 57276995b6 Add support for expanding environment variables.
Signed-off-by: Jeppe Johansen <jgj@gomspace.com>
2019-05-08 16:56:33 +02:00
Clifford Wolf f087a71f49 Check if config contains any engines, fixes #38
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-05-01 18:47:41 +02:00
Clifford Wolf faa5b1f908 Fix re-run in same directory feature
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-04-30 20:03:24 +02:00
Clifford Wolf f918e2369a Add extra "setundef -anyseq" to aiger script
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-22 13:40:50 +01:00
Clifford Wolf 32d7325446 Backward compatibility with Python 3.4 API
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-21 20:09:44 +01:00
Clifford Wolf a2b85faa08 Significantly improve management of child processes
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-21 15:06:49 +01:00
Clifford Wolf 334b952e5a Improve logfile/output flushing
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-20 19:09:00 +01:00
Clifford Wolf 93a5dd0641 Do not overwrite config.sby in reusedir mode
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-20 19:09:00 +01:00
Clifford Wolf ef26dff799
Merge pull request #33 from cr1901/no-resource
Meaningful Windows Support
2019-03-19 14:20:28 +01:00
William D. Jones f8e27a06aa Annotate cmdline comment, summary string, and output XML with
OS-specific information.
2019-03-18 00:46:06 -04:00
William D. Jones b5eb5b3c78 Choose command separator for tasks based on OS.
Signed-off-by: William D. Jones <thor0505@comcast.net>
2019-03-17 23:01:24 -04:00
Clifford Wolf 410db87ebc Rename ".stamp" file to "status"
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-15 16:29:23 +01:00
William D. Jones 71e5dbabd6 Merge branch 'master' into no-resource 2019-03-12 16:59:17 -04:00
William D. Jones 43c7db77d4 Gate Unix-specific functionality from resources and fcntl.
Signed-off-by: William D. Jones <thor0505@comcast.net>
2019-03-10 00:43:55 -05:00
Clifford Wolf 577b5bcbc7 Improve rerun-in-existing-dir functionality
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-09 12:52:51 -08:00
Clifford Wolf bd4094f216 Add support for (re-)running in existing workdir
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-09 12:42:54 -08:00
Clifford Wolf d5fa89ee0c Improve sby file pycode/tasks handling
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-08 10:58:28 -08:00
Clifford Wolf 4a392bb639 Add --dumpcfg and --dumptasks
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2019-03-02 19:09:33 -08:00
Clifford Wolf 0772456a15 Further improve BTOR cex handling
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-12-10 03:44:08 +01:00
Clifford Wolf 6878ba0a82 Improve BTOR cex handling
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-12-10 02:42:03 +01:00
Clifford Wolf 3d66e7cec5 Fixes and improvements in BTOR engine
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-12-08 07:16:19 +01:00
Clifford Wolf 150f30ae08 Working BTOR BMC engine
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-12-08 07:01:21 +01:00
Clifford Wolf 4c485766e2 Add btor engine
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-12-08 05:23:04 +01:00
Clifford Wolf 4eb91d5b88 Add "smtbmc ... -- ..." feature (for "raw" smtbmc options)
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-11-22 17:08:28 +01:00
Clifford Wolf b50f4f3d10 Generate AIGERs with -I -B
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-11-12 09:36:12 +01:00
Clifford Wolf e90bcb588e Improve bogus task tags detection
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-09-12 13:26:08 +02:00
Clifford Wolf e111f7c935 Detect bogus task tags
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-09-12 13:23:34 +02:00
Clifford Wolf bf47da495b Add "skip" options (smtbmc only)
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-09-12 13:23:34 +02:00
Clifford Wolf f2697c23c0 Fixed "counterexample trace:" log message for things like warmup failed
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-08-21 14:00:30 +02:00
Clifford Wolf 07d124084c Use async2sync for "multiclock off" mode
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-07-19 15:31:49 +02:00
Clifford Wolf d24d7e1aef Use "hierarchy -simcheck" in default script
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-05-12 14:03:37 +02:00
Clifford Wolf 35d956c7bb Fix fix for chained tasks
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-05-01 15:58:55 +02:00
Clifford Wolf 162bdc9a3b Fix bug in handling of chained tasks
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-05-01 14:58:18 +02:00
Clifford Wolf 21d9e5d66f Add comment support in [tasks] section
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-04-19 17:28:18 +02:00
Clifford Wolf 836d54d4c7 Add check for malformed dst filename in [files] section
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-04-13 18:03:35 +02:00
Clifford Wolf fc7ace7884 Add JUnit XML output file and .stamp files
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-28 13:31:50 +02:00
Clifford Wolf 36c7185393 More improvements in sby error handling
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-27 16:23:57 +02:00
Clifford Wolf 9edc65874c Drastically improve sby error handling 2018-03-27 16:11:43 +02:00
Clifford Wolf 76a624a363 Improve handling of nomem models
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-15 19:11:42 +01:00
Clifford Wolf c003a1b078 Add localtime also to early log messages
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-11 01:26:40 +01:00
Clifford Wolf 93752c6fce Add localtime to log file
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-11 01:06:09 +01:00
Clifford Wolf ec38b0b841 Add "smtbmc --basecase/--induction"
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-07 22:23:50 +01:00
Clifford Wolf 47729cd61c Add smtbmc --progress option
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-07 22:16:24 +01:00
Clifford Wolf cfff7095e4 Merge branch 'master' of github.com:cliffordwolf/SymbiYosys 2018-03-06 23:42:09 +01:00
Clifford Wolf 2efa7c2b90 Use memory_nordff in postprocess script
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-06 23:40:08 +01:00
Clifford Wolf f6ab848797 Improvements in [tasks] handling
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-06 18:05:51 +01:00
Clifford Wolf d736fb14f9 Slightly change tasks syntax
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-06 00:01:55 +01:00
Clifford Wolf 92b247260a Add tasks in .sby files
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-05 13:09:20 +01:00
Clifford Wolf a94f21abab Add multiclock option
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-04 14:09:16 +01:00
Clifford Wolf e966f3dca4 Add smtbmc --stdt option
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-03-04 14:08:55 +01:00