From 83fb1fd4655bee54f5c59161aafad3951fc16dd3 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 17 Oct 2023 13:22:49 +0200 Subject: [PATCH] FPGA: Clean-up of prefix_sum --- fpga/hls/spot_finder.h | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/fpga/hls/spot_finder.h b/fpga/hls/spot_finder.h index c244bca5..4f52189b 100644 --- a/fpga/hls/spot_finder.h +++ b/fpga/hls/spot_finder.h @@ -63,36 +63,6 @@ ap_uint prefix_sum(const ap_uint ext_column_sum) { return pack32(line_sum); } -template -ap_uint prefix_sum(const ap_uint ext_column_sum, - const ap_uint ext_column_sum_old) { -#pragma HLS PIPELINE II=1 - ap_int column_sum[32 + 2 * FPGA_NBX]; - ap_uint retval; - ap_int line_sum[32]; - ap_int tmp_sum = 0; - - for (int i = 0; i < 2 * FPGA_NBX; i++) - column_sum[i] = ext_column_sum_old(i*N+(N-1), i*N); - - for (int i = 0; i < 32; i++) - column_sum[i+ 2 * FPGA_NBX] = ext_column_sum(i * N + (N - 1), i * N); - - //for (int i = 0; i < 32; i++) { - // line_sum[i] = 0; - // for (int j = 0; j < 2 * FPGA_NBX + 1; j++) - // line_sum[i] += column_sum[i + j]; - //} - - for (int i = 0; i < 32; i++) { - tmp_sum += column_sum[i + 2 * FPGA_NBX]; - line_sum[i] = tmp_sum; - tmp_sum -= column_sum[i]; - } - - return pack32(line_sum); -} - void calc_mask_diff(ap_uint &ext_column_valid, const ap_uint<32> ext_old_value, const ap_uint<32> ext_new_value);