diff options
Diffstat (limited to 'ecp5')
-rw-r--r-- | ecp5/arch.cc | 2 | ||||
-rw-r--r-- | ecp5/config.h | 2 | ||||
-rw-r--r-- | ecp5/main.cc | 6 | ||||
-rw-r--r-- | ecp5/place_legaliser.cc | 26 | ||||
-rw-r--r-- | ecp5/place_legaliser.h | 31 |
5 files changed, 3 insertions, 64 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 262f43fe..377b8665 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -426,7 +426,7 @@ delay_t Arch::getBudgetOverride(const NetInfo *net_info, const PortRef &sink, de // ----------------------------------------------------------------------- -bool Arch::place() { return placer1(getCtx()); } +bool Arch::place() { return placer1(getCtx(), Placer1Cfg()); } bool Arch::route() { diff --git a/ecp5/config.h b/ecp5/config.h index 038ddbf0..3d2ef971 100644 --- a/ecp5/config.h +++ b/ecp5/config.h @@ -20,8 +20,8 @@ #ifndef ECP5_CONFIG_H #define ECP5_CONFIG_H -#include "nextpnr.h" #include <map> +#include "nextpnr.h" NEXTPNR_NAMESPACE_BEGIN diff --git a/ecp5/main.cc b/ecp5/main.cc index 805c0d26..dde3ffed 100644 --- a/ecp5/main.cc +++ b/ecp5/main.cc @@ -162,12 +162,8 @@ int main(int argc, char *argv[]) if (!ctx->pack() && !ctx->force) log_error("Packing design failed.\n"); - if (vm.count("freq")) { + if (vm.count("freq")) ctx->target_freq = vm["freq"].as<double>() * 1e6; - ctx->user_freq = true; - } else { - log_warning("Target frequency not specified. Will optimise for max frequency.\n"); - } assign_budget(ctx.get()); ctx->check(); print_utilisation(ctx.get()); diff --git a/ecp5/place_legaliser.cc b/ecp5/place_legaliser.cc deleted file mode 100644 index 0d23f15b..00000000 --- a/ecp5/place_legaliser.cc +++ /dev/null @@ -1,26 +0,0 @@ -/* - * nextpnr -- Next Generation Place and Route - * - * Copyright (C) 2018 David Shah <david@symbioticeda.com> - * - * 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 "place_legaliser.h" - -NEXTPNR_NAMESPACE_BEGIN - -bool legalise_design(Context *ctx) { return true; } - -NEXTPNR_NAMESPACE_END diff --git a/ecp5/place_legaliser.h b/ecp5/place_legaliser.h deleted file mode 100644 index 5f4df6aa..00000000 --- a/ecp5/place_legaliser.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * nextpnr -- Next Generation Place and Route - * - * Copyright (C) 2018 David Shah <david@symbioticeda.com> - * - * 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_LEGALISER_H -#define PLACE_LEGALISER_H - -#include "nextpnr.h" - -NEXTPNR_NAMESPACE_BEGIN - -bool legalise_design(Context *ctx); - -NEXTPNR_NAMESPACE_END - -#endif |