diff options
author | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-13 19:10:20 +0100 |
---|---|---|
committer | Sergiusz Bazanski <q3k@q3k.org> | 2018-07-13 19:10:27 +0100 |
commit | b8ca1a55820d6429f5ad5207be1e125b8786e093 (patch) | |
tree | 6733f6ff9de556ccee6bf87b33dbe6b963cbc6db /ecp5 | |
parent | 89809a8b810dd57f50f365d70a0ce547705f8dbb (diff) | |
parent | 07ff5ad8b8e4d0f87770b81b8478aa257567c504 (diff) | |
download | nextpnr-b8ca1a55820d6429f5ad5207be1e125b8786e093.tar.gz nextpnr-b8ca1a55820d6429f5ad5207be1e125b8786e093.tar.bz2 nextpnr-b8ca1a55820d6429f5ad5207be1e125b8786e093.zip |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into q3k/lock-the-things
Diffstat (limited to 'ecp5')
-rw-r--r-- | ecp5/arch.h | 1 | ||||
-rw-r--r-- | ecp5/archdefs.h | 2 | ||||
-rw-r--r-- | ecp5/main.cc | 3 | ||||
-rw-r--r-- | ecp5/pack.cc | 4 | ||||
-rw-r--r-- | ecp5/pack.h | 31 |
5 files changed, 5 insertions, 36 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h index bbc7c561..930c488e 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -730,6 +730,7 @@ struct Arch : BaseCtx // ------------------------------------------------- + bool pack(); bool place(); bool route(); diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h index c4d25a50..84a431fd 100644 --- a/ecp5/archdefs.h +++ b/ecp5/archdefs.h @@ -22,7 +22,7 @@ #error Include "archdefs.h" via "nextpnr.h" only. #endif -#include <boost/functional/hash_fwd.hpp> +#include <boost/functional/hash.hpp> NEXTPNR_NAMESPACE_BEGIN diff --git a/ecp5/main.cc b/ecp5/main.cc index 734ae560..4cb2f10d 100644 --- a/ecp5/main.cc +++ b/ecp5/main.cc @@ -43,7 +43,6 @@ #include "bitstream.h" #include "design_utils.h" #include "jsonparse.h" -#include "pack.h" #include "timing.h" USING_NEXTPNR_NAMESPACE @@ -147,7 +146,7 @@ int main(int argc, char *argv[]) if (!parse_json_file(f, filename, ctx.get())) log_error("Loading design failed.\n"); - if (!pack_design(ctx.get()) && !ctx->force) + if (!ctx->pack() && !ctx->force) log_error("Packing design failed.\n"); if (vm.count("freq")) ctx->target_freq = vm["freq"].as<double>() * 1e6; diff --git a/ecp5/pack.cc b/ecp5/pack.cc index 7f54c231..e3ddc07d 100644 --- a/ecp5/pack.cc +++ b/ecp5/pack.cc @@ -17,7 +17,6 @@ * */ -#include "pack.h" #include <algorithm> #include <iterator> #include <unordered_set> @@ -84,8 +83,9 @@ void pack_io(Context *ctx) } // Main pack function -bool pack_design(Context *ctx) +bool Arch::pack() { + Context *ctx = getCtx(); try { log_break(); pack_io(ctx); diff --git a/ecp5/pack.h b/ecp5/pack.h deleted file mode 100644 index cc051a41..00000000 --- a/ecp5/pack.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 PACK_H -#define PACK_H - -#include "nextpnr.h" - -NEXTPNR_NAMESPACE_BEGIN - -bool pack_design(Context *ctx); - -NEXTPNR_NAMESPACE_END - -#endif // ROUTE_H |