From 997a66791e13c8e983fcd01473d51a66cbb971b7 Mon Sep 17 00:00:00 2001 From: David Shah Date: Wed, 20 Mar 2019 16:05:43 +0000 Subject: json: Fix inputs directly driving inouts Signed-off-by: David Shah --- common/placer1.cc | 2 +- json/jsonparse.cc | 17 ++++++++++++++++- tests | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/common/placer1.cc b/common/placer1.cc index cec37847..5b72602f 100644 --- a/common/placer1.cc +++ b/common/placer1.cc @@ -230,7 +230,7 @@ class SAPlacer double upper = 0.6, lower = 0.4; - if (curr_metric < 0.95 * avg_metric) { + if (curr_metric < 0.95 * avg_metric && curr_metric > 0) { avg_metric = 0.8 * avg_metric + 0.2 * curr_metric; } else { if (Raccept >= 0.8) { diff --git a/json/jsonparse.cc b/json/jsonparse.cc index 5f4df0a2..a0479c2e 100644 --- a/json/jsonparse.cc +++ b/json/jsonparse.cc @@ -758,11 +758,26 @@ void json_import(Context *ctx, string modname, JsonNode *node) // N.B. ports must be imported after cells for tristate behaviour // to be correct - // Loop through all ports + // Loop through all ports, first non-tristate then tristate to handle + // interconnected ports correctly for (int portid = 0; portid < GetSize(ports_parent->data_dict_keys); portid++) { JsonNode *here; here = ports_parent->data_dict.at(ports_parent->data_dict_keys[portid]); + JsonNode *dir_node = here->data_dict.at("direction"); + NPNR_ASSERT(dir_node->type == 'S'); + if (dir_node->data_string == "inout") + continue; + json_import_toplevel_port(ctx, modname, netids, ports_parent->data_dict_keys[portid], here); + } + for (int portid = 0; portid < GetSize(ports_parent->data_dict_keys); portid++) { + JsonNode *here; + + here = ports_parent->data_dict.at(ports_parent->data_dict_keys[portid]); + JsonNode *dir_node = here->data_dict.at("direction"); + NPNR_ASSERT(dir_node->type == 'S'); + if (dir_node->data_string != "inout") + continue; json_import_toplevel_port(ctx, modname, netids, ports_parent->data_dict_keys[portid], here); } } diff --git a/tests b/tests index ee3ff3c4..f29dcbe1 160000 --- a/tests +++ b/tests @@ -1 +1 @@ -Subproject commit ee3ff3c4bdce20c47bd6c35a2f7430497b283807 +Subproject commit f29dcbe187b517d01964b1074eb7ff0b90849eed -- cgit v1.2.3