github-mirrors/vortex
1
0
Fork 0
mirror of https://github.com/vortexgpgpu/vortex.git synced 2025-04-23 13:27:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Blaise Tine 2020-04-20 06:06:54 -04:00
commit 5671b08a5e
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
hw/simulate/simulator.cpp
View file

@ -100,17 +100,17 @@ void Simulator::ibus_driver() {
vortex_->I_dram_rsp_addr = 0;
}
#ifdef ENABLE_DRAM_STALLS
I_dram_stalled_ = false;
if (0 == (total_cycles_ % DRAM_STALLS_MODULO)) {
I_dram_stalled_ = true;
} else
if (I_dram_req_vec_.size() >= DRAM_RQ_SIZE) {
I_dram_stalled_ = true;
}
#endif
// #ifdef ENABLE_DRAM_STALLS
// I_dram_stalled_ = false;
// if (0 == (total_cycles_ % DRAM_STALLS_MODULO)) {
// I_dram_stalled_ = true;
// } else
// if (I_dram_req_vec_.size() >= DRAM_RQ_SIZE) {
// I_dram_stalled_ = true;
// }
// #endif
vortex_->dram_req_full = I_dram_stalled_;
// vortex_->dram_req_delay = I_dram_stalled_;
}
#endif
@ -130,16 +130,6 @@ void Simulator::dbus_driver() {
}
}
#ifdef ENABLE_DRAM_STALLS
dram_stalled_ = false;
if (0 == (total_cycles_ % DRAM_STALLS_MODULO)) {
dram_stalled_ = true;
} else
if (dram_req_vec_.size() >= DRAM_RQ_SIZE) {
dram_stalled_ = true;
}
#endif
#ifdef USE_MULTICORE
if (!dram_stalled_) {
@ -280,6 +270,16 @@ void Simulator::step() {
vortex_->clk = 1;
vortex_->eval();
#ifdef ENABLE_DRAM_STALLS
dram_stalled_ = false;
if (0 == (total_cycles_ % DRAM_STALLS_MODULO)) {
dram_stalled_ = true;
} else
if (dram_req_vec_.size() >= DRAM_RQ_SIZE) {
dram_stalled_ = true;
}
#endif
#ifndef USE_MULTICORE
ibus_driver();
#endif
@ -374,7 +374,7 @@ bool Simulator::run() {
int status = 0;
#else
// check riscv-tests PASSED/FAILED status
int status = (int)vortex_->Vortex->vx_back_end->vx_wb->last_data_wb & 0xf;
int status = (int)vortex_->Vortex->back_end->wb->last_data_wb & 0xf;
#endif
return (status == 1);