Use yowasp_yosys instead of system-installed yosys #50
Conversation
Signed-off-by: Daniel Lim Wee Soong <weesoong.lim@gmail.com>
|
Can we make this a configuration option? |
|
Yup sure, so a setting in conf.py? |
|
Yeap! Sounds good. |
|
Now we support both types of yosys installations. @mithro Do you think we need to implement tests for both use cases? I can't think of any straightforward way of doing so without setting up a whole sphinx project for each of the two cases. |
Signed-off-by: Daniel Lim Wee Soong <weesoong.lim@gmail.com>
Signed-off-by: Daniel Lim Wee Soong <weesoong.lim@gmail.com>
|
@daniellimws - Can we just set up travis to run in the two configurations? |
|
@mithro I'm not good with Travis so if you got any ideas you could try it first |
|
I believe that the mechanism for tests provided in the #52 can be useful here. |
|
@rw1nkler -- Can you take a look at this PR? If @daniellimws doesn't currently have the time, can you take it over and get it merged? |
|
Hi, yes I currently am quite busy with school work. I might be free next week though. Feel free to take over if you want :). |
|
|
||
| def setup(app): | ||
| ... | ||
| VerilogDiagram.use_yowasp = False |
There was a problem hiding this comment.
In my opinion, the global settings for the extension should be based on variables added to sphinxconf.py file.
See: https://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_config_value
| @@ -268,7 +281,7 @@ def diagram_netlistsvg(ipath, opath, module='top', flatten=False): | |||
| run_yosys( | |||
| src=ipath, | |||
| cmd = """\ | |||
| prep -top {top} {flatten}; cd {top}; write_json {ojson} | |||
| prep -top {top} {flatten}; cd {top}; write_json -compat-int {ojson} | |||
There was a problem hiding this comment.
The compatibility mode seems to work incorectly when added to the standard conda Yosys version.
Following the discussion in #40, change to use the wasm-bundled version of yosys as in yowasp_yosys instead of the system-installed yosys (symbiflow projects use conda to install it, but this might not be the case for other users).
One benefit of this is that it allows us to control the version of yosys used by the user. This is important because there might be breaking changes in yosys, such as #13, and it wouldn't be ideal to cater for multiple versions of yosys.
One small downside is this takes about twice the duration compared to native yosys but I don't think this really matters.
Signed-off-by: Daniel Lim Wee Soong weesoong.lim@gmail.com