add missed Vivado backend pooling changes

Author: jmitrevs

hls4ml/templates/vivado/nnet_utils/nnet_pooling.h

@@ -184,9 +184,9 @@ void pooling2d_cl(data_T data[CONFIG_T::in_height * CONFIG_T::in_width * CONFIG_
     for (int ff = 0; ff < CONFIG_T::n_filt; ff++) {
 
         // Loop over input image y in steps of stride
-        for (int ii = 0; ii < padded_height; ii += CONFIG_T::stride_height) {
+        for (int ii = 0; ii < restricted_padded_height; ii += CONFIG_T::stride_height) {
             // Loop over input image x in steps of stride
-            for (int jj = 0; jj < padded_width; jj += CONFIG_T::stride_width) {
+            for (int jj = 0; jj < restricted_padded_width; jj += CONFIG_T::stride_width) {
                 data_T pool[CONFIG_T::pool_height * CONFIG_T::pool_width];
                 #pragma HLS ARRAY_PARTITION variable=pool complete dim=0
 
@@ -229,19 +229,17 @@ void pooling2d_cf(data_T data[CONFIG_T::in_height * CONFIG_T::in_width * CONFIG_
     // TODO partition the arrays according to the reuse factor
     const int limit = pool_op_limit<CONFIG_T>();
     #pragma HLS ALLOCATION function instances=CONFIG_T::pool_op limit=limit
-    // Add any necessary padding
-    unsigned padded_height = CONFIG_T::in_height + CONFIG_T::pad_top + CONFIG_T::pad_bottom;
-    unsigned padded_width = CONFIG_T::in_width + CONFIG_T::pad_left + CONFIG_T::pad_right;
-    if (CONFIG_T::pad_top == 0 && CONFIG_T::pad_bottom == 0 && CONFIG_T::pad_left == 0 && CONFIG_T::pad_right == 0) {
-        padded_height -= padded_height - (padded_height / CONFIG_T::stride_height * CONFIG_T::stride_height);
-        padded_width -= padded_width - (padded_width / CONFIG_T::stride_width * CONFIG_T::stride_width);
-    }
+    // Add padding and reduce input width to area covered by pooling function
+    static constexpr int full_padded_width = CONFIG_T::in_width + CONFIG_T::pad_left + CONFIG_T::pad_right;
+    static constexpr int full_padded_height = CONFIG_T::in_height + CONFIG_T::pad_top + CONFIG_T::pad_bottom;
+    static constexpr int restricted_padded_width = full_padded_width / CONFIG_T::stride_width * CONFIG_T::stride_width;
+    static constexpr int restricted_padded_height = full_padded_height / CONFIG_T::stride_height * CONFIG_T::stride_height;
 
     for (int ff = 0; ff < CONFIG_T::n_filt; ff++) {
         // Loop over input image y in steps of stride
-        for (int ii = 0; ii < padded_height; ii += CONFIG_T::stride_height) {
+        for (int ii = 0; ii < restricted_padded_height; ii += CONFIG_T::stride_height) {
             // Loop over input image x in steps of stride
-            for (int jj = 0; jj < padded_width; jj += CONFIG_T::stride_width) {
+            for (int jj = 0; jj < restricted_padded_width; jj += CONFIG_T::stride_width) {
                 data_T pool[CONFIG_T::pool_height * CONFIG_T::pool_width];
                 #pragma HLS ARRAY_PARTITION variable=pool complete dim=0
                 // Keep track of number of pixels in image vs padding region
@@ -250,8 +248,8 @@ void pooling2d_cf(data_T data[CONFIG_T::in_height * CONFIG_T::in_width * CONFIG_
                 for (int kk = 0; kk < CONFIG_T::stride_height; kk++) {
                     // Loop over pool window x
                     for (int ll = 0; ll < CONFIG_T::stride_width; ll++) {
-                        if (ii + kk < CONFIG_T::pad_top || ii + kk >= (padded_height - CONFIG_T::pad_bottom) ||
-                            jj + ll < CONFIG_T::pad_left || jj + ll >= (padded_width - CONFIG_T::pad_right)) {
+                        if (ii + kk < CONFIG_T::pad_top || ii + kk >= (full_padded_height - CONFIG_T::pad_bottom) ||
+                            jj + ll < CONFIG_T::pad_left || jj + ll >= (full_padded_width - CONFIG_T::pad_right)) {
                             // Add padding
                             pool[kk * CONFIG_T::stride_width + ll] = pad_val<data_T, CONFIG_T::pool_op>();
                             if (CONFIG_T::count_pad)