Temporarily disable N-caches to facilitate a merge to master
MODIFY
src/cachesim/cacheconfigwidget.ui
src/cachesim/cacheconfigwidget.ui
<rect>
<x>0</x>
<y>0</y>
- <width>637</width>
- <height>191</height>
+ <width>389</width>
+ <height>192</height>
</rect>
</property>
<property name="windowTitle">
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
+ <item row="5" column="2">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>Wr. hit:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;2&lt;span style=&quot; vertical-align:super;&quot;&gt;N&lt;/span&gt; Lines:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ </widget>
+ </item>
<item row="6" column="1">
<widget class="QSpinBox" name="blocks">
<property name="sizePolicy">
</property>
</widget>
</item>
- <item row="6" column="2">
- <widget class="QLabel" name="label_10">
- <property name="text">
- <string>Wr. miss:</string>
- </property>
- </widget>
- </item>
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;2&lt;span style=&quot; vertical-align:super;&quot;&gt;N&lt;/span&gt; Ways:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- </item>
<item row="4" column="3">
<widget class="QComboBox" name="replacementPolicy"/>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;2&lt;span style=&quot; vertical-align:super;&quot;&gt;N&lt;/span&gt; Lines:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
- </property>
- </widget>
- </item>
- <item row="5" column="2">
- <widget class="QLabel" name="label_9">
- <property name="text">
- <string>Wr. hit:</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QSpinBox" name="ways">
+ <item row="4" column="1">
+ <widget class="QSpinBox" name="lines">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<item row="6" column="3">
<widget class="QComboBox" name="wrMiss"/>
</item>
- <item row="5" column="3">
- <widget class="QComboBox" name="wrHit"/>
+ <item row="6" column="2">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Wr. miss:</string>
+ </property>
+ </widget>
</item>
- <item row="4" column="2">
- <widget class="QLabel" name="label_8">
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_2">
<property name="text">
- <string>Repl. policy:</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;2&lt;span style=&quot; vertical-align:super;&quot;&gt;N&lt;/span&gt; Ways:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QSpinBox" name="lines">
+ <item row="5" column="1">
+ <widget class="QSpinBox" name="ways">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
</property>
</widget>
</item>
- <item row="4" column="4">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Acc. latency:</string>
- </property>
- </widget>
+ <item row="5" column="3">
+ <widget class="QComboBox" name="wrHit"/>
</item>
- <item row="4" column="5">
- <widget class="QSpinBox" name="spinBox">
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>99999</number>
+ <item row="4" column="2">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Repl. policy:</string>
</property>
</widget>
</item>

MODIFY
src/cachetabwidget.cpp
src/cachetabwidget.cpp
@@ -37,7 +37,9 @@ CacheTabWidget::CacheTabWidget(QWidget* parent) : QWidget(parent), m_ui(new Ui::
m_l1dShim->setNextLevelCache(m_ui->dataCacheWidget->getCacheSim());
m_l1iShim->setNextLevelCache(m_ui->instructionCacheWidget->getCacheSim());
+#ifdef N_CACHES_ENABLED
m_addTabIdx = m_ui->tabWidget->addTab(new QLabel("Placeholder"), QIcon((":/icons/plus.svg")), QString());
+#endif
connect(m_ui->tabWidget, &QTabWidget::currentChanged, this, &CacheTabWidget::handleTabIndexChanged);
connect(m_ui->tabWidget, &QTabWidget::tabCloseRequested, this, &CacheTabWidget::handleTabCloseRequest);
@@ -50,7 +52,9 @@ CacheTabWidget::CacheTabWidget(QWidget* parent) : QWidget(parent), m_ui(new Ui::
// Disable closing for L1 caches and add tab
m_ui->tabWidget->tabBar()->tabButton(0, QTabBar::RightSide)->resize(0, 0);
m_ui->tabWidget->tabBar()->tabButton(1, QTabBar::RightSide)->resize(0, 0);
- m_ui->tabWidget->tabBar()->tabButton(2, QTabBar::RightSide)->resize(0, 0);
+#ifdef N_CACHES_ENABLED
+ m_ui->tabWidget->tabBar()->tabButton(m_addTabIdx, QTabBar::RightSide)->resize(0, 0);
+#endif
// Filter out scroll events to avoid mouse scrolling creating a bazillion new caches
m_ui->tabWidget->tabBar()->installEventFilter(new ScrollEventFilter(this));

MODIFY
src/cachetabwidget.h
src/cachetabwidget.h
#include "cachesim/l1cacheshim.h"
+// #define N_CACHES_ENABLED
+
namespace Ripes {
class CacheWidget;

Temporarily disable N-caches to facilitate a merge to master