Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr into q3k/lock-2-electric-boogaloo

5 files changed, 138 insertions, 26 deletions

diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index 4a225bd6..78c2fe3a 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -116,7 +116,7 @@ void BaseMainWindow::createMenusAndBars()
     actionOpen->setStatusTip("Open an existing project file");

     connect(actionOpen, SIGNAL(triggered()), this, SLOT(open_proj()));

 

-    QAction *actionSave = new QAction("Save", this);

+    actionSave = new QAction("Save", this);

     actionSave->setIcon(QIcon(":/icons/resources/save.png"));

     actionSave->setShortcuts(QKeySequence::Save);

     actionSave->setStatusTip("Save existing project to disk");

diff --git a/gui/basewindow.h b/gui/basewindow.h
index eee426c7..1184fa80 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -73,6 +73,7 @@ class BaseMainWindow : public QMainWindow
     QStatusBar *statusBar;

     QAction *actionNew;

     QAction *actionOpen;

+    QAction *actionSave;

     QProgressBar *progressBar;

     DesignWidget *designview;

 };

diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index 4123bf30..a59307f0 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -230,6 +230,9 @@ void DesignWidget::addToHistory(QTreeWidgetItem *item)
 void DesignWidget::newContext(Context *ctx)

 {

     treeWidget->clear();

+    // reset pointers since they are not valid after clear

+    nets_root = nullptr;

+    cells_root = nullptr;

     history_ignore = false;

     history_index = -1;

     history.clear();

@@ -334,16 +337,7 @@ void DesignWidget::newContext(Context *ctx)
     for (auto pip : nameToItem[2].toStdMap()) {

         pip_root->addChild(pip.second);

     }

-

-    // Add nets to tree

-    nets_root = new QTreeWidgetItem(treeWidget);

-    nets_root->setText(0, "Nets");

-    treeWidget->insertTopLevelItem(0, nets_root);

-

-    // Add cells to tree

-    cells_root = new QTreeWidgetItem(treeWidget);

-    cells_root->setText(0, "Cells");

-    treeWidget->insertTopLevelItem(0, cells_root);

+    updateTree();

 }

 

 void DesignWidget::updateTree()

@@ -513,6 +507,14 @@ void DesignWidget::onItemSelectionChanged()
         addProperty(topItem, QVariant::String, "Conflicting Net", ctx->getConflictingWireNet(wire).c_str(ctx),

                     ElementType::NET);

 

+        DelayInfo delay = ctx->getWireDelay(wire);

+

+        QtProperty *delayItem = addSubGroup(topItem, "Delay");

+        addProperty(delayItem, QVariant::Double, "Min Raise", delay.minRaiseDelay());

+        addProperty(delayItem, QVariant::Double, "Max Raise", delay.maxRaiseDelay());

+        addProperty(delayItem, QVariant::Double, "Min Fall", delay.minFallDelay());

+        addProperty(delayItem, QVariant::Double, "Max Fall", delay.maxFallDelay());

+

         QtProperty *belpinItem = addSubGroup(topItem, "BelPin Uphill");

         BelPin uphill = ctx->getBelPinUphill(wire);

         if (uphill.bel != BelId())

@@ -535,7 +537,7 @@ void DesignWidget::onItemSelectionChanged()
         }

 

         int counter = 0;

-        QtProperty *pipsDownItem = addSubGroup(downhillItem, "Pips Downhill");

+        QtProperty *pipsDownItem = addSubGroup(topItem, "Pips Downhill");

         for (const auto &item : ctx->getPipsDownhill(wire)) {

             addProperty(pipsDownItem, QVariant::String, "", ctx->getPipName(item).c_str(ctx), ElementType::PIP);

             counter++;

@@ -546,7 +548,7 @@ void DesignWidget::onItemSelectionChanged()
         }

 

         counter = 0;

-        QtProperty *pipsUpItem = addSubGroup(downhillItem, "Pips Uphill");

