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

Merge pull request #4500 from YosysHQ/micko/vhdl_mixcase

Browse source 
VHDL is case insensitive, make sure netlist name is proper
This commit is contained in:
Miodrag Milanović 2024-07-29 16:44:13 +02:00 committed by GitHub
parent 92cac63845 405897a971
commit 3e14e67374
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
frontends/verific/verific.cc
View file

@ -58,6 +58,7 @@ USING_YOSYS_NAMESPACE
#ifdef VERIFIC_VHDL_SUPPORT #ifdef VERIFIC_VHDL_SUPPORT
#include "vhdl_file.h" #include "vhdl_file.h"
#include "VhdlIdDef.h"
#include "VhdlUnits.h" #include "VhdlUnits.h"
#include "NameSpace.h" #include "NameSpace.h"
#endif #endif
@ -2759,7 +2760,7 @@ void import_all(const char* work, std::map<std::string,Netlist*> *nl_todo, Map *
#endif #endif
} }
std::set<std::string> import_tops(const char* work, std::map<std::string,Netlist*> *nl_todo, Map *parameters, bool show_message, std::string ppfile YS_MAYBE_UNUSED, std::vector<std::string> &tops) std::set<std::string> import_tops(const char* work, std::map<std::string,Netlist*> *nl_todo, Map *parameters, bool show_message, std::string ppfile YS_MAYBE_UNUSED, std::vector<std::string> &tops, std::string *top = nullptr)
{ {
std::set<std::string> top_mod_names; std::set<std::string> top_mod_names;
Array *netlists = nullptr; Array *netlists = nullptr;
@ -2817,6 +2818,12 @@ std::set<std::string> import_tops(const char* work, std::map<std::string,Netlist
if (show_message) if (show_message)
log("Adding VHDL unit '%s' to elaboration queue.\n", name); log("Adding VHDL unit '%s' to elaboration queue.\n", name);
vhdl_units.InsertLast(vhdl_unit); vhdl_units.InsertLast(vhdl_unit);
if (strcmp(name, vhdl_unit->Id()->OrigName()) != 0) {
top_mod_names.erase(name);
top_mod_names.insert(vhdl_unit->Id()->OrigName());
if (top && *top == name)
*top = vhdl_unit->Id()->OrigName();
}
continue; continue;
} }
#endif #endif
@ -2957,7 +2964,7 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin
veri_file::RemoveAllLOptions(); veri_file::RemoveAllLOptions();
veri_file::AddLOption("work"); veri_file::AddLOption("work");
#endif #endif
top_mod_names = import_tops("work", &nl_todo, &verific_params, false, "", tops) ; top_mod_names = import_tops("work", &nl_todo, &verific_params, false, "", tops, &top) ;
} }
if (!verific_error_msg.empty()) if (!verific_error_msg.empty())