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

CMakeLists.txt

@@ -79,7 +79,7 @@ if (NOT Boost_PYTHON_FOUND )
     message( FATAL_ERROR "No version of Boost::Python 3.x could be found.")
 endif ()
 
-include_directories(common/ gui/ frontend/json ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} 3rdparty/QtPropertyBrowser/src)
+include_directories(common/ frontend/json ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
 aux_source_directory(common/ COMMON_SRC_FILES)
 aux_source_directory(frontend/json/ JSON_PARSER_FILES)
 set(COMMON_FILES ${COMMON_SRC_FILES} ${JSON_PARSER_FILES})
@@ -115,7 +115,7 @@ foreach (family ${FAMILIES})
     include(${family}/family.cmake)
     foreach (target ${family_targets})
         # Include family-specific source files to all family targets and set defines appropriately
-        target_include_directories(${target} PRIVATE ${family}/ generated/)
+        target_include_directories(${target} PRIVATE ${family}/ generated/ gui/${family}/)
         target_compile_definitions(${target} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family} ARCH_${ufamily} ARCHNAME=${family} QT_NO_KEYWORDS)
         target_link_libraries(${target} LINK_PUBLIC gui_${family} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${GUI_LIBRARY_FILES_${ufamily}})
     endforeach (target)

dummy/main.cc

@@ -20,20 +20,99 @@
 #ifdef MAIN_EXECUTABLE
 
 #include <QApplication>
+#include <boost/filesystem/convenience.hpp>
+#include <boost/program_options.hpp>
+#include "log.h"
 #include "mainwindow.h"
 #include "nextpnr.h"
+#include "pybindings.h"
+#include "version.h"
 
 USING_NEXTPNR_NAMESPACE
 
 int main(int argc, char *argv[])
 {
-    Context ctx(ArchArgs{});
+    namespace po = boost::program_options;
+    int rc = 0;
 
+    log_files.push_back(stdout);
+
+    po::options_description options("Allowed options");
+    options.add_options()("help,h", "show help");
+    options.add_options()("verbose,v", "verbose output");
+    options.add_options()("force,f", "keep running after errors");
+    options.add_options()("gui", "start gui");
+    options.add_options()("run", po::value<std::vector<std::string>>(),
+                          "python file to execute");
+    options.add_options()("version,V", "show version");
+    po::positional_options_description pos;
+    pos.add("run", -1);
+
+    po::variables_map vm;
+    try {
+        po::parsed_options parsed = po::command_line_parser(argc, argv)
+                                            .options(options)
+                                            .positional(pos)
+                                            .run();
+
+        po::store(parsed, vm);
+
+        po::notify(vm);
+    }
+
+    catch (std::exception &e) {
+        std::cout << e.what() << "\n";
+        return 1;
+    }
+
+    if (vm.count("help") || argc == 1) {
+        std::cout << boost::filesystem::basename(argv[0])
+                  << " -- Next Generation Place and Route (git "
+                     "sha1 " GIT_COMMIT_HASH_STR ")\n";
+        std::cout << "\n";
+        std::cout << options << "\n";
+        return argc != 1;
+    }
+
+    if (vm.count("version")) {
+        std::cout << boost::filesystem::basename(argv[0])
+                  << " -- Next Generation Place and Route (git "
+                     "sha1 " GIT_COMMIT_HASH_STR ")\n";
+        return 1;
+    }
+
+    Context ctx(ArchArgs{});
+    init_python(argv[0]);
+    python_export_global("ctx", ctx);
+
+    if (vm.count("verbose")) {
+        ctx.verbose = true;
+    }
+
+    if (vm.count("force")) {
+        ctx.force = true;
+    }
+
+    if (vm.count("seed")) {
+        ctx.rngseed(vm["seed"].as<int>());
+    }
+
+    if (vm.count("run")) {
+        std::vector<std::string> files =
+                vm["run"].as<std::vector<std::string>>();
+        for (auto filename : files)
+            execute_python_file(filename.c_str());
+    }
+
+    if (vm.count("gui")) {
         QApplication a(argc, argv);
         MainWindow w(&ctx);
         w.show();
 
-    return a.exec();
+        rc = a.exec();
+    }
+    deinit_python();
+    return rc;
 }
 
 #endif

gui/CMakeLists.txt

@@ -2,6 +2,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 aux_source_directory(. GUI_SOURCE_FILES)
+aux_source_directory(${family}/ GUI_SOURCE_FILES)
 set(_RESOURCES nextpnr.qrc)
   
 qt5_add_resources(GUI_RESOURCE_FILES ${_RESOURCES})