+        QtProperty *pipsUpItem = addSubGroup(topItem, "Pips Uphill");

         for (const auto &item : ctx->getPipsUphill(wire)) {

             addProperty(pipsUpItem, QVariant::String, "", ctx->getPipName(item).c_str(ctx), ElementType::PIP);

             counter++;

@@ -572,9 +574,10 @@ void DesignWidget::onItemSelectionChanged()
         DelayInfo delay = ctx->getPipDelay(pip);

 

         QtProperty *delayItem = addSubGroup(topItem, "Delay");

-        addProperty(delayItem, QVariant::Double, "Raise", delay.raiseDelay());

-        addProperty(delayItem, QVariant::Double, "Fall", delay.fallDelay());

-        addProperty(delayItem, QVariant::Double, "Average", delay.avgDelay());

+        addProperty(delayItem, QVariant::Double, "Min Raise", delay.minRaiseDelay());

+        addProperty(delayItem, QVariant::Double, "Max Raise", delay.maxRaiseDelay());

+        addProperty(delayItem, QVariant::Double, "Min Fall", delay.minFallDelay());

+        addProperty(delayItem, QVariant::Double, "Max Fall", delay.maxFallDelay());

     } else if (type == ElementType::NET) {

         NetInfo *net = ctx->nets.at(c).get();

 

diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index 28792ed3..847698c5 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -20,9 +20,12 @@
 #include "mainwindow.h"

 #include <QAction>

 #include <QFileDialog>

+#include <QFileInfo>

 #include <QIcon>

 #include <QInputDialog>

 #include <QLineEdit>

+#include <boost/property_tree/json_parser.hpp>

+#include <boost/property_tree/ptree.hpp>

 #include "bitstream.h"

 #include "design_utils.h"

 #include "jsonparse.h"

@@ -219,9 +222,11 @@ void MainWindow::new_proj()
         QString package = QInputDialog::getItem(this, "Select package", "Package:", getSupportedPackages(chipArgs.type),

                                                 0, false, &ok);

 

-        if (ok && !item.isEmpty()) {

+        if (ok && !item.isEmpty()) {            

+            currentProj = "";

+            currentJson = "";

+            currentPCF = "";

             disableActions();

-            preload_pcf = "";

             chipArgs.package = package.toStdString().c_str();

             ctx = std::unique_ptr<Context>(new Context(chipArgs));

             actionLoadJSON->setEnabled(true);

@@ -233,14 +238,16 @@ void MainWindow::new_proj()
 

 void MainWindow::load_json(std::string filename, std::string pcf)

 {

-    preload_pcf = pcf;

     disableActions();

+    currentJson = filename;

+    currentPCF = pcf;

     Q_EMIT task->loadfile(filename);

 }

 

 void MainWindow::load_pcf(std::string filename)

 {

     disableActions();

+    currentPCF = filename;

     Q_EMIT task->loadpcf(filename);

 }

 

@@ -252,10 +259,79 @@ void MainWindow::newContext(Context *ctx)
 

 void MainWindow::open_proj()

 {

+    QMap<std::string, int> arch;

+#ifdef ICE40_HX1K_ONLY

+    arch.insert("hx1k", ArchArgs::HX1K);

+#else

+    arch.insert("lp384", ArchArgs::LP384);

+    arch.insert("lp1k", ArchArgs::LP1K);

+    arch.insert("hx1k", ArchArgs::HX1K);

+    arch.insert("up5k", ArchArgs::UP5K);

+    arch.insert("lp8k", ArchArgs::LP8K);

+    arch.insert("hx8k", ArchArgs::HX8K);

+#endif

+

     QString fileName = QFileDialog::getOpenFileName(this, QString("Open Project"), QString(), QString("*.proj"));

     if (!fileName.isEmpty()) {

-        std::string fn = fileName.toStdString();

-        disableActions();

+        try {

+            namespace pt = boost::property_tree;

+

+            std::string fn = fileName.toStdString();

+            currentProj = fn;

+            disableActions();

+

+            pt::ptree root;

+            std::string filename = fileName.toStdString();

+            pt::read_json(filename, root);

+            log_info("Loading project %s...\n", filename.c_str());

+            log_break();

+

+            int version = root.get<int>("project.version");

+            if (version != 1)

+                log_error("Wrong project format version.\n");

+

+            std::string arch_name = root.get<std::string>("project.arch.name");

+            if (arch_name != "ice40")

+                log_error("Unsuported project architecture.\n");

+

+            std::string arch_type = root.get<std::string>("project.arch.type");

+            std::string arch_package = root.get<std::string>("project.arch.package");

+

+            chipArgs.type = (ArchArgs::ArchArgsTypes)arch.value(arch_type);

+            chipArgs.package = arch_package;

+            ctx = std::unique_ptr<Context>(new Context(chipArgs));

+            Q_EMIT contextChanged(ctx.get());

+

+            QFileInfo fi(fileName);

+            QDir::setCurrent(fi.absoluteDir().absolutePath());

+            log_info("Setting current dir to %s...\n", fi.absoluteDir().absolutePath().toStdString().c_str());

+            log_info("Loading project %s...\n", filename.c_str());

+            log_info("Context changed to %s (%s)\n", arch_type.c_str(), arch_package.c_str());

+

+            auto project = root.get_child("project");

+            std::string json;

+            std::string pcf;

+            if (project.count("input")) {

+                auto input = project.get_child("input");

+                if (input.count("json"))

+                    json = input.get<std::string>("json");

+                if (input.count("pcf"))

+                    pcf = input.get<std::string>("pcf");

+            }

+

+            if (!(QFileInfo::exists(json.c_str()) && QFileInfo(json.c_str()).isFile())) {

+                log_error("Json file does not exist.\n");

+            }

+            if (!pcf.empty()) {

+                if (!(QFileInfo::exists(pcf.c_str()) && QFileInfo(pcf.c_str()).isFile())) {

+                    log_error("PCF file does not exist.\n");

+                }

+            }

+

+            log_info("Loading json: %s...\n", json.c_str());

+            load_json(json, pcf);

+        } catch (log_execution_error_exception) {

+        }

     }

 }

 

@@ -275,7 +351,35 @@ void MainWindow::open_pcf()
     }

 }

 

-bool MainWindow::save_proj() { return false; }

+bool MainWindow::save_proj()

+{

+    if (currentProj.empty()) {

+        QString fileName = QFileDialog::getSaveFileName(this, QString("Save Project"), QString(), QString("*.proj"));

+        if (fileName.isEmpty())

+            return false;

+        currentProj = fileName.toStdString();

+    }

+    if (!currentProj.empty()) {

+        namespace pt = boost::property_tree;

+        QFileInfo fi(currentProj.c_str());

+        QDir dir(fi.absoluteDir().absolutePath());

+        std::ofstream f(currentProj);

+        pt::ptree root;

+        root.put("project.version", 1);

+        root.put("project.name", fi.baseName().toStdString());

+        root.put("project.arch.name", ctx->archId().c_str(ctx.get()));

+        root.put("project.arch.type", ctx->archArgsToId(chipArgs).c_str(ctx.get()));

+        root.put("project.arch.package", chipArgs.package);

+        if (!currentJson.empty())

+            root.put("project.input.json", dir.relativeFilePath(currentJson.c_str()).toStdString());

+        if (!currentPCF.empty())

+            root.put("project.input.pcf", dir.relativeFilePath(currentPCF.c_str()).toStdString());

+        pt::write_json(f, root);

+        log_info("Project %s saved...\n", fi.baseName().toStdString().c_str());

+        return true;

+    }

+    return false;

+}

 

 void MainWindow::save_asc()

 {

@@ -303,6 +407,7 @@ void MainWindow::disableActions()
 

     actionNew->setEnabled(true);

     actionOpen->setEnabled(true);

+    actionSave->setEnabled(!currentJson.empty());

 }

 

 void MainWindow::loadfile_finished(bool status)

@@ -312,12 +417,12 @@ void MainWindow::loadfile_finished(bool status)
         log("Loading design successful.\n");

         actionLoadPCF->setEnabled(true);

         actionPack->setEnabled(true);

-        if (!preload_pcf.empty())

-            load_pcf(preload_pcf);

+        if (!currentPCF.empty())

+            load_pcf(currentPCF);

         Q_EMIT updateTreeView();

     } else {

         log("Loading design failed.\n");

-        preload_pcf = "";

+        currentPCF = "";

     }

 }

 

diff --git a/gui/ice40/mainwindow.h b/gui/ice40/mainwindow.h
index cfd938f8..4600d1da 100644
--- a/gui/ice40/mainwindow.h
+++ b/gui/ice40/mainwindow.h
@@ -79,7 +79,10 @@ class MainWindow : public BaseMainWindow
 

     bool timing_driven;

     ArchArgs chipArgs;

-    std::string preload_pcf;

+

+    std::string currentProj;

+    std::string currentJson;

+    std::string currentPCF;

 };

 

 NEXTPNR_NAMESPACE_END