aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt1
-rw-r--r--common/log.cc2
-rw-r--r--common/log.h5
-rw-r--r--common/place.cc80
-rw-r--r--common/place.h26
-rw-r--r--common/rulecheck.cc15
-rw-r--r--frontend/json/jsonparse.cc47
-rw-r--r--ice40/chip.h13
-rw-r--r--ice40/main.cc6
9 files changed, 174 insertions, 21 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfc33e90..02e67e87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,7 @@ include_directories(common/ gui/ frontend/json ${Boost_INCLUDE_DIRS} ${PYTHON_IN
aux_source_directory(common/ COMMON_SRC_FILES)
aux_source_directory(frontend/json/ JSON_PARSER_FILES)
set(COMMON_FILES ${COMMON_SRC_FILES} ${JSON_PARSER_FILES})
+set(CMAKE_BUILD_TYPE Debug)
foreach (family ${FAMILIES})
string(TOUPPER ${family} ufamily)
diff --git a/common/log.cc b/common/log.cc
index 84150a15..00e1765f 100644
--- a/common/log.cc
+++ b/common/log.cc
@@ -31,8 +31,6 @@
std::vector<FILE*> log_files;
std::vector<std::ostream*> log_streams;
-std::map<std::string, std::set<std::string>> log_hdump;
-bool log_hdump_all = false;
FILE *log_errfile = NULL;
bool log_error_stderr = false;
diff --git a/common/log.h b/common/log.h
index 259a30a1..2bf1604a 100644
--- a/common/log.h
+++ b/common/log.h
@@ -24,6 +24,7 @@
#include <string>
#include <vector>
#include <set>
+#include <ostream>
#include <stdio.h>
#include <stdarg.h>
@@ -38,9 +39,6 @@ struct log_cmd_error_exception { };
extern std::vector<FILE*> log_files;
extern std::vector<std::ostream*> log_streams;
-extern std::set<std::string> log_warnings;
-extern int log_warnings_count;
-extern bool log_hdump_all;
extern FILE *log_errfile;
extern bool log_quiet_warnings;
@@ -54,6 +52,7 @@ void logv_warning_noprefix(const char *format, va_list ap);
NXP_NORETURN void logv_error(const char *format, va_list ap)
NXP_ATTRIBUTE(noreturn);
+extern std::ostream clog;
void log(const char *format, ...);
void log_header(const char *format, ...);
void log_info(const char *format, ...);
diff --git a/common/place.cc b/common/place.cc
new file mode 100644
index 00000000..e27a46be
--- /dev/null
+++ b/common/place.cc
@@ -0,0 +1,80 @@
+/*
+ * nextpnr -- Next Generation Place and Route
+ *
+ * Copyright (C) 2018 Clifford Wolf <clifford@clifford.at>
+ *
+ * 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 <iostream>
+#include <ostream>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <vector>
+#include <list>
+#include <map>
+#include <set>
+
+#include "log.h"
+#include "design.h"
+#include "place.h"
+
+void place_design(Design *design) {
+ std::set<IdString> types_used;
+ std::set<IdString>::iterator not_found, element;
+ std::set<BelType> used_bels;
+
+ for(auto cell_entry : design->cells) {
+ CellInfo *cell = cell_entry.second;
+ BelType bel_type;
+
+ element = types_used.find(cell->type);
+ if (element != types_used.end()) {
+ continue;
+ }
+
+ bel_type = belTypeFromId(cell->type);
+ if (bel_type == TYPE_NIL) {
+ log_error("No Bel of type \'%s\' defined for "
+ "this chip\n", cell->type.c_str());
+ }
+ types_used.insert(cell->type);
+ std::cout << cell->type << std::endl;
+ }
+
+ for(auto bel_type_name : types_used) {
+ BelRange blist = design->chip.getBels();
+ BelType bel_type = belTypeFromId(bel_type_name);
+ BelIterator bi = blist.begin();
+
+ for(auto cell_entry : design->cells) {
+ CellInfo *cell = cell_entry.second;
+
+ // Only place one type of Bel at a time
+ if (cell->type.compare(bel_type_name)!=0)
+ continue;
+
+ while((bi != blist.end())
+ &&(design->chip.getBelType(*bi) != bel_type))
+ bi++;
+ if (bi == blist.end())
+ log_error("Too many \'%s\' used in design\n",
+ cell->type.c_str());
+ cell->bel = *bi++;
+ }
+ }
+}
+
diff --git a/common/place.h b/common/place.h
new file mode 100644
index 00000000..483f11f3
--- /dev/null
+++ b/common/place.h
@@ -0,0 +1,26 @@
+/*
+ * nextpnr -- Next Generation Place and Route
+ *
+ * Copyright (C) 2018 Clifford Wolf <clifford@clifford.at>
+ *
+ * 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.
+ *
+ */
+#ifndef PLACE_H
+#define PLACE_H
+
+#include "design.h"
+
+extern void place_design(Design *design);
+
+#endif // PLACE_H
diff --git a/common/rulecheck.cc b/common/rulecheck.cc
index 28d4b6b7..11e57b8b 100644
--- a/common/rulecheck.cc
+++ b/common/rulecheck.cc
@@ -21,12 +21,17 @@ bool check_all_nets_driven(Design *design) {
port_entry.first.c_str(),
port.name.c_str());
assert(port.name.compare(port_entry.first)==0);
- assert(port.net);
assert(port.name.size() > 0);
- if (debug) log_info(" Checking for a net named \'%s\'\n",
- port.net->name.c_str());
- assert(design->nets.count(port.net->name)>0);
- // assert(design->nets[port.net->name]->driver.cell);
+
+ if (port.net == NULL) {
+ if (debug) log_warning(" Port \'%s\' in cell \'%s\' is unconnected\n",
+ port.name.c_str(), cell->name.c_str());
+ } else {
+ assert(port.net);
+ if (debug) log_info(" Checking for a net named \'%s\'\n",
+ port.net->name.c_str());
+ assert(design->nets.count(port.net->name)>0);
+ }
}
}
diff --git a/frontend/json/jsonparse.cc b/frontend/json/jsonparse.cc
index 25b01e44..3d7c52ea 100644
--- a/frontend/json/jsonparse.cc
+++ b/frontend/json/jsonparse.cc
@@ -34,7 +34,7 @@ extern bool check_all_nets_driven(Design *design);
namespace JsonParser {
- const bool json_debug = false;
+ const bool json_debug = true;
typedef std::string string;
@@ -413,7 +413,25 @@ void json_import_cell_ports(Design *design, string &modname, CellInfo *cell,
is_bus = (wire_group_node->data_array.size()>1);
// Now loop through all of the connections to this port.
- for(int index=0; index < wire_group_node->data_array.size(); index++) {
+ if (wire_group_node->data_array.size() == 0) {
+ //
+ // There is/are no connections to this port.
+ //
+ // Create the port, but leave the net NULL
+ PortInfo this_port;
+
+ //
+ this_port.name = port_info.name;
+ this_port.type = port_info.type;
+ this_port.net = NULL;
+
+ cell->ports[this_port.name] = this_port;
+
+ if (json_debug) log_info(" Port \'%s\' has no connection in \'%s\'\n",
+ this_port.name.c_str(), cell->name.c_str());
+
+ } else for(int index=0; index < wire_group_node->data_array.size();
+ index++) {
//
JsonNode *wire_node;
PortInfo this_port;
@@ -566,13 +584,24 @@ void json_import_cell(Design *design, string modname, JsonNode *cell_node,
// Both should contain dictionaries having the same keys.
//
- JsonNode *pdir_node
- = cell_node->data_dict.at("port_directions");
- if (pdir_node->type != 'D')
- log_error("JSON port_directions node of \'%s\' "
- "in module \'%s\' is not a "
- "dictionary\n", cell->name.c_str(),
- modname.c_str());
+ JsonNode *pdir_node = NULL;
+ if (cell_node->data_dict.count("port_directions") > 0) {
+
+ pdir_node = cell_node->data_dict.at("port_directions");
+ if (pdir_node->type != 'D')
+ log_error("JSON port_directions node of \'%s\' "
+ "in module \'%s\' is not a "
+ "dictionary\n", cell->name.c_str(),
+ modname.c_str());
+
+ } else if (cell_node->data_dict.count("ports") > 0) {
+ pdir_node = cell_node->data_dict.at("ports");
+ if (pdir_node->type != 'D')
+ log_error("JSON ports node of \'%s\' "
+ "in module \'%s\' is not a "
+ "dictionary\n", cell->name.c_str(),
+ modname.c_str());
+ }
JsonNode *connections
= cell_node->data_dict.at("connections");
diff --git a/ice40/chip.h b/ice40/chip.h
index d107b6aa..05ef2754 100644
--- a/ice40/chip.h
+++ b/ice40/chip.h
@@ -173,12 +173,23 @@ struct BelIterator
{
int cursor;
- void operator++() { cursor++; }
+ BelIterator operator++() { cursor++; return *this; }
+ BelIterator operator++(int) {
+ BelIterator prior(*this);
+ cursor++;
+ return prior;
+ }
+
bool operator!=(const BelIterator &other) const
{
return cursor != other.cursor;
}
+ bool operator==(const BelIterator &other) const
+ {
+ return cursor == other.cursor;
+ }
+
BelId operator*() const
{
BelId ret;
diff --git a/ice40/main.cc b/ice40/main.cc
index c65013eb..68089ffb 100644
--- a/ice40/main.cc
+++ b/ice40/main.cc
@@ -26,6 +26,8 @@
#include "mainwindow.h"
#include "pybindings.h"
#include "version.h"
+#include "log.h"
+#include "place.h"
void svg_dump_el(const GraphicElement &el)
{
@@ -53,7 +55,7 @@ int main(int argc, char *argv[])
int rc = 0;
std::string str;
- log_files.push_back(stderr);
+ log_files.push_back(stdout);
po::options_description options("Allowed options");
options.add_options()("help,h", "show help");
@@ -242,6 +244,7 @@ int main(int argc, char *argv[])
std::istream *f = new std::ifstream(filename);
parse_json_file(f, filename, &design);
+ place_design(&design);
}
if (vm.count("run")) {
@@ -251,6 +254,7 @@ int main(int argc, char *argv[])
execute_python_file(filename.c_str());
}
+
if (vm.count("gui")) {
QApplication a(argc, argv);
MainWindow w;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-08 19:16:38 +0000