FPGA: Remove multipixel from the pipeline
This commit is contained in:
@@ -231,8 +231,6 @@ void HLSSimulatedDevice::HLSMainThread() {
|
||||
STREAM_512 converted_8;
|
||||
STREAM_512 converted_9;
|
||||
STREAM_512 converted_10;
|
||||
STREAM_512 converted_11;
|
||||
STREAM_512 converted_12;
|
||||
|
||||
hls::stream<axis_addr> addr0;
|
||||
hls::stream<axis_addr> addr1;
|
||||
@@ -366,15 +364,12 @@ void HLSSimulatedDevice::HLSMainThread() {
|
||||
|
||||
hls_cores.emplace_back([&] { axis_32_to_512(spot_finder_result_0, spot_finder_result_1);});
|
||||
|
||||
// 9. Extend multipixels
|
||||
hls_cores.emplace_back([&] { add_multipixel(converted_9, converted_10);});
|
||||
|
||||
// Timer procedure - count how many times write_data is not accepting input (to help track down latency issues)
|
||||
hls_cores.emplace_back([&] { timer_host(converted_10, converted_11, counter_host); });
|
||||
hls_cores.emplace_back([&] { timer_host(converted_9, converted_10, counter_host); });
|
||||
|
||||
// 11. Prepare data to write to host memory
|
||||
// 9. Prepare data to write to host memory
|
||||
hls_cores.emplace_back([&] {
|
||||
host_writer(converted_11, adu_histo_result, integration_result_1, spot_finder_result_1,
|
||||
host_writer(converted_10, adu_histo_result, integration_result_1, spot_finder_result_1,
|
||||
compl7, datamover_out.GetDataStream(),
|
||||
datamover_out.GetCtrlStream(), work_request_stream, completion_stream,
|
||||
packets_processed, host_writer_idle, err_reg); });
|
||||
@@ -436,9 +431,6 @@ void HLSSimulatedDevice::HLSMainThread() {
|
||||
if (!converted_10.empty())
|
||||
throw std::runtime_error("Converted_10 queue not empty");
|
||||
|
||||
if (!converted_11.empty())
|
||||
throw std::runtime_error("Converted_11 queue not empty");
|
||||
|
||||
if (!compl0.empty())
|
||||
throw std::runtime_error("Compl0 queue not empty");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user