mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 38 Wiki Activity

HLS: Minor fixes to adu_histo.cpp

Browse Source
This commit is contained in:
leonarski_f
2023-10-27 15:27:36 +02:00
parent 4fbac629d6
commit 7973c2ca81
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fpga/hls/adu_histo.cpp
View File

@@ -35,19 +35,21 @@ void adu_histo(STREAM_512 &data_in,
axis_completion cmpl;
s_axis_completion >> cmpl;
while (!cmpl.last) {
m_axis_completion << cmpl;
for (int i = 0; i < (sum + 1) * RAW_MODULE_SIZE / (32 * 2); i++) {
for (int s = 0; s < sum+1; s++) {
m_axis_completion << cmpl;
for (int i = 0; i < RAW_MODULE_SIZE / (32 * 2); i++) {
#pragma HLS PIPELINE II=2
for (int k = 0; k < 2; k++) {
data_in >> packet_in;
data_out << packet_in;
for (int k = 0; k < 2; k++) {
data_in >> packet_in;
data_out << packet_in;
unpack32(packet_in.data, in_val);
for (int j = 0; j < 32; j++)
count[k * 32 + j][in_val[j] / ADU_HISTO_BIN_WIDTH] += (cmpl.packet_mask[i / 64] ? 1 : 0);
unpack32(packet_in.data, in_val);
for (int j = 0; j < 32; j++)
count[k * 32 + j][in_val[j] / ADU_HISTO_BIN_WIDTH] += (cmpl.packet_mask[i / 64] ? 1 : 0);
}
}
s_axis_completion >> cmpl;
}
for (int i = 0; i < ADU_HISTO_BIN_COUNT / 16; i++) {
#pragma HLS PIPELINE II=1
ap_uint<512> val = 0;
@@ -61,7 +63,6 @@ void adu_histo(STREAM_512 &data_in,
}
result_out << val;
}
s_axis_completion >> cmpl;
}
m_axis_completion << cmpl;