Fork edif pass

This allows us to use latest yosys. The upstream edif pass introduced changes which are incompatible with SystemVerilog. Signed-off-by: Tomasz Gorochowik <[email protected]>
chipsalliance · Sep 29, 2023 · 5e1a7cc · hzeller · Oct 29, 2023 · 5e1a7cc
1 parent 66cf5de
commit 5e1a7cc
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/frontends/systemverilog/uhdm_common_frontend.cc b/frontends/systemverilog/uhdm_common_frontend.cc
@@ -18,6 +18,7 @@
  */
 
 #include "uhdm_common_frontend.h"
+#include "edif.h"
 
 namespace systemverilog_plugin
 {
@@ -30,6 +31,8 @@ static void set_line_num(int) {}
 /* Stub for AST::process */
 static int get_line_num(void) { return 1; }
 
+UhdmCommonFrontend::UhdmCommonFrontend(std::string name, std::string short_help) : Frontend(name, short_help) { register_synlig_edif_backend(); }
+
 void UhdmCommonFrontend::print_read_options()
 {
     log("    -noassert\n");

diff --git a/frontends/systemverilog/uhdm_common_frontend.h b/frontends/systemverilog/uhdm_common_frontend.h
@@ -49,7 +49,7 @@ static inline ObjT *make_new_object_with_optional_extra_true_arg(ArgN &&...arg_n
 struct UhdmCommonFrontend : public ::Yosys::Frontend {
     UhdmAstShared shared;
     std::vector<std::string> args;
-    UhdmCommonFrontend(std::string name, std::string short_help) : Frontend(name, short_help) {}
+    UhdmCommonFrontend(std::string name, std::string short_help);
     virtual void print_read_options();
     virtual void help() = 0;
     virtual ::Yosys::AST::AstNode *parse(std::string filename) = 0;

diff --git a/third_party/yosys_mod/edif.cc b/third_party/yosys_mod/edif.cc
@@ -27,8 +27,10 @@
 #include "kernel/sigtools.h"
 #include <string>
 
-USING_YOSYS_NAMESPACE
-PRIVATE_NAMESPACE_BEGIN
+namespace systemverilog_plugin
+{
+
+using namespace ::Yosys;
 
 #define EDIF_DEF(_id) edif_names(RTLIL::unescape_id(_id), true).c_str()
 #define EDIF_DEFR(_id, _ren, _bl, _br) edif_names(RTLIL::unescape_id(_id), true, _ren, _bl, _br).c_str()
@@ -86,8 +88,8 @@ struct EdifNames {
     }
 };
 
-struct EdifBackend : public Backend {
-    EdifBackend() : Backend("edif", "write design to EDIF netlist file") {}
+struct SynligEdifBackend : public Backend {
+    SynligEdifBackend() : Backend("edif", "write design to EDIF netlist file") {}
     void help() override
     {
         //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -129,7 +131,7 @@ struct EdifBackend : public Backend {
     }
     void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) override
     {
-        log_header(design, "Executing EDIF backend.\n");
+        log_header(design, "Executing Synlig EDIF backend.\n");
         std::string top_module_name;
         bool port_rename = false;
         bool attr_properties = false;
@@ -598,6 +600,19 @@ struct EdifBackend : public Backend {
 
         *f << stringf(")\n");
     }
-} EdifBackend;
+};
+
+SynligEdifBackend *seb = NULL;
+
+void register_synlig_edif_backend()
+{
+    if (seb == NULL) {
+        backend_register.erase("edif");
+        pass_register.erase("edif");
+        pass_register.erase("write_edif");
+        seb = new SynligEdifBackend;
+        seb->init_register();
+    }
+}
 
-PRIVATE_NAMESPACE_END
+} // namespace systemverilog_plugin
diff --git a/third_party/yosys_mod/edif.h b/third_party/yosys_mod/edif.h
@@ -0,0 +1,4 @@
+namespace systemverilog_plugin
+{
+void register_synlig_edif_backend();
+}