Merge dev to main for release 2023.2

README.md

@@ -14,6 +14,7 @@ Example | Description
 [Training1](./Training1)|SmartHLS™ Training Session 1: Image Processing on the PolarFire® Video Kit 
 [Training2](./Training2)|SmartHLS™ Training Session 2: Multi-threaded Digit Recognition on the PolarFire® Video Kit 
 [Training3](./Training3)|SmartHLS™ Training Session 3: AXI Interfaces to DDR & Mi-V Soft Processor on the PolarFire® Video Kit 
+[Training4](./Training4)|SmartHLS™ Training Session 4: SmartHLS™ Training for Microchip PolarFire® SoC Flow  
 
 ## Examples of HLS Features
 

Training1/Canny/Makefile

@@ -4,10 +4,10 @@ NAME = Canny
 LOCAL_CONFIG = -legup-config=config.tcl
 SRCS = canny.cpp gaussian_filter.cpp gf_sw.cpp hf_sw.cpp hysteresis_filter.cpp nm_sw.cpp nonmaximum_suppression.cpp sf_sw.cpp sobel_filter.cpp util.cpp
 GUI_BASE_DIR =
-LEVEL = $(LEGUP_ROOT_DIR)/examples
+LEVEL = $(SHLS_ROOT_DIR)/examples
 
 
-USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(LEGUP_ROOT_DIR)/smarthls-library
+USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(SHLS_ROOT_DIR)/smarthls-library
 
 ifneq ("$(wildcard $(GUI_BASE_DIR)Makefile.user)","")
 include $(GUI_BASE_DIR)Makefile.user

Training1/Canny/canny.cpp

@@ -8,10 +8,17 @@ void canny(hls::FIFO<unsigned char> &input_fifo,
 #pragma HLS function top
 #pragma HLS function dataflow
 
+
+#ifndef __SYNTHESIS__
+    // For software, the fifo depth has to be larger.
+    hls::FIFO<unsigned char> output_fifo_gf(WIDTH * HEIGHT * 2);
+    hls::FIFO<unsigned short> output_fifo_sf(WIDTH * HEIGHT * 2);
+    hls::FIFO<unsigned char> output_fifo_nm(WIDTH * HEIGHT * 2);
+#else
     hls::FIFO<unsigned char> output_fifo_gf(/* depth = */ 2);
     hls::FIFO<unsigned short> output_fifo_sf(/* depth = */ 2);
     hls::FIFO<unsigned char> output_fifo_nm(/* depth = */ 2);
-
+#endif
     gaussian_filter(input_fifo, output_fifo_gf);
     sobel_filter(output_fifo_gf, output_fifo_sf);
     nonmaximum_suppression(output_fifo_sf, output_fifo_nm);
@@ -75,17 +82,17 @@ int main() {
             unsigned char b = input_channel->b;
             unsigned grayscale = (r + g + b) / 3;
             input_fifo.write(grayscale);
-            canny(input_fifo, output_fifo);
             input_channel++;
         }
     }
 
     // Give more inputs to flush out all pixels.
     for (i = 0; i < GF_KERNEL_SIZE * WIDTH + GF_KERNEL_SIZE; i++) {
         input_fifo.write(0);
-        canny(input_fifo, output_fifo);
     }
 
