diff options
Diffstat (limited to 'common/nextpnr.h')
| -rw-r--r-- | common/nextpnr.h | 150 |
1 files changed, 83 insertions, 67 deletions
diff --git a/common/nextpnr.h b/common/nextpnr.h index 50465869..e53e4d01 100644 --- a/common/nextpnr.h +++ b/common/nextpnr.h @@ -2,6 +2,7 @@ * nextpnr -- Next Generation Place and Route * * Copyright (C) 2018 Clifford Wolf <clifford@symbioticeda.com> + * Copyright (C) 2018 Serge Bazanski <q3k@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 @@ -88,28 +89,28 @@ inline void assert_false_impl(std::string message, std::string filename, int lin #define NPNR_ASSERT_MSG(cond, msg) except_assert_impl((cond), msg, #cond, __FILE__, __LINE__) #define NPNR_ASSERT_FALSE(msg) assert_false_impl(msg, __FILE__, __LINE__) -struct BaseCtx; +struct IdStringDB; struct Context; struct IdString { int index = 0; - static void initialize_arch(const BaseCtx *ctx); + static void initialize_arch(const IdStringDB *ctx); - static void initialize_add(const BaseCtx *ctx, const char *s, int idx); + static void initialize_add(const IdStringDB *ctx, const char *s, int idx); IdString() {} - void set(const BaseCtx *ctx, const std::string &s); + void set(const IdStringDB *ctx, const std::string &s); - IdString(const BaseCtx *ctx, const std::string &s) { set(ctx, s); } + IdString(const IdStringDB *ctx, const std::string &s) { set(ctx, s); } - IdString(const BaseCtx *ctx, const char *s) { set(ctx, s); } + IdString(const IdStringDB *ctx, const char *s) { set(ctx, s); } - const std::string &str(const BaseCtx *ctx) const; + const std::string &str(const IdStringDB *ctx) const; - const char *c_str(const BaseCtx *ctx) const; + const char *c_str(const IdStringDB *ctx) const; bool operator<(const IdString &other) const { return index < other.index; } @@ -238,23 +239,18 @@ struct CellInfo std::unordered_map<IdString, IdString> pins; }; -struct BaseCtx +class IdStringDB { - // -------------------------------------------------------------- - + friend class IdString; + private: mutable std::unordered_map<std::string, int> *idstring_str_to_idx; mutable std::vector<const std::string *> *idstring_idx_to_str; - + + public: IdString id(const std::string &s) const { return IdString(this, s); } - IdString id(const char *s) const { return IdString(this, s); } - // -------------------------------------------------------------- - - std::unordered_map<IdString, std::unique_ptr<NetInfo>> nets; - std::unordered_map<IdString, std::unique_ptr<CellInfo>> cells; - - BaseCtx() + IdStringDB() { idstring_str_to_idx = new std::unordered_map<std::string, int>; idstring_idx_to_str = new std::vector<const std::string *>; @@ -262,62 +258,22 @@ struct BaseCtx IdString::initialize_arch(this); } - ~BaseCtx() + ~IdStringDB() { delete idstring_str_to_idx; delete idstring_idx_to_str; } - - Context *getCtx() { return reinterpret_cast<Context *>(this); } - - const Context *getCtx() const { return reinterpret_cast<const Context *>(this); } - - // -------------------------------------------------------------- - - bool allUiReload = false; - bool frameUiReload = false; - std::unordered_set<BelId> belUiReload; - std::unordered_set<WireId> wireUiReload; - std::unordered_set<PipId> pipUiReload; - std::unordered_set<GroupId> groupUiReload; - - void refreshUi() { allUiReload = true; } - - void refreshUiFrame() { frameUiReload = true; } - - void refreshUiBel(BelId bel) { belUiReload.insert(bel); } - - void refreshUiWire(WireId wire) { wireUiReload.insert(wire); } - - void refreshUiPip(PipId pip) { pipUiReload.insert(pip); } - - void refreshUiGroup(GroupId group) { groupUiReload.insert(group); } }; -NEXTPNR_NAMESPACE_END - -#include "arch.h" - -NEXTPNR_NAMESPACE_BEGIN - -struct Context : Arch +class DeterministicRNG { - bool verbose = false; - bool debug = false; - bool force = false; - bool timing_driven = true; - float target_freq = 12e6; - - Context(ArchArgs args) : Arch(args) {} - - // -------------------------------------------------------------- + private: + uint64_t rngstate; - // provided by router1.cc - bool getActualRouteDelay(WireId src_wire, WireId dst_wire, delay_t &delay); - - // -------------------------------------------------------------- - - uint64_t rngstate = 0x3141592653589793; + public: + DeterministicRNG() : rngstate(0x3141592653589793) + { + } uint64_t rng64() { @@ -377,6 +333,66 @@ struct Context : Arch shuffle(a); } +}; + +class BaseCtx : public IdStringDB, public DeterministicRNG +{ + public: + std::unordered_map<IdString, std::unique_ptr<NetInfo>> nets; + std::unordered_map<IdString, std::unique_ptr<CellInfo>> cells; + + BaseCtx() {} + ~BaseCtx() {} + + Context *getCtx() { return reinterpret_cast<Context *>(this); } + + const Context *getCtx() const { return reinterpret_cast<const Context *>(this); } + + // -------------------------------------------------------------- + + bool allUiReload = false; + bool frameUiReload = false; + std::unordered_set<BelId> belUiReload; + std::unordered_set<WireId> wireUiReload; + std::unordered_set<PipId> pipUiReload; + std::unordered_set<GroupId> groupUiReload; + + void refreshUi() { allUiReload = true; } + + void refreshUiFrame() { frameUiReload = true; } + + void refreshUiBel(BelId bel) { belUiReload.insert(bel); } + + void refreshUiWire(WireId wire) { wireUiReload.insert(wire); } + + void refreshUiPip(PipId pip) { pipUiReload.insert(pip); } + + void refreshUiGroup(GroupId group) { groupUiReload.insert(group); } +}; + +NEXTPNR_NAMESPACE_END + +#include "arch.h" + +NEXTPNR_NAMESPACE_BEGIN + +struct Context : Arch +{ + bool verbose = false; + bool debug = false; + bool force = false; + bool timing_driven = true; + float target_freq = 12e6; + + Context(ArchArgs args) : Arch(args) {} + + // -------------------------------------------------------------- + + // provided by router1.cc + bool getActualRouteDelay(WireId src_wire, WireId dst_wire, delay_t &delay); + + // -------------------------------------------------------------- + uint32_t checksum() const; void check() const; |