Skip to content

GitLab

Commit a4de8c62 authored by Jakob Görgen's avatar Jakob Görgen Committed by Jakob Görgen
Browse files

lib/simbricks/nicbm/nicbm: reformat code

parent 23e0cd07
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 48 deletions
lib/simbricks/nicbm/nicbm.cc
View file @ a4de8c62
......@@ -73,9 +73,10 @@ static int stat_flag = 0;
void Runner::PrintBaseIfInfo() {
sim_log::LogError("net_in_timestamp = %lu\n", nicif_.net.base.in_timestamp);
sim_log::LogError("net_out_timestamp = %lu\n", nicif_.net.base.out_timestamp);
sim_log::LogError("pci_in_timestamp = %lu\n", nicif_.pcie.base.in_timestamp);
sim_log::LogError("pci_out_timestamp = %lu\n", nicif_.pcie.base.out_timestamp);
sim_log::LogError("pci_out_timestamp = %lu\n",
nicif_.pcie.base.out_timestamp);
}
static void sigint_handler(int dummy) {
......@@ -106,7 +107,7 @@ volatile union SimbricksProtoPcieD2H *Runner::D2HAlloc() {
while ((msg = SimbricksPcieIfD2HOutAlloc(&nicif_.pcie, main_time_)) == NULL) {
if (first) {
sim_log::LogError("D2HAlloc: warning waiting for entry (%zu)\n",
nicif_.pcie.base.out_pos);
nicif_.pcie.base.out_pos);
first = false;
}
YieldPoll();
......@@ -124,7 +125,7 @@ volatile union SimbricksProtoNetMsg *Runner::D2NAlloc() {
while ((msg = SimbricksNetIfOutAlloc(&nicif_.net, main_time_)) == NULL) {
if (first) {
sim_log::LogError("D2NAlloc: warning waiting for entry (%zu)\n",
nicif_.pcie.base.out_pos);
nicif_.pcie.base.out_pos);
first = false;
}
YieldPoll();
......@@ -140,7 +141,8 @@ void Runner::IssueDma(DMAOp &op) {
if (dma_pending_ < DMA_MAX_PENDING) {
// can directly issue
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_,
sim_log::LogInfo(
log_,
"main_time = %lu: nicbm: issuing dma op %p addr %lx len %zu pending "
"%zu\n",
main_time_, &op, op.dma_addr_, op.len_, dma_pending_);
......@@ -148,7 +150,8 @@ void Runner::IssueDma(DMAOp &op) {
DmaDo(op);
} else {
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_,
sim_log::LogInfo(
log_,
"main_time = %lu: nicbm: enqueuing dma op %p addr %lx len %zu pending "
"%zu\n",
main_time_, &op, op.dma_addr_, op.len_, dma_pending_);
......@@ -174,7 +177,8 @@ void Runner::DmaDo(DMAOp &op) {
volatile union SimbricksProtoPcieD2H *msg = D2HAlloc();
dma_pending_++;
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_,
sim_log::LogInfo(
log_,
"main_time = %lu: nicbm: executing dma op %p addr %lx len %zu pending "
"%zu\n",
main_time_, &op, op.dma_addr_, op.len_, dma_pending_);
......@@ -185,9 +189,9 @@ void Runner::DmaDo(DMAOp &op) {
volatile struct SimbricksProtoPcieD2HWrite *write = &msg->write;
if (maxlen < sizeof(*write) + op.len_) {
sim_log::LogError(
"issue_dma: write too big (%zu), can only fit up "
"to (%zu)\n",
op.len_, maxlen - sizeof(*write));
"issue_dma: write too big (%zu), can only fit up "
"to (%zu)\n",
op.len_, maxlen - sizeof(*write));
abort();
}
......@@ -198,7 +202,8 @@ void Runner::DmaDo(DMAOp &op) {
#ifdef DEBUG_NICBM
uint8_t *tmp = (uint8_t *)op.data_;
sim_log::LogInfo(log_, "main_time = %lu: nicbm: dma write data: \n", main_time_);
sim_log::LogInfo(log_, "main_time = %lu: nicbm: dma write data: \n",
main_time_);
for (size_t d = 0; d < op.len_; d++) {
sim_log::LogInfo(log_, "%02X ", *tmp);
tmp++;
......@@ -210,9 +215,9 @@ void Runner::DmaDo(DMAOp &op) {
volatile struct SimbricksProtoPcieD2HRead *read = &msg->read;
if (maxlen < sizeof(struct SimbricksProtoPcieH2DReadcomp) + op.len_) {
sim_log::LogError(
"issue_dma: write too big (%zu), can only fit up "
"to (%zu)\n",
op.len_, maxlen - sizeof(struct SimbricksProtoPcieH2DReadcomp));
"issue_dma: write too big (%zu), can only fit up "
"to (%zu)\n",
op.len_, maxlen - sizeof(struct SimbricksProtoPcieH2DReadcomp));
abort();
}
......@@ -230,7 +235,7 @@ void Runner::MsiIssue(uint8_t vec) {
volatile union SimbricksProtoPcieD2H *msg = D2HAlloc();
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_, "main_time = %lu: nicbm: issue MSI interrupt vec %u\n",
sim_log::LogInfo(log_, "main_time = %lu: nicbm: issue MSI interrupt vec %u\n",
main_time_, vec);
#endif
volatile struct SimbricksProtoPcieD2HInterrupt *intr = &msg->interrupt;
......@@ -247,7 +252,8 @@ void Runner::MsiXIssue(uint8_t vec) {
volatile union SimbricksProtoPcieD2H *msg = D2HAlloc();
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_,"main_time = %lu: nicbm: issue MSI-X interrupt vec %u\n",
sim_log::LogInfo(log_,
"main_time = %lu: nicbm: issue MSI-X interrupt vec %u\n",
main_time_, vec);
#endif
volatile struct SimbricksProtoPcieD2HInterrupt *intr = &msg->interrupt;
......@@ -264,7 +270,7 @@ void Runner::IntXIssue(bool level) {
volatile union SimbricksProtoPcieD2H *msg = D2HAlloc();
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_, "main_time = %lu: nicbm: set intx interrupt %u\n",
sim_log::LogInfo(log_, "main_time = %lu: nicbm: set intx interrupt %u\n",
main_time_, level);
#endif
volatile struct SimbricksProtoPcieD2HInterrupt *intr = &msg->interrupt;
......@@ -299,8 +305,9 @@ void Runner::H2DRead(volatile struct SimbricksProtoPcieH2DRead *read) {
memcpy(&dbg_val, (const void *)rc->data, read->len <= 8 ? read->len : 8);
auto offset = read->offset;
auto len = read->len;
sim_log::LogInfo(log_,"main_time = %lu: nicbm: read(off=0x%lx, len=%u, val=0x%lx)\n",
main_time_, offset, len, dbg_val);
sim_log::LogInfo(
log_, "main_time = %lu: nicbm: read(off=0x%lx, len=%u, val=0x%lx)\n",
main_time_, offset, len, dbg_val);
#endif
SimbricksPcieIfD2HOutSend(&nicif_.pcie, msg,
......@@ -317,9 +324,11 @@ void Runner::H2DWrite(volatile struct SimbricksProtoPcieH2DWrite *write,
memcpy(&dbg_val, (const void *)write->data, write->len <= 8 ? write->len : 8);
auto offset = write->offset;
auto len = write->len;
sim_log::LogInfo(log_,
sim_log::LogInfo(
log_,
"main_time = %lu: nicbm: write(off=0x%lx, len=%u, val=0x%lx, "
"posted=%u)\n", main_time_, offset, len, dbg_val, posted);
"posted=%u)\n",
main_time_, offset, len, dbg_val, posted);
#endif
dev_.RegWrite(write->bar, write->offset, (void *)write->data, write->len);
......@@ -337,8 +346,10 @@ void Runner::H2DReadcomp(volatile struct SimbricksProtoPcieH2DReadcomp *rc) {
DMAOp *op = (DMAOp *)(uintptr_t)rc->req_id;
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_, "main_time = %lu: nicbm: completed dma read op %p addr %lx len %zu\n",
main_time_, op, op->dma_addr_, op->len_);
sim_log::LogInfo(
log_,
"main_time = %lu: nicbm: completed dma read op %p addr %lx len %zu\n",
main_time_, op, op->dma_addr_, op->len_);
#endif
memcpy(op->data_, (void *)rc->data, op->len_);
......@@ -352,8 +363,10 @@ void Runner::H2DWritecomp(volatile struct SimbricksProtoPcieH2DWritecomp *wc) {
DMAOp *op = (DMAOp *)(uintptr_t)wc->req_id;
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_,"main_time = %lu: nicbm: completed dma write op %p addr %lx len %zu\n",
main_time_, op, op->dma_addr_, op->len_);
sim_log::LogInfo(
log_,
"main_time = %lu: nicbm: completed dma write op %p addr %lx len %zu\n",
main_time_, op, op->dma_addr_, op->len_);
#endif
dev_.DmaComplete(*op);
......@@ -369,7 +382,7 @@ void Runner::H2DDevctrl(volatile struct SimbricksProtoPcieH2DDevctrl *dc) {
void Runner::EthRecv(volatile struct SimbricksProtoNetMsgPacket *packet) {
#ifdef DEBUG_NICBM
auto len = packet->len;
sim_log::LogInfo(log_,"main_time = %lu: nicbm: eth rx: port %u len %u\n",
sim_log::LogInfo(log_, "main_time = %lu: nicbm: eth rx: port %u len %u\n",
main_time_, packet->port, len);
#endif
......@@ -378,8 +391,8 @@ void Runner::EthRecv(volatile struct SimbricksProtoNetMsgPacket *packet) {
void Runner::EthSend(const void *data, size_t len) {
#ifdef DEBUG_NICBM
sim_log::LogInfo(log_,"main_time = %lu: nicbm: eth tx: len %zu\n", main_time_,
len);
sim_log::LogInfo(log_, "main_time = %lu: nicbm: eth tx: len %zu\n",
main_time_, len);
#endif
volatile union SimbricksProtoNetMsg *msg = D2NAlloc();
......@@ -565,9 +578,9 @@ Runner::Runner(Device &dev) : main_time_(0), dev_(dev), events_(EventCmp()) {
int Runner::ParseArgs(int argc, char *argv[]) {
if (argc < 4 || argc > 10) {
sim_log::LogError(
"Usage: corundum_bm PCI-SOCKET ETH-SOCKET "
"SHM [SYNC-MODE] [START-TICK] [SYNC-PERIOD] [PCI-LATENCY] "
"[ETH-LATENCY] [MAC-ADDR] [LOG-FILE-PATH]\n");
"Usage: corundum_bm PCI-SOCKET ETH-SOCKET "
"SHM [SYNC-MODE] [START-TICK] [SYNC-PERIOD] [PCI-LATENCY] "
"[ETH-LATENCY] [MAC-ADDR] [LOG-FILE-PATH]\n");
return -1;
}
if (argc >= 6)
......@@ -650,42 +663,43 @@ int Runner::RunMain() {
sim_log::LogInfo("exit main_time: %lu\n", main_time_);
#ifdef STAT_NICBM
sim_log::LogInfo("%20s: %22lu %20s: %22lu poll_suc_rate: %f\n",
"h2d_poll_total", h2d_poll_total, "h2d_poll_suc", h2d_poll_suc,
(double)h2d_poll_suc / h2d_poll_total);
"h2d_poll_total", h2d_poll_total, "h2d_poll_suc",
h2d_poll_suc, (double)h2d_poll_suc / h2d_poll_total);
sim_log::LogInfo("%65s: %22lu sync_rate: %f\n", "h2d_poll_sync",
h2d_poll_sync, (double)h2d_poll_sync / h2d_poll_suc);
h2d_poll_sync, (double)h2d_poll_sync / h2d_poll_suc);
sim_log::LogInfo("%20s: %22lu %20s: %22lu poll_suc_rate: %f\n",
"n2d_poll_total", n2d_poll_total, "n2d_poll_suc", n2d_poll_suc,
(double)n2d_poll_suc / n2d_poll_total);
"n2d_poll_total", n2d_poll_total, "n2d_poll_suc",
n2d_poll_suc, (double)n2d_poll_suc / n2d_poll_total);
sim_log::LogInfo("%65s: %22lu sync_rate: %f\n", "n2d_poll_sync",
n2d_poll_sync, (double)n2d_poll_sync / n2d_poll_suc);
n2d_poll_sync, (double)n2d_poll_sync / n2d_poll_suc);
sim_log::LogInfo("%20s: %22lu %20s: %22lu sync_rate: %f\n", "recv_total",
sim_log::LogInfo(
"%20s: %22lu %20s: %22lu sync_rate: %f\n", "recv_total",
h2d_poll_suc + n2d_poll_suc, "recv_sync", h2d_poll_sync + n2d_poll_sync,
(double)(h2d_poll_sync + n2d_poll_sync) / (h2d_poll_suc + n2d_poll_suc));
sim_log::LogInfo("%20s: %22lu %20s: %22lu poll_suc_rate: %f\n",
"s_h2d_poll_total", s_h2d_poll_total, "s_h2d_poll_suc",
s_h2d_poll_suc, (double)s_h2d_poll_suc / s_h2d_poll_total);
"s_h2d_poll_total", s_h2d_poll_total, "s_h2d_poll_suc",
s_h2d_poll_suc, (double)s_h2d_poll_suc / s_h2d_poll_total);
sim_log::LogInfo("%65s: %22lu sync_rate: %f\n", "s_h2d_poll_sync",
s_h2d_poll_sync, (double)s_h2d_poll_sync / s_h2d_poll_suc);
s_h2d_poll_sync, (double)s_h2d_poll_sync / s_h2d_poll_suc);
sim_log::LogInfo("%20s: %22lu %20s: %22lu poll_suc_rate: %f\n",
"s_n2d_poll_total", s_n2d_poll_total, "s_n2d_poll_suc",
s_n2d_poll_suc, (double)s_n2d_poll_suc / s_n2d_poll_total);
"s_n2d_poll_total", s_n2d_poll_total, "s_n2d_poll_suc",
s_n2d_poll_suc, (double)s_n2d_poll_suc / s_n2d_poll_total);
sim_log::LogInfo("%65s: %22lu sync_rate: %f\n", "s_n2d_poll_sync",
s_n2d_poll_sync, (double)s_n2d_poll_sync / s_n2d_poll_suc);
s_n2d_poll_sync, (double)s_n2d_poll_sync / s_n2d_poll_suc);
sim_log::LogInfo("%20s: %22lu %20s: %22lu sync_rate: %f\n", "s_recv_total",
s_h2d_poll_suc + s_n2d_poll_suc, "s_recv_sync",
s_h2d_poll_sync + s_n2d_poll_sync,
(double)(s_h2d_poll_sync + s_n2d_poll_sync) /
(s_h2d_poll_suc + s_n2d_poll_suc));
s_h2d_poll_suc + s_n2d_poll_suc, "s_recv_sync",
s_h2d_poll_sync + s_n2d_poll_sync,
(double)(s_h2d_poll_sync + s_n2d_poll_sync) /
(s_h2d_poll_suc + s_n2d_poll_suc));
#endif
SimbricksNicIfCleanup(&nicif_);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment