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.

Sign up for GitHub

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

Jump to bottom

Enable sw_emu on Vitis HLS v2021.2 #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Enable sw_emu on Vitis HLS v2021.2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c09b895
enable sw_emu on Vitis HLS v2021.2
ueqri Mar 18, 2022
f8762b5
remove exit condition in k2k_relay
ueqri Mar 19, 2022
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
15 changes: 3 additions & 12 deletions spmv/k2k_relay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,19 @@

extern "C" {
void k2k_relay(
hls::stream<VEC_AXIS_T> &in, // in
hls::stream<VEC_AXIS_T> &out // out
hls::stream<VEC_AXIS_IF_T> &in, // in
hls::stream<VEC_AXIS_IF_T> &out // out
) {
#pragma HLS interface ap_ctrl_none port=return

#pragma HLS interface axis register both port=in
#pragma HLS interface axis register both port=out

#ifndef __SYNTHESIS__
bool exit = false;
while (!exit) {
VEC_AXIS_T pkt = in.read();
out.write(pkt);
exit = (pkt.user == EOS);
}
#else
while (1) {
#pragma HLS pipeline II=1
VEC_AXIS_T pkt = in.read();
VEC_AXIS_IF_T pkt = in.read();
out.write(pkt);
}
#endif

} // kernel
} // extern "C"
16 changes: 15 additions & 1 deletion spmv/libfpga/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ struct VEC_PLD_T{
#define VEC_PLD_EOS ((VEC_PLD_T){0,0,EOS})

#ifndef __SYNTHESIS__
namespace {
std::string inst2str(INST_T inst) {
switch (inst) {
case SOD: return std::string("SOD");
Expand Down Expand Up @@ -130,6 +131,7 @@ std::ostream& operator<<(std::ostream& os, const VEC_PLD_T &p) {
<< "inst: " << inst2str(p.inst) << '}';
return os;
}
}
#endif

//-------------------------------------------------------------------------
Expand All @@ -140,12 +142,14 @@ std::ostream& operator<<(std::ostream& os, const VEC_PLD_T &p) {
typedef struct {
ap_uint<32 * (PACK_SIZE + 1)> data;
ap_uint<2> user; // same as INST_T
} VEC_AXIS_T;
} VEC_AXIS_T; // only used for stream FIFOs
typedef ap_axiu<32 * (PACK_SIZE + 1), 2, 0, 0> VEC_AXIS_IF_T; // AXI4-Stream interface of split kernels

#define VEC_AXIS_PKT_IDX(p) (p.data(31,0))
#define VEC_AXIS_VAL(p, i) (p.data(63 + 32 * i,32 + 32 * i))

#ifndef __SYNTHESIS__
namespace {
std::ostream& operator<<(std::ostream& os, const VEC_AXIS_T &p) {
os << '{' << "pktidx: " << VEC_AXIS_PKT_IDX(p) << '|';
for (unsigned i = 0; i < PACK_SIZE; i++) {
Expand All @@ -154,6 +158,16 @@ std::ostream& operator<<(std::ostream& os, const VEC_AXIS_T &p) {
os << "user: " << inst2str(p.user) << '}';
return os;
}

std::ostream& operator<<(std::ostream& os, const VEC_AXIS_IF_T &p) {
os << '{' << "pktidx: " << VEC_AXIS_PKT_IDX(p) << '|';
for (unsigned i = 0; i < PACK_SIZE; i++) {
os << "val: " << float(VEC_AXIS_VAL(p, i)) / (1 << FBITS) << '|';
}
os << "user: " << inst2str(p.user) << '}';
return os;
}
}
#endif

//-------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions spmv/libfpga/shuffle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// bool line_tracing_shuffle_core = false;
// bool csim_abort_shuffle_core = false;
// unsigned max_iter_limit_shuffle_core = 100;
unsigned long long iter_cnt = 0;
// unsigned long long iter_cnt = 0;
#endif

const unsigned ARBITER_LATENCY = 7;
Expand All @@ -34,7 +34,7 @@ void arbiter_1p(
#pragma HLS pipeline II=1 enable_flush
#pragma HLS latency min=ARBITER_LATENCY max=ARBITER_LATENCY

#pragma HLS array_partition variable=in_addr complete
#pragma HLS array_partition variable=in_resend complete
#pragma HLS array_partition variable=xbar_sel complete

// prioritized valid and addr
Expand Down Expand Up @@ -112,7 +112,7 @@ void arbiter_1p(
#pragma HLS pipeline II=1 enable_flush
#pragma HLS latency min=ARBITER_LATENCY max=ARBITER_LATENCY

#pragma HLS array_partition variable=in_addr complete
#pragma HLS array_partition variable=in_resend complete
#pragma HLS array_partition variable=xbar_sel complete

// prioritized valid and addr
Expand Down
8 changes: 5 additions & 3 deletions spmv/libfpga/spmv_cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
template<typename T, unsigned len>
T array_max(T array[len]) {
#pragma HLS inline
#pragma HLS expression_balance
// #pragma HLS expression_balance
T result = 0;
for (unsigned i = 0; i < len; i++) {
#pragma HLS unroll
Expand All @@ -31,6 +31,7 @@ T array_max(T array[len]) {
return result;
}

namespace {
void CPSR_matrix_loader(
const SPMV_MAT_PKT_T *matrix_hbm, // in
unsigned row_partition_idx, // in
Expand Down Expand Up @@ -191,6 +192,7 @@ void spmv_result_packer (
#endif
}
}
}

// one computational cluster
template<int cluster_id>
Expand All @@ -213,14 +215,14 @@ void spmv_cluster(
#pragma HLS stream variable=ML2SF depth=FIFO_DEPTH
#pragma HLS stream variable=SF2VAU depth=FIFO_DEPTH
#pragma HLS stream variable=VAU2SF depth=FIFO_DEPTH
#pragma HLS stream variable=FS2PE depth=FIFO_DEPTH
#pragma HLS stream variable=SF2PE depth=FIFO_DEPTH
#pragma HLS stream variable=PE2PK depth=FIFO_DEPTH
#pragma HLS stream variable=UPK2VAU depth=FIFO_DEPTH

#pragma HLS bind_storage variable=ML2SF type=FIFO impl=SRL
#pragma HLS bind_storage variable=SF2VAU type=FIFO impl=SRL
#pragma HLS bind_storage variable=VAU2SF type=FIFO impl=SRL
#pragma HLS bind_storage variable=FS2PE type=FIFO impl=SRL
#pragma HLS bind_storage variable=SF2PE type=FIFO impl=SRL
#pragma HLS bind_storage variable=PE2PK type=FIFO impl=SRL
#pragma HLS bind_storage variable=UPK2VAU type=FIFO impl=SRL

Expand Down
20 changes: 13 additions & 7 deletions spmv/libfpga/stream_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,24 @@
// duplicate 1 AXIS stream to N
template<unsigned N>
void axis_duplicate(
hls::stream<VEC_AXIS_T> &in,
hls::stream<VEC_AXIS_IF_T> &in,
hls::stream<VEC_AXIS_T> out[N]
) {
bool exit = false;
while (!exit) {
#pragma HLS pipeline II=1
VEC_AXIS_T pkt = in.read();
VEC_AXIS_T pkt_reg = reg(reg(pkt));
VEC_AXIS_IF_T pkt_if = in.read();
VEC_AXIS_IF_T pkt_if_reg = reg(reg(pkt_if));
VEC_AXIS_T pkt_reg;
pkt_reg.data = pkt_if_reg.data;
pkt_reg.user = pkt_if_reg.user;
VEC_AXIS_T pkt_replicas[N];
for (unsigned k = 0; k < N; k++) {
#pragma HLS unroll
pkt_replicas[k] = reg(pkt_reg);
out[k].write(pkt_replicas[k]);
}
exit = (pkt.user == EOS);
exit = (pkt_if.user == EOS);
}
}

Expand All @@ -35,7 +38,7 @@ void axis_duplicate(
template<unsigned N>
void axis_merge(
hls::stream<VEC_AXIS_T> in[N],
hls::stream<VEC_AXIS_T> &out
hls::stream<VEC_AXIS_IF_T> &out
) {
unsigned i = 0;
unsigned c = 0;
Expand All @@ -47,7 +50,10 @@ void axis_merge(
VEC_AXIS_T pkt = in[i].read();
VEC_AXIS_PKT_IDX(pkt) = c;
if (pkt.user != EOS) {
out.write(pkt);
VEC_AXIS_IF_T pkt_if;
pkt_if.data = pkt.data;
pkt_if.user = pkt.user;
out.write(pkt_if);
#ifdef AXIS_MERGE_LINE_TRACING
std::cout << "axis merge write output from input " << i << std::endl
<< " " << pkt << std::endl;
Expand All @@ -64,7 +70,7 @@ void axis_merge(
}


VEC_AXIS_T eos;
VEC_AXIS_IF_T eos;
for (unsigned k = 0; k < PACK_SIZE; k++) {
#pragma HLS unroll
VEC_AXIS_VAL(eos, k) = 0;
Expand Down
8 changes: 4 additions & 4 deletions spmv/spmv_result_drain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ void spmv_result_drain(
PACKED_VAL_T *packed_dense_result, // out
const unsigned row_part_id, // in
// const unsigned rows_per_c_in_partition, // in
hls::stream<VEC_AXIS_T> &from_SLR0, // out
hls::stream<VEC_AXIS_T> &from_SLR1, // out
hls::stream<VEC_AXIS_T> &from_SLR2 // out
hls::stream<VEC_AXIS_IF_T> &from_SLR0, // out
hls::stream<VEC_AXIS_IF_T> &from_SLR1, // out
hls::stream<VEC_AXIS_IF_T> &from_SLR2 // out
) {
#pragma HLS interface m_axi port=packed_dense_result offset=slave bundle=spmv_vin
#pragma HLS interface s_axilite port=packed_dense_result bundle=control
Expand All @@ -37,7 +37,7 @@ void spmv_result_drain(
result_drain_main_loop:
while (!exit) {
#pragma HLS pipeline II=1
VEC_AXIS_T pkt;
VEC_AXIS_IF_T pkt;
bool do_write = false;
switch (current_input) {
case 0:
Expand Down
4 changes: 2 additions & 2 deletions spmv/spmv_sk0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ void spmv_sk0(
const SPMV_MAT_PKT_T *matrix_hbm_1, // in
const SPMV_MAT_PKT_T *matrix_hbm_2, // in
const SPMV_MAT_PKT_T *matrix_hbm_3, // in
hls::stream<VEC_AXIS_T> &vec_in, // in
hls::stream<VEC_AXIS_T> &res_out, // out
hls::stream<VEC_AXIS_IF_T> &vec_in, // in
hls::stream<VEC_AXIS_IF_T> &res_out, // out
const unsigned row_partition_idx, // in
const unsigned rows_per_c_in_partition, // in
const unsigned num_col_partitions, // in
Expand Down
4 changes: 2 additions & 2 deletions spmv/spmv_sk1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ void spmv_sk1(
const SPMV_MAT_PKT_T *matrix_hbm_7, // in
const SPMV_MAT_PKT_T *matrix_hbm_8, // in
const SPMV_MAT_PKT_T *matrix_hbm_9, // in
hls::stream<VEC_AXIS_T> &vec_in, // in
hls::stream<VEC_AXIS_T> &res_out, // out
hls::stream<VEC_AXIS_IF_T> &vec_in, // in
hls::stream<VEC_AXIS_IF_T> &res_out, // out
const unsigned row_partition_idx, // in
const unsigned rows_per_c_in_partition, // in
const unsigned num_col_partitions, // in
Expand Down
4 changes: 2 additions & 2 deletions spmv/spmv_sk2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ void spmv_sk2(
const SPMV_MAT_PKT_T *matrix_hbm_13, // in
const SPMV_MAT_PKT_T *matrix_hbm_14, // in
const SPMV_MAT_PKT_T *matrix_hbm_15, // in
hls::stream<VEC_AXIS_T> &vec_in, // in
hls::stream<VEC_AXIS_T> &res_out, // out
hls::stream<VEC_AXIS_IF_T> &vec_in, // in
hls::stream<VEC_AXIS_IF_T> &res_out, // out
const unsigned row_partition_idx, // in
const unsigned rows_per_c_in_partition, // in
const unsigned num_col_partitions, // in
Expand Down
13 changes: 8 additions & 5 deletions spmv/spmv_vector_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,17 @@ void load_duplicate(

void write_k2ks(
hls::stream<VEC_AXIS_T> &in, // in
hls::stream<VEC_AXIS_T> &out // out
hls::stream<VEC_AXIS_IF_T> &out // out
) {
bool exit = false;
loop_fifo2axis:
while (!exit) {
#pragma HLS pipeline II=1
VEC_AXIS_T pkt = in.read();
out.write(pkt);
VEC_AXIS_IF_T pkt_if;
pkt_if.data = pkt.data;
pkt_if.user = pkt.user;
out.write(pkt_if);
exit = (pkt.user == EOS);
}
}
Expand All @@ -96,9 +99,9 @@ extern "C" {
void spmv_vector_loader(
const PACKED_VAL_T *packed_dense_vector, // in
const unsigned num_cols, // in
hls::stream<VEC_AXIS_T> &to_SLR0, // out
hls::stream<VEC_AXIS_T> &to_SLR1, // out
hls::stream<VEC_AXIS_T> &to_SLR2 // out
hls::stream<VEC_AXIS_IF_T> &to_SLR0, // out
hls::stream<VEC_AXIS_IF_T> &to_SLR1, // out
hls::stream<VEC_AXIS_IF_T> &to_SLR2 // out
) {
#pragma HLS interface m_axi port=packed_dense_vector offset=slave bundle=spmv_vin
#pragma HLS interface s_axilite port=packed_dense_vector bundle=control
Expand Down
11 changes: 10 additions & 1 deletion sw/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ HOST_ARCH = x86

CXX := g++

CXXFLAGS += -Wall -std=c++11
CXXFLAGS += -Wall -std=c++14

CXXFLAGS += -I$(CNPY_INCLUDE)
LDFLAGS += -L$(CNPY_LIB) -lcnpy
Expand All @@ -36,10 +36,15 @@ LDFLAGS += -lrt -lstdc++
CXXFLAGS += -Wno-maybe-uninitialized
CXXFLAGS += -Wno-uninitialized
CXXFLAGS += -Wno-int-in-bool-context
CXXFLAGS += -Wno-unknown-pragmas
CXXFLAGS += -Wno-unused-function

$(HW_DIR)/build_dir.hw_emu/spmv.xclbin:
cd $(HW_DIR); make -j5 build TARGET=hw_emu IMPL=$(IMPL)

$(HW_DIR)/build_dir.sw_emu/spmv.xclbin:
cd $(HW_DIR); make -j5 build TARGET=sw_emu IMPL=$(IMPL)

$(HW_DIR)/build_dir.hw/spmv.xclbin:
cd $(HW_DIR); make -j5 build TARGET=hw IMPL=$(IMPL)

Expand All @@ -59,6 +64,10 @@ hw_emu: host $(HW_DIR)/build_dir.hw_emu/spmv.xclbin
cp $(HW_DIR)/emconfig.json .
./host hw_emu $(HW_DIR)/build_dir.hw_emu/spmv.xclbin

sw_emu: host $(HW_DIR)/build_dir.sw_emu/spmv.xclbin
cp $(HW_DIR)/emconfig.json .
./host sw_emu $(HW_DIR)/build_dir.sw_emu/spmv.xclbin

hw: host $(HW_DIR)/build_dir.hw/spmv.xclbin
./host hw $(HW_DIR)/build_dir.hw/spmv.xclbin

Expand Down
6 changes: 3 additions & 3 deletions sw/host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,13 +537,13 @@ int main (int argc, char** argv) {
// parse command-line arguments
if (argc != 3) {
std::cout << "Usage: " << argv[0]
<< " <hw_emu/hw> <xclbin>" << std::endl;
<< " <sw_emu/hw_emu/hw> <xclbin>" << std::endl;
return 0;
}
std::string target = argv[1];
std::string xclbin = argv[2];
if (target != "hw_emu" && target != "hw") {
std::cout << "This host program only support hw_emu and hw!" << std::endl;
if (target != "sw_emu" && target != "hw_emu" && target != "hw") {
std::cout << "This host program only support sw_emu, hw_emu and hw!" << std::endl;
return 1;
}

Expand Down