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

add backannotation to pc trace plugin

This commit is contained in:
Eyck Jentzsch 2022-05-17 15:29:04 +02:00
parent 766f3ba9ee
commit 1438f0f373
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public:
void callback(instr_info_t instr_info, exec_info const&) override; void callback(instr_info_t instr_info, exec_info const&) override;
private: private:
iss::instrumentation_if *arch_instr; iss::instrumentation_if *instr_if;
std::vector<instr_desc> delays; std::vector<instr_desc> delays;
struct pair_hash { struct pair_hash {
size_t operator()(const std::pair<uint64_t, uint64_t> &p) const { size_t operator()(const std::pair<uint64_t, uint64_t> &p) const {

14
src/plugin/cycle_estimate.cpp
View File

@ -48,7 +48,7 @@ using namespace rapidjson;
using namespace std; using namespace std;
iss::plugin::cycle_estimate::cycle_estimate(string const& config_file_name) iss::plugin::cycle_estimate::cycle_estimate(string const& config_file_name)
: arch_instr(nullptr) : instr_if(nullptr)
, config_file_name(config_file_name) , config_file_name(config_file_name)
{ {
} }
@ -57,9 +57,9 @@ iss::plugin::cycle_estimate::~cycle_estimate() {
} }
bool iss::plugin::cycle_estimate::registration(const char* const version, vm_if& vm) { bool iss::plugin::cycle_estimate::registration(const char* const version, vm_if& vm) {
arch_instr = vm.get_arch()->get_instrumentation_if(); instr_if = vm.get_arch()->get_instrumentation_if();
if(!arch_instr) return false; if(!instr_if) return false;
const string core_name = arch_instr->core_type_name(); const string core_name = instr_if->core_type_name();
if (config_file_name.length() > 0) { if (config_file_name.length() > 0) {
ifstream is(config_file_name); ifstream is(config_file_name);
if (is.is_open()) { if (is.is_open()) {
@ -108,11 +108,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& exc_info) { 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(instr_if && "No instrumentation interface available but callback executed");
auto entry = delays[instr_info.instr_id]; auto entry = delays[instr_info.instr_id];
bool taken = exc_info.branch_taken; bool taken = exc_info.branch_taken;
if (exc_info.branch_taken && (entry.taken > 1)) if (exc_info.branch_taken && (entry.taken > 1))
arch_instr->set_curr_instr_cycles(entry.taken); instr_if->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); instr_if->set_curr_instr_cycles(entry.not_taken);
} }

9
src/plugin/pctrace.cpp
View File

@ -159,10 +159,15 @@ void cov::callback(instr_info_t iinfo, const exec_info& einfo) {
auto instr = instr_if->get_instr_word(); auto instr = instr_if->get_instr_word();
auto call = (id==2 || id==3) && bit_sub<7,5>(instr)!=0; auto call = (id==2 || id==3) && bit_sub<7,5>(instr)!=0;
bool taken = einfo.branch_taken; bool taken = einfo.branch_taken;
if (einfo.branch_taken) if (einfo.branch_taken) {
delay = entry.taken; delay = entry.taken;
else if(entry.taken > 1)
instr_if->set_curr_instr_cycles(entry.taken);
} else {
delay = entry.not_taken; delay = entry.not_taken;
if (entry.not_taken > 1)
instr_if->set_curr_instr_cycles(entry.not_taken);
}
#ifndef WITH_LZ4 #ifndef WITH_LZ4
output<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay <<"," << call<< "\n"; output<<std::hex <<"0x" << instr_if->get_pc() <<"," << delay <<"," << call<< "\n";
#else #else