From 109287ee90cf5d7a7858d04dbc0fea595981538f Mon Sep 17 00:00:00 2001 From: ZipCPU Date: Wed, 6 Jun 2018 17:17:44 -0400 Subject: Removed unused set of warnings from log.cc --- common/log.cc | 2 -- common/log.h | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'common') 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 log_files; std::vector log_streams; -std::map> 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 #include #include +#include #include #include @@ -38,9 +39,6 @@ struct log_cmd_error_exception { }; extern std::vector log_files; extern std::vector log_streams; -extern std::set 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, ...); -- cgit v1.2.3 From f32b9622d5c61610f6027f6544ab9683cd57282b Mon Sep 17 00:00:00 2001 From: ZipCPU Date: Thu, 7 Jun 2018 09:38:14 -0400 Subject: Initial (random) placer capability This commit also includes changes to jsonparse to allow it to 1) recognize ports with no connection, and set their net pointers to NULL 2) recognize designs with a ports node rather than a ports_direction The rule checker has also been modified to accommodate possible NULL netlists The ice40 chip now also has iterator operations ++bi and bi++. --- common/place.cc | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ common/rulecheck.cc | 15 ++++++---- 2 files changed, 92 insertions(+), 5 deletions(-) create mode 100644 common/place.cc (limited to 'common') diff --git a/common/place.cc b/common/place.cc new file mode 100644 index 00000000..d3348820 --- /dev/null +++ b/common/place.cc @@ -0,0 +1,82 @@ +/* + * nextpnr -- Next Generation Place and Route + * + * Copyright (C) 2018 Clifford Wolf + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "log.h" +#include "design.h" + +namespace Placer { +}; + +void place_design(Design *design) { + std::set types_used; + std::set::iterator not_found, element; + std::set 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/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); + } } } -- cgit v1.2.3 From c352f6536b8f9eb4ad8d108e692a149348284723 Mon Sep 17 00:00:00 2001 From: ZipCPU Date: Thu, 7 Jun 2018 09:49:21 -0400 Subject: Moved placer definitions to place.h, main automatically runs placer now --- common/place.cc | 4 +--- common/place.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 common/place.h (limited to 'common') diff --git a/common/place.cc b/common/place.cc index d3348820..e27a46be 100644 --- a/common/place.cc +++ b/common/place.cc @@ -30,9 +30,7 @@ #include "log.h" #include "design.h" - -namespace Placer { -}; +#include "place.h" void place_design(Design *design) { std::set types_used; 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 + * + * 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 -- cgit v1.2.3