Merge pull request #427 from antmicro/rk/global-typedef
Add global typedefs to scope before simplify
diff --git a/environment.yml b/environment.yml
index a4cf46c..dc51454 100644
--- a/environment.yml
+++ b/environment.yml
@@ -20,5 +20,5 @@
- litex-hub
dependencies:
- litex-hub::yosys=0.17_7_g990c9b8e1=20220512_085338_py37
- - litex-hub::surelog
+ - litex-hub::surelog=0.0_5519_g900fb2499=20221223_060448_py37
- litex-hub::iverilog
diff --git a/ql-qlf-plugin/synth_quicklogic.cc b/ql-qlf-plugin/synth_quicklogic.cc
index f861704..a8e830c 100644
--- a/ql-qlf-plugin/synth_quicklogic.cc
+++ b/ql-qlf-plugin/synth_quicklogic.cc
@@ -532,11 +532,7 @@
if (check_label("blif")) {
if (!blif_file.empty()) {
- if (inferAdder) {
- run(stringf("write_blif -param %s", help_mode ? "<file-name>" : blif_file.c_str()));
- } else {
- run(stringf("write_blif %s", help_mode ? "<file-name>" : blif_file.c_str()));
- }
+ run(stringf("write_blif -param %s", help_mode ? "<file-name>" : blif_file.c_str()));
}
}
diff --git a/systemverilog-plugin/UhdmAst.cc b/systemverilog-plugin/UhdmAst.cc
index 3fd52d9..8f92ac6 100644
--- a/systemverilog-plugin/UhdmAst.cc
+++ b/systemverilog-plugin/UhdmAst.cc
@@ -1711,7 +1711,7 @@
}
});
visit_one_to_many({vpiModule, vpiInterface, vpiTaskFunc, vpiParameter, vpiParamAssign, vpiPort, vpiNet, vpiArrayNet, vpiGenScopeArray,
- vpiContAssign, vpiProcess, vpiClockingBlock, vpiAssertion},
+ vpiProcess, vpiClockingBlock, vpiAssertion},
obj_h, [&](AST::AstNode *node) {
if (node) {
if (node->type == AST::AST_ASSIGN && node->children.size() < 2)
@@ -1836,7 +1836,7 @@
add_or_replace_child(module_node, node);
}
});
- visit_one_to_many({vpiInterface, vpiModule, vpiPort, vpiGenScopeArray}, obj_h, [&](AST::AstNode *node) {
+ visit_one_to_many({vpiInterface, vpiModule, vpiPort, vpiGenScopeArray, vpiContAssign}, obj_h, [&](AST::AstNode *node) {
if (node) {
add_or_replace_child(module_node, node);
}
diff --git a/third_party/make-env b/third_party/make-env
index 59adb0f..33b80bd 160000
--- a/third_party/make-env
+++ b/third_party/make-env
@@ -1 +1 @@
-Subproject commit 59adb0f248cc4a5d764b6b06224bf6adea7fa36e
+Subproject commit 33b80bd32c30fb8affd0fd5cda544d1bca075593
