Revert index to select
[yosys.git] / kernel / sigtools.h
index 32ef444aa4f882e9bb2d511e3004982b94bdc595..2517d6de33ad782bf31ed83dc506043f813e42b8 100644 (file)
@@ -2,11 +2,11 @@
  *  yosys -- Yosys Open SYnthesis Suite
  *
  *  Copyright (C) 2012  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
@@ -29,9 +29,10 @@ struct SigPool
        struct bitDef_t : public std::pair<RTLIL::Wire*, int> {
                bitDef_t() : std::pair<RTLIL::Wire*, int>(NULL, 0) { }
                bitDef_t(const RTLIL::SigBit &bit) : std::pair<RTLIL::Wire*, int>(bit.wire, bit.offset) { }
+               unsigned int hash() const { return first->name.hash() + second; }
        };
 
-       std::set<bitDef_t> bits;
+       pool<bitDef_t> bits;
 
        void clear()
        {
@@ -66,8 +67,8 @@ struct SigPool
 
        void expand(RTLIL::SigSpec from, RTLIL::SigSpec to)
        {
-               log_assert(SIZE(from) == SIZE(to));
-               for (int i = 0; i < SIZE(from); i++) {
+               log_assert(GetSize(from) == GetSize(to));
+               for (int i = 0; i < GetSize(from); i++) {
                        bitDef_t bit_from(from[i]), bit_to(to[i]);
                        if (bit_from.first != NULL && bit_to.first != NULL && bits.count(bit_from) > 0)
                                bits.insert(bit_to);
@@ -122,27 +123,30 @@ struct SigPool
 
        RTLIL::SigSpec export_all()
        {
-               std::set<RTLIL::SigBit> sig;
+               pool<RTLIL::SigBit> sig;
                for (auto &bit : bits)
                        sig.insert(RTLIL::SigBit(bit.first, bit.second));
                return sig;
        }
 
-       size_t size()
+       size_t size() const
        {
                return bits.size();
        }
 };
 
-template <typename T, class Compare = std::less<T>>
+template <typename T, class Compare = void>
 struct SigSet
 {
+       static_assert(!std::is_same<Compare,void>::value, "Default value for `Compare' class not found for SigSet<T>. Please specify.");
+
        struct bitDef_t : public std::pair<RTLIL::Wire*, int> {
                bitDef_t() : std::pair<RTLIL::Wire*, int>(NULL, 0) { }
                bitDef_t(const RTLIL::SigBit &bit) : std::pair<RTLIL::Wire*, int>(bit.wire, bit.offset) { }
+               unsigned int hash() const { return first->name.hash() + second; }
        };
 
-       std::map<bitDef_t, std::set<T, Compare>> bits;
+       dict<bitDef_t, std::set<T, Compare>> bits;
 
        void clear()
        {
@@ -193,6 +197,15 @@ struct SigSet
                        }
        }
 
+       void find(RTLIL::SigSpec sig, pool<T> &result)
+       {
+               for (auto &bit : sig)
+                       if (bit.wire != NULL) {
+                               auto &data = bits[bit];
+                               result.insert(data.begin(), data.end());
+                       }
+       }
+
        std::set<T> find(RTLIL::SigSpec sig)
        {
                std::set<T> result;
@@ -209,19 +222,16 @@ struct SigSet
        }
 };
 
+template<typename T>
+class SigSet<T, typename std::enable_if<!std::is_pointer<T>::value>::type> : public SigSet<T, std::less<T>> {};
+template<typename T>
+using sort_by_name_id_guard = typename std::enable_if<std::is_same<T,RTLIL::Cell*>::value>::type;
+template<typename T>
+class SigSet<T, sort_by_name_id_guard<T>> : public SigSet<T, RTLIL::sort_by_name_id<typename std::remove_pointer<T>::type>> {};
+
 struct SigMap
 {
-       struct bitDef_t : public std::pair<RTLIL::Wire*, int> {
-               bitDef_t() : std::pair<RTLIL::Wire*, int>(NULL, 0) { }
-               bitDef_t(const RTLIL::SigBit &bit) : std::pair<RTLIL::Wire*, int>(bit.wire, bit.offset) { }
-       };
-
-       struct shared_bit_data_t {
-               RTLIL::SigBit map_to;
-               std::set<bitDef_t> bits;
-       };
-
-       std::map<bitDef_t, shared_bit_data_t*> bits;
+       mfp<SigBit> database;
 
        SigMap(RTLIL::Module *module = NULL)
        {
@@ -229,166 +239,72 @@ struct SigMap
                        set(module);
        }
 
-       SigMap(const SigMap &other)
-       {
-               copy(other);
-       }
-
-       const SigMap &operator=(const SigMap &other)
-       {
-               copy(other);
-               return *this;
-       }
-
-       void copy(const SigMap &other)
-       {
-               clear();
-               for (auto &bit : other.bits) {
-                       bits[bit.first] = new shared_bit_data_t;
-                       bits[bit.first]->map_to = bit.second->map_to;
-                       bits[bit.first]->bits = bit.second->bits;
-               }
-       }
-
        void swap(SigMap &other)
        {
-               bits.swap(other.bits);
-       }
-
-       ~SigMap()
-       {
-               clear();
+               database.swap(other.database);
        }
 
        void clear()
        {
-               std::set<shared_bit_data_t*> all_bd_ptr;
-               for (auto &it : bits)
-                       all_bd_ptr.insert(it.second);
-               for (auto bd_ptr : all_bd_ptr)
-                       delete bd_ptr;
-               bits.clear();
+               database.clear();
        }
 
        void set(RTLIL::Module *module)
        {
-               clear();
+               int bitcount = 0;
                for (auto &it : module->connections())
-                       add(it.first, it.second);
-       }
+                       bitcount += it.first.size();
 
-       // internal helper function
-       void register_bit(const RTLIL::SigBit &bit)
-       {
-               if (bit.wire && bits.count(bit) == 0) {
-                       shared_bit_data_t *bd = new shared_bit_data_t;
-                       bd->map_to = bit;
-                       bd->bits.insert(bit);
-                       bits[bit] = bd;
-               }
-       }
-
-       // internal helper function
-       void unregister_bit(const RTLIL::SigBit &bit)
-       {
-               if (bit.wire && bits.count(bit) > 0) {
-                       shared_bit_data_t *bd = bits[bit];
-                       bd->bits.erase(bit);
-                       if (bd->bits.size() == 0)
-                               delete bd;
-                       bits.erase(bit);
-               }
-       }
-
-       // internal helper function
-       void merge_bit(const RTLIL::SigBit &bit1, const RTLIL::SigBit &bit2)
-       {
-               log_assert(bit1.wire != NULL && bit2.wire != NULL);
-
-               shared_bit_data_t *bd1 = bits[bit1];
-               shared_bit_data_t *bd2 = bits[bit2];
-               log_assert(bd1 != NULL && bd2 != NULL);
-
-               if (bd1 == bd2)
-                       return;
-
-               if (bd1->bits.size() < bd2->bits.size())
-               {
-                       for (auto &bit : bd1->bits)
-                               bits[bit] = bd2;
-                       bd2->bits.insert(bd1->bits.begin(), bd1->bits.end());
-                       delete bd1;
-               }
-               else
-               {
-                       bd1->map_to = bd2->map_to;
-                       for (auto &bit : bd2->bits)
-                               bits[bit] = bd1;
-                       bd1->bits.insert(bd2->bits.begin(), bd2->bits.end());
-                       delete bd2;
-               }
-       }
+               database.clear();
+               database.reserve(bitcount);
 
-       // internal helper function
-       void set_bit(const RTLIL::SigBit &bit1, const RTLIL::SigBit &bit2)
-       {
-               log_assert(bit1.wire != NULL);
-               log_assert(bits.count(bit1) > 0);
-               bits[bit1]->map_to = bit2;
-       }
-
-       // internal helper function
-       void map_bit(RTLIL::SigBit &bit) const
-       {
-               if (bit.wire && bits.count(bit) > 0)
-                       bit = bits.at(bit)->map_to;
+               for (auto &it : module->connections())
+                       add(it.first, it.second);
        }
 
        void add(RTLIL::SigSpec from, RTLIL::SigSpec to)
        {
-               log_assert(SIZE(from) == SIZE(to));
+               log_assert(GetSize(from) == GetSize(to));
 
-               for (int i = 0; i < SIZE(from); i++)
+               for (int i = 0; i < GetSize(from); i++)
                {
-                       RTLIL::SigBit &bf = from[i];
-                       RTLIL::SigBit &bt = to[i];
+                       int bfi = database.lookup(from[i]);
+                       int bti = database.lookup(to[i]);
+
+                       const RTLIL::SigBit &bf = database[bfi];
+                       const RTLIL::SigBit &bt = database[bti];
 
-                       if (bf.wire == NULL)
-                               continue;
+                       if (bf.wire || bt.wire)
+                       {
+                               database.imerge(bfi, bti);
 
-                       register_bit(bf);
-                       register_bit(bt);
+                               if (bf.wire == nullptr)
+                                       database.ipromote(bfi);
 
-                       if (bt.wire != NULL)
-                               merge_bit(bf, bt);
-                       else
-                               set_bit(bf, bt);
+                               if (bt.wire == nullptr)
+                                       database.ipromote(bti);
+                       }
                }
        }
 
        void add(RTLIL::SigSpec sig)
        {
                for (auto &bit : sig) {
-                       register_bit(bit);
-                       set_bit(bit, bit);
+                       RTLIL::SigBit b = database.find(bit);
+                       if (b.wire != nullptr)
+                               database.promote(bit);
                }
        }
 
-       void del(RTLIL::SigSpec sig)
-       {
-               for (auto &bit : sig)
-                       unregister_bit(bit);
-       }
-
        void apply(RTLIL::SigBit &bit) const
        {
-               map_bit(bit);
+               bit = database.find(bit);
        }
 
        void apply(RTLIL::SigSpec &sig) const
        {
                for (auto &bit : sig)
-                       map_bit(bit);
+                       apply(bit);
        }
 
        RTLIL::SigBit operator()(RTLIL::SigBit bit) const
@@ -405,10 +321,19 @@ struct SigMap
 
        RTLIL::SigSpec operator()(RTLIL::Wire *wire) const
        {
-               RTLIL::SigSpec sig(wire);
+               SigSpec sig(wire);
                apply(sig);
                return sig;
        }
+
+       RTLIL::SigSpec allbits() const
+       {
+               RTLIL::SigSpec sig;
+               for (auto &bit : database)
+                       if (bit.wire != nullptr)
+                               sig.append(bit);
+               return sig;
+       }
 };
 
 YOSYS_NAMESPACE_END