@@ -10,6 +11,6 @@ set(GUI_LIBRARY_FILES_${ufamily} Qt5::Widgets Qt5::OpenGL ${OPENGL_LIBRARIES} Qt
 
 add_library(gui_${family} STATIC ${GUI_SOURCE_FILES} ${GUI_RESOURCE_FILES})
 
-target_include_directories(gui_${family} PRIVATE ../${family}/)
+target_include_directories(gui_${family} PRIVATE ../${family} ${family} ../3rdparty/QtPropertyBrowser/src)
 target_compile_definitions(gui_${family} PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family} ARCH_${ufamily} ARCHNAME=${family} QT_NO_KEYWORDS)
 target_link_libraries(gui_${family} Qt5::Widgets)

gui/basewindow.cc

@@ -1,28 +1,23 @@
-#include "mainwindow.h"
 #include <QAction>
 #include <QFileDialog>
 #include <QGridLayout>
 #include <QIcon>
-#include <QMenu>
-#include <QMenuBar>
 #include <QSplitter>
-#include <QStatusBar>
-#include <QToolBar>
 #include <fstream>
 #include "designwidget.h"
 #include "fpgaviewwidget.h"
 #include "jsonparse.h"
 #include "log.h"
+#include "mainwindow.h"
 #include "pythontab.h"
 //#include "pack.h"
 //#include "pcf.h"
 #include "place_sa.h"
-#include "pybindings.h"
 #include "route.h"
 //#include "bitstream.h"
 #include "design_utils.h"
 
-MainWindow::MainWindow(Context *_ctx, QWidget *parent)
+BaseMainWindow::BaseMainWindow(Context *_ctx, QWidget *parent)
         : QMainWindow(parent), ctx(_ctx)
 {
     Q_INIT_RESOURCE(nextpnr);
@@ -31,9 +26,7 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent)
     log_streams.clear();
     log_write_function = [this](std::string text) { info->info(text); };
 
-    std::string title = "nextpnr-ice40 - " + ctx->getChipName();
-    setWindowTitle(title.c_str());
-    setObjectName(QStringLiteral("MainWindow"));
+    setObjectName(QStringLiteral("BaseMainWindow"));
     resize(1024, 768);
 
     createMenusAndBars();
@@ -68,11 +61,11 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent)
     splitter_v->addWidget(tabWidget);
 }
 
-MainWindow::~MainWindow() {}
+BaseMainWindow::~BaseMainWindow() {}
 
-void MainWindow::writeInfo(std::string text) { info->info(text); }
+void BaseMainWindow::writeInfo(std::string text) { info->info(text); }
 
-void MainWindow::createMenusAndBars()
+void BaseMainWindow::createMenusAndBars()
 {
     QAction *actionOpen = new QAction("Open", this);
     QIcon icon1;
@@ -101,7 +94,7 @@ void MainWindow::createMenusAndBars()
 
     QAction *actionAbout = new QAction("About", this);
 
-    QMenuBar *menuBar = new QMenuBar();
+    menuBar = new QMenuBar();
     menuBar->setGeometry(QRect(0, 0, 1024, 27));
     QMenu *menu_File = new QMenu("&File", menuBar);
     QMenu *menu_Help = new QMenu("&Help", menuBar);
@@ -109,10 +102,10 @@ void MainWindow::createMenusAndBars()
     menuBar->addAction(menu_Help->menuAction());
     setMenuBar(menuBar);
 
-    QToolBar *mainToolBar = new QToolBar();
+    mainToolBar = new QToolBar();
     addToolBar(Qt::TopToolBarArea, mainToolBar);
 
-    QStatusBar *statusBar = new QStatusBar();
+    statusBar = new QStatusBar();
     setStatusBar(statusBar);
 
     menu_File->addAction(actionOpen);
@@ -125,7 +118,7 @@ void MainWindow::createMenusAndBars()
     mainToolBar->addAction(actionSave);
 }
 
-void MainWindow::open()
+void BaseMainWindow::open()
 {
     QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(),
                                                     QString("*.json"));
@@ -142,4 +135,4 @@ void MainWindow::open()
     }
 }
 
-bool MainWindow::save() { return false; }
+bool BaseMainWindow::save() { return false; }

gui/basewindow.h

@@ -0,0 +1,44 @@
+#ifndef BASEMAINWINDOW_H
+#define BASEMAINWINDOW_H
+
+#include "infotab.h"
+#include "nextpnr.h"
+
+#include <QMainWindow>
+#include <QMenu>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QTabWidget>
+#include <QToolBar>
+
+// FIXME
+USING_NEXTPNR_NAMESPACE
+
+class BaseMainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+  public:
+    explicit BaseMainWindow(Context *ctx, QWidget *parent = 0);
+    ~BaseMainWindow();
+    Context *getContext() { return ctx; }
+
+  protected:
+    void createMenusAndBars();
+
+  protected Q_SLOTS:
+    void writeInfo(std::string text);
+    void open();
+    bool save();
+
+  protected:
+    Context *ctx;
+    QTabWidget *tabWidget;
+    InfoTab *info;
+
+    QMenuBar *menuBar;
+    QToolBar *mainToolBar;
+    QStatusBar *statusBar;
+};
+
+#endif // BASEMAINWINDOW_H

