1 files changed, 78 insertions, 224 deletions

diff --git a/gui/treemodel.cc b/gui/treemodel.cc
index d42dc401..fd3ae45b 100644
--- a/gui/treemodel.cc
+++ b/gui/treemodel.cc
@@ -18,229 +18,86 @@
  */
 
 #include "treemodel.h"
+#include "log.h"
 
 NEXTPNR_NAMESPACE_BEGIN
 
-static bool contextTreeItemLessThan(const ContextTreeItem *v1, const ContextTreeItem *v2)
- {
-     return v1->name() < v2->name();
- }
+ContextTreeModel::ContextTreeModel(QObject *parent) :
+        QAbstractItemModel(parent),
+        root_(new StaticTreeItem("Elements", nullptr)) {}
 
-ContextTreeItem::ContextTreeItem() { parentNode = nullptr; }
+ContextTreeModel::~ContextTreeModel() {}
 
-ContextTreeItem::ContextTreeItem(QString name)
-        : parentNode(nullptr), itemId(IdString()), itemType(ElementType::NONE), itemName(name)
-{
-}
-
-ContextTreeItem::ContextTreeItem(IdString id, ElementType type, QString name)
-        : parentNode(nullptr), itemId(id), itemType(type), itemName(name)
-{
-}
-
-ContextTreeItem::~ContextTreeItem()
-{
-    if (parentNode)
-        parentNode->children.removeOne(this);
-    qDeleteAll(children);
-}
-void ContextTreeItem::addChild(ContextTreeItem *item)
-{
-    item->parentNode = this;
-    children.append(item);
-}
-
-void ContextTreeItem::sort()
-{
-    for (auto item : children)
-        if (item->count()>1) item->sort();
-    qSort(children.begin(), children.end(), contextTreeItemLessThan);
-}
-
-ContextTreeModel::ContextTreeModel(QObject *parent) : QAbstractItemModel(parent) { root = new ContextTreeItem(); }
-
-ContextTreeModel::~ContextTreeModel() { delete root; }
-
-void ContextTreeModel::loadData(Context *ctx)
+void ContextTreeModel::loadContext(Context *ctx)
 {
     if (!ctx)
         return;
 
     beginResetModel();
 
-    delete root;
-    root = new ContextTreeItem();
-
-    for (int i = 0; i < 6; i++)
-        nameToItem[i].clear();
-
-    IdString none;
-
-    ContextTreeItem *bels_root = new ContextTreeItem("Bels");
-    root->addChild(bels_root);
-    QMap<QString, ContextTreeItem *> bel_items;
-
-    // Add bels to tree
-    for (auto bel : ctx->getBels()) {
-        IdString id = ctx->getBelName(bel);
-        QStringList items = QString(id.c_str(ctx)).split("/");
-        QString name;
-        ContextTreeItem *parent = bels_root;
-        for (int i = 0; i < items.size(); i++) {
-            if (!name.isEmpty())
-                name += "/";
-            name += items.at(i);
-            if (!bel_items.contains(name)) {
-                if (i == items.size() - 1) {
-                    ContextTreeItem *item = new ContextTreeItem(id, ElementType::BEL, items.at(i));
-                    parent->addChild(item);
-                    nameToItem[0].insert(name, item);
-                } else {
-                    ContextTreeItem *item = new ContextTreeItem(none, ElementType::NONE, items.at(i));
-                    parent->addChild(item);
-                    bel_items.insert(name, item);
-                }
-            }
-            parent = bel_items[name];
+    // Currently we lack an API to get a proper hierarchy of bels/pip/wires
+    // cross-arch. So we only do this for ICE40 by querying the ChipDB
+    // directly.
+    // TODO(q3k): once AnyId and the tree API land in Arch, move this over.
+#ifdef ARCH_ICE40
+    {
+        std::map<std::pair<int, int>, std::vector<BelId>> belMap;
+        for (auto bel : ctx->getBels()) {
+            auto loc = ctx->getBelLocation(bel);
+            belMap[std::pair<int, int>(loc.x, loc.y)].push_back(bel);
         }
-    }    
-    bels_root->sort();
-    
-    ContextTreeItem *wire_root = new ContextTreeItem("Wires");
-    root->addChild(wire_root);
-    QMap<QString, ContextTreeItem *> wire_items;
-
-    // Add wires to tree
-    for (auto wire : ctx->getWires()) {
-        auto id = ctx->getWireName(wire);
-        QStringList items = QString(id.c_str(ctx)).split("/");
-        QString name;
-        ContextTreeItem *parent = wire_root;
-        for (int i = 0; i < items.size(); i++) {
-            if (!name.isEmpty())
-                name += "/";
-            name += items.at(i);
-            if (!wire_items.contains(name)) {
-                if (i == items.size() - 1) {
-                    ContextTreeItem *item = new ContextTreeItem(id, ElementType::WIRE, items.at(i));
-                    parent->addChild(item);
-                    nameToItem[1].insert(name, item);
-                } else {
-                    ContextTreeItem *item = new ContextTreeItem(none, ElementType::NONE, items.at(i));
-                    parent->addChild(item);
-                    wire_items.insert(name, item);
-                }
-            }
-            parent = wire_items[name];
+        auto belGetter = [](Context *ctx, BelId id) { return ctx->getBelName(id); };
+        bel_root_ = std::unique_ptr<BelXYRoot>(new BelXYRoot(ctx, "Bels", root_.get(), belMap, belGetter));
+
+        std::map<std::pair<int, int>, std::vector<WireId>> wireMap;
+        for (int i = 0; i < ctx->chip_info->num_wires; i++) {
+            const auto wire = &ctx->chip_info->wire_data[i];
+            WireId wireid;
+            wireid.index = i;
+            wireMap[std::pair<int, int>(wire->x, wire->y)].push_back(wireid);
         }
-    }
-    wire_root->sort();
-
-    ContextTreeItem *pip_root = new ContextTreeItem("Pips");
-    root->addChild(pip_root);
-    QMap<QString, ContextTreeItem *> pip_items;
-
-    // Add pips to tree
-#ifndef ARCH_ECP5
-    for (auto pip : ctx->getPips()) {
-        auto id = ctx->getPipName(pip);
-        QStringList items = QString(id.c_str(ctx)).split("/");
-        QString name;
-        ContextTreeItem *parent = pip_root;
-        for (int i = 0; i < items.size(); i++) {
-            if (!name.isEmpty())
-                name += "/";
-            name += items.at(i);
-            if (!pip_items.contains(name)) {
-                if (i == items.size() - 1) {
-                    ContextTreeItem *item = new ContextTreeItem(id, ElementType::PIP, items.at(i));
-                    parent->addChild(item);
-                    nameToItem[2].insert(name, item);
-                } else {
-                    ContextTreeItem *item = new ContextTreeItem(none, ElementType::NONE, items.at(i));
-                    parent->addChild(item);
-                    pip_items.insert(name, item);
-                }
-            }
-            parent = pip_items[name];
+        auto wireGetter = [](Context *ctx, WireId id) { return ctx->getWireName(id); };
+        wire_root_ = std::unique_ptr<WireXYRoot>(new WireXYRoot(ctx, "Wires", root_.get(), wireMap, wireGetter));
+
+        std::map<std::pair<int, int>, std::vector<PipId>> pipMap;
+        for (int i = 0; i < ctx->chip_info->num_pips; i++) {
+            const auto pip = &ctx->chip_info->pip_data[i];
+            PipId pipid;
+            pipid.index = i;
+            pipMap[std::pair<int, int>(pip->x, pip->y)].push_back(pipid);
         }
+        printf("generating pip static tree...\n");
+        auto pipGetter = [](Context *ctx, PipId id) { return ctx->getPipName(id); };
+        pip_root_ = std::unique_ptr<PipXYRoot>(new PipXYRoot(ctx, "Pips", root_.get(), pipMap, pipGetter));
     }
 #endif
-    pip_root->sort();
-
-    nets_root = new ContextTreeItem("Nets");
-    root->addChild(nets_root);
 
-    cells_root = new ContextTreeItem("Cells");
-    root->addChild(cells_root);
+    cell_root_ = std::unique_ptr<IdStringList>(new IdStringList(QString("Cells"), root_.get()));
+    net_root_ = std::unique_ptr<IdStringList>(new IdStringList(QString("Nets"), root_.get()));
 
     endResetModel();
+
+    updateCellsNets(ctx);
 }
 
-void ContextTreeModel::updateData(Context *ctx)
+void ContextTreeModel::updateCellsNets(Context *ctx)
 {
     if (!ctx)
         return;
 
     beginResetModel();
 
-    //QModelIndex nets_index = indexFromNode(nets_root);
-    // Remove nets not existing any more
-    QMap<QString, ContextTreeItem *>::iterator i = nameToItem[3].begin();
-    while (i != nameToItem[3].end()) {
-        QMap<QString, ContextTreeItem *>::iterator prev = i;
-        ++i;
-        if (ctx->nets.find(ctx->id(prev.key().toStdString())) == ctx->nets.end()) {
-            //int pos = prev.value()->parent()->indexOf(prev.value());
-            //beginRemoveRows(nets_index, pos, pos);
-            delete prev.value();
-            nameToItem[3].erase(prev);
-            //endRemoveRows();
-        }
-    }
-    // Add nets to tree
-    for (auto &item : ctx->nets) {
-        auto id = item.first;
-        QString name = QString(id.c_str(ctx));
-        if (!nameToItem[3].contains(name)) {
-            //beginInsertRows(nets_index, nets_root->count() + 1, nets_root->count() + 1);
-            ContextTreeItem *newItem = new ContextTreeItem(id, ElementType::NET, name);
-            nets_root->addChild(newItem);
-            nameToItem[3].insert(name, newItem);
-            //endInsertRows();
-        }
+    std::vector<IdString> cells;
+    for (auto &pair : ctx->cells) {
+        cells.push_back(pair.first);
     }
+    cell_root_->updateElements(ctx, cells);
 
-    nets_root->sort();
-
-    //QModelIndex cell_index = indexFromNode(cells_root);
-    // Remove cells not existing any more
-    i = nameToItem[4].begin();
-    while (i != nameToItem[4].end()) {
-        QMap<QString, ContextTreeItem *>::iterator prev = i;
-        ++i;
-        if (ctx->cells.find(ctx->id(prev.key().toStdString())) == ctx->cells.end()) {
-            //int pos = prev.value()->parent()->indexOf(prev.value());
-            //beginRemoveRows(cell_index, pos, pos);
-            delete prev.value();
-            nameToItem[4].erase(prev);
-            //endRemoveRows();
-        }
-    }
-    // Add cells to tree
-    for (auto &item : ctx->cells) {
-        auto id = item.first;
-        QString name = QString(id.c_str(ctx));
-        if (!nameToItem[4].contains(name)) {
-            //beginInsertRows(cell_index, cells_root->count() + 1, cells_root->count() + 1);
-            ContextTreeItem *newItem = new ContextTreeItem(id, ElementType::CELL, name);
-            cells_root->addChild(newItem);
-            nameToItem[4].insert(name, newItem);
-            //endInsertRows();
-        }
+    std::vector<IdString> nets;
+    for (auto &pair : ctx->nets) {
+        nets.push_back(pair.first);
     }
-
-    cells_root->sort();
+    net_root_->updateElements(ctx, nets);
 
     endResetModel();
 }
@@ -251,18 +108,19 @@ int ContextTreeModel::columnCount(const QModelIndex &parent) const { return 1; }
 
 QModelIndex ContextTreeModel::index(int row, int column, const QModelIndex &parent) const
 {
-    ContextTreeItem *node = nodeFromIndex(parent);
+    LazyTreeItem *node = nodeFromIndex(parent);
     if (row >= node->count())
         return QModelIndex();
-    return createIndex(row, column, node->at(row));
+
+    return createIndex(row, column, node->child(row));
 }
 
 QModelIndex ContextTreeModel::parent(const QModelIndex &child) const
 {
-    ContextTreeItem *parent = nodeFromIndex(child)->parent();
-    if (parent == root)
+    LazyTreeItem *parent = nodeFromIndex(child)->parent();
+    if (parent == root_.get())
         return QModelIndex();
-    ContextTreeItem *node = parent->parent();
+    LazyTreeItem *node = parent->parent();
     return createIndex(node->indexOf(parent), 0, parent);
 }
 
@@ -272,7 +130,7 @@ QVariant ContextTreeModel::data(const QModelIndex &index, int role) const
         return QVariant();
     if (role != Qt::DisplayRole)
         return QVariant();
-    ContextTreeItem *node = nodeFromIndex(index);
+    LazyTreeItem *node = nodeFromIndex(index);
     return node->name();
 }
 
@@ -285,11 +143,11 @@ QVariant ContextTreeModel::headerData(int section, Qt::Orientation orientation,
     return QVariant();
 }
 
-ContextTreeItem *ContextTreeModel::nodeFromIndex(const QModelIndex &idx) const
+LazyTreeItem *ContextTreeModel::nodeFromIndex(const QModelIndex &idx) const
 {
     if (idx.isValid())
-        return (ContextTreeItem *)idx.internalPointer();
-    return root;
+        return (LazyTreeItem *)idx.internalPointer();
+    return root_.get();
 }
 
 static int getElementIndex(ElementType type)
@@ -307,40 +165,36 @@ static int getElementIndex(ElementType type)
     return -1;
 }
 
-ContextTreeItem *ContextTreeModel::nodeForIdType(const ElementType type, const QString name) const
+Qt::ItemFlags ContextTreeModel::flags(const QModelIndex &index) const
 {
-    int index = getElementIndex(type);
-    if (type != ElementType::NONE && nameToItem[index].contains(name))
-        return nameToItem[index].value(name);
-    return nullptr;
+    LazyTreeItem *node = nodeFromIndex(index);
+    return Qt::ItemIsEnabled | (node->type() != ElementType::NONE ? Qt::ItemIsSelectable : Qt::NoItemFlags);
 }
 
-QModelIndex ContextTreeModel::indexFromNode(ContextTreeItem *node)
+
+void ContextTreeModel::fetchMore(const QModelIndex &parent)
 {
-    ContextTreeItem *parent = node->parent();
-    if (parent == root)
-        return QModelIndex();
-    return createIndex(parent->indexOf(node), 0, node);
+    nodeFromIndex(parent)->fetchMore();
 }
 
-Qt::ItemFlags ContextTreeModel::flags(const QModelIndex &index) const
+bool ContextTreeModel::canFetchMore(const QModelIndex &parent) const
 {
-    ContextTreeItem *node = nodeFromIndex(index);
-    return Qt::ItemIsEnabled | (node->type() != ElementType::NONE ? Qt::ItemIsSelectable : Qt::NoItemFlags);
+    return nodeFromIndex(parent)->canFetchMore();
 }
 
 QList<QModelIndex> ContextTreeModel::search(QString text)
 {
     QList<QModelIndex> list;
-    for (int i = 0; i < 6; i++) {
-        for (auto key : nameToItem[i].keys()) {
-            if (key.contains(text, Qt::CaseInsensitive)) {
-                list.append(indexFromNode(nameToItem[i].value(key)));
-                if (list.count() > 500)
-                    break; // limit to 500 results
-            }
-        }
-    }
+    //for (int i = 0; i < 6; i++) {
+    //    for (auto key : nameToItem[i].keys()) {
+    //        if (key.contains(text, Qt::CaseInsensitive)) {
+    //            list.append(indexFromNode(nameToItem[i].value(key)));
+    //            if (list.count() > 500)
+    //                break; // limit to 500 results
+    //        }
+    //    }
+    //}
     return list;
 }
+
 NEXTPNR_NAMESPACE_END