3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-15 02:16:17 +00:00

Add blackboxes a little later and use ignore files rather than ignore modules

This commit is contained in:
Akash Levy 2024-05-30 14:17:10 -07:00
parent 8b93aa10cb
commit 5bc23b272a

View file

@ -3459,9 +3459,6 @@ struct VerificPass : public Pass {
veri_file::AddFileExtMode(".svh", veri_file::SYSTEM_VERILOG); veri_file::AddFileExtMode(".svh", veri_file::SYSTEM_VERILOG);
veri_file::AddFileExtMode(".svp", veri_file::SYSTEM_VERILOG); veri_file::AddFileExtMode(".svp", veri_file::SYSTEM_VERILOG);
veri_file::AddFileExtMode(".h", veri_file::SYSTEM_VERILOG); veri_file::AddFileExtMode(".h", veri_file::SYSTEM_VERILOG);
// Add blackbox modules
veri_file::AddVFile("preqorsor/data/blackboxes.v");
// Select analyze function // Select analyze function
auto analyze_function = (args[argidx] == "-auto_discover") ? hdl_file_sort::AnalyzeDiscoveredFiles : hdl_file_sort::AnalyzeSortedFiles; auto analyze_function = (args[argidx] == "-auto_discover") ? hdl_file_sort::AnalyzeDiscoveredFiles : hdl_file_sort::AnalyzeSortedFiles;
@ -3476,6 +3473,7 @@ struct VerificPass : public Pass {
if (args[argidx] == "-f" || args[argidx] == "-F" || args[argidx] == "-FF") { if (args[argidx] == "-f" || args[argidx] == "-F" || args[argidx] == "-FF") {
veri_file::f_file_flags flags = (args[argidx] == "-f") ? veri_file::F_FILE_NONE : ((args[argidx] == "-F") ? veri_file::F_FILE_CAPITAL : veri_file::F_FILE_CAPITAL_NESTED); veri_file::f_file_flags flags = (args[argidx] == "-f") ? veri_file::F_FILE_NONE : ((args[argidx] == "-F") ? veri_file::F_FILE_CAPITAL : veri_file::F_FILE_CAPITAL_NESTED);
Array *file_names = veri_file::ProcessFFile(args[++argidx].c_str(), flags, verilog_mode); Array *file_names = veri_file::ProcessFFile(args[++argidx].c_str(), flags, verilog_mode);
veri_file::AddVFile("preqorsor/data/blackboxes.v");
FOREACH_ARRAY_ITEM(veri_file::IncludeDirs(), i, dir_name) { FOREACH_ARRAY_ITEM(veri_file::IncludeDirs(), i, dir_name) {
if (!hdl_file_sort::RegisterDir(dir_name)) { if (!hdl_file_sort::RegisterDir(dir_name)) {
verific_error_msg.clear(); verific_error_msg.clear();
@ -3519,11 +3517,9 @@ struct VerificPass : public Pass {
} }
delete file_names; delete file_names;
} else if (args[argidx] == "-i") { } else if (args[argidx] == "-i") {
const char *ignore_module = args[++argidx].c_str(); const char *ignore_file = args[++argidx].c_str();
log("AUTO-DISCOVER: ignoring module %s\n", ignore_module); log("AUTO-DISCOVER: ignoring file %s\n", ignore_file);
veri_file::AddToIgnoredModuleNames(ignore_module); hdl_file_sort::UnRegisterFile(ignore_file);
veri_file::AddToIgnoredParsedModuleNames(ignore_module);
hdl_file_sort::RegisterIgnoreUnitName(ignore_module);
} else { } else {
veri_file::AddIncludeDir(args[argidx].c_str()); veri_file::AddIncludeDir(args[argidx].c_str());
if (!hdl_file_sort::RegisterDir(args[argidx].c_str())) { if (!hdl_file_sort::RegisterDir(args[argidx].c_str())) {