diff options
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/arch.cc | 99 | ||||
| -rw-r--r-- | ice40/arch.h | 21 | ||||
| -rw-r--r-- | ice40/main.cc | 466 | ||||
| -rw-r--r-- | ice40/pcf.cc | 2 | ||||
| -rw-r--r-- | ice40/project.cc | 71 |
5 files changed, 270 insertions, 389 deletions
diff --git a/ice40/arch.cc b/ice40/arch.cc index 0c078f0e..7e2dd7f7 100644 --- a/ice40/arch.cc +++ b/ice40/arch.cc @@ -27,6 +27,7 @@ #include "placer1.h" #include "router1.h" #include "util.h" + NEXTPNR_NAMESPACE_BEGIN // ----------------------------------------------------------------------- @@ -181,7 +182,8 @@ BelId Arch::getBelByLocation(Loc loc) const BelRange Arch::getBelsByTile(int x, int y) const { - // In iCE40 chipdb bels at the same tile are consecutive and dense z ordinates are used + // In iCE40 chipdb bels at the same tile are consecutive and dense z ordinates + // are used BelRange br; br.b.cursor = Arch::getBelByLocation(Loc(x, y, 0)).index; @@ -535,23 +537,27 @@ bool Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, delay auto sink_loc = getBelLocation(sink.cell->bel); if (driver_loc.y == sink_loc.y) budget = 0; - else switch (args.type) { + else + switch (args.type) { #ifndef ICE40_HX1K_ONLY case ArchArgs::HX8K: #endif case ArchArgs::HX1K: - budget = 190; break; + budget = 190; + break; #ifndef ICE40_HX1K_ONLY case ArchArgs::LP384: case ArchArgs::LP1K: case ArchArgs::LP8K: - budget = 290; break; + budget = 290; + break; case ArchArgs::UP5K: - budget = 560; break; + budget = 560; + break; #endif default: log_error("Unsupported iCE40 chip type.\n"); - } + } return true; } return false; @@ -770,27 +776,76 @@ bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort return false; } -IdString Arch::getPortClock(const CellInfo *cell, IdString port) const +// Get the port class, also setting clockPort to associated clock if applicable +TimingPortClass Arch::getPortTimingClass(const CellInfo *cell, IdString port, IdString &clockPort) const { - if (cell->type == id_ICESTORM_LC && cell->lcInfo.dffEnable) { - if (port != id_LO && port != id_CIN && port != id_COUT) - return id_CLK; + if (cell->type == id_ICESTORM_LC) { + if (port == id_CLK) + return TMG_CLOCK_INPUT; + if (port == id_CIN) + return TMG_COMB_INPUT; + if (port == id_COUT || port == id_LO) + return TMG_COMB_OUTPUT; + if (cell->lcInfo.dffEnable) { + clockPort = id_CLK; + if (port == id_O) + return TMG_REGISTER_OUTPUT; + else + return TMG_REGISTER_INPUT; + } else { + if (port == id_O) + return TMG_COMB_OUTPUT; + else + return TMG_COMB_INPUT; + } } else if (cell->type == id_ICESTORM_RAM) { + + if (port == id_RCLK || port == id_WCLK) + return TMG_CLOCK_INPUT; + if (port.str(this)[0] == 'R') - return id_RCLK; + clockPort = id_RCLK; else - return id_WCLK; - } - return IdString(); -} + clockPort = id_WCLK; -bool Arch::isClockPort(const CellInfo *cell, IdString port) const -{ - if (cell->type == id_ICESTORM_LC && port == id_CLK) - return true; - if (cell->type == id_ICESTORM_RAM && (port == id_RCLK || port == id_WCLK)) - return true; - return false; + if (cell->ports.at(port).type == PORT_OUT) + return TMG_REGISTER_OUTPUT; + else + return TMG_REGISTER_INPUT; + } else if (cell->type == id_ICESTORM_DSP || cell->type == id_ICESTORM_SPRAM) { + clockPort = id_CLK; + if (port == id_CLK) + return TMG_CLOCK_INPUT; + else if (cell->ports.at(port).type == PORT_OUT) + return TMG_REGISTER_OUTPUT; + else + return TMG_REGISTER_INPUT; + } else if (cell->type == id_SB_IO) { + if (port == id_D_IN_0 || port == id_D_IN_1) + return TMG_STARTPOINT; + if (port == id_D_OUT_0 || port == id_D_OUT_1 || port == id_OUTPUT_ENABLE) + return TMG_ENDPOINT; + return TMG_IGNORE; + } else if (cell->type == id_ICESTORM_PLL) { + if (port == id_PLLOUT_A || port == id_PLLOUT_B) + return TMG_GEN_CLOCK; + return TMG_IGNORE; + } else if (cell->type == id_ICESTORM_LFOSC) { + if (port == id_CLKLF) + return TMG_GEN_CLOCK; + return TMG_IGNORE; + } else if (cell->type == id_ICESTORM_HFOSC) { + if (port == id_CLKHF) + return TMG_GEN_CLOCK; + return TMG_IGNORE; + } else if (cell->type == id_SB_GB) { + if (port == id_GLOBAL_BUFFER_OUTPUT) + return TMG_COMB_OUTPUT; + return TMG_COMB_INPUT; + } else if (cell->type == id_SB_WARMBOOT) { + return TMG_ENDPOINT; + } + log_error("no timing info for port '%s' of cell type '%s'\n", port.c_str(this), cell->type.c_str(this)); } bool Arch::isGlobalNet(const NetInfo *net) const diff --git a/ice40/arch.h b/ice40/arch.h index 62a637ae..561d75c3 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -400,10 +400,10 @@ struct Arch : BaseCtx mutable std::unordered_map<Loc, int> bel_by_loc; std::vector<bool> bel_carry; - std::vector<CellInfo*> bel_to_cell; - std::vector<NetInfo*> wire_to_net; - std::vector<NetInfo*> pip_to_net; - std::vector<NetInfo*> switches_locked; + std::vector<CellInfo *> bel_to_cell; + std::vector<NetInfo *> wire_to_net; + std::vector<NetInfo *> pip_to_net; + std::vector<NetInfo *> switches_locked; ArchArgs args; Arch(ArchArgs args); @@ -411,6 +411,7 @@ struct Arch : BaseCtx std::string getChipName() const; IdString archId() const { return id("ice40"); } + ArchArgs archArgs() const { return args; } IdString archArgsToId(ArchArgs args) const; // ------------------------------------------------- @@ -782,16 +783,15 @@ struct Arch : BaseCtx // Get the delay through a cell from one port to another, returning false // if no path exists bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort, DelayInfo &delay) const; - // Get the associated clock to a port, or empty if the port is combinational - IdString getPortClock(const CellInfo *cell, IdString port) const; - // Return true if a port is a clock - bool isClockPort(const CellInfo *cell, IdString port) const; + // Get the port class, also setting clockDomain if applicable + TimingPortClass getPortTimingClass(const CellInfo *cell, IdString port, IdString &clockDomain) const; // Return true if a port is a net bool isGlobalNet(const NetInfo *net) const; // ------------------------------------------------- - // Perform placement validity checks, returning false on failure (all implemented in arch_place.cc) + // Perform placement validity checks, returning false on failure (all + // implemented in arch_place.cc) // Whether or not a given cell can be placed at a given Bel // This is not intended for Bel type checks, but finer-grained constraints @@ -805,7 +805,8 @@ struct Arch : BaseCtx bool logicCellsCompatible(const std::vector<const CellInfo *> &cells) const; // ------------------------------------------------- - // Assign architecure-specific arguments to nets and cells, which must be called between packing or further + // Assign architecure-specific arguments to nets and cells, which must be + // called between packing or further // netlist modifications, and validity checks void assignArchInfo(); void assignCellInfo(CellInfo *cell); diff --git a/ice40/main.cc b/ice40/main.cc index 78236af1..2818a3ad 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -2,6 +2,7 @@ * nextpnr -- Next Generation Place and Route * * Copyright (C) 2018 Clifford Wolf <clifford@symbioticeda.com> + * Copyright (C) 2018 Miodrag Milanovic <miodrag@symbioticeda.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -19,391 +20,144 @@ #ifdef MAIN_EXECUTABLE -#ifndef NO_GUI -#include <QApplication> -#include "application.h" -#include "mainwindow.h" -#endif -#ifndef NO_PYTHON -#include "pybindings.h" -#endif - -#include <boost/filesystem/convenience.hpp> -#include <boost/program_options.hpp> -#include <boost/property_tree/json_parser.hpp> -#include <boost/property_tree/ptree.hpp> #include <fstream> -#include <iostream> #include "bitstream.h" +#include "command.h" #include "design_utils.h" #include "jsonparse.h" #include "log.h" -#include "nextpnr.h" #include "pcf.h" #include "timing.h" -#include "version.h" USING_NEXTPNR_NAMESPACE -void conflicting_options(const boost::program_options::variables_map &vm, const char *opt1, const char *opt2) +class Ice40CommandHandler : public CommandHandler { - if (vm.count(opt1) && !vm[opt1].defaulted() && vm.count(opt2) && !vm[opt2].defaulted()) { - std::string msg = "Conflicting options '" + std::string(opt1) + "' and '" + std::string(opt1) + "'."; - log_error("%s\n", msg.c_str()); - } -} - -int main(int argc, char *argv[]) + public: + Ice40CommandHandler(int argc, char **argv); + virtual ~Ice40CommandHandler(){}; + std::unique_ptr<Context> createContext() override; + void setupArchContext(Context *ctx) override; + void validate() override; + void customAfterLoad(Context *ctx) override; + void customBitstream(Context *ctx) override; + + protected: + po::options_description getArchOptions(); +}; + +Ice40CommandHandler::Ice40CommandHandler(int argc, char **argv) : CommandHandler(argc, argv) {} + +po::options_description Ice40CommandHandler::getArchOptions() { - try { - namespace po = boost::program_options; - namespace pt = boost::property_tree; - int rc = 0; - std::string str; - - log_files.push_back(stdout); - - po::options_description options("Allowed options"); - options.add_options()("help,h", "show help"); - options.add_options()("verbose,v", "verbose output"); - options.add_options()("debug", "debug output"); - options.add_options()("force,f", "keep running after errors"); -#ifndef NO_GUI - options.add_options()("gui", "start gui"); -#endif - options.add_options()("pack-only", "pack design only without placement or routing"); - - po::positional_options_description pos; -#ifndef NO_PYTHON - options.add_options()("run", po::value<std::vector<std::string>>(), "python file to execute"); - pos.add("run", -1); -#endif - options.add_options()("json", po::value<std::string>(), "JSON design file to ingest"); - options.add_options()("pcf", po::value<std::string>(), "PCF constraints file to ingest"); - options.add_options()("asc", po::value<std::string>(), "asc bitstream file to write"); - options.add_options()("read", po::value<std::string>(), "asc bitstream file to read"); - options.add_options()("seed", po::value<int>(), "seed value for random number generator"); - options.add_options()("slack_redist_iter", po::value<int>(), - "number of iterations between slack redistribution"); - options.add_options()("cstrweight", po::value<float>(), - "placer weighting for relative constraint satisfaction"); - - options.add_options()("version,V", "show version"); - options.add_options()("tmfuzz", "run path delay estimate fuzzer"); - options.add_options()("test", "check architecture database integrity"); + po::options_description specific("Architecture specific options"); #ifdef ICE40_HX1K_ONLY - options.add_options()("hx1k", "set device type to iCE40HX1K"); + specific.add_options()("hx1k", "set device type to iCE40HX1K"); #else - options.add_options()("lp384", "set device type to iCE40LP384"); - options.add_options()("lp1k", "set device type to iCE40LP1K"); - options.add_options()("lp8k", "set device type to iCE40LP8K"); - options.add_options()("hx1k", "set device type to iCE40HX1K"); - options.add_options()("hx8k", "set device type to iCE40HX8K"); - options.add_options()("up5k", "set device type to iCE40UP5K"); + specific.add_options()("lp384", "set device type to iCE40LP384"); + specific.add_options()("lp1k", "set device type to iCE40LP1K"); + specific.add_options()("lp8k", "set device type to iCE40LP8K"); + specific.add_options()("hx1k", "set device type to iCE40HX1K"); + specific.add_options()("hx8k", "set device type to iCE40HX8K"); + specific.add_options()("up5k", "set device type to iCE40UP5K"); #endif - options.add_options()("freq", po::value<double>(), "set target frequency for design in MHz"); - options.add_options()("no-tmdriv", "disable timing-driven placement"); - options.add_options()("package", po::value<std::string>(), "set device package"); - options.add_options()("save", po::value<std::string>(), "project file to write"); - options.add_options()("load", po::value<std::string>(), "project file to read"); - - po::variables_map vm; - try { - po::parsed_options parsed = po::command_line_parser(argc, argv).options(options).positional(pos).run(); - - po::store(parsed, vm); - - po::notify(vm); - } catch (std::exception &e) { - std::cout << e.what() << "\n"; - return 1; - } - - conflicting_options(vm, "read", "json"); -#ifndef ICE40_HX1K_ONLY - if ((vm.count("lp384") + vm.count("lp1k") + vm.count("lp8k") + vm.count("hx1k") + vm.count("hx8k") + - vm.count("up5k")) > 1) - log_error("Only one device type can be set\n"); -#endif - if (vm.count("help") || argc == 1) { - help: - std::cout << boost::filesystem::basename(argv[0]) - << " -- Next Generation Place and Route (git " - "sha1 " GIT_COMMIT_HASH_STR ")\n"; - std::cout << "\n"; - std::cout << options << "\n"; - return argc != 1; - } - - if (vm.count("version")) { - std::cout << boost::filesystem::basename(argv[0]) - << " -- Next Generation Place and Route (git " - "sha1 " GIT_COMMIT_HASH_STR ")\n"; - return 1; - } - - if (vm.count("load")) { - try { - pt::ptree root; - std::string filename = vm["load"].as<std::string>(); - pt::read_json(filename, root); - log_info("Loading project %s...\n", filename.c_str()); - log_break(); - - bool isLoadingGui = vm.count("gui") > 0; - std::string ascOutput; - if (vm.count("asc")) - ascOutput = vm["asc"].as<std::string>(); - vm.clear(); - - int version = root.get<int>("project.version"); - if (version != 1) - log_error("Wrong project format version.\n"); - - std::string arch_name = root.get<std::string>("project.arch.name"); - if (arch_name != "ice40") - log_error("Unsuported project architecture.\n"); - - std::string arch_type = root.get<std::string>("project.arch.type"); - vm.insert(std::make_pair(arch_type, po::variable_value())); - - std::string arch_package = root.get<std::string>("project.arch.package"); - vm.insert(std::make_pair("package", po::variable_value(arch_package, false))); + specific.add_options()("package", po::value<std::string>(), "set device package"); + specific.add_options()("pcf", po::value<std::string>(), "PCF constraints file to ingest"); + specific.add_options()("asc", po::value<std::string>(), "asc bitstream file to write"); + specific.add_options()("read", po::value<std::string>(), "asc bitstream file to read"); + specific.add_options()("tmfuzz", "run path delay estimate fuzzer"); + return specific; +} +void Ice40CommandHandler::validate() +{ + conflicting_options(vm, "read", "json"); + if ((vm.count("lp384") + vm.count("lp1k") + vm.count("lp8k") + vm.count("hx1k") + vm.count("hx8k") + + vm.count("up5k")) > 1) + log_error("Only one device type can be set\n"); +} - auto project = root.get_child("project"); - if (project.count("input")) { - auto input = project.get_child("input"); - if (input.count("json")) - vm.insert(std::make_pair("json", po::variable_value(input.get<std::string>("json"), false))); - if (input.count("pcf")) - vm.insert(std::make_pair("pcf", po::variable_value(input.get<std::string>("pcf"), false))); - } - if (project.count("params")) { - auto params = project.get_child("params"); - if (params.count("freq")) - vm.insert(std::make_pair("freq", po::variable_value(params.get<double>("freq"), false))); - if (params.count("seed")) - vm.insert(std::make_pair("seed", po::variable_value(params.get<int>("seed"), false))); - } - if (!ascOutput.empty()) - vm.insert(std::make_pair("asc", po::variable_value(ascOutput, false))); - if (isLoadingGui) - vm.insert(std::make_pair("gui", po::variable_value())); - po::notify(vm); - } catch (...) { - log_error("Error loading project file.\n"); - } - } +void Ice40CommandHandler::customAfterLoad(Context *ctx) +{ + if (vm.count("pcf")) { + std::ifstream pcf(vm["pcf"].as<std::string>()); + if (!apply_pcf(ctx, pcf)) + log_error("Loading PCF failed.\n"); + } +} +void Ice40CommandHandler::customBitstream(Context *ctx) +{ + if (vm.count("asc")) { + std::string filename = vm["asc"].as<std::string>(); + std::ofstream f(filename); + write_asc(ctx, f); + } +} - ArchArgs chipArgs; +void Ice40CommandHandler::setupArchContext(Context *ctx) +{ + if (vm.count("tmfuzz")) + ice40DelayFuzzerMain(ctx); + + if (vm.count("read")) { + std::string filename = vm["read"].as<std::string>(); + std::ifstream f(filename); + if (!read_asc(ctx, f)) + log_error("Loading ASC failed.\n"); + } +} - if (vm.count("lp384")) { - if (chipArgs.type != ArchArgs::NONE) - goto help; - chipArgs.type = ArchArgs::LP384; - chipArgs.package = "qn32"; - } +std::unique_ptr<Context> Ice40CommandHandler::createContext() +{ + if (vm.count("lp384")) { + chipArgs.type = ArchArgs::LP384; + chipArgs.package = "qn32"; + } - if (vm.count("lp1k")) { - if (chipArgs.type != ArchArgs::NONE) - goto help; - chipArgs.type = ArchArgs::LP1K; - chipArgs.package = "tq144"; - } + if (vm.count("lp1k")) { + chipArgs.type = ArchArgs::LP1K; + chipArgs.package = "tq144"; + } - if (vm.count("lp8k")) { - if (chipArgs.type != ArchArgs::NONE) - goto help; - chipArgs.type = ArchArgs::LP8K; - chipArgs.package = "ct256"; - } + if (vm.count("lp8k")) { + chipArgs.type = ArchArgs::LP8K; + chipArgs.package = "ct256"; + } - if (vm.count("hx1k")) { - if (chipArgs.type != ArchArgs::NONE) - goto help; - chipArgs.type = ArchArgs::HX1K; - chipArgs.package = "tq144"; - } + if (vm.count("hx1k")) { + chipArgs.type = ArchArgs::HX1K; + chipArgs.package = "tq144"; + } - if (vm.count("hx8k")) { - if (chipArgs.type != ArchArgs::NONE) - goto help; - chipArgs.type = ArchArgs::HX8K; - chipArgs.package = "ct256"; - } + if (vm.count("hx8k")) { + chipArgs.type = ArchArgs::HX8K; + chipArgs.package = "ct256"; + } - if (vm.count("up5k")) { - if (chipArgs.type != ArchArgs::NONE) - goto help; - chipArgs.type = ArchArgs::UP5K; - chipArgs.package = "sg48"; - } + if (vm.count("up5k")) { + chipArgs.type = ArchArgs::UP5K; + chipArgs.package = "sg48"; + } - if (chipArgs.type == ArchArgs::NONE) { - chipArgs.type = ArchArgs::HX1K; - chipArgs.package = "tq144"; - } + if (chipArgs.type == ArchArgs::NONE) { + chipArgs.type = ArchArgs::HX1K; + chipArgs.package = "tq144"; + } #ifdef ICE40_HX1K_ONLY - if (chipArgs.type != ArchArgs::HX1K) { - std::cout << "This version of nextpnr-ice40 is built with " - "HX1K-support " - "only.\n"; - return 1; - } -#endif - - if (vm.count("package")) - chipArgs.package = vm["package"].as<std::string>(); - - if (vm.count("save")) { - Context ctx(chipArgs); - std::string filename = vm["save"].as<std::string>(); - std::ofstream f(filename); - pt::ptree root; - root.put("project.version", 1); - root.put("project.name", boost::filesystem::basename(filename)); - root.put("project.arch.name", ctx.archId().c_str(&ctx)); - root.put("project.arch.type", ctx.archArgsToId(chipArgs).c_str(&ctx)); - root.put("project.arch.package", chipArgs.package); - if (vm.count("json")) - root.put("project.input.json", vm["json"].as<std::string>()); - if (vm.count("pcf")) - root.put("project.input.pcf", vm["pcf"].as<std::string>()); - if (vm.count("freq")) - root.put("project.params.freq", vm["freq"].as<double>()); - if (vm.count("seed")) - root.put("project.params.seed", vm["seed"].as<int>()); - pt::write_json(f, root); - return 1; - } - - std::unique_ptr<Context> ctx = std::unique_ptr<Context>(new Context(chipArgs)); - - if (vm.count("verbose")) { - ctx->verbose = true; - } - - if (vm.count("debug")) { - ctx->verbose = true; - ctx->debug = true; - } - - if (vm.count("force")) { - ctx->force = true; - } - - if (vm.count("seed")) { - ctx->rngseed(vm["seed"].as<int>()); - } - - if (vm.count("slack_redist_iter")) { - ctx->slack_redist_iter = vm["slack_redist_iter"].as<int>(); - if (vm.count("freq") && vm["freq"].as<double>() == 0) { - ctx->auto_freq = true; -#ifndef NO_GUI - if (!vm.count("gui")) -#endif - log_warning("Target frequency not specified. Will optimise for max frequency.\n"); - } - } - - if (vm.count("cstrweight")) { - ctx->placer_constraintWeight = vm["cstrweight"].as<float>(); - } - - if (vm.count("test")) - ctx->archcheck(); - - if (vm.count("tmfuzz")) - ice40DelayFuzzerMain(ctx.get()); - - if (vm.count("freq")) { - auto freq = vm["freq"].as<double>(); - if (freq > 0) - ctx->target_freq = freq * 1e6; - } - - ctx->timing_driven = true; - if (vm.count("no-tmdriv")) - ctx->timing_driven = false; - - if (vm.count("read")) { - std::string filename = vm["read"].as<std::string>(); - std::ifstream f(filename); - if (!read_asc(ctx.get(), f)) - log_error("Loading ASC failed.\n"); - } - -#ifndef NO_GUI - if (vm.count("gui")) { - Application a(argc, argv); - MainWindow w(std::move(ctx), chipArgs); - if (vm.count("json")) { - std::string filename = vm["json"].as<std::string>(); - std::string pcf = ""; - w.load_json(filename); - if (vm.count("pcf")) { - pcf = vm["pcf"].as<std::string>(); - w.load_pcf(pcf); - } - } - w.show(); - - return a.exec(); - } + if (chipArgs.type != ArchArgs::HX1K) { + log_error("This version of nextpnr-ice40 is built with HX1K-support only.\n"); + } #endif - if (vm.count("json")) { - std::string filename = vm["json"].as<std::string>(); - std::ifstream f(filename); - if (!parse_json_file(f, filename, ctx.get())) - log_error("Loading design failed.\n"); - - if (vm.count("pcf")) { - std::ifstream pcf(vm["pcf"].as<std::string>()); - if (!apply_pcf(ctx.get(), pcf)) - log_error("Loading PCF failed.\n"); - } - if (!ctx->pack() && !ctx->force) - log_error("Packing design failed.\n"); - assign_budget(ctx.get()); - ctx->check(); - print_utilisation(ctx.get()); - if (!vm.count("pack-only")) { - if (!ctx->place() && !ctx->force) - log_error("Placing design failed.\n"); - ctx->check(); - if (!ctx->route() && !ctx->force) - log_error("Routing design failed.\n"); - } - } + if (vm.count("package")) + chipArgs.package = vm["package"].as<std::string>(); - if (vm.count("asc")) { - std::string filename = vm["asc"].as<std::string>(); - std::ofstream f(filename); - write_asc(ctx.get(), f); - } - -#ifndef NO_PYTHON - if (vm.count("run")) { - init_python(argv[0], true); - python_export_global("ctx", *ctx.get()); - - std::vector<std::string> files = vm["run"].as<std::vector<std::string>>(); - for (auto filename : files) - execute_python_file(filename.c_str()); + return std::unique_ptr<Context>(new Context(chipArgs)); +} - deinit_python(); - } -#endif - return rc; - } catch (log_execution_error_exception) { -#if defined(_MSC_VER) - _exit(EXIT_FAILURE); -#else - _Exit(EXIT_FAILURE); -#endif - } +int main(int argc, char *argv[]) +{ + Ice40CommandHandler handler(argc, argv); + return handler.exec(); } #endif diff --git a/ice40/pcf.cc b/ice40/pcf.cc index ac1c8598..410fa1c9 100644 --- a/ice40/pcf.cc +++ b/ice40/pcf.cc @@ -31,7 +31,7 @@ bool apply_pcf(Context *ctx, std::istream &in) { try { if (!in) - log_error("failed to open PCF file"); + log_error("failed to open PCF file\n"); std::string line; while (std::getline(in, line)) { size_t cstart = line.find("#"); diff --git a/ice40/project.cc b/ice40/project.cc new file mode 100644 index 00000000..d1f1674a --- /dev/null +++ b/ice40/project.cc @@ -0,0 +1,71 @@ +/* + * nextpnr -- Next Generation Place and Route + * + * Copyright (C) 2018 Miodrag Milanovic <miodrag@symbioticeda.com> + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include "project.h" +#include <boost/filesystem/convenience.hpp> +#include <fstream> +#include "log.h" +#include "pcf.h" + +NEXTPNR_NAMESPACE_BEGIN + +void ProjectHandler::saveArch(Context *ctx, pt::ptree &root) +{ + root.put("project.arch.package", ctx->archArgs().package); + // if(!pcfFilename.empty()) + // root.put("project.input.pcf", pcfFilename); +} + +std::unique_ptr<Context> ProjectHandler::createContext(pt::ptree &root) +{ + ArchArgs chipArgs; + std::string arch_type = root.get<std::string>("project.arch.type"); + if (arch_type == "lp384") { + chipArgs.type = ArchArgs::LP384; + } + if (arch_type == "lp1k") { + chipArgs.type = ArchArgs::LP1K; + } + if (arch_type == "lp8k") { + chipArgs.type = ArchArgs::LP8K; + } + if (arch_type == "hx1k") { + chipArgs.type = ArchArgs::HX1K; + } + if (arch_type == "hx8k") { + chipArgs.type = ArchArgs::HX8K; + } + if (arch_type == "up5k") { + chipArgs.type = ArchArgs::UP5K; + } + chipArgs.package = root.get<std::string>("project.arch.package"); + + return std::unique_ptr<Context>(new Context(chipArgs)); +} + +void ProjectHandler::loadArch(Context *ctx, pt::ptree &root, std::string path) +{ + auto input = root.get_child("project").get_child("input"); + boost::filesystem::path pcf = boost::filesystem::path(path) / input.get<std::string>("pcf"); + std::ifstream f(pcf.string()); + if (!apply_pcf(ctx, f)) + log_error("Loading PCF failed.\n"); +} + +NEXTPNR_NAMESPACE_END |