Skip to content

Commit ca93412

Browse files
duc-tran-mchpduc-tran-mchp
authored
Merge pull request #30 from MicrochipTech/dev
Merge dev to main for release 2023.1
2 parents e3df73a + 2475fbd commit ca93412

29 files changed

Lines changed: 71 additions & 70 deletions

File tree

‎Training1/Canny/.cproject‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<tool id="legup.managedbuild.tool.gnu.cpp.compiler.exe.debug.376673803" name="GCC C++ Compiler" superClass="legup.managedbuild.tool.gnu.cpp.compiler.exe.debug">
2222
<option id="gnu.cpp.compiler.option.optimization.level.1759095256" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
2323
<option id="gnu.cpp.compiler.option.debugging.level.1810804837" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
24+
<option id="gnu.cpp.compiler.option.dialect.std.2033344015" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
2425
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1733918208" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
2526
</tool>
2627
<tool id="legup.managedbuild.tool.gnu.c.compiler.exe.debug.994173059" name="GCC C Compiler" superClass="legup.managedbuild.tool.gnu.c.compiler.exe.debug">

‎Training1/Canny/canny.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
void canny(hls::FIFO<unsigned char> &input_fifo,
77
hls::FIFO<unsigned char> &output_fifo) {
88
#pragma HLS function top
9+
#pragma HLS function dataflow
910

1011
hls::FIFO<unsigned char> output_fifo_gf(/* depth = */ 2);
1112
hls::FIFO<unsigned short> output_fifo_sf(/* depth = */ 2);

‎Training1/Canny_FIFO_Switch/.cproject‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<tool id="legup.managedbuild.tool.gnu.cpp.compiler.exe.debug.376673803" name="GCC C++ Compiler" superClass="legup.managedbuild.tool.gnu.cpp.compiler.exe.debug">
2222
<option id="gnu.cpp.compiler.option.optimization.level.1759095256" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
2323
<option id="gnu.cpp.compiler.option.debugging.level.1810804837" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
24+
<option id="gnu.cpp.compiler.option.dialect.std.2033344015" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
2425
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1733918208" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
2526
</tool>
2627
<tool id="legup.managedbuild.tool.gnu.c.compiler.exe.debug.994173059" name="GCC C Compiler" superClass="legup.managedbuild.tool.gnu.c.compiler.exe.debug">

‎Training1/Canny_FIFO_Switch/canny.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,32 @@
33

44
#include <assert.h>
55

6-
void canny(hls::FIFO<hls::ap_uint<1>> &switch_fifo_0,
7-
hls::FIFO<hls::ap_uint<1>> &switch_fifo_1,
8-
hls::FIFO<hls::ap_uint<1>> &switch_fifo_2,
9-
hls::FIFO<hls::ap_uint<1>> &switch_fifo_3,
6+
void canny(bool switch_0,
7+
bool switch_1,
8+
bool switch_2,
9+
bool switch_3,
1010
hls::FIFO<unsigned char> &input_fifo,
1111
hls::FIFO<unsigned char> &output_fifo) {
1212
#pragma HLS function top
13+
#pragma HLS function dataflow
1314

1415
hls::FIFO<unsigned char> output_fifo_gf(/* depth = */ 2);
1516
hls::FIFO<unsigned short> output_fifo_sf(/* depth = */ 2);
1617
hls::FIFO<unsigned char> output_fifo_nm(/* depth = */ 2);
1718

18-
gaussian_filter(switch_fifo_0, input_fifo, output_fifo_gf);
19-
sobel_filter(switch_fifo_1, output_fifo_gf, output_fifo_sf);
20-
nonmaximum_suppression(switch_fifo_2, output_fifo_sf, output_fifo_nm);
21-
hysteresis_filter(switch_fifo_3, output_fifo_nm, output_fifo);
19+
gaussian_filter(switch_0, input_fifo, output_fifo_gf);
20+
sobel_filter(switch_1, output_fifo_gf, output_fifo_sf);
21+
nonmaximum_suppression(switch_2, output_fifo_sf, output_fifo_nm);
22+
hysteresis_filter(switch_3, output_fifo_nm, output_fifo);
2223
}
2324

2425
int main() {
2526
unsigned int i, j;
2627

27-
hls::FIFO<hls::ap_uint<1>> switch_fifo_0(/* depth = */ WIDTH * HEIGHT * 2);
28-
hls::FIFO<hls::ap_uint<1>> switch_fifo_1(/* depth = */ WIDTH * HEIGHT * 2);
29-
hls::FIFO<hls::ap_uint<1>> switch_fifo_2(/* depth = */ WIDTH * HEIGHT * 2);
30-
hls::FIFO<hls::ap_uint<1>> switch_fifo_3(/* depth = */ WIDTH * HEIGHT * 2);
28+
bool switch_0;
29+
bool switch_1;
30+
bool switch_2;
31+
bool switch_3;
3132
hls::FIFO<unsigned char> input_fifo(/* depth = */ WIDTH * HEIGHT * 2);
3233
hls::FIFO<unsigned char> output_fifo(/* depth = */ WIDTH * HEIGHT * 2);
3334

@@ -74,33 +75,32 @@ int main() {
7475
nm_sw(sobel_output, nonmaximum_suppression_output);
7576
hf_sw(nonmaximum_suppression_output, hysteresis_output_golden);
7677

77-
const hls::ap_uint<1> on = 1;
7878
// Write test input pixels.
7979
for (i = 0; i < HEIGHT; i++) {
8080
for (j = 0; j < WIDTH; j++) {
81-
switch_fifo_0.write(on);
82-
switch_fifo_1.write(on);
83-
switch_fifo_2.write(on);
84-
switch_fifo_3.write(on);
81+
switch_0 = true;
82+
switch_1 = true;
83+
switch_2 = true;
84+
switch_3 = true;
8585
unsigned char r = input_channel->r;
8686
unsigned char g = input_channel->g;
8787
unsigned char b = input_channel->b;
8888
unsigned grayscale = (r + g + b) / 3;
8989
input_fifo.write(grayscale);
90-
canny(switch_fifo_0, switch_fifo_1, switch_fifo_2, switch_fifo_3,
90+
canny(switch_0, switch_1, switch_2, switch_3,
9191
input_fifo, output_fifo);
9292
input_channel++;
9393
}
9494
}
9595

9696
// Give more inputs to flush out all pixels.
9797
for (i = 0; i < GF_KERNEL_SIZE * WIDTH + GF_KERNEL_SIZE; i++) {
98-
switch_fifo_0.write(on);
99-
switch_fifo_1.write(on);
100-
switch_fifo_2.write(on);
101-
switch_fifo_3.write(on);
98+
switch_0 = true;
99+
switch_1 = true;
100+
switch_2 = true;
101+
switch_3 = true;
102102
input_fifo.write(0);
103-
canny(switch_fifo_0, switch_fifo_1, switch_fifo_2, switch_fifo_3,
103+
canny(switch_0, switch_1, switch_2, switch_3,
104104
input_fifo, output_fifo);
105105
}
106106

‎Training1/Canny_FIFO_Switch/define.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,29 @@ void window_and_line_buffer(hls::ap_uint<10> input,
2525

2626
// Gaussian Filter.
2727
const unsigned int GF_KERNEL_SIZE = 5;
28-
void gaussian_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
28+
void gaussian_filter(bool on_switch,
2929
hls::FIFO<unsigned char> &input_fifo,
3030
hls::FIFO<unsigned char> &output_fifo);
3131
void gf_sw(unsigned char input[][WIDTH], unsigned char output[][WIDTH]);
3232

3333
// Sobel Filter.
3434
const unsigned int SF_KERNEL_SIZE = 3;
3535
void sf_sw(unsigned char input[][WIDTH], hls::ap_uint<10> output[][WIDTH]);
36-
void sobel_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
36+
void sobel_filter(bool on_switch,
3737
hls::FIFO<unsigned char> &input_fifo,
3838
hls::FIFO<unsigned short> &output_fifo);
3939

4040
// Non-maximum suppression.
4141
const unsigned int NM_KERNEL_SIZE = 3;
42-
void nonmaximum_suppression(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
42+
void nonmaximum_suppression(bool on_switch,
4343
hls::FIFO<unsigned short> &input_fifo,
4444
hls::FIFO<unsigned char> &output_fifo);
4545
void nm_sw(hls::ap_uint<10> input[][WIDTH], unsigned char output[][WIDTH]);
4646

4747
// Hysteresis filter.
4848
const unsigned int HF_KERNEL_SIZE = 3;
4949
void hf_sw(unsigned char input[][WIDTH], unsigned char output[][WIDTH]);
50-
void hysteresis_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
50+
void hysteresis_filter(bool on_switch,
5151
hls::FIFO<unsigned char> &input_fifo,
5252
hls::FIFO<unsigned char> &output_fifo);
5353

‎Training1/Canny_FIFO_Switch/gaussian_filter.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const unsigned int GAUSSIAN[GF_KERNEL_SIZE]
1010
{1, 3, 4, 3, 1}};
1111
const unsigned int DIVISOR = 128;
1212

13-
void gaussian_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
13+
void gaussian_filter(bool on_switch,
1414
hls::FIFO<unsigned char> &input_fifo,
1515
hls::FIFO<unsigned char> &output_fifo) {
1616
#pragma HLS function pipeline
@@ -46,10 +46,9 @@ void gaussian_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
4646
unsigned char current_pixel = line_buffer.window[center][center];
4747

4848
// if filter is off, pass pixel through
49-
bool on = switch_fifo.read();
50-
if (!on) {
51-
output_fifo.write(current_pixel);
52-
return;
49+
if (!on_switch) {
50+
output_fifo.write(current_pixel);
51+
return;
5352
}
5453

5554
if (outofbounds) {

‎Training1/Canny_FIFO_Switch/hysteresis_filter.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "define.hpp"
22
#include <hls/image_processing.hpp>
33

4-
void hysteresis_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
4+
void hysteresis_filter(bool on_switch,
55
hls::FIFO<unsigned char> &input_fifo,
66
hls::FIFO<unsigned char> &output_fifo) {
77
#pragma HLS function pipeline
@@ -37,8 +37,7 @@ void hysteresis_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
3737
unsigned char current_pixel = line_buffer.window[center][center];
3838

3939
// if filter is off, pass pixel through
40-
bool on = switch_fifo.read();
41-
if (!on) {
40+
if (!on_switch) {
4241
output_fifo.write(current_pixel);
4342
return;
4443
}

‎Training1/Canny_FIFO_Switch/nonmaximum_suppression.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "define.hpp"
22
#include <hls/image_processing.hpp>
33

4-
void nonmaximum_suppression(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
5-
hls::FIFO<unsigned short> &input_fifo,
4+
void nonmaximum_suppression(bool on_switch,
5+
hls::FIFO<unsigned short> &input_fifo,
66
hls::FIFO<unsigned char> &output_fifo) {
77
#pragma HLS function pipeline
88

@@ -36,12 +36,11 @@ void nonmaximum_suppression(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
3636
unsigned int center = NM_KERNEL_SIZE / 2;
3737
int current_pixel = (int)line_buffer.window[center][center] & 0xff;
3838

39-
// if filter is off, pass pixel through
40-
bool on = switch_fifo.read();
41-
if (!on) {
42-
output_fifo.write(current_pixel);
43-
return;
44-
}
39+
// if filter is off, pass pixel through
40+
if (!on_switch) {
41+
output_fifo.write(current_pixel);
42+
return;
43+
}
4544

4645
if (outofbounds) {
4746
output_fifo.write(current_pixel);

‎Training1/Canny_FIFO_Switch/sobel_filter.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const int GX[SF_KERNEL_SIZE]
66
const int GY[SF_KERNEL_SIZE]
77
[SF_KERNEL_SIZE] = {{1, 2, 1}, {0, 0, 0}, {-1, -2, -1}};
88

9-
void sobel_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
10-
hls::FIFO<unsigned char> &input_fifo,
9+
void sobel_filter(bool on_switch,
10+
hls::FIFO<unsigned char> &input_fifo,
1111
hls::FIFO<unsigned short> &output_fifo) {
1212
#pragma HLS function pipeline
1313

@@ -42,8 +42,7 @@ void sobel_filter(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
4242
unsigned char current_pixel = line_buffer.window[center][center];
4343

4444
// if filter is off, pass pixel through
45-
bool on = switch_fifo.read();
46-
if (!on) {
45+
if (!on_switch) {
4746
output_fifo.write(current_pixel);
4847
return;
4948
}

‎Training1/Gaussian_FIFO_Pipelined/.cproject‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<tool id="legup.managedbuild.tool.gnu.cpp.compiler.exe.debug.376673803" name="GCC C++ Compiler" superClass="legup.managedbuild.tool.gnu.cpp.compiler.exe.debug">
2222
<option id="gnu.cpp.compiler.option.optimization.level.1759095256" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
2323
<option id="gnu.cpp.compiler.option.debugging.level.1810804837" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
24+
<option id="gnu.cpp.compiler.option.dialect.std.2033344015" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
2425
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1733918208" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
2526
</tool>
2627
<tool id="legup.managedbuild.tool.gnu.c.compiler.exe.debug.994173059" name="GCC C Compiler" superClass="legup.managedbuild.tool.gnu.c.compiler.exe.debug">

0 commit comments

Comments
 (0)