Skip to content

Commit

Permalink
Updates to C++ infra (#105)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dpetrisko
dpetrisko authored Oct 16, 2024
1 parent c7348de commit 7d21eb7
Show file tree
Hide file tree
Showing 31 changed files with 2,602 additions and 2,306 deletions.
5 changes: 5 additions & 0 deletions .clang-format
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Language: Cpp
BasedOnStyle: LLVM
IndentWidth: 4
TabWidth: 4
UseTab: Never
266 changes: 133 additions & 133 deletions cosim/axi3-perf-example/ps.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,148 +4,148 @@
// the API we provide abstracts away the
// communication plumbing differences.

#include <stdlib.h>
#include <stdio.h>
#include "bsg_zynq_pl.h"
#include "bsg_printing.h"
#include "bsg_argparse.h"
#include "bsg_printing.h"
#include "bsg_zynq_pl.h"
#include <stdio.h>
#include <stdlib.h>

#include <sys/time.h>

uint64_t get_microseconds()
{
uint64_t get_microseconds() {
struct timeval tv;
gettimeofday(&tv,NULL);
return tv.tv_sec*(uint64_t)1000000+tv.tv_usec;
gettimeofday(&tv, NULL);
return tv.tv_sec * (uint64_t)1000000 + tv.tv_usec;
}

int ps_main(int argc, char **argv) {

bsg_zynq_pl *zpl = new bsg_zynq_pl(argc, argv);

// the read memory map is essentially
//
// 0,4,8,C: registers
// 10, 14: output fifo heads
// 18, 1C: output fifo counts
// 20,24,28,2C: input fifo counts
// 30: last address of write

// the write memory map is essentially
//
// 0,4,8,C: registers
// 10,14,18,1C: input fifo

int val1 = 0xDEADBEEF;
int val2 = 0xCAFEBABE;
int val3 = 0x0000CADE;
int val4 = 0xC0DE0000;
int mask1 = 0xf;
int mask2 = 0xf;

// NEON
{
uint32_t words_per_xfer = 4;
const char *label="neon 4x32:";
uint64_t start=get_microseconds();
int limit = 100000;
for (int i = 0; i < limit/4; i++) {
zpl->shell_write(GP0_ADDR_BASE, 23, 0xf);
zpl->shell_write(GP0_ADDR_BASE, 12, 0xf);
zpl->shell_write(GP0_ADDR_BASE, 1, 0xf);
zpl->shell_write(GP0_ADDR_BASE, 43, 0xf);
bsg_zynq_pl *zpl = new bsg_zynq_pl(argc, argv);

// the read memory map is essentially
//
// 0,4,8,C: registers
// 10, 14: output fifo heads
// 18, 1C: output fifo counts
// 20,24,28,2C: input fifo counts
// 30: last address of write

// the write memory map is essentially
//
// 0,4,8,C: registers
// 10,14,18,1C: input fifo

int val1 = 0xDEADBEEF;
int val2 = 0xCAFEBABE;
int val3 = 0x0000CADE;
int val4 = 0xC0DE0000;
int mask1 = 0xf;
int mask2 = 0xf;

// NEON
{
uint32_t words_per_xfer = 4;
const char *label = "neon 4x32:";
uint64_t start = get_microseconds();
int limit = 100000;
for (int i = 0; i < limit / 4; i++) {
zpl->shell_write(GP0_ADDR_BASE, 23, 0xf);
zpl->shell_write(GP0_ADDR_BASE, 12, 0xf);
zpl->shell_write(GP0_ADDR_BASE, 1, 0xf);
zpl->shell_write(GP0_ADDR_BASE, 43, 0xf);
}
uint64_t net = get_microseconds() - start;
printf("%s: %llu microseconds for %d xfers: %f words per microsecond\n",
label, net, limit, ((double)limit) / ((double)net));
}

// Single AXI request
{
uint32_t words_per_xfer = 1;
const char *label = "int32 :";
uint64_t start = get_microseconds();
int limit = 100000;
for (int i = 0; i < limit; i++) {
zpl->shell_write4(GP0_ADDR_BASE, 23, 12, 1, 43);
}
uint64_t net = get_microseconds() - start;
printf("%s: %llu microseconds for %d xfers: %f words per microsecond\n",
label, net, limit, ((double)limit) / ((double)net));
}
uint64_t net=get_microseconds()-start;
printf("%s: %llu microseconds for %d xfers: %f words per microsecond\n", label, net, limit, ((double) limit) / ((double) net) );
}

// Single AXI request
{
uint32_t words_per_xfer = 1;
const char *label="int32 :";
uint64_t start=get_microseconds();
int limit = 100000;
for (int i = 0; i < limit; i++) {
zpl->shell_write4(GP0_ADDR_BASE, 23, 12, 1, 43);

if (1) {
// write to two registers, checking our address snoop to see
// actual address that was received over the AXI bus
zpl->shell_write(0x0 + GP0_ADDR_BASE, val1, mask1);
assert(zpl->shell_read(0x30 + GP0_ADDR_BASE) == 0x0);
zpl->shell_write(0x4 + GP0_ADDR_BASE, val2, mask2);
assert(zpl->shell_read(0x30 + GP0_ADDR_BASE) == 0x4);
// 8,12

// check output fifo counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == 0));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == 0));

// check input fifo counters
bsg_pr_dbg_ps("%d\n", zpl->shell_read(0x20 + GP0_ADDR_BASE));
assert((zpl->shell_read(0x20 + GP0_ADDR_BASE) == 4));
assert((zpl->shell_read(0x24 + GP0_ADDR_BASE) == 4));
assert((zpl->shell_read(0x28 + GP0_ADDR_BASE) == 4));
assert((zpl->shell_read(0x2C + GP0_ADDR_BASE) == 4));

// write to fifos
zpl->shell_write(0x10 + GP0_ADDR_BASE, val3, mask1);

// checker counters
assert((zpl->shell_read(0x20 + GP0_ADDR_BASE) == (3)));
assert((zpl->shell_read(0x24 + GP0_ADDR_BASE) == (4)));

// write to fifo
zpl->shell_write(0x10 + GP0_ADDR_BASE, val1, mask1);
// checker counters
assert((zpl->shell_read(0x20 + GP0_ADDR_BASE) == (2)));
assert((zpl->shell_read(0x24 + GP0_ADDR_BASE) == (4)));

zpl->shell_write(0x14 + GP0_ADDR_BASE, val4, mask2);
zpl->shell_write(0x14 + GP0_ADDR_BASE, val2, mask2);

// checker counters
assert((zpl->shell_read(0x20 + GP0_ADDR_BASE) == (4)));
assert((zpl->shell_read(0x24 + GP0_ADDR_BASE) == (4)));

// check register writes
assert((zpl->shell_read(0x0 + GP0_ADDR_BASE) == (val1)));
assert((zpl->shell_read(0x4 + GP0_ADDR_BASE) == (val2)));

// checker output counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == (2)));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == (0)));

// check that the output fifo has the sum of the input fifos
assert((zpl->shell_read(0x10 + GP0_ADDR_BASE) == (val3 + val4)));
assert((zpl->shell_read(0x10 + GP0_ADDR_BASE) == (val1 + val2)));

// checker output counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == (0)));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == (0)));

// try a different set of input and output fifos
zpl->shell_write(0x18 + GP0_ADDR_BASE, val1, mask1);
zpl->shell_write(0x1C + GP0_ADDR_BASE, val2, mask2);

// checker output counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == (0)));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == (1)));

// read value out of fifo
assert((zpl->shell_read(0x14 + GP0_ADDR_BASE) == (val1 + val2)));

// checker output counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == (0)));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == (0)));
}
uint64_t net=get_microseconds()-start;
printf("%s: %llu microseconds for %d xfers: %f words per microsecond\n", label, net, limit, ((double) limit) / ((double) net) );
}

if (1) {
// write to two registers, checking our address snoop to see
// actual address that was received over the AXI bus
zpl->shell_write(0x0 + GP0_ADDR_BASE, val1, mask1);
assert(zpl->shell_read(0x30 + GP0_ADDR_BASE) == 0x0);
zpl->shell_write(0x4 + GP0_ADDR_BASE, val2, mask2);
assert(zpl->shell_read(0x30 + GP0_ADDR_BASE) == 0x4);
// 8,12

// check output fifo counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == 0));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == 0));

// check input fifo counters
bsg_pr_dbg_ps("%d\n", zpl->shell_read(0x20 + GP0_ADDR_BASE));
assert((zpl->shell_read(0x20 + GP0_ADDR_BASE) == 4));
assert((zpl->shell_read(0x24 + GP0_ADDR_BASE) == 4));
assert((zpl->shell_read(0x28 + GP0_ADDR_BASE) == 4));
assert((zpl->shell_read(0x2C + GP0_ADDR_BASE) == 4));

// write to fifos
zpl->shell_write(0x10 + GP0_ADDR_BASE, val3, mask1);

// checker counters
assert((zpl->shell_read(0x20 + GP0_ADDR_BASE) == (3)));
assert((zpl->shell_read(0x24 + GP0_ADDR_BASE) == (4)));

// write to fifo
zpl->shell_write(0x10 + GP0_ADDR_BASE, val1, mask1);
// checker counters
assert((zpl->shell_read(0x20 + GP0_ADDR_BASE) == (2)));
assert((zpl->shell_read(0x24 + GP0_ADDR_BASE) == (4)));

zpl->shell_write(0x14 + GP0_ADDR_BASE, val4, mask2);
zpl->shell_write(0x14 + GP0_ADDR_BASE, val2, mask2);

// checker counters
assert((zpl->shell_read(0x20 + GP0_ADDR_BASE) == (4)));
assert((zpl->shell_read(0x24 + GP0_ADDR_BASE) == (4)));

// check register writes
assert((zpl->shell_read(0x0 + GP0_ADDR_BASE) == (val1)));
assert((zpl->shell_read(0x4 + GP0_ADDR_BASE) == (val2)));

// checker output counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == (2)));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == (0)));

// check that the output fifo has the sum of the input fifos
assert((zpl->shell_read(0x10 + GP0_ADDR_BASE) == (val3 + val4)));
assert((zpl->shell_read(0x10 + GP0_ADDR_BASE) == (val1 + val2)));

// checker output counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == (0)));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == (0)));

// try a different set of input and output fifos
zpl->shell_write(0x18 + GP0_ADDR_BASE, val1, mask1);
zpl->shell_write(0x1C + GP0_ADDR_BASE, val2, mask2);

// checker output counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == (0)));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == (1)));

// read value out of fifo
assert((zpl->shell_read(0x14 + GP0_ADDR_BASE) == (val1 + val2)));

// checker output counters
assert((zpl->shell_read(0x18 + GP0_ADDR_BASE) == (0)));
assert((zpl->shell_read(0x1C + GP0_ADDR_BASE) == (0)));

}
printf("## everything passed; at end of test\n");
zpl->done();

delete zpl;
printf("## everything passed; at end of test\n");
zpl->done();

delete zpl;
}
65 changes: 34 additions & 31 deletions cosim/axis-example/ps.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,45 @@
// the API we provide abstracts away the
// communication plumbing differences.

#include <stdlib.h>
#include <stdio.h>
#include "bsg_zynq_pl.h"
#include "bsg_printing.h"
#include "bsg_argparse.h"
#include "bsg_printing.h"
#include "bsg_zynq_pl.h"
#include <stdio.h>
#include <stdlib.h>

#include <sys/time.h>

#include "ps.hpp"

int ps_main(int argc, char **argv) {
bsg_zynq_pl *zpl = new bsg_zynq_pl(argc, argv);
zpl->start();

zpl->shell_write(GP0_WR_CSR_TINIT, 0, 0xf);
assert(zpl->shell_read(GP0_RD_CSR_TINIT) == 0);

for (int i = 0; i < 16; i++) {
while (!zpl->shell_read(GP0_RD_PS2PL_FIFO_CTRS));
zpl->shell_write(GP0_WR_PS2PL_FIFO_DATA, i, 0xf);
}

// Make sure the fifo data is correct
for (int i = 0; i < 16; i++) {
while (!zpl->shell_read(GP0_RD_PL2PS_FIFO_CTRS));
assert(zpl->shell_read(GP0_RD_PL2PS_FIFO_DATA) == i);
}

// Make sure TLAST was set correctly
assert(zpl->shell_read(GP0_RD_CSR_TSTATUS) == 1);

printf("## everything passed; at end of test\n");
for (int i = 0; i < 50; i++) zpl->tick();
zpl->stop();
zpl->done();

delete zpl;
return 0;
bsg_zynq_pl *zpl = new bsg_zynq_pl(argc, argv);
zpl->start();

zpl->shell_write(GP0_WR_CSR_TINIT, 0, 0xf);
assert(zpl->shell_read(GP0_RD_CSR_TINIT) == 0);

for (int i = 0; i < 16; i++) {
while (!zpl->shell_read(GP0_RD_PS2PL_FIFO_CTRS))
;
zpl->shell_write(GP0_WR_PS2PL_FIFO_DATA, i, 0xf);
}

// Make sure the fifo data is correct
for (int i = 0; i < 16; i++) {
while (!zpl->shell_read(GP0_RD_PL2PS_FIFO_CTRS))
;
assert(zpl->shell_read(GP0_RD_PL2PS_FIFO_DATA) == i);
}

// Make sure TLAST was set correctly
assert(zpl->shell_read(GP0_RD_CSR_TSTATUS) == 1);

printf("## everything passed; at end of test\n");
for (int i = 0; i < 50; i++)
zpl->tick();
zpl->stop();
zpl->done();

delete zpl;
return 0;
}
Loading

0 comments on commit 7d21eb7

Please sign in to comment.