riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3749 from lethalbit/aki/plugin-stuff 

Updated the `plugin` command to better handle paths
This commit is contained in:
Miodrag Milanović 2023-05-09 08:46:02 +02:00 committed by GitHub
parent f790e00478 bb240665b7
commit 226a224640
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
passes/cmds/plugin.cc
View File

@ -41,50 +41,70 @@ std::map<std::string, std::string> loaded_plugin_aliases;
void load_plugin(std::string filename, std::vector<std::string> aliases) void load_plugin(std::string filename, std::vector<std::string> aliases)
{ {
std::string orig_filename = filename; std::string orig_filename = filename;
rewrite_filename(filename);
if (filename.find('/') == std::string::npos) // Would something like this better be put in `rewrite_filename`?
if (filename.find("/") == std::string::npos)
filename = "./" + filename; filename = "./" + filename;
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
if (!loaded_plugins.count(filename) && !loaded_python_plugins.count(filename)) { const bool is_loaded = loaded_plugins.count(orig_filename) && loaded_python_plugins.count(orig_filename);
#else #else
if (!loaded_plugins.count(filename)) { const bool is_loaded = loaded_plugins.count(orig_filename);
#endif #endif
#ifdef WITH_PYTHON if (!is_loaded) {
// Check if we're loading a python script
boost::filesystem::path full_path(filename); if(filename.find(".py") != std::string::npos)
if(strcmp(full_path.extension().c_str(), ".py") == 0)
{ {
std::string path(full_path.parent_path().c_str()); #ifdef WITH_PYTHON
filename = full_path.filename().c_str(); boost::filesystem::path full_path(filename);
filename = filename.substr(0,filename.size()-3); std::string path(full_path.parent_path().c_str());
PyRun_SimpleString(("sys.path.insert(0,\""+path+"\")").c_str()); filename = full_path.filename().c_str();
PyErr_Print(); filename = filename.substr(0,filename.size()-3);
PyObject *module_p = PyImport_ImportModule(filename.c_str()); PyRun_SimpleString(("sys.path.insert(0,\""+path+"\")").c_str());
if(module_p == NULL)
{
PyErr_Print(); PyErr_Print();
log_cmd_error("Can't load python module `%s'\n", full_path.filename().c_str()); PyObject *module_p = PyImport_ImportModule(filename.c_str());
return; if(module_p == NULL)
} {
loaded_python_plugins[orig_filename] = module_p; PyErr_Print();
Pass::init_register(); log_cmd_error("Can't load python module `%s'\n", full_path.filename().c_str());
return;
}
loaded_python_plugins[orig_filename] = module_p;
Pass::init_register();
#else
log_error(
"\n This version of Yosys cannot load python plugins.\n"
" Ensure Yosys is built with Python support to do so.\n"
);
#endif
} else { } else {
#endif // Otherwise we assume it's a native plugin
void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL); void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL);
if (hdl == NULL && orig_filename.find('/') == std::string::npos)
hdl = dlopen((proc_share_dirname() + "plugins/" + orig_filename + ".so").c_str(), RTLD_LAZY|RTLD_LOCAL); // We were unable to open the file, try to do so from the plugin directory
if (hdl == NULL) if (hdl == NULL && orig_filename.find('/') == std::string::npos) {
log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror()); hdl = dlopen([orig_filename]() {
loaded_plugins[orig_filename] = hdl; std::string new_path = proc_share_dirname() + "plugins/" + orig_filename;
Pass::init_register();
// Check if we need to append .so
if (new_path.find(".so") == std::string::npos)
new_path.append(".so");
return new_path;
}().c_str(), RTLD_LAZY|RTLD_LOCAL);
}
if (hdl == NULL)
log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror());
loaded_plugins[orig_filename] = hdl;
Pass::init_register();
#ifdef WITH_PYTHON
} }
#endif
} }
for (auto &alias : aliases) for (auto &alias : aliases)
@ -182,4 +202,3 @@ struct PluginPass : public Pass {
} PluginPass; } PluginPass;
YOSYS_NAMESPACE_END YOSYS_NAMESPACE_END