diff options
| -rw-r--r-- | gui/gui.cc | 77 | ||||
| -rw-r--r-- | gui/gui.h | 17 | ||||
| -rw-r--r-- | gui/gui.ui | 40 | ||||
| -rw-r--r-- | gui/worker.cc | 75 | ||||
| -rw-r--r-- | gui/worker.h | 10 |
5 files changed, 161 insertions, 58 deletions
@@ -45,6 +45,9 @@ GUI::GUI(QWidget *parent) // Load program from worker thread connect(this, &GUI::sendLoadProgram, worker, &Worker::loadProgram, Qt::QueuedConnection); + // Configure pipeline + connect(this, &GUI::sendConfigure, worker, &Worker::configure, Qt::QueuedConnection); + // Refresh Cache from worker thread connect(this, &GUI::sendRefreshCache, worker, &Worker::refreshCache, Qt::QueuedConnection); @@ -121,6 +124,7 @@ std::vector<signed int> browseAndRetrieveFile(QWidget* parent) { QString filePath = QFileDialog::getOpenFileName(parent, "Open Binary File", QDir::homePath(), "Binary Files (*.bin *.rv);;All Files (*.*)"); std::vector<signed int> program; + if (filePath.isEmpty()) return program; QFile file(filePath); @@ -130,14 +134,19 @@ std::vector<signed int> browseAndRetrieveFile(QWidget* parent) { } while (!file.atEnd()) { - int32_t word = 0; - if (file.read(reinterpret_cast<char*>(&word), sizeof(int32_t)) == sizeof(int32_t)) { - program.push_back(static_cast<signed int>(bswap_32(word))); + char bytes[4]; + if (file.read(bytes, 4) == 4) { + uint32_t word = + (static_cast<uint8_t>(bytes[0]) << 24) | + (static_cast<uint8_t>(bytes[1]) << 16) | + (static_cast<uint8_t>(bytes[2]) << 8) | + (static_cast<uint8_t>(bytes[3])); + + program.push_back(static_cast<signed int>(word)); } } file.close(); - return program; } @@ -261,26 +270,39 @@ void GUI::on_upload_program_state_btn_clicked() qDebug() << "upload program state button is clicked."; } - -void GUI::on_refresh_dram_btn_clicked() -{ - qDebug() << "Refresh DRAM button clicked."; - emit sendRefreshDram(); - -} - - -void GUI::on_refresh_cache_btn_clicked() +void GUI::on_set_levels_btn_clicked() { - qDebug() << "Refresh cache button clicked."; - emit sendRefreshCache(); + qDebug() << "Set levels button clicked."; + bool ok; + int value = QInputDialog::getInt(this, "Enter Value", "Enter value:", + 0, + 0, 10, 1, &ok); + if (ok) { + cache_levels = value; + ui->cache_levels_dropdwn->clear(); // Clear previous entries + for (int i = 0; i < cache_levels; ++i) { + ui->cache_levels_dropdwn->addItem(QString::number(i)); + ways.push_back(2); + size.push_back(5); + } + } else { + qDebug() << "User cancelled input."; + } } - -void GUI::on_refresh_registers_btn_clicked() -{ - qDebug() << "Refresh registers button clicked."; - emit sendRefreshRegisters(); +void GUI::on_set_cache_btn_clicked() { + int current_cache = ui->cache_levels_dropdwn->currentIndex(); + // qDebug() << "current cache: " << current_cache; + int prevWays = ways[current_cache]; + int prevSize = size[current_cache]; + QString cache_ways = ui->cache_ways_inp->text(); + QString cache_size = ui->cache_size_inp->text(); + ways[current_cache] = cache_ways.isEmpty() ? prevWays : cache_ways.toInt(); + size[current_cache] = cache_size.isEmpty() ? prevSize : cache_size.toInt(); + QMessageBox::information(ui->register_table, "Cache Configuration", "Cache" + QString::number(current_cache) + " values set successfully! Please click on Configure button to configure the pipeline or configure other caches."); + // for(int i=0;i<ways.size();i++) { + // qDebug() << "ways: " << ways[i] << " size: " << size[i]; + // } } @@ -289,8 +311,10 @@ void GUI::on_enable_pipeline_checkbox_checkStateChanged(const Qt::CheckState &ar //TODO: handle pipeline enabling if(arg1 == Qt::CheckState::Checked) { qDebug() << "enable pipeline checkbox checked."; + is_pipelined = true; } else { qDebug() << "enable pipeline checkbox unchecked."; + is_pipelined = false; } } @@ -300,8 +324,10 @@ void GUI::on_enabl_cache_checkbox_checkStateChanged(const Qt::CheckState &arg1) //TODO: handle cache enabling if(arg1 == Qt::CheckState::Checked) { qDebug() << "enable cache checkbox checked."; + is_cache_enabled = true; } else { - qDebug() << "enable cache checkbox unchecked."; + qDebug() << "enable cache checkbox unchecked."; + is_cache_enabled = false; } } @@ -326,3 +352,10 @@ void GUI::on_save_program_state_btn_clicked() //TODO: save program state qDebug() << "save program state button is clicked."; } + +void GUI::on_Configure_Btn_clicked() +{ + emit sendConfigure(ways, size, is_pipelined, is_cache_enabled); + QMessageBox::information(ui->register_table, "Pipeline Configuration", "Pipeline and memory subsystem configured successfully!"); +} + @@ -8,6 +8,7 @@ #include <QTextStream> #include <QTextEdit> #include <QMessageBox> +#include <QInputDialog> #include "worker.h" QT_BEGIN_NAMESPACE @@ -23,6 +24,11 @@ class GUI : public QMainWindow public: GUI(QWidget *parent = nullptr); ~GUI(); + bool is_pipelined = false; + bool is_cache_enabled = false; + int cache_levels = 0; + std::vector<int> ways; + std::vector<int> size; signals: void sendRefreshDram(); @@ -31,6 +37,7 @@ signals: void sendRunSteps(int steps); void sendRunStep(); void sendLoadProgram(std::vector<signed int> program); + void sendConfigure(std::vector<int> ways, std::vector<int> size, bool is_pipelined, bool is_cache_enabled); private slots: void onWorkerClockCycles(int value, int pc); @@ -56,12 +63,12 @@ private slots: void on_upload_intructions_btn_clicked(); void on_upload_program_state_btn_clicked(); + + void on_Configure_Btn_clicked(); - void on_refresh_dram_btn_clicked(); - - void on_refresh_cache_btn_clicked(); - - void on_refresh_registers_btn_clicked(); + void on_set_levels_btn_clicked(); + + void on_set_cache_btn_clicked(); void on_enable_pipeline_checkbox_checkStateChanged(const Qt::CheckState &arg1); @@ -437,26 +437,36 @@ </item> <item> <layout class="QVBoxLayout" name="verticalLayout_27"> - <item> + <item> <layout class="QHBoxLayout" name="horizontalLayout_9"> - <item> - <widget class="QPushButton" name="refresh_dram_btn"> + <item> + <widget class="QPushButton" name="set_levels_btn"> <property name="text"> - <string>Refresh DRAM</string> + <string>Cache Levels</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="refresh_cache_btn"> - <property name="text"> - <string>Refresh Cache</string> + <widget class="QComboBox" name="cache_levels_dropdwn"/> + </item> + <item> + <widget class="QLineEdit" name="cache_size_inp"> + <property name="placeholderText"> + <string>size</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="refresh_registers_btn"> + <widget class="QLineEdit" name="cache_ways_inp"> + <property name="placeholderText"> + <string>ways</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="set_cache_btn"> <property name="text"> - <string>Refresh Registers</string> + <string>Cache Conf</string> </property> </widget> </item> @@ -465,9 +475,9 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_10"> <item> - <widget class="QPushButton" name="Reset_Btn"> + <widget class="QPushButton" name="Configure_Btn"> <property name="text"> - <string>Reset</string> + <string>Configure</string> </property> </widget> </item> @@ -476,12 +486,12 @@ <property name="text"> <string>Enable Pipeline</string> </property> - <property name="checkable"> + <!-- <property name="checkable"> <bool>false</bool> </property> <property name="checked"> <bool>false</bool> - </property> + </property> --> </widget> </item> <item> @@ -489,9 +499,9 @@ <property name="text"> <string>Enable Cache</string> </property> - <property name="checkable"> + <!-- <property name="checkable"> <bool>false</bool> - </property> + </property> --> </widget> </item> </layout> diff --git a/gui/worker.cc b/gui/worker.cc index e4e3bdf..fac835e 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -2,22 +2,56 @@ Worker::Worker(QObject *parent) : QObject(parent) {} +void Worker::configure(std::vector<int> ways, std::vector<int> size, bool is_pipelined, bool is_cache_enabled) { + this->d = new Dram(ways.size()+1); + setWays(ways); + setSize(size); + qDebug() << "is cache enabled:" << is_cache_enabled; + qDebug() << "is pipelined:" << is_pipelined; + this->cache_enabled = is_cache_enabled; + if (!is_cache_enabled || ways.size() == 0) { + this->ct = new Controller(wb_stage, this->d, is_pipelined); + } else { + // 0th index cache has largest delay + for(int i=0;i<ways.size();i++) { + if(i==0){ + Cache* cache = new Cache(this->d, size[i], ways[i], ways.size()); + this->c.push_back(cache); + } else { + Cache* cache = new Cache(this->c[i-1], size[i], ways[i], ways.size()-i); + this->c.push_back(cache); + } + } + this->ct = new Controller(wb_stage, this->c.at(ways.size()-1), is_pipelined); + } + emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); +} + +void Worker::setWays(std::vector<int> ways) { + this->cache_ways = ways; +} + +void Worker::setSize(std::vector<int> size) { + this->cache_size = size; +} + +std::vector<int> Worker::getWays() { + return this->cache_ways; +} + +std::vector<int> Worker::getSize() { + return this->cache_size; +} + void Worker::doWork() { qDebug() << "Initializing..."; - this->d = new Dram(0); - this->c = new Cache(this->d, 8, 0, 0); + this->if_stage = new IF(nullptr); this->id_stage = new ID(if_stage); this->ex_stage = new EX(id_stage); this->mm_stage = new MM(ex_stage); this->wb_stage = new WB(mm_stage); - this->ct = new Controller(wb_stage, this->c, true); - - emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); - emit dram_storage(this->d->view(0, 255)); - emit cache_storage(this->c->view(0, 255)); - emit register_storage(this->ct->get_gprs()); } Worker::~Worker() @@ -26,7 +60,9 @@ Worker::~Worker() qDebug() << "Worker destructor called in thread:" << QThread::currentThread(); delete this->ct; - delete this->c; + for(Cache *cache: this->c) { + delete cache; + } } void Worker::loadProgram(std::vector<signed int> p) { @@ -36,13 +72,16 @@ void Worker::loadProgram(std::vector<signed int> p) { void Worker::refreshDram() { qDebug() << "Refreshing Dram"; - emit dram_storage(this->d->view(0, 31)); + emit dram_storage(this->d->view(0, 255)); } void Worker::refreshCache() { - qDebug() << "Refreshing Dram"; - emit cache_storage(this->c->view(0, 255)); + qDebug() << "Refreshing Cache"; + if(getWays().size() > 0) { + unsigned int size = this->c.at(getWays().size()-1)->get_size(); + emit cache_storage(this->c.at(getWays().size()-1)->view(0, 1<<size)); + } } void Worker::refreshRegisters() @@ -56,7 +95,10 @@ void Worker::runSteps(int steps) qDebug() << "Running for steps: " << steps; this->ct->run_for(steps); emit dram_storage(this->d->view(0, 255)); - emit cache_storage(this->c->view(0, 255)); + if(this->cache_enabled && getWays().size() > 0) { + unsigned int size = this->c.at(getWays().size()-1)->get_size(); + emit cache_storage(this->c.at(getWays().size()-1)->view(0, 1<<size)); + } emit register_storage(this->ct->get_gprs()); emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); emit if_info(this->if_stage->stage_info()); @@ -69,9 +111,12 @@ void Worker::runSteps(int steps) void Worker::runStep() { qDebug() << "Running for 1 step "; - this->ct->run_for(1); + this->ct->advance(WAIT); emit dram_storage(this->d->view(0, 255)); - emit cache_storage(this->c->view(0, 255)); + if(this->cache_enabled && getWays().size() > 0) { + unsigned int size = this->c.at(getWays().size()-1)->get_size(); + emit cache_storage(this->c.at(getWays().size()-1)->view(0, 1<<size)); + } emit register_storage(this->ct->get_gprs()); emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); emit if_info(this->if_stage->stage_info()); diff --git a/gui/worker.h b/gui/worker.h index 8fde554..fe539fe 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -18,7 +18,10 @@ class Worker : public QObject { Q_OBJECT private: - Cache *c; + std::vector<Cache*> c; + std::vector<int> cache_ways; + std::vector<int> cache_size; + bool cache_enabled = false; Dram *d; Controller *ct; ID *id_stage; @@ -30,11 +33,16 @@ private: public: explicit Worker(QObject *parent = nullptr); ~Worker(); + std::vector<int> getWays(); + std::vector<int> getSize(); + void setWays(std::vector<int> ways); + void setSize(std::vector<int> size); public slots: void doWork(); void refreshDram(); void loadProgram(std::vector<signed int> p); + void configure(std::vector<int> ways, std::vector<int> size, bool is_pipelined, bool is_cache_enabled); void refreshCache(); void refreshRegisters(); void runSteps(int steps); |