Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADD: a basic BTM N-trace spec compliant trace encoder model #1824

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions riscv/execute.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

#include "config.h"
#include "processor.h"
#include "trace_ingress.h"
#include "trace_encoder_n.h"
#include "mmu.h"
#include "disasm.h"
#include "decode_macros.h"
#include "trace_ingress.h"
#include <cassert>

static void commit_log_reset(processor_t* p)
Expand Down Expand Up @@ -162,6 +165,7 @@ inline void processor_t::update_histogram(reg_t pc)
static inline reg_t execute_insn_fast(processor_t* p, reg_t pc, insn_fetch_t fetch) {
return fetch.func(p, fetch.insn, pc);
}

static inline reg_t execute_insn_logged(processor_t* p, reg_t pc, insn_fetch_t fetch)
{
if (p->get_log_commits_enabled()) {
Expand All @@ -173,6 +177,20 @@ static inline reg_t execute_insn_logged(processor_t* p, reg_t pc, insn_fetch_t f

try {
npc = fetch.func(p, fetch.insn, pc);

if (p->get_log_commits_enabled()) {
iansseijelly marked this conversation as resolved.
Show resolved Hide resolved
hart_to_encoder_ingress_t packet {
.i_type = _get_insn_type(&fetch.insn, npc != p->get_state()->pc + insn_length(fetch.insn.bits())),
.exc_cause = 0,
.tval = 0,
.priv = P_M, // TODO: check for processor privilege level
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This priv should be fixed.

Should this trace_encoder_push_commit also be added to the take_trap and take_interrupt methods?

.i_addr = pc,
.iretire = 1,
.ilastsize = insn_length(fetch.insn.bits())/2,
};
p->trace_encoder.trace_encoder_push_commit(packet);
}

if (npc != PC_SERIALIZE_BEFORE) {
if (p->get_log_commits_enabled()) {
commit_log_print_insn(p, pc, fetch.insn);
Expand Down
5 changes: 4 additions & 1 deletion riscv/processor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "platform.h"
#include "vector_unit.h"
#include "debug_defines.h"
#include "trace_encoder_n.h"
#include <cinttypes>
#include <cmath>
#include <cstdlib>
Expand Down Expand Up @@ -39,7 +40,7 @@ processor_t::processor_t(const char* isa_str, const char* priv_str,
log_file(log_file), sout_(sout_.rdbuf()), halt_on_reset(halt_on_reset),
in_wfi(false), check_triggers_icount(false),
impl_table(256, false), extension_enable_table(isa.get_extension_table()),
last_pc(1), executions(1), TM(cfg->trigger_count)
last_pc(1), executions(1), TM(cfg->trigger_count), trace_encoder()
iansseijelly marked this conversation as resolved.
Show resolved Hide resolved
{
VU.p = this;
TM.proc = this;
Expand Down Expand Up @@ -204,6 +205,8 @@ void processor_t::reset()

if (sim)
sim->proc_reset(id);

trace_encoder.reset();
}

extension_t* processor_t::get_extension()
Expand Down
4 changes: 4 additions & 0 deletions riscv/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "triggers.h"
#include "../fesvr/memif.h"
#include "vector_unit.h"
#include "trace_encoder_n.h"

#define FIRST_HPMCOUNTER 3
#define N_HPMCOUNTERS 29
Expand Down Expand Up @@ -367,6 +368,8 @@ class processor_t : public abstract_device_t

void check_if_lpad_required();

trace_encoder_n* get_trace_encoder() { return &trace_encoder; }

private:
const isa_parser_t isa;
const cfg_t * const cfg;
Expand Down Expand Up @@ -432,6 +435,7 @@ class processor_t : public abstract_device_t

vectorUnit_t VU;
triggers::module_t TM;
trace_encoder_n trace_encoder;
};

#endif
3 changes: 3 additions & 0 deletions riscv/riscv.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ riscv_install_hdrs = \
trap.h \
triggers.h \
vector_unit.h \
trace_ingress.h \
trace_encoder_n.h \

riscv_precompiled_hdrs = \
insn_template.h \
Expand Down Expand Up @@ -73,6 +75,7 @@ riscv_srcs = \
vector_unit.cc \
socketif.cc \
cfg.cc \
trace_encoder_n.cc \
$(riscv_gen_srcs) \

riscv_test_srcs = \
Expand Down
207 changes: 207 additions & 0 deletions riscv/trace_encoder_n.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
#include "trace_encoder_n.h"

iansseijelly marked this conversation as resolved.
Show resolved Hide resolved
void trace_encoder_n::reset() {
this->state = TRACE_ENCODER_N_IDLE;
this->icnt = 0;
this->packet_0 = hart_to_encoder_ingress_t(); // create empty packet
this->packet_1 = hart_to_encoder_ingress_t(); // create empty packet
this->enabled = false;
this->active = true;
}

void trace_encoder_n::set_enable(bool enabled) {
bool was_enabled = this->enabled;
printf("[trace_encoder_n] QAQ setting enable to %d\n", enabled);
this->enabled = enabled;
if (!was_enabled && enabled) {
this->state = TRACE_ENCODER_N_IDLE;
}
}

void trace_encoder_n::trace_encoder_push_commit(hart_to_encoder_ingress_t packet) {
printf("[trace_encoder_n] pushed commit packet at i_addr: %lx\n", packet.i_addr);
this->packet_1 = this->packet_0;
this->packet_0 = packet;
printf("[trace_encoder_n] new packet tcode: %lx\n", _get_packet_0()->i_type);
if (this->enabled) {
fprintf(this->debug_reference, "%lx\n", packet.i_addr);
if (this->state == TRACE_ENCODER_N_IDLE) {
trace_encoder_generate_packet(TCODE_PROG_TRACE_SYNC);
this->state = TRACE_ENCODER_N_DATA;
this->icnt += _get_packet_0()->ilastsize;
} else if (this->state == TRACE_ENCODER_N_DATA) {
this->icnt += _get_packet_0()->ilastsize;
printf("[trace_encoder_n] icnt: %lx\n", this->icnt);
if (_get_packet_1()->i_type == I_BRANCH_TAKEN) {
trace_encoder_generate_packet(TCODE_DBR);
this->icnt = _get_packet_0()->ilastsize;
} else if (_get_packet_1()->i_type == I_JUMP_INFERABLE || _get_packet_1()->i_type == I_JUMP_UNINFERABLE) {
trace_encoder_generate_packet(TCODE_IBR);
this->icnt = _get_packet_0()->ilastsize;
}
this->state = this->icnt >= MAX_ICNT ? TRACE_ENCODER_N_FULL : TRACE_ENCODER_N_DATA;
} else if (this->state == TRACE_ENCODER_N_FULL) {
trace_encoder_generate_packet(TCODE_FULL);
this->state = TRACE_ENCODER_N_DATA;
this->icnt = 0;
}
}
}

void print_packet(trace_encoder_n_packet_t* packet) {
printf("[trace_encoder_n] printing packet: tcode: %lx, src: %lx, icnt: %lx, f_addr: %lx, u_addr: %lx, b_type: %lx\n", packet->tcode, packet->src, packet->icnt, packet->f_addr, packet->u_addr, packet->b_type);
}

void print_encoded_packet(uint8_t* buffer, int num_bytes) {
printf("[trace_encoder_n] encoded packet: ");
for (int i = 0; i < num_bytes; i++) {
printf("%lx ", buffer[i]);
}
printf("\n");
}

void trace_encoder_n::trace_encoder_generate_packet(tcode_t tcode) {
trace_encoder_n_packet_t packet;
int num_bytes;
switch (tcode) {
case TCODE_PROG_TRACE_SYNC:
_set_program_trace_sync_packet(&packet);
print_packet(&packet);
num_bytes = packet_to_buffer(&packet);
fwrite(this->buffer, 1, num_bytes, this->trace_sink);
print_encoded_packet(this->buffer, num_bytes);
break;
case TCODE_DBR:
_set_direct_branch_packet(&packet);
print_packet(&packet);
num_bytes = packet_to_buffer(&packet);
fwrite(this->buffer, 1, num_bytes, this->trace_sink);
print_encoded_packet(this->buffer, num_bytes);
break;
case TCODE_IBR:
_set_indirect_branch_packet(&packet);
print_packet(&packet);
num_bytes = packet_to_buffer(&packet);
fwrite(this->buffer, 1, num_bytes, this->trace_sink);
print_encoded_packet(this->buffer, num_bytes);
break;
default:
break;
}
}

void trace_encoder_n::_set_program_trace_sync_packet(trace_encoder_n_packet_t* packet){
packet->tcode = TCODE_PROG_TRACE_SYNC;
packet->src = this->src;
packet->sync = SYNC_TRACE_EN;
packet->icnt = 0;
packet->f_addr = _get_packet_0()->i_addr >> 1;
this->prev_addr = packet->f_addr;
}

void trace_encoder_n::_set_direct_branch_packet(trace_encoder_n_packet_t* packet){
packet->tcode = TCODE_DBR;
packet->src = this->src;
packet->icnt = this->icnt - _get_packet_0()->ilastsize;
}

void trace_encoder_n::_set_indirect_branch_packet(trace_encoder_n_packet_t* packet){
packet->tcode = TCODE_IBR;
packet->src = this->src;
packet->b_type = B_INDIRECT;
printf("[trace_encoder_n] _set_indirect_branch_packet: this->icnt: %lx, _get_packet_0()->ilastsize: %lx\n", this->icnt, _get_packet_0()->ilastsize);
packet->icnt = this->icnt - _get_packet_0()->ilastsize;
uint64_t e_addr = _get_packet_0()->i_addr >> 1;
packet->u_addr = e_addr ^ this->prev_addr;
this->prev_addr = e_addr;
}

// returns the number of bytes written to the buffer
int trace_encoder_n::packet_to_buffer(trace_encoder_n_packet_t* packet){
switch (packet->tcode) {
case TCODE_PROG_TRACE_SYNC:
return _packet_to_buffer_program_trace_sync(packet);
case TCODE_DBR:
return _packet_to_buffer_direct_branch_packet(packet);
case TCODE_IBR:
return _packet_to_buffer_indirect_branch_packet(packet);
default:
break;
}
}

int trace_encoder_n::_packet_to_buffer_program_trace_sync(trace_encoder_n_packet_t* packet) {
int msb = find_msb(packet->f_addr);
this->buffer[0] = packet->tcode << MDO_OFFSET | MSEO_IDLE;
this->buffer[1] = packet->sync << MDO_OFFSET | MSEO_IDLE;
this->buffer[1] |= (packet->f_addr & 0b11) << 6;
int num_bytes = 0;
if (msb < 2) {
this->buffer[1] |= MSEO_LAST;
} else {
packet->f_addr >>= 2;
msb -= 2;
num_bytes = ceil_div(msb, 6);
for (int iter = 0; iter < num_bytes; iter++) {
this->buffer[2 + iter] = ((packet->f_addr & 0x3F) << MDO_OFFSET) | MSEO_IDLE;
packet->f_addr >>= 6;
}
this->buffer[2 + num_bytes - 1] |= MSEO_LAST;
}
return 2 + num_bytes;
}

int trace_encoder_n::_packet_to_buffer_direct_branch_packet(trace_encoder_n_packet_t* packet) {
this->buffer[0] = packet->tcode << MDO_OFFSET | MSEO_IDLE;
int msb = find_msb(packet->icnt);
int num_bytes = ceil_div(msb, 6);
for (int iter = 0; iter < num_bytes; iter++) {
this->buffer[1 + iter] = ((packet->icnt & 0x3F) << MDO_OFFSET) | MSEO_IDLE;
packet->icnt >>= 6;
}
this->buffer[1 + num_bytes - 1] |= MSEO_LAST;
return 1 + num_bytes;
}

int trace_encoder_n::_packet_to_buffer_indirect_branch_packet(trace_encoder_n_packet_t* packet) {
this->buffer[0] = packet->tcode << MDO_OFFSET | MSEO_IDLE;
this->buffer[1] = packet->b_type << MDO_OFFSET | MSEO_IDLE;
// icnt
int icnt_msb = find_msb(packet->icnt);
int icnt_num_bytes = 0;
this->buffer[1] |= (packet->icnt & 0xF) << 4;
if (icnt_msb < 4) {
this->buffer[1] |= MSEO_EOF;
} else {
packet->icnt >>= 4;
icnt_msb -= 4;
icnt_num_bytes = ceil_div(icnt_msb, 6);
for (int iter = 0; iter < icnt_num_bytes; iter++) {
this->buffer[2 + iter] = ((packet->icnt & 0x3F) << MDO_OFFSET) | MSEO_IDLE;
packet->icnt >>= 6;
}
this->buffer[2 + icnt_num_bytes - 1] |= MSEO_EOF;
}
// u_addr
int u_addr_start = 2 + icnt_num_bytes;
int u_addr_msb = find_msb(packet->u_addr);
int u_addr_num_bytes = ceil_div(u_addr_msb, 6);
printf("[trace_encoder_n] _packet_to_buffer_indirect_branch_packet: u_addr_start: %d, u_addr_msb: %d, u_addr_num_bytes: %d\n", u_addr_start, u_addr_msb, u_addr_num_bytes);
for (int iter = 0; iter < u_addr_num_bytes; iter++) {
this->buffer[u_addr_start + iter] = ((packet->u_addr & 0x3F) << MDO_OFFSET) | MSEO_IDLE;
packet->u_addr >>= 6;
}
this->buffer[u_addr_start + u_addr_num_bytes - 1] |= MSEO_LAST;
return u_addr_start + u_addr_num_bytes;
}

// returns the 0-index of the most significant bit
int find_msb(uint64_t x) {
if (x == 0) return -1;
return 63 - __builtin_clzll(x);
}

// returns the ceiling of the division of a 0-indexed a by b
int ceil_div(int a, int b) {
return a / b + 1;
}
Loading