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

mistral: Remove mistral root argument

Browse Source 
Signed-off-by: gatecat <gatecat@ds0.me>
This commit is contained in:
gatecat 2021-06-04 19:25:34 +01:00
parent 47f24a7024
commit 6fbc9e8159
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mistral/arch.cc
View File

@ -46,7 +46,7 @@ void IdString::initialize_arch(const BaseCtx *ctx)
Arch::Arch(ArchArgs args) Arch::Arch(ArchArgs args)
{ {
this->args = args; this->args = args;
this->cyclonev = mistral::CycloneV::get_model(args.device, args.mistral_root); this->cyclonev = mistral::CycloneV::get_model(args.device);
NPNR_ASSERT(this->cyclonev != nullptr); NPNR_ASSERT(this->cyclonev != nullptr);
// Setup fast identifier maps // Setup fast identifier maps

1
mistral/arch.h
View File

@ -34,7 +34,6 @@ NEXTPNR_NAMESPACE_BEGIN
struct ArchArgs struct ArchArgs
{ {
std::string device; std::string device;
std::string mistral_root;
}; };
// These structures are used for fast ALM validity checking // These structures are used for fast ALM validity checking

5
mistral/main.cc
View File

@ -47,7 +47,6 @@ MistralCommandHandler::MistralCommandHandler(int argc, char **argv) : CommandHan
po::options_description MistralCommandHandler::getArchOptions() po::options_description MistralCommandHandler::getArchOptions()
{ {
po::options_description specific("Architecture specific options"); po::options_description specific("Architecture specific options");
specific.add_options()("mistral", po::value<std::string>(), "path to mistral root");
specific.add_options()("device", po::value<std::string>(), "device name (e.g. 5CSEBA6U23I7)"); specific.add_options()("device", po::value<std::string>(), "device name (e.g. 5CSEBA6U23I7)");
specific.add_options()("qsf", po::value<std::string>(), "path to QSF constraints file"); specific.add_options()("qsf", po::value<std::string>(), "path to QSF constraints file");
specific.add_options()("rbf", po::value<std::string>(), "RBF bitstream to write"); specific.add_options()("rbf", po::value<std::string>(), "RBF bitstream to write");
@ -74,13 +73,9 @@ void MistralCommandHandler::customBitstream(Context *ctx)
std::unique_ptr<Context> MistralCommandHandler::createContext(dict<std::string, Property> &values) std::unique_ptr<Context> MistralCommandHandler::createContext(dict<std::string, Property> &values)
{ {
ArchArgs chipArgs; ArchArgs chipArgs;
if (!vm.count("mistral")) {
log_error("mistral must be specified on the command line\n");
}
if (!vm.count("device")) { if (!vm.count("device")) {
log_error("device must be specified on the command line (e.g. --device 5CSEBA6U23I7)\n"); log_error("device must be specified on the command line (e.g. --device 5CSEBA6U23I7)\n");
} }
chipArgs.mistral_root = vm["mistral"].as<std::string>();
chipArgs.device = vm["device"].as<std::string>(); chipArgs.device = vm["device"].as<std::string>();
auto ctx = std::unique_ptr<Context>(new Context(chipArgs)); auto ctx = std::unique_ptr<Context>(new Context(chipArgs));
if (vm.count("compress-rbf")) if (vm.count("compress-rbf"))