v1.0.0-rc.31

This commit is contained in:
2025-03-02 13:15:28 +01:00
parent aeabc81a4c
commit ddf4c75645
309 changed files with 8705 additions and 1421 deletions
+30 -8
View File
@@ -295,9 +295,11 @@ void HLSDevice::HLSMainThread() {
STREAM_768 stream_768_2("stream_768_2");
STREAM_768 stream_768_3("stream_768_3");
STREAM_768 stream_768_4("stream_768_4");
STREAM_768 stream_768_4a("stream_768_4a");
STREAM_768 stream_768_5("stream_768_5");
STREAM_768 stream_768_6("stream_768_6");
STREAM_768 stream_768_7("stream_768_7");
STREAM_768 stream_768_8("stream_768_8");
STREAM_512 data_0("data_0");
STREAM_512 data_1("data_1");
@@ -327,13 +329,17 @@ void HLSDevice::HLSMainThread() {
hls::stream<ap_axiu<32,1,1,1>> spot_finder_result_0("spot_finder_result_0");
hls::stream<ap_axiu<32,1,1,1>> spot_finder_result_1("spot_finder_result_1");
hls::stream<ap_axiu<32,1,1,1>> spot_finder_result_0a("spot_finder_result_0a");
hls::stream<ap_uint<32>> spot_finder_conn_0("spot_finder_conn_0");
hls::stream<ap_axiu<32,1,1,1>> spot_finder_result_2("spot_finder_result_2");
hls::stream<ap_uint<512>> spot_finder_result_3("spot_finder_result_3");
hls::stream<ap_uint<32>> spot_finder_mask_0("spot_finder_mask_0");
hls::stream<ap_axiu<32,1,1,1>> spot_finder_mask_0("spot_finder_mask_0");
hls::stream<ap_axiu<32,1,1,1>> spot_finder_mask_1("spot_finder_mask_1");
hls::stream<ap_axiu<32,1,1,1>> spot_finder_mask_2("spot_finder_mask_2");
hls::stream<ap_uint<256>> roi_calc_result_0("roi_calc_result_0");
hls::stream<ap_uint<128>> pixel_count_result_0("pixel_calc_result_0");
hls::stream<ap_uint<UDP_METADATA_STREAM_WIDTH> > udp_metadata("udp_metadata");
@@ -567,11 +573,23 @@ void HLSDevice::HLSMainThread() {
});
hls_cores.emplace_back([&] {
spot_finder(stream_768_4, spot_finder_mask_0, stream_768_5, spot_finder_result_0, tmp_count_threshold, tmp_snr_threshold);
spot_finder(stream_768_4, spot_finder_mask_0, stream_768_4a, spot_finder_mask_1, spot_finder_result_0, tmp_count_threshold, tmp_snr_threshold);
});
hls_cores.emplace_back([&] {
spot_finder_connectivity(spot_finder_result_0,
while (spot_finder_result_0.read().user == 0);
});
hls_cores.emplace_back([&] {
spot_finder(stream_768_4a, spot_finder_mask_1, stream_768_5, spot_finder_mask_2, spot_finder_result_0a, tmp_count_threshold, tmp_snr_threshold);
});
hls_cores.emplace_back([&] {
while (spot_finder_mask_2.read().user == 0);
});
hls_cores.emplace_back([&] {
spot_finder_connectivity(spot_finder_result_0a,
spot_finder_result_1,
spot_finder_conn_0);
});
@@ -599,16 +617,20 @@ void HLSDevice::HLSMainThread() {
impl_->hbm_if_size);
});
// 13. Pixel sq root
hls_cores.emplace_back([&] { pixel_sqrt(stream_768_6,stream_768_7); });
// 13. Calc pixel statistics
hls_cores.emplace_back([&] { pixel_calc(stream_768_6, stream_768_7, pixel_count_result_0); });
// 14. Reduce/extend 24-bit stream
hls_cores.emplace_back([&] { stream768to512(stream_768_7, data_12, stream768to512_idle);});
// 14. Pixel sq root
hls_cores.emplace_back([&] { pixel_sqrt(stream_768_7,stream_768_8); });
// 15. Prepare data to write to host memory
// 15. Reduce/extend 24-bit stream
hls_cores.emplace_back([&] { stream768to512(stream_768_8, data_12, stream768to512_idle);});
// 16. Prepare data to write to host memory
hls_cores.emplace_back([&] {
ap_uint<3> state;
host_writer(data_12, adu_histo_result, integration_result_1, spot_finder_result_3, roi_calc_result_0,
pixel_count_result_0,
axi_compl[12], impl_->datamover_out.GetDataStream(),
impl_->datamover_out.GetCtrlStream(), impl_->work_request_stream, impl_->completion_stream,
dma_address_table.data(), packets_processed, impl_->host_writer_idle, impl_->cancel_data_collection, state);