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

added project saving and loading

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-06-24 14:38:45 +02:00
parent 0cedb7276f
commit 1acaf41277
5 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dummy/arch.h
View File

@ -79,6 +79,9 @@ struct Arch : BaseCtx
virtual IdString id(const std::string &s) const { abort(); }
virtual IdString id(const char *s) const { abort(); }
IdString archId() const { return id("dummy"); }
IdString archArgsToId(ArchArgs args) const { return id("none"); }
IdString belTypeToId(BelType type) const { return type; }
IdString portPinToId(PortPin type) const { return type; }

19
ice40/arch.cc
View File

@ -196,6 +196,25 @@ std::string Arch::getChipName()
// -----------------------------------------------------------------------
IdString Arch::archArgsToId(ArchArgs args) const
{
if (args.type == ArchArgs::LP384)
return id("lp384");
if (args.type == ArchArgs::LP1K)
return id("lp1k");
if (args.type == ArchArgs::HX1K)
return id("hx1k");
if (args.type == ArchArgs::UP5K)
return id("up5k");
if (args.type == ArchArgs::LP8K)
return id("lp8k");
if (args.type == ArchArgs::HX8K)
return id("hx8k");
return IdString();
}
// -----------------------------------------------------------------------
BelId Arch::getBelByName(IdString name) const
{
BelId ret;

3
ice40/arch.h
View File

@ -484,6 +484,9 @@ struct Arch : BaseCtx
std::string getChipName();
IdString archId() const { return id("ice40"); }
IdString archArgsToId(ArchArgs args) const;
IdString belTypeToId(BelType type) const;
BelType belTypeFromId(IdString id) const;

18
ice40/blinky.proj Normal file
View File

@ -0,0 +1,18 @@
{
"project": {
"version": "1",
"name": "blinky",
"arch": {
"name": "ice40",
"type": "hx1k",
"package": "tq144"
},
"input": {
"json": "blinky.json",
"pcf": "blinky.pcf"
},
"params": {
"freq": "50"
}
}
}

71
ice40/main.cc
View File

@ -30,6 +30,8 @@
#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"
@ -67,6 +69,7 @@ int main(int argc, char *argv[])
{
try {
namespace po = boost::program_options;
namespace pt = boost::property_tree;
int rc = 0;
std::string str;
@ -103,6 +106,8 @@ int main(int argc, char *argv[])
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 {
@ -133,6 +138,50 @@ int main(int argc, char *argv[])
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();
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)));
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)));
}
po::notify(vm);
} catch (...) {
log_error("Error loading project file.\n");
}
}
ArchArgs chipArgs;
if (vm.count("lp384")) {
@ -193,6 +242,28 @@ int main(int argc, char *argv[])
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;
}
Context ctx(chipArgs);
#ifndef NO_PYTHON