GUI: Performance optimizations (#162)

Author: ppisa

CMakeLists.txt

@@ -132,6 +132,15 @@ if (NOT "${BUILD_DEBUG}")
     add_definitions(-DQT_NO_DEBUG_OUTPUT=1)
 endif ()
 
+add_compile_definitions(QT_USE_QSTRINGBUILDER)
+
+# Profiling flags
+if (NOT "${WASM}" AND NOT "${WIN32}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer")
+    set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer")
+endif ()
+
 include_directories("src" "src/machine")
 
 

src/gui/windows/cache/cachedock.cpp

@@ -12,18 +12,25 @@ CacheDock::CacheDock(QWidget *parent, const QString &type)
     layout_top_form = new QFormLayout(top_form);
 
     l_hit = new QLabel("0", top_form);
+    l_hit->setTextFormat(Qt::PlainText);
     layout_top_form->addRow("Hit:", l_hit);
     l_miss = new QLabel("0", top_form);
+    l_miss->setTextFormat(Qt::PlainText);
     layout_top_form->addRow("Miss:", l_miss);
     l_m_reads = new QLabel("0", top_form);
+    l_m_reads->setTextFormat(Qt::PlainText);
     layout_top_form->addRow("Memory reads:", l_m_reads);
     l_m_writes = new QLabel("0", top_form);
+    l_m_writes->setTextFormat(Qt::PlainText);
     layout_top_form->addRow("Memory writes:", l_m_writes);
     l_stalled = new QLabel("0", top_form);
+    l_stalled->setTextFormat(Qt::PlainText);
     layout_top_form->addRow("Memory stall cycles:", l_stalled);
     l_hit_rate = new QLabel("0.000%", top_form);
+    l_hit_rate->setTextFormat(Qt::PlainText);
     layout_top_form->addRow("Hit rate:", l_hit_rate);
     l_speed = new QLabel("100%", top_form);
+    l_speed->setTextFormat(Qt::PlainText);
     layout_top_form->addRow("Improved speed:", l_speed);
 
     graphicsview = new GraphicsView(top_widget);
@@ -39,6 +46,14 @@ CacheDock::CacheDock(QWidget *parent, const QString &type)
 }
 
 void CacheDock::setup(const machine::Cache *cache, bool cache_after_cache) {
+    memory_reads = 0;
+    memory_writes = 0;
+    hit = 0;
+    miss = 0;
+    stalled = 0;
+    speed_improv = 0.0;
+    hit_rate = 0.0;
+
     l_hit->setText("0");
     l_miss->setText("0");
     l_stalled->setText("0");
@@ -48,19 +63,12 @@ void CacheDock::setup(const machine::Cache *cache, bool cache_after_cache) {
     l_speed->setText("100%");
     l_speed->setHidden(cache_after_cache);
     if (cache != nullptr) {
+        connect(cache, &machine::Cache::hit_update, this, &CacheDock::hit_update);
+        connect(cache, &machine::Cache::miss_update, this, &CacheDock::miss_update);
+        connect(cache, &machine::Cache::memory_reads_update, this, &CacheDock::memory_reads_update);
         connect(
-            cache, &machine::Cache::hit_update, this, &CacheDock::hit_update);
-        connect(
-            cache, &machine::Cache::miss_update, this, &CacheDock::miss_update);
-        connect(
-            cache, &machine::Cache::memory_reads_update, this,
-            &CacheDock::memory_reads_update);
-        connect(
-            cache, &machine::Cache::memory_writes_update, this,
-            &CacheDock::memory_writes_update);
-        connect(
-            cache, &machine::Cache::statistics_update, this,
-            &CacheDock::statistics_update);
+            cache, &machine::Cache::memory_writes_update, this, &CacheDock::memory_writes_update);
+        connect(cache, &machine::Cache::statistics_update, this, &CacheDock::statistics_update);
     }
     top_form->setVisible(cache != nullptr);
     no_cache->setVisible(cache == nullptr || !cache->get_config().enabled());
@@ -71,27 +79,38 @@ void CacheDock::setup(const machine::Cache *cache, bool cache_after_cache) {
     graphicsview->setVisible(cache != nullptr && cache->get_config().enabled());
 }
 
+void CacheDock::paintEvent(QPaintEvent *event) {
+    l_stalled->setText(QString::number(stalled));
+    l_hit_rate->setText(QString::number(hit_rate, 'f', 3) + QString("%"));
+    l_speed->setText(QString::number(speed_improv, 'f', 0) + QString("%"));
+    l_hit->setText(QString::number(hit));
+    l_miss->setText(QString::number(miss));
+    l_m_reads->setText(QString::number(memory_reads));
+    l_m_writes->setText(QString::number(memory_writes));
+    QDockWidget::paintEvent(event);
+}
+
 void CacheDock::hit_update(unsigned val) {
-    l_hit->setText(QString::number(val));
+    hit = val;
 }
 
 void CacheDock::miss_update(unsigned val) {
-    l_miss->setText(QString::number(val));
+    miss = val;
 }
 
 void CacheDock::memory_reads_update(unsigned val) {
-    l_m_reads->setText(QString::number(val));
+    memory_reads = val;
 }
 
 void CacheDock::memory_writes_update(unsigned val) {
-    l_m_writes->setText(QString::number(val));
+    memory_writes = val;
 }
 
 void CacheDock::statistics_update(
     unsigned stalled_cycles,
     double speed_improv,
     double hit_rate) {
-    l_stalled->setText(QString::number(stalled_cycles));
-    l_hit_rate->setText(QString::number(hit_rate, 'f', 3) + QString("%"));
-    l_speed->setText(QString::number(speed_improv, 'f', 0) + QString("%"));
+    this->stalled = stalled_cycles;
+    this->hit = hit_rate;
+    this->speed_improv = speed_improv;
 }

src/gui/windows/cache/cachedock.h

@@ -16,6 +16,8 @@ class CacheDock : public QDockWidget {
 
     void setup(const machine::Cache *cache, bool cache_after_cache = false);
 
+    void paintEvent(QPaintEvent *event) override;
+
 private slots:
     void hit_update(unsigned);
     void miss_update(unsigned);
@@ -35,6 +37,15 @@ private slots:
     QLabel *l_m_reads, *l_m_writes;
     GraphicsView *graphicsview;
     CacheViewScene *cachescene;
+
+    // Statistics
+    unsigned memory_reads = 0;
+    unsigned memory_writes = 0;
+    unsigned hit = 0;
+    unsigned miss = 0;
+    unsigned stalled = 0;
+    double speed_improv = 0.0;
+    double hit_rate = 0.0;
 };
 
 #endif // CACHEDOCK_H

src/gui/windows/cache/cacheview.cpp

@@ -2,9 +2,8 @@
 
 #include "fontsize.h"
 
-#include <cmath>
-
 #include <QtAlgorithms>
+#include <cmath>
 
 //////////////////////
 #define ROW_HEIGHT 14
@@ -27,9 +26,13 @@ static inline unsigned int bitsToRepresent(quint32 range_max_val) {
 CacheAddressBlock::CacheAddressBlock(const machine::Cache *cache, unsigned width) {
     rows = cache->get_config().set_count();
     columns = cache->get_config().block_size();
-    s_row = cache->get_config().set_count() > 1 ? bitsToRepresent(cache->get_config().set_count() - 1) : 0;
+    s_row = cache->get_config().set_count() > 1
+                ? bitsToRepresent(cache->get_config().set_count() - 1)
+                : 0;
     this->width = width;
-    s_col = cache->get_config().block_size() > 1 ? bitsToRepresent(cache->get_config().block_size() - 1) : 0;
+    s_col = cache->get_config().block_size() > 1
+                ? bitsToRepresent(cache->get_config().block_size() - 1)
+                : 0;
     s_tag = 30 - s_row - s_col; // 32 bits - 2 unused and then every bit used
                                 // for different index
     this->width = width;
@@ -353,14 +356,15 @@ void CacheViewBlock::cache_update(
     validity[set]->setText(valid ? "1" : "0");
     if (this->dirty) { this->dirty[set]->setText(valid ? (dirty ? "1" : "0") : ""); }
     // TODO calculate correct size of tag
-    this->tag[set]->setText(valid ? QString("0x") + QString("%1").arg(tag, 8, 16, QChar('0')) : "");
+    this->tag[set]->setText(
+        valid ? QString("0x") + QString("%1").arg(tag, 8, 16, QChar('0')) : QString(""));
     for (unsigned i = 0; i < columns; i++) {
         this->data[set][i]->setText(
             valid ? QString("0x")
                         + QString("%1").arg(
                             byteswap_if(data[i], simulated_machine_endian != NATIVE_ENDIAN), 8, 16,
                             QChar('0'))
-                  : "");
+                  : QString(""));
         //  TODO Use cache API
     }
 

src/gui/windows/csr/csrdock.cpp

@@ -2,15 +2,18 @@
 
 #include "csr/controlstate.h"
 
-CsrDock::CsrDock(QWidget *parent) : QDockWidget(parent) {
+CsrDock::CsrDock(QWidget *parent)
+    : QDockWidget(parent)
+    , xlen(machine::Xlen::_32)
+    , csr_handle(nullptr) {
     scrollarea = new QScrollArea(this);
     scrollarea->setWidgetResizable(true);
     widg = new StaticTable(scrollarea);
-    xlen = machine::Xlen::_32;
 
     for (size_t i = 0; i < machine::CSR::REGISTERS.size(); i++) {
         auto &desc = machine::CSR::REGISTERS.at(i);
         csr_view[i] = new QLabel(sizeHintText(), widg);
+        csr_view[i]->setTextFormat(Qt::PlainText);
         csr_view[i]->setFixedSize(csr_view[i]->sizeHint());
         csr_view[i]->setText("");
         csr_view[i]->setTextInteractionFlags(Qt::TextSelectableByMouse);
@@ -34,14 +37,6 @@ CsrDock::CsrDock(QWidget *parent) : QDockWidget(parent) {
     pal_read.setColor(QPalette::WindowText, QColor(0, 0, 240));
     csr_highlighted_any = false;
 }
-
-const char *CsrDock::sizeHintText() {
-    if (xlen == machine::Xlen::_64)
-        return "0x0000000000000000";
-    else
-        return "0x00000000";
-}
-
 void CsrDock::setup(machine::Machine *machine) {
     if (machine == nullptr) {
         // Reset data
@@ -51,10 +46,6 @@ void CsrDock::setup(machine::Machine *machine) {
         return;
     }
 
-    const machine::CSR::ControlState *controlst = machine->control_state();
-    if (controlst == nullptr)
-        return;
-
     // if xlen changes adjust space to show full value
     if (xlen != machine->config().get_simulated_xlen()) {
         xlen = machine->config().get_simulated_xlen();
@@ -65,16 +56,31 @@ void CsrDock::setup(machine::Machine *machine) {
         delete dumy_data_label;
     }
 
+    csr_handle = machine->control_state();
+    reload();
+    connect(csr_handle, &machine::CSR::ControlState::write_signal, this, &CsrDock::csr_changed);
+    connect(csr_handle, &machine::CSR::ControlState::read_signal, this, &CsrDock::csr_read);
+    connect(machine, &machine::Machine::tick, this, &CsrDock::clear_highlights);
+}
+
+const char *CsrDock::sizeHintText() {
+    if (xlen == machine::Xlen::_64)
+        return "0x0000000000000000";
+    else
+        return "0x00000000";
+}
+
+void CsrDock::reload() {
+    if (csr_handle == nullptr) { return; }
+    clear_highlights();
     for (size_t i = 0; i < machine::CSR::REGISTERS.size(); i++) {
-        labelVal(csr_view[i], controlst->read_internal(i).as_xlen(xlen));
+        labelVal(csr_view[i], csr_handle->read_internal(i).as_xlen(xlen));
     }
-
-    connect(controlst, &machine::CSR::ControlState::write_signal, this, &CsrDock::csr_changed);
-    connect(controlst, &machine::CSR::ControlState::read_signal, this, &CsrDock::csr_read);
-    connect(machine, &machine::Machine::tick, this, &CsrDock::clear_highlights);
 }
 
 void CsrDock::csr_changed(size_t internal_reg_id, machine::RegisterValue val) {
+    if (isHidden()) { return; }
+
     // FIXME assert takes literal
     SANITY_ASSERT(
         (uint)internal_reg_id < machine::CSR::REGISTERS.size(),
@@ -88,6 +94,9 @@ void CsrDock::csr_changed(size_t internal_reg_id, machine::RegisterValue val) {
 
 void CsrDock::csr_read(size_t internal_reg_id, machine::RegisterValue val) {
     (void)val;
+
+    if (isHidden()) { return; }
+
     // FIXME assert takes literal
     SANITY_ASSERT(
         (uint)internal_reg_id < machine::CSR::REGISTERS.size(),
@@ -109,7 +118,13 @@ void CsrDock::clear_highlights() {
     csr_highlighted_any = false;
 }
 
+void CsrDock::showEvent(QShowEvent *event) {
+    // Slots are inactive when this widget is hidden
+    reload();
+    QDockWidget::showEvent(event);
+}
+
 void CsrDock::labelVal(QLabel *label, uint64_t value) {
     QString t = QString("0x") + QString::number(value, 16);
     label->setText(t);
-}
+}

src/gui/windows/csr/csrdock.h

@@ -18,14 +18,20 @@ class CsrDock : public QDockWidget {
     explicit CsrDock(QWidget *parent);
 
     void setup(machine::Machine *machine);
+    void reload();
 
 private slots:
     void csr_changed(std::size_t internal_reg_id, machine::RegisterValue val);
     void csr_read(std::size_t internal_reg_id, machine::RegisterValue val);
     void clear_highlights();
 
+private:
+    void showEvent(QShowEvent *event) override;
+
 private:
     machine::Xlen xlen;
+    // We keep this handle for batch updates when this widget was hidden.
+    const machine::CSR::ControlState *csr_handle {};
 
     const char *sizeHintText();
 

src/gui/windows/memory/memorymodel.cpp

@@ -64,7 +64,7 @@ QVariant MemoryModel::data(const QModelIndex &index, int role) const {
         if (index.column() == 0) {
             t = QString::number(address.get_raw(), 16);
             s.fill('0', 8 - t.count());
-            return "0x" + s + t;
+            return { QString("0x") + s + t };
         }
         if (machine == nullptr) { return QString(""); }
         mem = mem_access();