aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gowin/arch.cc40
-rw-r--r--gowin/arch.h13
-rw-r--r--gowin/main.cc7
3 files changed, 45 insertions, 15 deletions
diff --git a/gowin/arch.cc b/gowin/arch.cc
index 3b91b817..ca93c3ba 100644
--- a/gowin/arch.cc
+++ b/gowin/arch.cc
@@ -670,7 +670,6 @@ void Arch::addMuxBels(const DatabasePOD *db, int row, int col)
Arch::Arch(ArchArgs args) : args(args)
{
family = args.family;
- device = args.device;
// Load database
std::string chipdb = stringf("gowin/chipdb-%s.bin", family.c_str());
@@ -685,37 +684,58 @@ Arch::Arch(ArchArgs args) : args(args)
for (size_t i = 0; i < db->num_ids; i++) {
IdString::initialize_add(this, db->id_strs[i].get(), uint32_t(i) + db->num_constids);
}
+
+ // setup package
+ IdString package_name;
+ IdString device_id;
+ IdString speed_id;
+ for (unsigned int i = 0; i < db->num_partnumbers; i++) {
+ auto partnumber = &db->partnumber_packages[i];
+ // std::cout << IdString(partnumber->name_id).str(this) << IdString(partnumber->package_id).str(this) <<
+ // std::endl;
+ if (IdString(partnumber->name_id) == id(args.partnumber)) {
+ package_name = IdString(partnumber->package_id);
+ device_id = IdString(partnumber->device_id);
+ speed_id = IdString(partnumber->speed_id);
+ break;
+ }
+ }
+ if (package_name == IdString()) {
+ log_error("Unsuported partnumber '%s'.\n", args.partnumber.c_str());
+ }
+
// setup timing info
speed = nullptr;
for (unsigned int i = 0; i < db->num_speeds; i++) {
const TimingClassPOD *tc = &db->speeds[i];
// std::cout << IdString(tc->name_id).str(this) << std::endl;
- if (IdString(tc->name_id) == id(args.speed)) {
+ if (IdString(tc->name_id) == speed_id) {
speed = tc->groups.get();
break;
}
}
if (speed == nullptr) {
- log_error("Unsuported speed grade '%s'.\n", args.speed.c_str());
+ log_error("Unsuported speed grade '%s'.\n", speed_id.c_str(this));
}
+
const VariantPOD *variant = nullptr;
for (unsigned int i = 0; i < db->num_variants; i++) {
auto var = &db->variants[i];
// std::cout << IdString(var->name_id).str(this) << std::endl;
- if (IdString(var->name_id) == id(args.device)) {
+ if (IdString(var->name_id) == device_id) {
variant = var;
break;
}
}
if (variant == nullptr) {
- log_error("Unsuported device grade '%s'.\n", args.device.c_str());
+ log_error("Unsuported device grade '%s'.\n", device_id.c_str(this));
}
package = nullptr;
for (unsigned int i = 0; i < variant->num_packages; i++) {
auto pkg = &variant->packages[i];
// std::cout << IdString(pkg->name_id).str(this) << std::endl;
- if (IdString(pkg->name_id) == id(args.package)) {
+ if (IdString(pkg->name_id) == package_name) {
package = pkg;
break;
}
@@ -724,9 +744,15 @@ Arch::Arch(ArchArgs args) : args(args)
// std::cout << IdString(pin.src_id).str(this) << " " << IdString(pin.dest_id).str(this) << std::endl;
// }
}
+
if (package == nullptr) {
- log_error("Unsuported package '%s'.\n", args.package.c_str());
+ log_error("Unsuported package '%s'.\n", package_name.c_str(this));
}
+
+ //
+ log_info("Series:%s Device:%s Package:%s Speed:%s\n", family.c_str(), device_id.c_str(this),
+ package_name.c_str(this), speed_id.c_str(this));
+
// setup db
char buf[32];
// The reverse order of the enumeration simplifies the creation
diff --git a/gowin/arch.h b/gowin/arch.h
index 602c3db5..bf69ebe9 100644
--- a/gowin/arch.h
+++ b/gowin/arch.h
@@ -131,6 +131,13 @@ NPNR_PACKED_STRUCT(struct TimingClassPOD {
RelPtr<TimingGroupsPOD> groups;
});
+NPNR_PACKED_STRUCT(struct PartnumberPOD {
+ uint32_t name_id;
+ uint32_t package_id;
+ uint32_t device_id;
+ uint32_t speed_id;
+});
+
NPNR_PACKED_STRUCT(struct PackagePOD {
uint32_t name_id;
uint32_t num_pins;
@@ -153,6 +160,8 @@ NPNR_PACKED_STRUCT(struct DatabasePOD {
RelPtr<GlobalAliasPOD> aliases;
uint32_t num_speeds;
RelPtr<TimingClassPOD> speeds;
+ uint32_t num_partnumbers;
+ RelPtr<PartnumberPOD> partnumber_packages;
uint32_t num_variants;
RelPtr<VariantPOD> variants;
uint16_t num_constids;
@@ -162,10 +171,8 @@ NPNR_PACKED_STRUCT(struct DatabasePOD {
struct ArchArgs
{
- std::string device;
std::string family;
- std::string speed;
- std::string package;
+ std::string partnumber;
// y = mx + c relationship between distance and delay for interconnect
// delay estimates
double delayScale = 0.4, delayOffset = 0.4;
diff --git a/gowin/main.cc b/gowin/main.cc
index a56cc8e8..c6697ecc 100644
--- a/gowin/main.cc
+++ b/gowin/main.cc
@@ -54,7 +54,7 @@ po::options_description GowinCommandHandler::getArchOptions()
std::unique_ptr<Context> GowinCommandHandler::createContext(dict<std::string, Property> &values)
{
- std::regex devicere = std::regex("GW1N([A-Z]*)-(LV|UV|UX)([0-9])(C?)([A-Z]{2}[0-9]+)(C[0-9]/I[0-9])");
+ std::regex devicere = std::regex("GW1N([A-Z]*)-(LV|UV|UX)([0-9])(C?).*");
std::smatch match;
std::string device = vm["device"].as<std::string>();
if (!std::regex_match(device, match, devicere)) {
@@ -62,8 +62,6 @@ std::unique_ptr<Context> GowinCommandHandler::createContext(dict<std::string, Pr
}
ArchArgs chipArgs;
char buf[36];
- snprintf(buf, 36, "GW1N%s-%s%s", match[1].str().c_str(), match[3].str().c_str(), match[4].str().c_str());
- chipArgs.device = buf;
// GW1N and GW1NR variants share the same database.
// Most Gowin devices are a System in Package with some SDRAM wirebonded to a GPIO bank.
// However, it appears that the S series with embedded ARM core are unique silicon.
@@ -73,8 +71,7 @@ std::unique_ptr<Context> GowinCommandHandler::createContext(dict<std::string, Pr
snprintf(buf, 36, "GW1N-%s", match[3].str().c_str());
}
chipArgs.family = buf;
- chipArgs.package = match[5];
- chipArgs.speed = match[6];
+ chipArgs.partnumber = match[0];
return std::unique_ptr<Context>(new Context(chipArgs));
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-16 15:44:47 +0000