DBT-RISE
/
DBT-RISE-TGC
11
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

fix cycle estimation plugin

This commit is contained in:
Eyck Jentzsch 2022-02-01 21:14:50 +01:00
parent 98b418ff43
commit 09b0f0d0c8
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
incl/iss/arch/riscv_hart_m_p.h
View File

@ -201,7 +201,7 @@ public:
void disass_output(uint64_t pc, const std::string instr) override { void disass_output(uint64_t pc, const std::string instr) override {
CLOG(INFO, disass) << fmt::format("0x{:016x} {:40} [s:0x{:x};c:{}]", CLOG(INFO, disass) << fmt::format("0x{:016x} {:40} [s:0x{:x};c:{}]",
pc, instr, (reg_t)state.mstatus, this->reg.icount); pc, instr, (reg_t)state.mstatus, this->reg.icount + cycle_offset);
}; };
iss::instrumentation_if *get_instrumentation_if() override { return &instr_if; } iss::instrumentation_if *get_instrumentation_if() override { return &instr_if; }

2
incl/iss/arch/riscv_hart_msu_vp.h
View File

@ -307,7 +307,7 @@ public:
void disass_output(uint64_t pc, const std::string instr) override { void disass_output(uint64_t pc, const std::string instr) override {
CLOG(INFO, disass) << fmt::format("0x{:016x} {:40} [p:{};s:0x{:x};c:{}]", CLOG(INFO, disass) << fmt::format("0x{:016x} {:40} [p:{};s:0x{:x};c:{}]",
pc, instr, lvl[this->reg.PRIV], (reg_t)state.mstatus, this->reg.ccount); pc, instr, lvl[this->reg.PRIV], (reg_t)state.mstatus, this->reg.ccount + cycle_offset);
}; };
iss::instrumentation_if *get_instrumentation_if() override { return &instr_if; } iss::instrumentation_if *get_instrumentation_if() override { return &instr_if; }

2
incl/iss/arch/riscv_hart_mu_p.h
View File

@ -216,7 +216,7 @@ public:
void disass_output(uint64_t pc, const std::string instr) override { void disass_output(uint64_t pc, const std::string instr) override {
CLOG(INFO, disass) << fmt::format("0x{:016x} {:40} [p:{};s:0x{:x};c:{}]", CLOG(INFO, disass) << fmt::format("0x{:016x} {:40} [p:{};s:0x{:x};c:{}]",
pc, instr, lvl[this->reg.PRIV], (reg_t)state.mstatus, this->reg.icount); pc, instr, lvl[this->reg.PRIV], (reg_t)state.mstatus, this->reg.icount + cycle_offset);
}; };
iss::instrumentation_if *get_instrumentation_if() override { return &instr_if; } iss::instrumentation_if *get_instrumentation_if() override { return &instr_if; }

6
incl/iss/plugin/cycle_estimate.h
View File

@ -49,11 +49,13 @@ class cycle_estimate: public iss::vm_plugin {
BEGIN_BF_DECL(instr_desc, uint32_t) BEGIN_BF_DECL(instr_desc, uint32_t)
BF_FIELD(taken, 24, 8) BF_FIELD(taken, 24, 8)
BF_FIELD(not_taken, 16, 8) BF_FIELD(not_taken, 16, 8)
BF_FIELD(size, 0, 16) BF_FIELD(is_branch, 8, 8)
instr_desc(uint32_t size, uint32_t taken, uint32_t not_taken): instr_desc() { BF_FIELD(size, 0, 8)
instr_desc(uint32_t size, uint32_t taken, uint32_t not_taken, bool branch): instr_desc() {
this->size=size; this->size=size;
this->taken=taken; this->taken=taken;
this->not_taken=not_taken; this->not_taken=not_taken;
this->is_branch=branch;
} }
END_BF_DECL(); END_BF_DECL();

14
src/plugin/cycle_estimate.cpp
View File

@ -75,10 +75,14 @@ bool iss::plugin::cycle_estimate::registration(const char* const version, vm_if&
auto& name = (*it)["name"]; auto& name = (*it)["name"];
auto& size = (*it)["size"]; auto& size = (*it)["size"];
auto& delay = (*it)["delay"]; auto& delay = (*it)["delay"];
auto& branch = (*it)["branch"];
if(delay.IsArray()) { if(delay.IsArray()) {
delays.push_back(instr_desc{size.Get<unsigned>(), delay[0].Get<unsigned>(), delay[1].Get<unsigned>()}); auto dt = delay[0].Get<unsigned>();
auto dnt = delay[1].Get<unsigned>();
delays.push_back(instr_desc{size.Get<unsigned>(), dt, dnt, branch.Get<bool>()});
} else if(delay.Is<unsigned>()) { } else if(delay.Is<unsigned>()) {
delays.push_back(instr_desc{size.Get<unsigned>(), delay.Get<unsigned>(), 0}); auto d = delay.Get<unsigned>();
delays.push_back(instr_desc{size.Get<unsigned>(), d, d, branch.Get<bool>()});
} else } else
throw runtime_error("JSON parse error"); throw runtime_error("JSON parse error");
} }
@ -103,11 +107,11 @@ bool iss::plugin::cycle_estimate::registration(const char* const version, vm_if&
} }
void iss::plugin::cycle_estimate::callback(instr_info_t instr_info, exec_info const&) { void iss::plugin::cycle_estimate::callback(instr_info_t instr_info, exec_info const& exc_info) {
assert(arch_instr && "No instrumentation interface available but callback executed"); assert(arch_instr && "No instrumentation interface available but callback executed");
auto entry = delays[instr_info.instr_id]; auto entry = delays[instr_info.instr_id];
bool taken = (arch_instr->get_next_pc()-arch_instr->get_pc()) != (entry.size/8); bool taken = exc_info.branch_taken;
if (taken && entry.taken > 1) if (exc_info.branch_taken && entry.taken > 1)
arch_instr->set_curr_instr_cycles(entry.taken); arch_instr->set_curr_instr_cycles(entry.taken);
else if (entry.not_taken > 1) else if (entry.not_taken > 1)
arch_instr->set_curr_instr_cycles(entry.not_taken); arch_instr->set_curr_instr_cycles(entry.not_taken);

3
src/sysc/core_complex.cpp
View File

@ -136,7 +136,8 @@ public:
if (!owner->disass_output(pc, instr)) { if (!owner->disass_output(pc, instr)) {
std::stringstream s; std::stringstream s;
s << "[p:" << lvl[this->reg.PRIV] << ";s:0x" << std::hex << std::setfill('0') s << "[p:" << lvl[this->reg.PRIV] << ";s:0x" << std::hex << std::setfill('0')
<< std::setw(sizeof(reg_t) * 2) << (reg_t)this->state.mstatus << std::dec << ";c:" << this->reg.icount << "]"; << std::setw(sizeof(reg_t) * 2) << (reg_t)this->state.mstatus << std::dec << ";c:"
<< this->reg.icount + this->cycle_offset << "]";
SCCDEBUG(owner->name())<<"disass: " SCCDEBUG(owner->name())<<"disass: "
<< "0x" << std::setw(16) << std::right << std::setfill('0') << std::hex << pc << "\t\t" << std::setw(40) << "0x" << std::setw(16) << std::right << std::setfill('0') << std::hex << pc << "\t\t" << std::setw(40)
<< std::setfill(' ') << std::left << instr << s.str(); << std::setfill(' ') << std::left << instr << s.str();