From 06632f57c9047b7e54a274b6b020bcc83f5f9a64 Mon Sep 17 00:00:00 2001 From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> Date: Fri, 18 Apr 2025 04:08:15 -0400 Subject: initialization from GUI --- gui/worker.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gui/worker.h') 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 c; + std::vector cache_ways; + std::vector 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 getWays(); + std::vector getSize(); + void setWays(std::vector ways); + void setSize(std::vector size); public slots: void doWork(); void refreshDram(); void loadProgram(std::vector p); + void configure(std::vector ways, std::vector size, bool is_pipelined, bool is_cache_enabled); void refreshCache(); void refreshRegisters(); void runSteps(int steps); -- cgit v1.2.3 From 80063914f09975f24451ce1acb9875cea0d2d384 Mon Sep 17 00:00:00 2001 From: bd Date: Fri, 18 Apr 2025 19:03:35 -0400 Subject: Remove run_steps button --- gui/gui.cc | 23 ++++------------------- gui/gui.h | 20 +++++++++----------- gui/worker.cc | 22 ++-------------------- gui/worker.h | 7 +++---- 4 files changed, 18 insertions(+), 54 deletions(-) (limited to 'gui/worker.h') diff --git a/gui/gui.cc b/gui/gui.cc index b7f3d8a..e2e7beb 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -54,9 +54,6 @@ GUI::GUI(QWidget *parent) // Refresh Registers from worker thread connect(this, &GUI::sendRefreshRegisters, worker, &Worker::refreshRegisters, Qt::QueuedConnection); - // Advance controller by #steps - connect(this, &GUI::sendRunSteps, worker, &Worker::runSteps, Qt::QueuedConnection); - // Advance controller by 1 step connect(this, &GUI::sendRunStep, worker, &Worker::runStep, Qt::QueuedConnection); @@ -274,7 +271,7 @@ void GUI::on_set_levels_btn_clicked() { qDebug() << "Set levels button clicked."; bool ok; - int value = QInputDialog::getInt(this, "Enter Value", "Enter value:", + int value = QInputDialog::getInt(this, "Enter Value", "Enter value:", 0, 0, 10, 1, &ok); if (ok) { @@ -284,7 +281,7 @@ void GUI::on_set_levels_btn_clicked() ui->cache_levels_dropdwn->addItem(QString::number(i)); ways.push_back(2); size.push_back(5); - } + } } else { qDebug() << "User cancelled input."; } @@ -305,7 +302,6 @@ void GUI::on_set_cache_btn_clicked() { // } } - void GUI::on_enable_pipeline_checkbox_checkStateChanged(const Qt::CheckState &arg1) { //TODO: handle pipeline enabling @@ -318,7 +314,6 @@ void GUI::on_enable_pipeline_checkbox_checkStateChanged(const Qt::CheckState &ar } } - void GUI::on_enabl_cache_checkbox_checkStateChanged(const Qt::CheckState &arg1) { //TODO: handle cache enabling @@ -326,27 +321,18 @@ void GUI::on_enabl_cache_checkbox_checkStateChanged(const Qt::CheckState &arg1) qDebug() << "enable cache checkbox checked."; is_cache_enabled = true; } else { - qDebug() << "enable cache checkbox unchecked."; - is_cache_enabled = false; + qDebug() << "enable cache checkbox unchecked."; + is_cache_enabled = false; } } - -void GUI::on_run_steps_btn_clicked() -{ - qDebug() << "Run steps button clicked."; - emit sendRunSteps(ui->number_steps_inp->text().toInt()); -} - - void GUI::on_step_btn_clicked() { qDebug() << "Run step button clicked."; emit sendRunStep(); } - void GUI::on_save_program_state_btn_clicked() { //TODO: save program state @@ -358,4 +344,3 @@ 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!"); } - diff --git a/gui/gui.h b/gui/gui.h index c25ab93..ee871a1 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -55,29 +55,27 @@ private slots: void onWorkerShowDram(const std::vector> data); void onWorkerShowCache(const std::vector> data); - + void onWorkerShowRegisters(const std::array &data); - + void onWorkerFinished(); - + void on_upload_intructions_btn_clicked(); - + void on_upload_program_state_btn_clicked(); void on_Configure_Btn_clicked(); - + void on_set_levels_btn_clicked(); void on_set_cache_btn_clicked(); - + void on_enable_pipeline_checkbox_checkStateChanged(const Qt::CheckState &arg1); - + void on_enabl_cache_checkbox_checkStateChanged(const Qt::CheckState &arg1); - - void on_run_steps_btn_clicked(); - + void on_step_btn_clicked(); - + void on_save_program_state_btn_clicked(); private: diff --git a/gui/worker.cc b/gui/worker.cc index 2612eb1..4465268 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -8,7 +8,7 @@ void Worker::configure(std::vector ways, std::vector size, bool is_pip setSize(size); qDebug() << "is cache enabled:" << is_cache_enabled; qDebug() << "is pipelined:" << is_pipelined; - this->cache_enabled = is_cache_enabled; + this->cache_enabled = is_cache_enabled; if (!is_cache_enabled || ways.size() == 0) { this->ct = new Controller(wb_stage, this->d, is_pipelined); } else { @@ -46,7 +46,7 @@ std::vector Worker::getSize() { void Worker::doWork() { qDebug() << "Initializing..."; - + this->if_stage = new IF(nullptr); this->id_stage = new ID(if_stage); this->ex_stage = new EX(id_stage); @@ -90,24 +90,6 @@ void Worker::refreshRegisters() emit register_storage(this->ct->get_gprs()); } -void Worker::runSteps(int steps) -{ - qDebug() << "Running for steps: " << steps; - this->ct->run_for(steps); - emit dram_storage(this->d->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<ct->get_gprs()); - emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); - emit if_info(this->if_stage->stage_info()); - emit id_info(this->id_stage->stage_info()); - emit ex_info(this->ex_stage->stage_info()); - emit mm_info(this->mm_stage->stage_info()); - emit wb_info(this->wb_stage->stage_info()); -} - void Worker::runStep() { qDebug() << "Running for 1 step "; diff --git a/gui/worker.h b/gui/worker.h index fe539fe..60bbce3 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -43,9 +43,8 @@ public slots: void refreshDram(); void loadProgram(std::vector p); void configure(std::vector ways, std::vector size, bool is_pipelined, bool is_cache_enabled); - void refreshCache(); - void refreshRegisters(); - void runSteps(int steps); + void refreshCache(); + void refreshRegisters(); void runStep(); signals: @@ -61,4 +60,4 @@ signals: void finished(); }; -#endif // WORKER_H \ No newline at end of file +#endif // WORKER_H -- cgit v1.2.3 From 5e96476ae29a104df1c4526ba1037dc830207d56 Mon Sep 17 00:00:00 2001 From: bd Date: Fri, 18 Apr 2025 19:31:17 -0400 Subject: Use a slider for step amount --- gui/gui.cc | 13 ++- gui/gui.h | 2 +- gui/gui.ui | 348 +++++++++++++++++++++++++++++++++++++++------------------- gui/worker.cc | 6 +- gui/worker.h | 2 +- 5 files changed, 250 insertions(+), 121 deletions(-) (limited to 'gui/worker.h') diff --git a/gui/gui.cc b/gui/gui.cc index e2e7beb..7e3ddfe 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -54,8 +54,14 @@ GUI::GUI(QWidget *parent) // Refresh Registers from worker thread connect(this, &GUI::sendRefreshRegisters, worker, &Worker::refreshRegisters, Qt::QueuedConnection); - // Advance controller by 1 step - connect(this, &GUI::sendRunStep, worker, &Worker::runStep, Qt::QueuedConnection); + // Advance controller by somes steps + connect(this, &GUI::sendRunSteps, worker, &Worker::runSteps, Qt::QueuedConnection); + + // Update the step button with step amount + connect(ui->step_slider, &QSlider::valueChanged, this, [=](int index){ + int value = step_values[index]; + ui->step_btn->setText(QString("Step %1").arg(value)); + }); // Proper cleanup when worker finishes connect(worker, &Worker::finished, this, &GUI::onWorkerFinished); @@ -330,7 +336,8 @@ void GUI::on_enabl_cache_checkbox_checkStateChanged(const Qt::CheckState &arg1) void GUI::on_step_btn_clicked() { qDebug() << "Run step button clicked."; - emit sendRunStep(); + int steps = step_values[ui->step_slider->value()]; + emit sendRunSteps(steps); } void GUI::on_save_program_state_btn_clicked() diff --git a/gui/gui.h b/gui/gui.h index ee871a1..618f2b5 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -35,7 +35,6 @@ signals: void sendRefreshCache(); void sendRefreshRegisters(); void sendRunSteps(int steps); - void sendRunStep(); void sendLoadProgram(std::vector program); void sendConfigure(std::vector ways, std::vector size, bool is_pipelined, bool is_cache_enabled); @@ -82,6 +81,7 @@ private: Ui::GUI *ui; QThread workerThread; Worker *worker; + QVector step_values = {1, 5, 10, 50, 250, 1000, 10000}; const std::map mnemonicNameMap = { {Mnemonic::ADD, "ADD"}, {Mnemonic::SUB, "SUB"}, diff --git a/gui/gui.ui b/gui/gui.ui index 661e228..7198a20 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -7,7 +7,7 @@ 0 0 1359 - 638 + 621 @@ -16,8 +16,108 @@ - - + + + + + + + + + + true + + + + Registers + + + + + + + Qt::Orientation::Horizontal + + + + + + + + + + + + Qt::Orientation::Horizontal + + + + + + + + + + + + true + + + + Cache + + + + + + + Qt::Orientation::Horizontal + + + + + + + + + + + + Qt::Orientation::Vertical + + + + + + + + + + true + + + + DRAM + + + + + + + Qt::Orientation::Horizontal + + + + + + + + + + + + + @@ -42,6 +142,13 @@ + + + + Qt::Orientation::Vertical + + + @@ -65,6 +172,13 @@ + + + + Qt::Orientation::Vertical + + + @@ -112,6 +226,13 @@ + + + + Qt::Orientation::Vertical + + + @@ -159,6 +280,13 @@ + + + + Qt::Orientation::Vertical + + + @@ -206,9 +334,61 @@ + + + + + + + true + + + + Run + + + + + + + 0 + + + 6 + + + 1 + + + Qt::Orientation::Horizontal + + + QSlider::TickPosition::NoTicks + + + 1 + + + + + + + Step + + + + + + + + + Qt::Orientation::Vertical + + + - + @@ -224,6 +404,13 @@ + + + + Qt::Orientation::Horizontal + + + @@ -246,6 +433,13 @@ + + + + Qt::Orientation::Horizontal + + + @@ -262,6 +456,13 @@ + + + + Qt::Orientation::Horizontal + + + @@ -331,48 +532,31 @@ - - - - true - + + + Qt::Orientation::Horizontal - - Run + + + + + + Qt::Orientation::Horizontal - - - - - - - # Steps - - - - - - - Run Steps - - - - - - - - - Step - - - - + + + + + Qt::Orientation::Horizontal + + + @@ -387,6 +571,13 @@ + + + + Qt::Orientation::Horizontal + + + @@ -405,70 +596,12 @@ - - - - - - - - - true - - - - Registers - - - - - - - - - - - - - - - - - true - - - - Cache - - - - - - - - - - - - - - - true - - - - DRAM - - - - - - - - - - - + + + + Qt::Orientation::Vertical + + @@ -485,17 +618,6 @@ - - - toolBar - - - TopToolBarArea - - - false - - diff --git a/gui/worker.cc b/gui/worker.cc index 4465268..3c2c952 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -90,10 +90,10 @@ void Worker::refreshRegisters() emit register_storage(this->ct->get_gprs()); } -void Worker::runStep() +void Worker::runSteps(int steps) { - qDebug() << "Running for 1 step "; - this->ct->advance(WAIT); + qDebug() << "Running for " << steps << "steps"; + this->ct->run_for(steps); emit dram_storage(this->d->view(0, 255)); if(this->cache_enabled && getWays().size() > 0) { unsigned int size = this->c.at(getWays().size()-1)->get_size(); diff --git a/gui/worker.h b/gui/worker.h index 60bbce3..f0ce7a3 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -45,7 +45,7 @@ public slots: void configure(std::vector ways, std::vector size, bool is_pipelined, bool is_cache_enabled); void refreshCache(); void refreshRegisters(); - void runStep(); + void runSteps(int steps); signals: void clock_cycles(int value, int pc); -- cgit v1.2.3 From 1613c52e8e52a5c1a2a8120fcfa7ed3a011fbdf1 Mon Sep 17 00:00:00 2001 From: bd Date: Fri, 18 Apr 2025 21:56:45 -0400 Subject: Remove/comment out a lot of code in charge of loading --- gui/gui.cc | 78 ++++----------------------------------------------- gui/gui.h | 12 -------- gui/gui.ui | 49 ++------------------------------ gui/worker.cc | 89 +++++++++-------------------------------------------------- gui/worker.h | 19 ++----------- 5 files changed, 24 insertions(+), 223 deletions(-) (limited to 'gui/worker.h') diff --git a/gui/gui.cc b/gui/gui.cc index b3dc666..39163ea 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -1,6 +1,5 @@ #include "gui.h" #include "./ui_gui.h" -// #include "byteswap.h" GUI::GUI(QWidget *parent) : QMainWindow(parent) @@ -8,16 +7,13 @@ GUI::GUI(QWidget *parent) { ui->setupUi(this); - ui->enabl_cache_checkbox->setChecked(true); - ui->enable_pipeline_checkbox->setChecked(true); - worker = new Worker(); worker->moveToThread(&workerThread); // Connect worker thread lifecycle - connect(&workerThread, &QThread::started, worker, &Worker::doWork); + // connect(&workerThread, &QThread::started, worker, &Worker::doWork); - // Display clock cycles and PC + // display clock cycles and PC connect(worker, &Worker::clock_cycles, this, &GUI::onWorkerClockCycles); connect(worker, &Worker::if_info, this, &GUI::onWorkerFetchInfo); @@ -39,17 +35,11 @@ GUI::GUI(QWidget *parent) // Display registers connect(worker, &Worker::register_storage, this, &GUI::onWorkerShowRegisters); - // Refresh DRAM from worker thread - connect(this, &GUI::sendRefreshDram, worker, &Worker::refreshDram, Qt::QueuedConnection); - - // 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 DRAM from worker thread + // connect(this, &GUI::sendRefreshDram, worker, &Worker::refreshDram, Qt::QueuedConnection); - // Refresh Cache from worker thread - connect(this, &GUI::sendRefreshCache, worker, &Worker::refreshCache, Qt::QueuedConnection); + // // Refresh Cache from worker thread + // connect(this, &GUI::sendRefreshCache, worker, &Worker::refreshCache, Qt::QueuedConnection); // Refresh Registers from worker thread connect(this, &GUI::sendRefreshRegisters, worker, &Worker::refreshRegisters, Qt::QueuedConnection); @@ -257,51 +247,14 @@ void GUI::on_upload_intructions_btn_clicked() QMessageBox::information(ui->register_table, "File Upload", "Instructions loaded successfully!"); } - void GUI::on_upload_program_state_btn_clicked() { //TODO:Upload and set program state ( have to decide how to use this) qDebug() << "upload program state button is clicked."; } -void GUI::on_set_levels_btn_clicked() -{ - 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_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;iregister_table, "Pipeline Configuration", "Pipeline and memory subsystem configured successfully!"); -} diff --git a/gui/gui.h b/gui/gui.h index 618f2b5..aaa0ede 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -25,10 +25,7 @@ public: GUI(QWidget *parent = nullptr); ~GUI(); bool is_pipelined = false; - bool is_cache_enabled = false; - int cache_levels = 0; std::vector ways; - std::vector size; signals: void sendRefreshDram(); @@ -36,7 +33,6 @@ signals: void sendRefreshRegisters(); void sendRunSteps(int steps); void sendLoadProgram(std::vector program); - void sendConfigure(std::vector ways, std::vector size, bool is_pipelined, bool is_cache_enabled); private slots: void onWorkerClockCycles(int value, int pc); @@ -63,16 +59,8 @@ private slots: void on_upload_program_state_btn_clicked(); - void on_Configure_Btn_clicked(); - - void on_set_levels_btn_clicked(); - - void on_set_cache_btn_clicked(); - void on_enable_pipeline_checkbox_checkStateChanged(const Qt::CheckState &arg1); - void on_enabl_cache_checkbox_checkStateChanged(const Qt::CheckState &arg1); - void on_step_btn_clicked(); void on_save_program_state_btn_clicked(); diff --git a/gui/gui.ui b/gui/gui.ui index ae853a2..d731e99 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -452,60 +452,17 @@ - - - - - Cache Levels - - - - - - - - - - size - - - - - - - ways - - - - - - - Cache Conf - - - - + - - - - Configure - - - Enable Pipeline - - - - - - Enable Cache + + true diff --git a/gui/worker.cc b/gui/worker.cc index 3c2c952..1d87fd3 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -2,86 +2,27 @@ Worker::Worker(QObject *parent) : QObject(parent) {} -void Worker::configure(std::vector ways, std::vector size, bool is_pipelined, bool is_cache_enabled) { - this->d = new Dram(ways.size()+10); - 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;id, 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 ways) { - this->cache_ways = ways; -} - -void Worker::setSize(std::vector size) { - this->cache_size = size; -} - -std::vector Worker::getWays() { - return this->cache_ways; -} - -std::vector Worker::getSize() { - return this->cache_size; -} - -void Worker::doWork() -{ - qDebug() << "Initializing..."; - - 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); -} - Worker::~Worker() { emit finished(); qDebug() << "Worker destructor called in thread:" << QThread::currentThread(); delete this->ct; - for(Cache *cache: this->c) { - delete cache; - } -} - -void Worker::loadProgram(std::vector p) { - this->d->load(p); } void Worker::refreshDram() { qDebug() << "Refreshing Dram"; - emit dram_storage(this->d->view(0, 255)); + // emit dram_storage(this->d->view(0, 255)); } void Worker::refreshCache() { 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< 0) { + // unsigned int size = this->c.at(getWays().size()-1)->get_size(); + // emit cache_storage(this->c.at(getWays().size()-1)->view(0, 1<ct->run_for(steps); - emit dram_storage(this->d->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<ct->get_gprs()); - emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); - emit if_info(this->if_stage->stage_info()); - emit id_info(this->id_stage->stage_info()); - emit ex_info(this->ex_stage->stage_info()); - emit mm_info(this->mm_stage->stage_info()); - emit wb_info(this->wb_stage->stage_info()); + // emit dram_storage(this->d->view(0, 255)); + // 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()); + // emit id_info(this->id_stage->stage_info()); + // emit ex_info(this->ex_stage->stage_info()); + // emit mm_info(this->mm_stage->stage_info()); + // emit wb_info(this->wb_stage->stage_info()); } diff --git a/gui/worker.h b/gui/worker.h index f0ce7a3..53e4851 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -18,31 +18,16 @@ class Worker : public QObject { Q_OBJECT private: - std::vector c; - std::vector cache_ways; - std::vector cache_size; - bool cache_enabled = false; - Dram *d; + std::vector s; + std::vector p; Controller *ct; - ID *id_stage; - IF *if_stage; - EX *ex_stage; - MM *mm_stage; - WB *wb_stage; public: explicit Worker(QObject *parent = nullptr); ~Worker(); - std::vector getWays(); - std::vector getSize(); - void setWays(std::vector ways); - void setSize(std::vector size); public slots: - void doWork(); void refreshDram(); - void loadProgram(std::vector p); - void configure(std::vector ways, std::vector size, bool is_pipelined, bool is_cache_enabled); void refreshCache(); void refreshRegisters(); void runSteps(int steps); -- cgit v1.2.3 From bb3d940fb4ce0dd3efc56b934a7b4ea8ffab4b13 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 03:37:43 -0400 Subject: GUI validate program --- gui/dynamicwaysentry.h | 6 ++++++ gui/gui.cc | 54 +++++++++++++++++++++++++++++++++++++++++++++++--- gui/gui.h | 27 +++++++++++++++++-------- gui/messages.h | 19 +++++++++++++++++- gui/worker.cc | 27 +++++++++++++++++++++++++ gui/worker.h | 1 + inc/pipe_spec.h | 10 ++++++++++ 7 files changed, 132 insertions(+), 12 deletions(-) (limited to 'gui/worker.h') diff --git a/gui/dynamicwaysentry.h b/gui/dynamicwaysentry.h index be42696..de001ee 100644 --- a/gui/dynamicwaysentry.h +++ b/gui/dynamicwaysentry.h @@ -1,3 +1,7 @@ +#ifndef DYNAMICWAYSENTRY_H +#define DYNAMICWAYSENTRY_H + + #include #include #include @@ -26,3 +30,5 @@ class DynamicWaysEntry : public QWidget void add_field(); void remove_last_field(); }; + +#endif // DYNAMICWAYSENTRY_H diff --git a/gui/gui.cc b/gui/gui.cc index a36920b..3a1027a 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -1,5 +1,6 @@ #include "gui.h" #include "./ui_gui.h" +#include "dynamicwaysentry.h" #include "messages.h" GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) @@ -43,6 +44,11 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) connect( worker, &Worker::register_storage, this, &GUI::onWorkerShowRegisters); + // Configure pipeline + connect( + this, &GUI::sendConfigure, worker, &Worker::configure, + Qt::QueuedConnection); + // // Refresh DRAM from worker thread // connect(this, &GUI::sendRefreshDram, worker, &Worker::refreshDram, // Qt::QueuedConnection); @@ -56,7 +62,7 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) this, &GUI::sendRefreshRegisters, worker, &Worker::refreshRegisters, Qt::QueuedConnection); - // Advance controller by somes steps + // Advance controller by some steps connect( this, &GUI::sendRunSteps, worker, &Worker::runSteps, Qt::QueuedConnection); @@ -269,7 +275,7 @@ void GUI::on_upload_intructions_btn_clicked() } if (this->p.empty()) - this->set_status(get_no_instructions); + this->set_status(get_no_instructions); else this->set_status(get_load_file); @@ -297,6 +303,8 @@ void GUI::on_enable_pipeline_checkbox_checkStateChanged( void GUI::on_step_btn_clicked() { qDebug() << "Run step button clicked."; + if (!this->ready) + return this->on_config_clicked(); int steps = step_values[ui->step_slider->value()]; emit sendRunSteps(steps); } @@ -307,7 +315,47 @@ void GUI::on_save_program_state_btn_clicked() qDebug() << "save program state button is clicked."; } +void GUI::on_config_clicked() +{ + std::vector ways; + QStringList entries; + signed int i; + DynamicWaysEntry *dwe = ui->cache_way_selector; + + for (const QString &s : dwe->get_entries()) { + + if (s.isEmpty()) + continue; + + i = dwe->parse_valid_way(s); + if (i != -1) { + ways.push_back((unsigned int)i); + } else { + this->set_status(get_bad_cache); + return; + } + } + + if (this->p.empty()) { + this->set_status(get_no_instructions); + return; + } + + this->ready = true; + + // say something snarky + if (!is_pipelined) + this->set_status(get_no_pipeline); + else if (ways.size() == 0) + this->set_status(get_no_cache); + else + this->set_status(get_initialize); + + emit sendConfigure(ways, is_pipelined); +} + void GUI::set_status(const std::function &func) { - this->status_label->setText("COMPUTER SAYS: \"" + QString::fromStdString(func()) + "\""); + this->status_label->setText( + "COMPUTER SAYS: \"" + QString::fromStdString(func()) + "\""); } diff --git a/gui/gui.h b/gui/gui.h index 09fe0d9..97f131a 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -5,8 +5,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -42,6 +42,7 @@ class GUI : public QMainWindow void sendRefreshCache(); void sendRefreshRegisters(); void sendRunSteps(int steps); + void sendConfigure(std::vector ways, bool is_pipelined); private slots: void onWorkerClockCycles(int value, int pc); @@ -77,9 +78,22 @@ class GUI : public QMainWindow void on_save_program_state_btn_clicked(); + /** + * Validates that the user has provided a valid program and cache. + * If so, `this->ready' is set and the user options are passed to the + * worker. + * If not, rudely complains. + */ + void on_config_clicked(); + private: Ui::GUI *ui; + /** + * Indicates if the program has been initialized. + */ + bool ready; + /** * The message displayed on the status bar. */ @@ -91,21 +105,19 @@ class GUI : public QMainWindow std::vector p; /** - * The current cache configurations. + * If this stage is pipelined or not. */ - std::vector c; + bool is_pipelined = false; /** - * If this stage is pipelined or not. + * The possible step slider values. */ - bool is_pipelined = false; + QVector step_values = {1, 5, 20, 50, 250, 1000, 10000}; QThread workerThread; Worker *worker; - QVector step_values = {1, 5, 20, 50, 250, 1000, 10000}; - const std::map mnemonicNameMap = { {Mnemonic::ADD, "ADD"}, {Mnemonic::SUB, "SUB"}, {Mnemonic::MUL, "MUL"}, {Mnemonic::QUOT, "QUOT"}, @@ -132,6 +144,5 @@ class GUI : public QMainWindow auto it = mnemonicNameMap.find(mnemonic); return (it != mnemonicNameMap.end()) ? it->second : "Unknown"; } - }; #endif // GUI_H diff --git a/gui/messages.h b/gui/messages.h index 2af8e6b..c2a86b9 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -13,8 +13,17 @@ const std::vector waiting = { const std::vector load_file = { "FILE LOADED", "FINISHED READING DATA. EAGERLY WAITING"}; const std::vector no_instructions = { - "NO PROGRAM PROVIDED", "RISC V[ECTOR]: INSTRUCTIONS NOT INCLUDED", + "NO PROGRAM PROVIDED", "INSTRUCTIONS NOT INCLUDED", "NOTHING TO DO, GIVING UP"}; +const std::vector bad_cache = { + "INVALID NUMBER OF WAYS", "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; +const std::vector no_pipeline = { + "PIPELINE--HUMANS PROBABLY WORKED HARD ON THAT", + "I WOULD PREFER YOU LEAVE THE PIPE ON", "SLOW MODE ENABLED", + "SIMULATION READY"}; +const std::vector no_cache = { + "NO CACHE HAS NO WAY TO GO", "SLOW MODE ENABLED", "SIMULATION READY"}; +const std::vector initialize = {"SIMULATION READY"}; /** * @return an unsolicited waiting message @@ -30,5 +39,13 @@ std::string get_load_file() { return RANDOM_MESSAGE(load_file); } * @return a friendly reminder that the simulation is not configured yet */ std::string get_no_instructions() { return RANDOM_MESSAGE(no_instructions); } +std::string get_bad_cache() { return RANDOM_MESSAGE(bad_cache); } + +/** + * @return unsolicited complaints for successful initialization + */ +std::string get_no_pipeline() { return RANDOM_MESSAGE(no_pipeline); } +std::string get_no_cache() { return RANDOM_MESSAGE(no_cache); } +std::string get_initialize() { return RANDOM_MESSAGE(initialize); } #endif // MESSAGES_H diff --git a/gui/worker.cc b/gui/worker.cc index 1d87fd3..558552f 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -10,6 +10,33 @@ Worker::~Worker() delete this->ct; } +void Worker::configure(std::vector ways, bool is_pipelined) +{ + // this->d = new Dram(DRAM_DELAY); + // setWays(ways); + // setSize(size); + // 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::refreshDram() { qDebug() << "Refreshing Dram"; diff --git a/gui/worker.h b/gui/worker.h index 53e4851..df7d9cc 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -31,6 +31,7 @@ public slots: void refreshCache(); void refreshRegisters(); void runSteps(int steps); + void configure(std::vector ways, bool is_pipelined); signals: void clock_cycles(int value, int pc); diff --git a/inc/pipe_spec.h b/inc/pipe_spec.h index d211b72..4f5bc46 100644 --- a/inc/pipe_spec.h +++ b/inc/pipe_spec.h @@ -48,6 +48,16 @@ */ #define MAX_INT 2147483647 +/** + * The delay on DRAM objects. + */ +#define DRAM_DELAY 10 + +/** + * The (base) on cache objects. + */ +#define CACHE_DELAY 1 + /** * Return the N least-significant bits from integer K using a bit mask * @param the integer to be parsed -- cgit v1.2.3 From c9b553e68dbd95a8faf5abf4f8e1362261bec99f Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 04:07:01 -0400 Subject: Readd logic to initialize pipeline --- gui/gui.cc | 2 +- gui/gui.h | 5 +++- gui/worker.cc | 55 +++++++++++++++++++++++----------------- gui/worker.h | 80 +++++++++++++++++++++++++++++++++++------------------------ 4 files changed, 85 insertions(+), 57 deletions(-) (limited to 'gui/worker.h') diff --git a/gui/gui.cc b/gui/gui.cc index 3a1027a..dc77fc9 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -351,7 +351,7 @@ void GUI::on_config_clicked() else this->set_status(get_initialize); - emit sendConfigure(ways, is_pipelined); + emit sendConfigure(ways, this->p, is_pipelined); } void GUI::set_status(const std::function &func) diff --git a/gui/gui.h b/gui/gui.h index 97f131a..cbd482b 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -42,7 +42,10 @@ class GUI : public QMainWindow void sendRefreshCache(); void sendRefreshRegisters(); void sendRunSteps(int steps); - void sendConfigure(std::vector ways, bool is_pipelined); + void sendConfigure( + std::vector ways, + vector program, + bool is_pipelined); private slots: void onWorkerClockCycles(int value, int pc); diff --git a/gui/worker.cc b/gui/worker.cc index 558552f..6ec564e 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -1,4 +1,5 @@ #include "worker.h" +#include "storage.h" Worker::Worker(QObject *parent) : QObject(parent) {} @@ -10,30 +11,38 @@ Worker::~Worker() delete this->ct; } -void Worker::configure(std::vector ways, bool is_pipelined) +void Worker::configure( + std::vector ways, + std::vector program, + bool is_pipelined) { - // this->d = new Dram(DRAM_DELAY); - // setWays(ways); - // setSize(size); - // 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); - // } + unsigned int size_inc; + Dram *d; + Storage *s; + int i; + + if (ways.size() != 0) + size_inc = MEM_LINE_SPEC / ways.size(); + d = new Dram(DRAM_DELAY); + s = (Storage *)d; + + this->s.push_front(s); + d->load(program); + + for (i = ways.size(); i > 0; --i) { + s = (Storage *)new Cache( + s, size_inc * (i), ways.at(i - 1), CACHE_DELAY + i); + this->s.push_front(s); + } + + 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, s, is_pipelined); + emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); } diff --git a/gui/worker.h b/gui/worker.h index df7d9cc..b6332b0 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -1,49 +1,65 @@ #ifndef WORKER_H #define WORKER_H -#include -#include -#include - +#include "cache.h" #include "controller.h" #include "dram.h" -#include "cache.h" +#include "ex.h" #include "id.h" #include "if.h" -#include "ex.h" #include "mm.h" #include "wb.h" +#include +#include +#include +#include -class Worker : public QObject { - Q_OBJECT +class Worker : public QObject +{ + Q_OBJECT -private: - std::vector s; - std::vector p; - Controller *ct; + private: + /** + * The storage objects, stored smallest to largest. + */ + std::deque s; + /** + * The stage objects, starting with fetch. + */ + IF *if_stage; + ID *id_stage; + EX *ex_stage; + MM *mm_stage; + WB *wb_stage; + Controller *ct; -public: - explicit Worker(QObject *parent = nullptr); - ~Worker(); + public: + explicit Worker(QObject *parent = nullptr); + ~Worker(); -public slots: - void refreshDram(); - void refreshCache(); - void refreshRegisters(); - void runSteps(int steps); - void configure(std::vector ways, bool is_pipelined); + public slots: + void refreshDram(); + void refreshCache(); + void refreshRegisters(); + void runSteps(int steps); + void configure( + std::vector ways, + std::vector program, + bool is_pipelined); -signals: - void clock_cycles(int value, int pc); - void dram_storage(const std::vector> data); - void cache_storage(const std::vector> data); - void register_storage(const std::array data); - void if_info(const std::vector info); - void id_info(const std::vector info); - void ex_info(const std::vector info); - void mm_info(const std::vector info); - void wb_info(const std::vector info); - void finished(); + signals: + void clock_cycles(int value, int pc); + void + dram_storage(const std::vector> data); + void + cache_storage(const std::vector> data); + void register_storage(const std::array data); + void if_info(const std::vector info); + void id_info(const std::vector info); + void ex_info(const std::vector info); + void mm_info(const std::vector info); + void wb_info(const std::vector info); + void finished(); }; #endif // WORKER_H -- cgit v1.2.3 From 24de6faf71c85e0281b32fb899fcbe4fe82380c4 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 04:16:00 -0400 Subject: Reinstate rest of worker.cc functions such that programs work again --- gui/dynamicwaysentry.cc | 2 ++ gui/worker.cc | 34 +++++++++++++++++----------------- gui/worker.h | 7 ++++--- 3 files changed, 23 insertions(+), 20 deletions(-) (limited to 'gui/worker.h') diff --git a/gui/dynamicwaysentry.cc b/gui/dynamicwaysentry.cc index f35c9ef..4e2cd66 100644 --- a/gui/dynamicwaysentry.cc +++ b/gui/dynamicwaysentry.cc @@ -26,6 +26,8 @@ int DynamicWaysEntry::parse_valid_way(QString t) return (s && i >= 0 && 5 > i) ? i : -1; } +// TODO if you enter something valid and then make it invalid, +// the next box still shows void DynamicWaysEntry::on_number_enter(const QString &t) { int i; diff --git a/gui/worker.cc b/gui/worker.cc index 6ec564e..cd79821 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -16,13 +16,14 @@ void Worker::configure( std::vector program, bool is_pipelined) { - unsigned int size_inc; Dram *d; Storage *s; int i; - if (ways.size() != 0) - size_inc = MEM_LINE_SPEC / ways.size(); + if (ways.size() != 0) { + // will ensure the largest cache is only half of DRAM + this->size_inc = (MEM_LINE_SPEC / ways.size()) / 2; + } d = new Dram(DRAM_DELAY); s = (Storage *)d; @@ -31,7 +32,7 @@ void Worker::configure( for (i = ways.size(); i > 0; --i) { s = (Storage *)new Cache( - s, size_inc * (i), ways.at(i - 1), CACHE_DELAY + i); + s, this->size_inc * (i), ways.at(i - 1), CACHE_DELAY + i); this->s.push_front(s); } @@ -49,16 +50,15 @@ void Worker::configure( void Worker::refreshDram() { qDebug() << "Refreshing Dram"; - // emit dram_storage(this->d->view(0, 255)); + emit dram_storage(this->s.back()->view(0, 255)); } void Worker::refreshCache() { 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<s.size() > 0) { + emit cache_storage(this->s.at(0)->view(0, 1 << this->size_inc)); + } } void Worker::refreshRegisters() @@ -71,12 +71,12 @@ void Worker::runSteps(int steps) { qDebug() << "Running for " << steps << "steps"; this->ct->run_for(steps); - // emit dram_storage(this->d->view(0, 255)); - // 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()); - // emit id_info(this->id_stage->stage_info()); - // emit ex_info(this->ex_stage->stage_info()); - // emit mm_info(this->mm_stage->stage_info()); - // emit wb_info(this->wb_stage->stage_info()); + emit dram_storage(this->s.back()->view(0, 255)); + 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()); + emit id_info(this->id_stage->stage_info()); + emit ex_info(this->ex_stage->stage_info()); + emit mm_info(this->mm_stage->stage_info()); + emit wb_info(this->wb_stage->stage_info()); } diff --git a/gui/worker.h b/gui/worker.h index b6332b0..acfffcf 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -23,15 +23,16 @@ class Worker : public QObject * The storage objects, stored smallest to largest. */ std::deque s; - /** - * The stage objects, starting with fetch. - */ IF *if_stage; ID *id_stage; EX *ex_stage; MM *mm_stage; WB *wb_stage; Controller *ct; + /** + * The size each progressive cache level increases by. + */ + unsigned int size_inc; public: explicit Worker(QObject *parent = nullptr); -- cgit v1.2.3 From 5ad39ec769fa09b9ac4dcc8f66232ef51384a3c6 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 19 Apr 2025 12:18:14 -0400 Subject: Safely delete old controller object when re-initializing --- gui/gui.cc | 25 +++++-------- gui/gui.h | 5 +-- gui/gui.ui | 93 ++++++++++++++++++++---------------------------- gui/messages.h | 12 +++++-- gui/resources/styles.qss | 9 +++-- gui/worker.cc | 42 +++++++++------------- gui/worker.h | 10 +++--- 7 files changed, 84 insertions(+), 112 deletions(-) (limited to 'gui/worker.h') diff --git a/gui/gui.cc b/gui/gui.cc index dc77fc9..6cb9ada 100644 --- a/gui/gui.cc +++ b/gui/gui.cc @@ -18,9 +18,6 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) worker = new Worker(); worker->moveToThread(&workerThread); - // Connect worker thread lifecycle - // connect(&workerThread, &QThread::started, worker, &Worker::doWork); - // display clock cycles and PC connect(worker, &Worker::clock_cycles, this, &GUI::onWorkerClockCycles); @@ -49,19 +46,6 @@ GUI::GUI(QWidget *parent) : QMainWindow(parent), ui(new Ui::GUI) this, &GUI::sendConfigure, worker, &Worker::configure, Qt::QueuedConnection); - // // Refresh DRAM from worker thread - // connect(this, &GUI::sendRefreshDram, worker, &Worker::refreshDram, - // Qt::QueuedConnection); - - // // Refresh Cache from worker thread - // connect(this, &GUI::sendRefreshCache, worker, &Worker::refreshCache, - // Qt::QueuedConnection); - - // Refresh Registers from worker thread - connect( - this, &GUI::sendRefreshRegisters, worker, &Worker::refreshRegisters, - Qt::QueuedConnection); - // Advance controller by some steps connect( this, &GUI::sendRunSteps, worker, &Worker::runSteps, @@ -303,10 +287,17 @@ void GUI::on_enable_pipeline_checkbox_checkStateChanged( void GUI::on_step_btn_clicked() { qDebug() << "Run step button clicked."; + // try to configure first + if (!this->ready) + this->on_config_clicked(); + // try again if (!this->ready) - return this->on_config_clicked(); + return; + + this->set_status(get_running); int steps = step_values[ui->step_slider->value()]; emit sendRunSteps(steps); + this->set_status(get_waiting); } void GUI::on_save_program_state_btn_clicked() diff --git a/gui/gui.h b/gui/gui.h index cbd482b..4c47874 100644 --- a/gui/gui.h +++ b/gui/gui.h @@ -38,9 +38,6 @@ class GUI : public QMainWindow void set_status(const std::function &func); signals: - void sendRefreshDram(); - void sendRefreshCache(); - void sendRefreshRegisters(); void sendRunSteps(int steps); void sendConfigure( std::vector ways, @@ -110,7 +107,7 @@ class GUI : public QMainWindow /** * If this stage is pipelined or not. */ - bool is_pipelined = false; + bool is_pipelined = true; /** * The possible step slider values. diff --git a/gui/gui.ui b/gui/gui.ui index b9ad041..acd9c53 100644 --- a/gui/gui.ui +++ b/gui/gui.ui @@ -604,60 +604,23 @@ - - - - - 0 - - - 6 - - - 1 - - - Qt::Orientation::Horizontal - - - QSlider::TickPosition::NoTicks - - - 1 - - - - - - - Qt::Orientation::Vertical - - - - - - - - - - true - - - - Program State - - - - - - - Clock Cycles - - - - - - + + + + true + + + + Program State + + + + + + + Clock Cycles + + @@ -666,6 +629,28 @@ + + + + 0 + + + 6 + + + 1 + + + Qt::Orientation::Horizontal + + + QSlider::TickPosition::NoTicks + + + 1 + + + diff --git a/gui/messages.h b/gui/messages.h index c2a86b9..2b31037 100644 --- a/gui/messages.h +++ b/gui/messages.h @@ -9,14 +9,19 @@ #define RANDOM_MESSAGE(v) (v[std::rand() % v.size()]) const std::vector waiting = { - "WAITING FOR USER", "FRIENDS MISSING", "BORED", "SLEEPING"}; + "WAITING FOR USER", "BORED", "SLEEPING", "TIRED", "IDLE", "EXCITED"}; +const std::vector running = { + "CALCULATING", "COMPUTING", + "EXTERMINATE" + "WORKING", + "BUSY"}; const std::vector load_file = { "FILE LOADED", "FINISHED READING DATA. EAGERLY WAITING"}; const std::vector no_instructions = { "NO PROGRAM PROVIDED", "INSTRUCTIONS NOT INCLUDED", "NOTHING TO DO, GIVING UP"}; const std::vector bad_cache = { - "INVALID NUMBER OF WAYS", "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; + "WAYS CANNOT BE BELOW 0 OR ABOVE 5"}; const std::vector no_pipeline = { "PIPELINE--HUMANS PROBABLY WORKED HARD ON THAT", "I WOULD PREFER YOU LEAVE THE PIPE ON", "SLOW MODE ENABLED", @@ -26,9 +31,10 @@ const std::vector no_cache = { const std::vector initialize = {"SIMULATION READY"}; /** - * @return an unsolicited waiting message + * @return an unsolicited status messages */ std::string get_waiting() { return RANDOM_MESSAGE(waiting); } +std::string get_running() { return RANDOM_MESSAGE(running); } /** * @return confirmation of file upload diff --git a/gui/resources/styles.qss b/gui/resources/styles.qss index 9b63249..59d36ca 100644 --- a/gui/resources/styles.qss +++ b/gui/resources/styles.qss @@ -2,7 +2,8 @@ font-family: "BigBlueTermPlusNerdFontMono", "monospace"; font-size: 20pt; color: "#00cc00"; - background-color: "#000004"; + background-color: "#000200"; + border: 0px solid "#000200"; } /* main window */ @@ -12,7 +13,6 @@ QWidget { QGroupBox { text-decoration: underline "#00cc00"; font-size: 17pt; - background-color: "#000004"; border: 4px solid ; border-radius: 0px; margin-top: 1ex; /* leave space at the top for the title */ @@ -38,11 +38,10 @@ QLineEdit { QTextEdit, QListView { font-size: 10pt; - background-color: "#000004"; } QPushButton { - color: "#000004"; + color: "#000200"; background-color: "#00cc00"; border-radius: 0px; padding: 1px; @@ -51,7 +50,7 @@ QPushButton { QPushButton:pressed { color: "#00cc00"; - background-color: "#000004"; + background-color: "#000200"; } QPushButton:flat { diff --git a/gui/worker.cc b/gui/worker.cc index cd79821..88248e8 100644 --- a/gui/worker.cc +++ b/gui/worker.cc @@ -18,21 +18,23 @@ void Worker::configure( { Dram *d; Storage *s; + Stage *old; int i; + this->ct_mutex.lock(); if (ways.size() != 0) { // will ensure the largest cache is only half of DRAM this->size_inc = (MEM_LINE_SPEC / ways.size()) / 2; } d = new Dram(DRAM_DELAY); - s = (Storage *)d; + s = static_cast(d); this->s.push_front(s); d->load(program); for (i = ways.size(); i > 0; --i) { - s = (Storage *)new Cache( - s, this->size_inc * (i), ways.at(i - 1), CACHE_DELAY + i); + s = static_cast(new Cache( + s, this->size_inc * (i), ways.at(i - 1), CACHE_DELAY + i)); this->s.push_front(s); } @@ -41,37 +43,26 @@ void Worker::configure( 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, s, is_pipelined); - emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); -} - -void Worker::refreshDram() -{ - qDebug() << "Refreshing Dram"; - emit dram_storage(this->s.back()->view(0, 255)); -} - -void Worker::refreshCache() -{ - qDebug() << "Refreshing Cache"; - if(this->s.size() > 0) { - emit cache_storage(this->s.at(0)->view(0, 1 << this->size_inc)); - } -} + old = static_cast(this->ct); + this->ct = new Controller(wb_stage, s, is_pipelined); + if (old) + delete old; + this->ct_mutex.unlock(); -void Worker::refreshRegisters() -{ - qDebug() << "Refreshing Registers"; - emit register_storage(this->ct->get_gprs()); + emit clock_cycles(this->ct->get_clock_cycle(), this->ct->get_pc()); } void Worker::runSteps(int steps) { + this->ct_mutex.lock(); qDebug() << "Running for " << steps << "steps"; this->ct->run_for(steps); + // TODO move these to separate functions emit dram_storage(this->s.back()->view(0, 255)); + if (this->s.size() > 1) { + emit cache_storage(this->s.at(0)->view(0, 1 << this->size_inc)); + } 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()); @@ -79,4 +70,5 @@ void Worker::runSteps(int steps) emit ex_info(this->ex_stage->stage_info()); emit mm_info(this->mm_stage->stage_info()); emit wb_info(this->wb_stage->stage_info()); + this->ct_mutex.unlock(); } diff --git a/gui/worker.h b/gui/worker.h index acfffcf..20a9838 100644 --- a/gui/worker.h +++ b/gui/worker.h @@ -12,6 +12,7 @@ #include #include #include +#include #include class Worker : public QObject @@ -28,7 +29,10 @@ class Worker : public QObject EX *ex_stage; MM *mm_stage; WB *wb_stage; - Controller *ct; + + Controller *ct = nullptr; + QMutex ct_mutex; + /** * The size each progressive cache level increases by. */ @@ -37,11 +41,9 @@ class Worker : public QObject public: explicit Worker(QObject *parent = nullptr); ~Worker(); + QMutex& get_ct_mutex() { return ct_mutex; } public slots: - void refreshDram(); - void refreshCache(); - void refreshRegisters(); void runSteps(int steps); void configure( std::vector ways, -- cgit v1.2.3