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
......@@ -75,7 +75,8 @@ void Runner::PrintBaseIfInfo() {
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) {
......@@ -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_);
......@@ -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++;
......@@ -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;
......@@ -299,7 +305,8 @@ 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",
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
......@@ -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,7 +346,9 @@ 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",
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
......@@ -352,7 +363,9 @@ 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",
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
......@@ -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();
......@@ -650,20 +663,21 @@ 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);
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);
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));
......
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