Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr

common/place_sa.cc

@@ -101,6 +101,7 @@ class SAPlacer
                 }
 
                 cell->bel = bel;
+                cell->belStrength = STRENGTH_USER;
                 ctx->bindBel(bel, cell->name);
                 locked_bels.insert(bel);
                 placed_cells++;
@@ -215,9 +216,9 @@ class SAPlacer
         }
         // Final post-pacement validitiy check
         for (auto bel : ctx->getBels()) {
+            IdString cell = ctx->getBelCell(bel, false);
             if (!checker->isBelLocationValid(bel)) {
                 std::string cell_text = "no cell";
-                IdString cell = ctx->getBelCell(bel, false);
                 if (cell != IdString())
                     cell_text = std::string("cell '") + cell.str(ctx) + "'";
                 log_error("post-placement validity check failed for Bel '%s' "
@@ -277,6 +278,7 @@ class SAPlacer
                 all_placed = true;
             }
             cell->bel = best_bel;
+            cell->belStrength = STRENGTH_WEAK;
             ctx->bindBel(cell->bel, cell->name);
 
             // Back annotate location

common/timing.cc

@@ -0,0 +1,96 @@
+/*
+ *  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 "timing.h"
+#include <algorithm>
+#include <unordered_map>
+#include <utility>
+#include "log.h"
+
+NEXTPNR_NAMESPACE_BEGIN
+
+static delay_t follow_net(Context *ctx, NetInfo *net, int path_length,
+                          delay_t slack);
+
+// Follow a path, returning budget to annotate
+static delay_t follow_user_port(Context *ctx, PortRef &user, int path_length,
+                                delay_t slack)
+{
+    delay_t value;
+    if (ctx->getPortClock(user.cell, user.port) != IdString()) {
+        // At the end of a timing path (arguably, should check setup time
+        // here too)
+        value = slack / path_length;
+    } else {
+        // Default to the path ending here, if no further paths found
+        value = slack / path_length;
+        // Follow outputs of the user
+        for (auto port : user.cell->ports) {
+            if (port.second.type == PORT_OUT) {
+                delay_t comb_delay;
+                // Look up delay through this path
+                bool is_path = ctx->getCellDelay(user.cell, user.port,
+                                                 port.first, comb_delay);
+                if (is_path) {
+                    NetInfo *net = port.second.net;
+                    if (net) {
+                        delay_t path_budget = follow_net(ctx, net, path_length,
+                                                         slack - comb_delay);
+                        value = std::min(value, path_budget);
+                    }
+                }
+            }
+        }
+    }
+
+    if (value < user.budget) {
+        user.budget = value;
+    }
+}
+
+static delay_t follow_net(Context *ctx, NetInfo *net, int path_length,
+                          delay_t slack)
+{
+    delay_t net_budget = slack / path_length;
+    for (auto &usr : net->users) {
+        net_budget = std::min(
+                net_budget, follow_user_port(ctx, usr, path_length + 1, slack));
+    }
+    return net_budget;
+}
+
+void assign_budget(Context *ctx, float default_clock)
+{
+    for (auto cell : ctx->cells) {
+        for (auto port : cell.second->ports) {
+            if (port.second.type == PORT_OUT) {
+                IdString clock_domain =
+                        ctx->getPortClock(cell.second, port.first);
+                if (clock_domain != IdString()) {
+                    delay_t slack = delay_t(
+                            1.0e12 / default_clock); // TODO: clock constraints
+                    if (port.second.net)
+                        follow_net(ctx, port.second.net, 0, slack);
+                }
+            }
+        }
+    }
+}
+
+NEXTPNR_NAMESPACE_END

common/timing.h

@@ -0,0 +1,32 @@
+/*
+ *  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 TIMING_H
+#define TIMING_H
+
+#include "nextpnr.h"
+
+NEXTPNR_NAMESPACE_BEGIN
+
+// Assign "budget" values for all user ports in the design
+void assign_budget(Context *ctx, float default_clock = 12e6);
+
+NEXTPNR_NAMESPACE_END
+
+#endif

dummy/arch.cc

@@ -176,4 +176,22 @@ std::vector<GraphicElement> Arch::getPipGraphics(PipId pip) const
     return ret;
 }
 
+// ---------------------------------------------------------------
+
+bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort,
+                        IdString toPort, delay_t &delay) const
+{
+    return false;
+}
+
+IdString Arch::getPortClock(const CellInfo *cell, IdString port) const
+{
+    return IdString();
+}
+
+bool Arch::isClockPort(const CellInfo *cell, IdString port) const
+{
+    return false;
+}
+
 NEXTPNR_NAMESPACE_END

dummy/arch.h

@@ -32,7 +32,9 @@ struct DelayInfo
     delay_t delay = 0;
 
     delay_t raiseDelay() const { return delay; }
+
     delay_t fallDelay() const { return delay; }
+
     delay_t avgDelay() const { return delay; }
 
     DelayInfo operator+(const DelayInfo &other) const
@@ -133,6 +135,11 @@ struct Arch : BaseCtx
     std::unordered_set<BelId> belGraphicsReload;
     std::unordered_set<WireId> wireGraphicsReload;
     std::unordered_set<PipId> pipGraphicsReload;
+
+    bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort,
+                      delay_t &delay) const;
+    IdString getPortClock(const CellInfo *cell, IdString port) const;
+    bool isClockPort(const CellInfo *cell, IdString port) const;
 };
 
 NEXTPNR_NAMESPACE_END

gui/infotab.cc

@@ -9,6 +9,16 @@ InfoTab::InfoTab(QWidget *parent) : QWidget(parent)
     f.setStyleHint(QFont::Monospace);
     plainTextEdit->setFont(f);
 
+    plainTextEdit->setContextMenuPolicy(Qt::CustomContextMenu);
+    QAction *clearAction = new QAction("Clear &buffer", this);
+    clearAction->setStatusTip("Clears display buffer");
+    connect(clearAction, SIGNAL(triggered()), this, SLOT(clearBuffer()));
+    contextMenu = plainTextEdit->createStandardContextMenu();
+    contextMenu->addSeparator();
+    contextMenu->addAction(clearAction);
+    connect(plainTextEdit, SIGNAL(customContextMenuRequested(const QPoint)),
+            this, SLOT(showContextMenu(const QPoint)));
+
     QGridLayout *mainLayout = new QGridLayout();
     mainLayout->addWidget(plainTextEdit);
     setLayout(mainLayout);
@@ -20,3 +30,10 @@ void InfoTab::info(std::string str)
     plainTextEdit->insertPlainText(str.c_str());
     plainTextEdit->moveCursor(QTextCursor::End);
 }
+
+void InfoTab::showContextMenu(const QPoint &pt)
+{
+    contextMenu->exec(mapToGlobal(pt));
+}
+
+void InfoTab::clearBuffer() { plainTextEdit->clear(); }

gui/infotab.h

@@ -1,6 +1,7 @@
 #ifndef INFOTAB_H
 #define INFOTAB_H
 
+#include <QMenu>
 #include <QPlainTextEdit>
 #include "nextpnr.h"
 
@@ -14,9 +15,13 @@ class InfoTab : public QWidget
   public:
     explicit InfoTab(QWidget *parent = 0);
     void info(std::string str);
+  private Q_SLOTS:
+    void showContextMenu(const QPoint &pt);
+    void clearBuffer();
 
   private:
     QPlainTextEdit *plainTextEdit;
+    QMenu *contextMenu;
 };
 
 #endif // INFOTAB_H

gui/pythontab.cc

@@ -15,6 +15,16 @@ PythonTab::PythonTab(QWidget *parent) : QWidget(parent)
     f.setStyleHint(QFont::Monospace);
     plainTextEdit->setFont(f);
 
+    plainTextEdit->setContextMenuPolicy(Qt::CustomContextMenu);
+    QAction *clearAction = new QAction("Clear &buffer", this);
+    clearAction->setStatusTip("Clears display buffer");
+    connect(clearAction, SIGNAL(triggered()), this, SLOT(clearBuffer()));
+    contextMenu = plainTextEdit->createStandardContextMenu();
+    contextMenu->addSeparator();
+    contextMenu->addAction(clearAction);
+    connect(plainTextEdit, SIGNAL(customContextMenuRequested(const QPoint)),
+            this, SLOT(showContextMenu(const QPoint)));
+
     lineEdit = new LineEditor();
     lineEdit->setMinimumHeight(30);
     lineEdit->setMaximumHeight(30);
@@ -98,3 +108,10 @@ void PythonTab::editLineReturnPressed(QString text)
     print(std::string(">>> " + input + "\n"));
     int error = executePython(input);
 }
+
+void PythonTab::showContextMenu(const QPoint &pt)
+{
+    contextMenu->exec(mapToGlobal(pt));
+}
+
+void PythonTab::clearBuffer() { plainTextEdit->clear(); }

gui/pythontab.h

@@ -2,6 +2,7 @@
 #define PYTHONTAB_H
 
 #include <QLineEdit>
+#include <QMenu>
 #include <QPlainTextEdit>
 #include "emb.h"
 #include "line_editor.h"
@@ -22,10 +23,13 @@ class PythonTab : public QWidget
     int executePython(std::string &command);
   private Q_SLOTS:
     void editLineReturnPressed(QString text);
+    void showContextMenu(const QPoint &pt);
+    void clearBuffer();
 
   private:
     QPlainTextEdit *plainTextEdit;
     LineEditor *lineEdit;
+    QMenu *contextMenu;
     emb::stdout_write_type write;
 };
 

ice40/arch.cc

@@ -415,4 +415,25 @@ std::vector<GraphicElement> Arch::getPipGraphics(PipId pip) const
     return ret;
 }
 
+// -----------------------------------------------------------------------
+
+bool Arch::getCellDelay(const CellInfo *cell, IdString fromPort,
+                        IdString toPort, delay_t &delay) const
+{
+    // TODO
+    return false;
+}
+
+IdString Arch::getPortClock(const CellInfo *cell, IdString port) const
+{
+    // TODO
+    return IdString();
+}
+
+bool Arch::isClockPort(const CellInfo *cell, IdString port) const
+{
+    // TODO
+    return false;
+}
+
 NEXTPNR_NAMESPACE_END

ice40/arch.h

@@ -770,6 +770,17 @@ struct Arch : BaseCtx
     std::unordered_set<BelId> belGraphicsReload;
     std::unordered_set<WireId> wireGraphicsReload;
     std::unordered_set<PipId> pipGraphicsReload;
+
+    // -------------------------------------------------
+
+    // Get the delay through a cell from one port to another, returning false
+    // if no path exists
+    bool getCellDelay(const CellInfo *cell, IdString fromPort, IdString toPort,
+                      delay_t &delay) const;
+    // Get the associated clock to a port, or empty if the port is combinational
+    IdString getPortClock(const CellInfo *cell, IdString port) const;
+    // Return true if a port is a clock
+    bool isClockPort(const CellInfo *cell, IdString port) const;
 };
 
 NEXTPNR_NAMESPACE_END