gui/dummy/mainwindow.cc

@@ -0,0 +1,18 @@
+#include "mainwindow.h"
+
+MainWindow::MainWindow(Context *_ctx, QWidget *parent)
+        : BaseMainWindow(_ctx, parent)
+{
+    std::string title = "nextpnr-dummy - " + ctx->getChipName();
+    setWindowTitle(title.c_str());
+
+    createMenu();
+}
+
+MainWindow::~MainWindow() {}
+
+void MainWindow::createMenu()
+{
+    QMenu *menu_Custom = new QMenu("&Dummy", menuBar);
+    menuBar->addAction(menu_Custom->menuAction());
+}

gui/dummy/mainwindow.h

@@ -0,0 +1,21 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "../basewindow.h"
+
+// FIXME
+USING_NEXTPNR_NAMESPACE
+
+class MainWindow : public BaseMainWindow
+{
+    Q_OBJECT
+
+  public:
+    explicit MainWindow(Context *ctx, QWidget *parent = 0);
+    ~MainWindow();
+
+  public:
+    void createMenu();
+};
+
+#endif // MAINWINDOW_H

gui/fpgaviewwidget.cc

@@ -9,14 +9,14 @@
 FPGAViewWidget::FPGAViewWidget(QWidget *parent)
         : QOpenGLWidget(parent), m_xMove(0), m_yMove(0), m_zDistance(1.0)
 {
-    ctx = qobject_cast<MainWindow *>(getMainWindow())->getContext();
+    ctx = qobject_cast<BaseMainWindow *>(getMainWindow())->getContext();
 }
 
 QMainWindow *FPGAViewWidget::getMainWindow()
 {
     QWidgetList widgets = qApp->topLevelWidgets();
     for (QWidgetList::iterator i = widgets.begin(); i != widgets.end(); ++i)
-        if ((*i)->objectName() == "MainWindow")
+        if ((*i)->objectName() == "BaseMainWindow")
             return (QMainWindow *)(*i);
     return NULL;
 }

gui/ice40/mainwindow.cc

@@ -0,0 +1,28 @@
+#include "mainwindow.h"
+#include <QAction>
+#include <QIcon>
+#include "bitstream.h"
+#include "design_utils.h"
+#include "jsonparse.h"
+#include "log.h"
+#include "pack.h"
+#include "pcf.h"
+#include "place_sa.h"
+#include "route.h"
+
+MainWindow::MainWindow(Context *_ctx, QWidget *parent)
+        : BaseMainWindow(_ctx, parent)
+{
+    std::string title = "nextpnr-ice40 - " + ctx->getChipName();
+    setWindowTitle(title.c_str());
+
+    createMenu();
+}
+
+MainWindow::~MainWindow() {}
+
+void MainWindow::createMenu()
+{
+    QMenu *menu_Custom = new QMenu("&ICE 40", menuBar);
+    menuBar->addAction(menu_Custom->menuAction());
+}

gui/ice40/mainwindow.h

@@ -0,0 +1,21 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include "../basewindow.h"
+
+// FIXME
+USING_NEXTPNR_NAMESPACE
+
+class MainWindow : public BaseMainWindow
+{
+    Q_OBJECT
+
+  public:
+    explicit MainWindow(Context *ctx, QWidget *parent = 0);
+    ~MainWindow();
+
+  public:
+    void createMenu();
+};
+
+#endif // MAINWINDOW_H

gui/mainwindow.h

@@ -1,36 +0,0 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include "infotab.h"
-#include "nextpnr.h"
-
-#include <QMainWindow>
-#include <QTabWidget>
-
-// FIXME
-USING_NEXTPNR_NAMESPACE
-
-class MainWindow : public QMainWindow
-{
-    Q_OBJECT
-
-  public:
-    explicit MainWindow(Context *ctx, QWidget *parent = 0);
-    ~MainWindow();
-    Context *getContext() { return ctx; }
-
-  private:
-    void createMenusAndBars();
-
-  private Q_SLOTS:
-    void writeInfo(std::string text);
-    void open();
-    bool save();
-
-  private:
-    Context *ctx;
-    QTabWidget *tabWidget;
-    InfoTab *info;
-};
-
-#endif // MAINWINDOW_H