caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

viaduct: Allow passing command line options to uarch with -o

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2022-08-15 12:15:00 +02:00
parent b653e39991
commit 47da562600
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
generic/main.cc
View File

@ -49,6 +49,8 @@ po::options_description GenericCommandHandler::getArchOptions()
po::options_description specific("Architecture specific options"); po::options_description specific("Architecture specific options");
specific.add_options()("uarch", po::value<std::string>(), uarch_help.c_str()); specific.add_options()("uarch", po::value<std::string>(), uarch_help.c_str());
specific.add_options()("no-iobs", "disable automatic IO buffer insertion"); specific.add_options()("no-iobs", "disable automatic IO buffer insertion");
specific.add_options()("vopt,o", po::value<std::vector<std::string>>(), "options to pass to the viaduct uarch");
return specific; return specific;
} }
@ -68,6 +70,16 @@ std::unique_ptr<Context> GenericCommandHandler::createContext(dict<std::string,
if (vm.count("uarch")) { if (vm.count("uarch")) {
std::string uarch_name = vm["uarch"].as<std::string>(); std::string uarch_name = vm["uarch"].as<std::string>();
dict<std::string, std::string> args; // TODO dict<std::string, std::string> args; // TODO
if (vm.count("vopt")) {
std::vector<std::string> options = vm["vopt"].as<std::vector<std::string>>();
for (const auto &opt : options) {
size_t epos = opt.find('=');
if (epos == std::string::npos)
args[opt] = "";
else
args[opt.substr(0, epos)] = opt.substr(epos + 1);
}
}
auto uarch = ViaductArch::create(uarch_name, args); auto uarch = ViaductArch::create(uarch_name, args);
if (!uarch) { if (!uarch) {
std::string all_uarches = ViaductArch::list(); std::string all_uarches = ViaductArch::list();
@ -75,6 +87,8 @@ std::unique_ptr<Context> GenericCommandHandler::createContext(dict<std::string,
} }
ctx->uarch = std::move(uarch); ctx->uarch = std::move(uarch);
ctx->uarch->init(ctx.get()); ctx->uarch->init(ctx.get());
} else if (vm.count("vopt")) {
log_error("Viaduct options passed in non-viaduct mode!\n");
} }
return ctx; return ctx;
} }