+    canny(input_fifo, output_fifo);
+
     // output validation
     for (i = 0; i < HEIGHT; i++) {
         for (j = 0; j < WIDTH; j++) {

Training1/Canny/config.tcl

@@ -1,6 +1,6 @@
 ########## This file is automatically generated. Any changes to this file will be lost. ##########
 ########## If you have your own constraints tcl file, please add it to the project ##########
 ########## by using the "Set custom config file" constraint in the HLS Constraints dialog. ##########
-source $env(LEGUP_ROOT_DIR)/examples/legup.tcl
+source $env(SHLS_ROOT_DIR)/examples/legup.tcl
 set_project PolarFire MPF300 MiV_SoC
 set_parameter CLOCK_PERIOD 10

Training1/Canny/gaussian_filter.cpp

@@ -12,51 +12,49 @@ const unsigned int DIVISOR = 128;
 
 void gaussian_filter(hls::FIFO<unsigned char> &input_fifo,
                      hls::FIFO<unsigned char> &output_fifo) {
-    #pragma HLS function pipeline
 
-    if (input_fifo.empty())
-        return;
-
-    unsigned char input_pixel = input_fifo.read();
-
-    static hls::LineBuffer<unsigned char, WIDTH, GF_KERNEL_SIZE> line_buffer;
-
-    line_buffer.ShiftInPixel(input_pixel);
-
-    // keep track of how many pixels we have shifted into the line_buffer to
-    // tell when it is filled
-    static int count = 0;
-    if (!is_filled(GF_KERNEL_SIZE, count)) {
-        count++;
-        return;
-    }
-
-    // i, j to track the position we are at while processing each input frame
-    static unsigned int i = 0, j = 0;
+    hls::LineBuffer<unsigned char, WIDTH, GF_KERNEL_SIZE> line_buffer;
+    const unsigned center = GF_KERNEL_SIZE / 2;
+    const unsigned LineBufferFillCount = center * WIDTH + center;
+    // track the position we are at while processing each input frame
+    unsigned int x = 0, y = 0;
+
+#pragma HLS loop pipeline
+    for (unsigned int i = 0; i < (HEIGHT * WIDTH + LineBufferFillCount); i++) {
+        unsigned char input_pixel = 0;
+        if (i < HEIGHT * WIDTH)
+            input_pixel = input_fifo.read();
+        line_buffer.ShiftInPixel(input_pixel);
+
+        // keep track of how many pixels we have shifted into the line_buffer to
+        // tell when it is filled
+        if (!is_filled(GF_KERNEL_SIZE, i)) {
+            continue;
+        }
 
-    // calculate if the kernel is currently out of bounds, i.e. the kernel
-    // overlaps with pixels outside of the current input frame
-    bool outofbounds = is_out_of_bounds(GF_KERNEL_SIZE, i, j);
+        // calculate if the kernel is currently out of bounds, i.e. the kernel
+        // overlaps with pixels outside of the current input frame
+        bool out_of_bounds =
+            is_out_of_bounds(GF_KERNEL_SIZE, y, x);
 
-    // update i, j for next iteration
-    update_image_position(i, j);
+        // update x, y for next iteration
+        update_image_position(y, x);
 
-    if (outofbounds) {
-        unsigned int center = GF_KERNEL_SIZE / 2;
-        unsigned char current_pixel = line_buffer.window[center][center];
-        output_fifo.write(current_pixel);
-        return;
-    }
+        if (out_of_bounds) {
+            output_fifo.write(line_buffer.window[center][center]);
+            continue;
+        }
 
-    unsigned int sum = 0;
-    for (unsigned int m = 0; m < GF_KERNEL_SIZE; m++) {
-        for (unsigned int n = 0; n < GF_KERNEL_SIZE; n++) {
-            sum += ((unsigned int)line_buffer.window[m][n]) * GAUSSIAN[m][n];
+        unsigned int sum = 0;
+        for (unsigned int m = 0; m < GF_KERNEL_SIZE; m++) {
+            for (unsigned int n = 0; n < GF_KERNEL_SIZE; n++) {
+                sum +=
+                    ((unsigned int)line_buffer.window[m][n] * GAUSSIAN[m][n]);
+            }
         }
-    }
 
-    int output = sum / DIVISOR;
+        sum /= DIVISOR;
 
-    output_fifo.write(output);
+        output_fifo.write((unsigned char)sum);
+    }
 }
-

Training1/Canny/hysteresis_filter.cpp

@@ -3,57 +3,56 @@
 
 void hysteresis_filter(hls::FIFO<unsigned char> &input_fifo,
                        hls::FIFO<unsigned char> &output_fifo) {
-    #pragma HLS function pipeline
 
-    if (input_fifo.empty())
-        return;
-
-    unsigned char input_pixel = input_fifo.read();
-
-    static hls::LineBuffer<unsigned char, WIDTH, HF_KERNEL_SIZE> line_buffer;
-
-    line_buffer.ShiftInPixel(input_pixel);
-
-    // keep track of how many pixels we have shifted into the line_buffer to
-    // tell when it is filled
-    static int count = 0;
-    if (!is_filled(HF_KERNEL_SIZE, count)) {
-        count++;
-        return;
-    }
-
-    // i, j to track the position we are at while processing each input frame
-    static unsigned int i = 0, j = 0;
+    hls::LineBuffer<unsigned char, WIDTH, HF_KERNEL_SIZE> line_buffer;
+    const unsigned center = HF_KERNEL_SIZE / 2;
+    const unsigned LineBufferFillCount = center * WIDTH + center;
+    // track the position we are at while processing each input frame
+    unsigned int x = 0, y = 0;
+
+#pragma HLS loop pipeline
+    for (unsigned int i = 0; i < (HEIGHT * WIDTH + LineBufferFillCount); i++) {
+        unsigned char input_pixel = 0;
+        if (i < HEIGHT * WIDTH)
+            input_pixel = input_fifo.read();
+        line_buffer.ShiftInPixel(input_pixel);
+
+        // keep track of how many pixels we have shifted into the line_buffer to
+        // tell when it is filled
+        if (!is_filled(HF_KERNEL_SIZE, i)) {
+            continue;
+        }
 
-    // calculate if the kernel is currently out of bounds, i.e. the kernel
-    // overlaps with pixels outside of the current input frame
-    bool outofbounds = is_out_of_bounds(HF_KERNEL_SIZE, i, j);
+        // calculate if the kernel is currently out of bounds, i.e. the kernel
+        // overlaps with pixels outside of the current input frame
+        bool out_of_bounds =
+            is_out_of_bounds(HF_KERNEL_SIZE, y, x);
 
-    // update i, j for next iteration
-    update_image_position(i, j);
+        // update x, y for next iteration
+        update_image_position(y, x);
 
-    if (outofbounds) {
-        output_fifo.write(0);
-        return;
-    }
+        if (out_of_bounds) {
+            output_fifo.write(0);
+            continue;
+        }
 
-    // check stencil for strong edges where the two most
-    // significant bits are set to one (& 0xC0)
-    int threshold = 0;
-    for (unsigned int m = 0; m < HF_KERNEL_SIZE; m++) {
-        for (unsigned int n = 0; n < HF_KERNEL_SIZE; n++) {
-            threshold = (line_buffer.window[m][n] & 0xC0) ? 1 : threshold;
+        // check stencil for strong edges where the two most
+        // significant bits are set to one (& 0xC0)
+        int threshold = 0;
+        for (unsigned int m = 0; m < HF_KERNEL_SIZE; m++) {
+            for (unsigned int n = 0; n < HF_KERNEL_SIZE; n++) {
+                threshold = (line_buffer.window[m][n] & 0xC0) ? 1 : threshold;
+            }
         }
-    }
 
-    // strengthen edge by a factor of 2
-    unsigned int center = HF_KERNEL_SIZE / 2;
-    int output = line_buffer.window[center][center] * 2;
-    output = (output > 255) ? 255 : output;
+        // strengthen edge by a factor of 2
+        unsigned int center = HF_KERNEL_SIZE / 2;
+        int output = line_buffer.window[center][center] * 2;
+        output = (output > 255) ? 255 : output;
 
-    // only keep edge if it neighbours on a strong edge
-    output = threshold ? output : 0;
+        // only keep edge if it neighbours on a strong edge
+        output = threshold ? output : 0;
 
-    output_fifo.write(output);
+        output_fifo.write(output);
+    }
 }
-