mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

plugin: shuffled the #ifdef WITH_PYTHON's around to un-tangle the code and pulled out the check for the .py extension so it will complain if you try to load a python extension without python support

Browse source
This commit is contained in:
Aki Van Ness 2023-05-03 02:50:23 -04:00
parent 572c8df9a8
commit bb240665b7
No known key found for this signature in database
GPG key ID: 58B2EF8A70E7F62C
1 changed files with 51 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
passes/cmds/plugin.cc
View file

@ -21,12 +21,12 @@
#ifdef YOSYS_ENABLE_PLUGINS #ifdef YOSYS_ENABLE_PLUGINS
# include <dlfcn.h> # include <dlfcn.h>
# include <boost/filesystem.hpp>
# include <boost/algorithm/string/predicate.hpp>
#endif #endif
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
# include <boost/algorithm/string/predicate.hpp>
# include <Python.h> # include <Python.h>
# include <boost/filesystem.hpp>
#endif #endif
YOSYS_NAMESPACE_BEGIN YOSYS_NAMESPACE_BEGIN
@ -42,60 +42,69 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
{ {
std::string orig_filename = filename; std::string orig_filename = filename;
rewrite_filename(filename); rewrite_filename(filename);
boost::filesystem::path full_path(filename);
// Would something like this better be put in `rewrite_filename`?
if (filename.find("/") == std::string::npos)
filename = "./" + filename;
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
if (!loaded_plugins.count(orig_filename) && !loaded_python_plugins.count(orig_filename)) { const bool is_loaded = loaded_plugins.count(orig_filename) && loaded_python_plugins.count(orig_filename);
#else #else
if (!loaded_plugins.count(orig_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
if(strcmp(full_path.extension().c_str(), ".py") == 0) if(filename.find(".py") != std::string::npos)
{ {
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);
// We were unable to open the file, try to do so from the plugin directory // We were unable to open the file, try to do so from the plugin directory
if (hdl == NULL && filename.find('/') == std::string::npos) { if (hdl == NULL && orig_filename.find('/') == std::string::npos) {
hdl = dlopen([filename]() { hdl = dlopen([orig_filename]() {
std::string new_path = proc_share_dirname() + "plugins/" + filename; std::string new_path = proc_share_dirname() + "plugins/" + orig_filename;
// Check if we need to append .so // Check if we need to append .so
if (new_path.find(".so") == std::string::npos) if (new_path.find(".so") == std::string::npos)
new_path.append(".so"); 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();
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)