Skip to content

GitLab

Commit b2a6951d authored by Antoine Kaufmann's avatar Antoine Kaufmann
Browse files

lib/nicif: refactor identifier names for google style

parent e5622be2
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 70 deletions
lib/simbricks/nicbm/nicbm.cc
View file @ b2a6951d
......@@ -59,7 +59,7 @@ static void sigusr1_handler(int dummy) {
volatile union SimbricksProtoPcieD2H *Runner::d2h_alloc(void) {
volatile union SimbricksProtoPcieD2H *msg;
while ((msg = nicsim_d2h_alloc(&nsparams, main_time)) == NULL) {
while ((msg = SimbricksNicIfD2HAlloc(&nsparams, main_time)) == NULL) {
fprintf(stderr, "d2h_alloc: no entry available\n");
}
return msg;
......@@ -67,7 +67,7 @@ volatile union SimbricksProtoPcieD2H *Runner::d2h_alloc(void) {
volatile union SimbricksProtoNetD2N *Runner::d2n_alloc(void) {
volatile union SimbricksProtoNetD2N *msg;
while ((msg = nicsim_d2n_alloc(&nsparams, main_time)) == NULL) {
while ((msg = SimbricksNicIfD2NAlloc(&nsparams, main_time)) == NULL) {
fprintf(stderr, "d2n_alloc: no entry available\n");
}
return msg;
......@@ -285,7 +285,7 @@ void Runner::eth_send(const void *data, size_t len) {
void Runner::poll_h2d() {
volatile union SimbricksProtoPcieH2D *msg =
nicif_h2d_poll(&nsparams, main_time);
SimbricksNicIfH2DPoll(&nsparams, main_time);
uint8_t type;
if (msg == NULL)
......@@ -320,13 +320,13 @@ void Runner::poll_h2d() {
fprintf(stderr, "poll_h2d: unsupported type=%u\n", type);
}
nicif_h2d_done(msg);
nicif_h2d_next();
SimbricksNicIfH2DDone(msg);
SimbricksNicIfH2DNext();
}
void Runner::poll_n2d() {
volatile union SimbricksProtoNetN2D *msg =
nicif_n2d_poll(&nsparams, main_time);
SimbricksNicIfN2DPoll(&nsparams, main_time);
uint8_t t;
if (msg == NULL)
......@@ -345,8 +345,8 @@ void Runner::poll_n2d() {
fprintf(stderr, "poll_n2d: unsupported type=%u", t);
}
nicif_n2d_done(msg);
nicif_n2d_next();
SimbricksNicIfN2DDone(msg);
SimbricksNicIfN2DNext();
}
uint64_t Runner::time_ps() const {
......@@ -436,7 +436,7 @@ int Runner::runMain(int argc, char *argv[]) {
sync_mode == SIMBRICKS_PROTO_SYNC_BARRIER);
nsparams.sync_mode = sync_mode;
if (nicsim_init(&nsparams, &dintro)) {
if (SimbricksNicIfInit(&nsparams, &dintro)) {
return EXIT_FAILURE;
}
fprintf(stderr, "sync_pci=%d sync_eth=%d\n", nsparams.sync_pci,
......@@ -445,10 +445,10 @@ int Runner::runMain(int argc, char *argv[]) {
bool is_sync = nsparams.sync_pci || nsparams.sync_eth;
while (!exiting) {
while (nicsim_sync(&nsparams, main_time)) {
fprintf(stderr, "warn: nicsim_sync failed (t=%lu)\n", main_time);
while (SimbricksNicIfSync(&nsparams, main_time)) {
fprintf(stderr, "warn: SimbricksNicIfSync failed (t=%lu)\n", main_time);
}
nicsim_advance_epoch(&nsparams, main_time);
SimbricksNicIfAdvanceEpoch(&nsparams, main_time);
do {
poll_h2d();
......@@ -456,7 +456,7 @@ int Runner::runMain(int argc, char *argv[]) {
event_trigger();
if (is_sync) {
next_ts = nicsim_next_timestamp(&nsparams);
next_ts = SimbricksNicIfNextTimestamp(&nsparams);
if (next_ts > main_time + max_step)
next_ts = main_time + max_step;
} else {
......@@ -467,11 +467,11 @@ int Runner::runMain(int argc, char *argv[]) {
if (event_next(ev_ts) && ev_ts < next_ts)
next_ts = ev_ts;
} while (next_ts <= main_time && !exiting);
main_time = nicsim_advance_time(&nsparams, next_ts);
main_time = SimbricksNicIfAdvanceTime(&nsparams, next_ts);
}
fprintf(stderr, "exit main_time: %lu\n", main_time);
nicsim_cleanup();
SimbricksNicIfCleanup();
return 0;
}
......
lib/simbricks/nicbm/nicbm.h
View file @ b2a6951d
......@@ -124,7 +124,7 @@ class Runner {
std::deque<DMAOp *> dma_queue;
size_t dma_pending;
uint64_t mac_addr;
struct nicsim_params nsparams;
struct SimbricksNicIfParams nsparams;
struct SimbricksProtoPcieDevIntro dintro;
volatile union SimbricksProtoPcieD2H *d2h_alloc(void);
......
lib/simbricks/nicif/nicsim.c
View file @ b2a6951d
......@@ -177,7 +177,7 @@ static int accept_conns(struct SimbricksProtoPcieDevIntro *di, int pci_lfd,
return 0;
}
int nicsim_init(struct nicsim_params *params,
int SimbricksNicIfInit(struct SimbricksNicIfParams *params,
struct SimbricksProtoPcieDevIntro *di) {
int pci_lfd = -1, eth_lfd = -1;
void *shmptr;
......@@ -243,7 +243,7 @@ int nicsim_init(struct nicsim_params *params,
return 0;
}
void nicsim_cleanup(void) {
void SimbricksNicIfCleanup(void) {
close(pci_cfd);
close(eth_cfd);
}
......@@ -251,7 +251,8 @@ void nicsim_cleanup(void) {
/******************************************************************************/
/* Sync */
int nicsim_sync(struct nicsim_params *params, uint64_t timestamp) {
int SimbricksNicIfSync(struct SimbricksNicIfParams *params,
uint64_t timestamp) {
int ret = 0;
volatile union SimbricksProtoPcieD2H *d2h;
volatile union SimbricksProtoNetD2N *d2n;
......@@ -274,7 +275,7 @@ int nicsim_sync(struct nicsim_params *params, uint64_t timestamp) {
}
if (sync) {
d2h = nicsim_d2h_alloc(params, timestamp);
d2h = SimbricksNicIfD2HAlloc(params, timestamp);
if (d2h == NULL) {
ret = -1;
} else {
......@@ -303,7 +304,7 @@ int nicsim_sync(struct nicsim_params *params, uint64_t timestamp) {
}
if (sync) {
d2n = nicsim_d2n_alloc(params, timestamp);
d2n = SimbricksNicIfD2NAlloc(params, timestamp);
if (d2n == NULL) {
ret = -1;
} else {
......@@ -316,7 +317,8 @@ int nicsim_sync(struct nicsim_params *params, uint64_t timestamp) {
return ret;
}
void nicsim_advance_epoch(struct nicsim_params *params, uint64_t timestamp) {
void SimbricksNicIfAdvanceEpoch(struct SimbricksNicIfParams *params,
uint64_t timestamp) {
if (params->sync_mode == SIMBRICKS_PROTO_SYNC_BARRIER) {
if ((params->sync_pci || params->sync_eth) &&
timestamp - current_epoch >= params->sync_delay) {
......@@ -325,7 +327,8 @@ void nicsim_advance_epoch(struct nicsim_params *params, uint64_t timestamp) {
}
}
uint64_t nicsim_advance_time(struct nicsim_params *params, uint64_t timestamp) {
uint64_t SimbricksNicIfAdvanceTime(struct SimbricksNicIfParams *params,
uint64_t timestamp) {
switch (params->sync_mode) {
case SIMBRICKS_PROTO_SYNC_SIMBRICKS:
return timestamp;
......@@ -339,7 +342,7 @@ uint64_t nicsim_advance_time(struct nicsim_params *params, uint64_t timestamp) {
}
}
uint64_t nicsim_next_timestamp(struct nicsim_params *params) {
uint64_t SimbricksNicIfNextTimestamp(struct SimbricksNicIfParams *params) {
if (params->sync_pci && params->sync_eth) {
return (pci_last_rx_time <= eth_last_rx_time ? pci_last_rx_time
: eth_last_rx_time);
......@@ -355,8 +358,8 @@ uint64_t nicsim_next_timestamp(struct nicsim_params *params) {
/******************************************************************************/
/* PCI */
volatile union SimbricksProtoPcieH2D *nicif_h2d_poll(
struct nicsim_params *params, uint64_t timestamp) {
volatile union SimbricksProtoPcieH2D *SimbricksNicIfH2DPoll(
struct SimbricksNicIfParams *params, uint64_t timestamp) {
volatile union SimbricksProtoPcieH2D *msg =
(volatile union SimbricksProtoPcieH2D *)(h2d_queue + h2d_pos * H2D_ELEN);
......@@ -373,18 +376,18 @@ volatile union SimbricksProtoPcieH2D *nicif_h2d_poll(
return msg;
}
void nicif_h2d_done(volatile union SimbricksProtoPcieH2D *msg) {
void SimbricksNicIfH2DDone(volatile union SimbricksProtoPcieH2D *msg) {
msg->dummy.own_type =
(msg->dummy.own_type & SIMBRICKS_PROTO_PCIE_H2D_MSG_MASK) |
SIMBRICKS_PROTO_PCIE_H2D_OWN_HOST;
}
void nicif_h2d_next(void) {
void SimbricksNicIfH2DNext(void) {
h2d_pos = (h2d_pos + 1) % H2D_ENUM;
}
volatile union SimbricksProtoPcieD2H *nicsim_d2h_alloc(
struct nicsim_params *params, uint64_t timestamp) {
volatile union SimbricksProtoPcieD2H *SimbricksNicIfD2HAlloc(
struct SimbricksNicIfParams *params, uint64_t timestamp) {
volatile union SimbricksProtoPcieD2H *msg =
(volatile union SimbricksProtoPcieD2H *)(d2h_queue + d2h_pos * D2H_ELEN);
......@@ -403,8 +406,8 @@ volatile union SimbricksProtoPcieD2H *nicsim_d2h_alloc(
/******************************************************************************/
/* Ethernet */
volatile union SimbricksProtoNetN2D *nicif_n2d_poll(
struct nicsim_params *params, uint64_t timestamp) {
volatile union SimbricksProtoNetN2D *SimbricksNicIfN2DPoll(
struct SimbricksNicIfParams *params, uint64_t timestamp) {
volatile union SimbricksProtoNetN2D *msg =
(volatile union SimbricksProtoNetN2D *)(n2d_queue + n2d_pos * N2D_ELEN);
......@@ -421,18 +424,18 @@ volatile union SimbricksProtoNetN2D *nicif_n2d_poll(
return msg;
}
void nicif_n2d_done(volatile union SimbricksProtoNetN2D *msg) {
void SimbricksNicIfN2DDone(volatile union SimbricksProtoNetN2D *msg) {
msg->dummy.own_type =
(msg->dummy.own_type & SIMBRICKS_PROTO_NET_N2D_MSG_MASK) |
SIMBRICKS_PROTO_NET_N2D_OWN_NET;
}
void nicif_n2d_next(void) {
void SimbricksNicIfN2DNext(void) {
n2d_pos = (n2d_pos + 1) % N2D_ENUM;
}
volatile union SimbricksProtoNetD2N *nicsim_d2n_alloc(
struct nicsim_params *params, uint64_t timestamp) {
volatile union SimbricksProtoNetD2N *SimbricksNicIfD2NAlloc(
struct SimbricksNicIfParams *params, uint64_t timestamp) {
volatile union SimbricksProtoNetD2N *msg =
(volatile union SimbricksProtoNetD2N *)(d2n_queue + d2n_pos * D2N_ELEN);
......
lib/simbricks/nicif/nicsim.h
View file @ b2a6951d
......@@ -28,7 +28,7 @@
#include <simbricks/proto/network.h>
#include <simbricks/proto/pcie.h>
struct nicsim_params {
struct SimbricksNicIfParams {
const char *pci_socket_path;
const char *eth_socket_path;
const char *shm_path;
......@@ -42,29 +42,31 @@ struct nicsim_params {
int sync_mode;
};
int nicsim_init(struct nicsim_params *params,
int SimbricksNicIfInit(struct SimbricksNicIfParams *params,
struct SimbricksProtoPcieDevIntro *di);
void nicsim_cleanup(void);
void SimbricksNicIfCleanup(void);
int nicsim_sync(struct nicsim_params *params, uint64_t timestamp);
void nicsim_advance_epoch(struct nicsim_params *params, uint64_t timestamp);
uint64_t nicsim_advance_time(struct nicsim_params *params, uint64_t timestamp);
uint64_t nicsim_next_timestamp(struct nicsim_params *params);
int SimbricksNicIfSync(struct SimbricksNicIfParams *params, uint64_t timestamp);
void SimbricksNicIfAdvanceEpoch(struct SimbricksNicIfParams *params,
uint64_t timestamp);
uint64_t SimbricksNicIfAdvanceTime(struct SimbricksNicIfParams *params,
uint64_t timestamp);
uint64_t SimbricksNicIfNextTimestamp(struct SimbricksNicIfParams *params);
volatile union SimbricksProtoPcieH2D *nicif_h2d_poll(
struct nicsim_params *params, uint64_t timestamp);
void nicif_h2d_done(volatile union SimbricksProtoPcieH2D *msg);
void nicif_h2d_next(void);
volatile union SimbricksProtoPcieH2D *SimbricksNicIfH2DPoll(
struct SimbricksNicIfParams *params, uint64_t timestamp);
void SimbricksNicIfH2DDone(volatile union SimbricksProtoPcieH2D *msg);
void SimbricksNicIfH2DNext(void);
volatile union SimbricksProtoPcieD2H *nicsim_d2h_alloc(
struct nicsim_params *params, uint64_t timestamp);
volatile union SimbricksProtoPcieD2H *SimbricksNicIfD2HAlloc(
struct SimbricksNicIfParams *params, uint64_t timestamp);
volatile union SimbricksProtoNetN2D *nicif_n2d_poll(
struct nicsim_params *params, uint64_t timestamp);
void nicif_n2d_done(volatile union SimbricksProtoNetN2D *msg);
void nicif_n2d_next(void);
volatile union SimbricksProtoNetN2D *SimbricksNicIfN2DPoll(
struct SimbricksNicIfParams *params, uint64_t timestamp);
void SimbricksNicIfN2DDone(volatile union SimbricksProtoNetN2D *msg);
void SimbricksNicIfN2DNext(void);
volatile union SimbricksProtoNetD2N *nicsim_d2n_alloc(
struct nicsim_params *params, uint64_t timestamp);
volatile union SimbricksProtoNetD2N *SimbricksNicIfD2NAlloc(
struct SimbricksNicIfParams *params, uint64_t timestamp);
#endif // SIMBRICKS_NICIF_NICSIM_H_
sims/nic/corundum/corundum_verilator.cc
View file @ b2a6951d
......@@ -54,7 +54,7 @@ static uint64_t eth_latency = 500 * 1000ULL; // 500ns
static volatile int exiting = 0;
uint64_t main_time = 0;
static struct nicsim_params nsparams;
static struct SimbricksNicIfParams nsparams;
#ifdef TRACE_ENABLED
static VerilatedVcdC *trace;
#endif
......@@ -540,7 +540,7 @@ static void h2d_write(MMIOInterface &mmio,
static void poll_h2d(MMIOInterface &mmio) {
volatile union SimbricksProtoPcieH2D *msg =
nicif_h2d_poll(&nsparams, main_time);
SimbricksNicIfH2DPoll(&nsparams, main_time);
uint8_t t;
if (msg == NULL)
......@@ -576,12 +576,12 @@ static void poll_h2d(MMIOInterface &mmio) {
std::cerr << "poll_h2d: unsupported type=" << t << std::endl;
}
nicif_h2d_done(msg);
nicif_h2d_next();
SimbricksNicIfH2DDone(msg);
SimbricksNicIfH2DNext();
}
static volatile union SimbricksProtoPcieD2H *d2h_alloc(void) {
return nicsim_d2h_alloc(&nsparams, main_time);
return SimbricksNicIfD2HAlloc(&nsparams, main_time);
}
class EthernetTx {
......@@ -596,7 +596,7 @@ class EthernetTx {
void packet_done() {
volatile union SimbricksProtoNetD2N *msg =
nicsim_d2n_alloc(&nsparams, main_time);
SimbricksNicIfD2NAlloc(&nsparams, main_time);
volatile struct SimbricksProtoNetD2NSend *send;
if (!msg)
......@@ -734,7 +734,7 @@ static void n2d_recv(EthernetRx &rx,
static void poll_n2d(EthernetRx &rx) {
volatile union SimbricksProtoNetN2D *msg =
nicif_n2d_poll(&nsparams, main_time);
SimbricksNicIfN2DPoll(&nsparams, main_time);
uint8_t t;
if (msg == NULL)
......@@ -754,8 +754,8 @@ static void poll_n2d(EthernetRx &rx) {
std::cerr << "poll_n2d: unsupported type=" << t << std::endl;
}
nicif_n2d_done(msg);
nicif_n2d_next();
SimbricksNicIfN2DDone(msg);
SimbricksNicIfN2DNext();
}
void pci_msi_issue(uint8_t vec) {
......@@ -845,7 +845,7 @@ int main(int argc, char *argv[]) {
sync_mode == SIMBRICKS_PROTO_SYNC_BARRIER);
nsparams.sync_mode = sync_mode;
if (nicsim_init(&nsparams, &di)) {
if (SimbricksNicIfInit(&nsparams, &di)) {
return EXIT_FAILURE;
}
std::cout << "sync_pci=" << nsparams.sync_pci
......@@ -954,17 +954,17 @@ int main(int argc, char *argv[]) {
top->rst = 0;
while (!exiting) {
while (nicsim_sync(&nsparams, main_time)) {
std::cerr << "warn: nicsim_sync failed (t=" << main_time << ")"
while (SimbricksNicIfSync(&nsparams, main_time)) {
std::cerr << "warn: SimbricksNicIfSync failed (t=" << main_time << ")"
<< std::endl;
}
nicsim_advance_epoch(&nsparams, main_time);
SimbricksNicIfAdvanceEpoch(&nsparams, main_time);
do {
poll_h2d(mmio);
poll_n2d(rx);
} while ((nsparams.sync_pci || nsparams.sync_eth) &&
nicsim_next_timestamp(&nsparams) <= main_time && !exiting);
SimbricksNicIfNextTimestamp(&nsparams) <= main_time && !exiting);
/* falling edge */
top->clk = !top->clk;
......
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