Skip to content

Commit fe3e3d8

Browse files
LindaMongMCHPLindaMongMCHP
authored
Merge pull request #20 from MicrochipTech/fixWarnings-addMakefiles-updateTrainingsDoc
Fixed warning messages + Updated training documents + Added missing 'Makefile'
2 parents fa8d57f + 0f5eedd commit fe3e3d8

34 files changed

Lines changed: 874 additions & 716 deletions

File tree

Training1/Canny/makefile renamed to Training1/Canny/Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
########## This file is automatically generated. Any changes to this file will be lost. ##########
2-
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3-
NAME = Canny
4-
LOCAL_CONFIG = -legup-config=config.tcl
5-
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
6-
GUI_BASE_DIR =
7-
LEVEL = $(LEGUP_ROOT_DIR)/examples
8-
EXTRA_SW_COMPILATION_FLAG+= -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes
9-
CPP_FLAG+= -I$(LEGUP_ROOT_DIR)/smarthls-library
10-
EXTRA_LD_LIBRARY_PATH+= $(LEGUP_ROOT_DIR)/smarthls-library
1+
########## This file is automatically generated. Any changes to this file will be lost. ##########
2+
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3+
NAME = Canny
4+
LOCAL_CONFIG = -legup-config=config.tcl
5+
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
6+
GUI_BASE_DIR =
7+
LEVEL = $(LEGUP_ROOT_DIR)/examples
8+
9+
10+
USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(LEGUP_ROOT_DIR)/smarthls-library
11+
1112
ifneq ("$(wildcard $(GUI_BASE_DIR)Makefile.user)","")
1213
include $(GUI_BASE_DIR)Makefile.user
13-
endif
14-
include $(LEVEL)/Makefile.common
14+
endif
15+
include $(LEVEL)/Makefile.common
16+

‎Training1/Canny/nonmaximum_suppression.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,12 @@ void nonmaximum_suppression(hls::FIFO<unsigned short> &input_fifo,
7979
// point must be greater than both averages otherwise set to 0
8080
// (suppress)
8181
int output = current_pixel;
82+
83+
#pragma GCC diagnostic push
84+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
8285
output = (output >= avg1) ? output : 0;
8386
output = (output >= avg2) ? output : 0;
87+
#pragma GCC diagnostic pop
8488

8589
output_fifo.write(output);
8690
}

Training1/Canny_FIFO_Switch/makefile renamed to Training1/Canny_FIFO_Switch/Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
########## This file is automatically generated. Any changes to this file will be lost. ##########
2-
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3-
NAME = Canny_FIFO_Switch
4-
LOCAL_CONFIG = -legup-config=config.tcl
5-
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
6-
GUI_BASE_DIR =
7-
LEVEL = $(LEGUP_ROOT_DIR)/examples
8-
EXTRA_SW_COMPILATION_FLAG+= -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes
9-
CPP_FLAG+= -I$(LEGUP_ROOT_DIR)/smarthls-library
10-
EXTRA_LD_LIBRARY_PATH+= $(LEGUP_ROOT_DIR)/smarthls-library
1+
########## This file is automatically generated. Any changes to this file will be lost. ##########
2+
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3+
NAME = Canny_FIFO_Switch
4+
LOCAL_CONFIG = -legup-config=config.tcl
5+
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
6+
GUI_BASE_DIR =
7+
LEVEL = $(LEGUP_ROOT_DIR)/examples
8+
9+
10+
USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(LEGUP_ROOT_DIR)/smarthls-library
11+
1112
ifneq ("$(wildcard $(GUI_BASE_DIR)Makefile.user)","")
1213
include $(GUI_BASE_DIR)Makefile.user
13-
endif
14-
include $(LEVEL)/Makefile.common
14+
endif
15+
include $(LEVEL)/Makefile.common
16+

‎Training1/Canny_FIFO_Switch/nonmaximum_suppression.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,12 @@ void nonmaximum_suppression(hls::FIFO<hls::ap_uint<1>> &switch_fifo,
8787
// point must be greater than both averages otherwise set to 0
8888
// (suppress)
8989
int output = current_pixel;
90+
91+
#pragma GCC diagnostic push
92+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
9093
output = (output >= avg1) ? output : 0;
9194
output = (output >= avg2) ? output : 0;
95+
#pragma GCC diagnostic pop
9296

9397
output_fifo.write(output);
9498
}

Training1/Gaussian_FIFO_Pipelined/makefile renamed to Training1/Gaussian_FIFO_Pipelined/Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
########## This file is automatically generated. Any changes to this file will be lost. ##########
2-
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3-
NAME = Gaussian_FIFO_Pipelined
4-
LOCAL_CONFIG = -legup-config=config.tcl
5-
SRCS = gaussian_filter.cpp
6-
GUI_BASE_DIR =
7-
LEVEL = $(LEGUP_ROOT_DIR)/examples
8-
EXTRA_SW_COMPILATION_FLAG+= -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes
9-
CPP_FLAG+= -I$(LEGUP_ROOT_DIR)/smarthls-library
10-
EXTRA_LD_LIBRARY_PATH+= $(LEGUP_ROOT_DIR)/smarthls-library
1+
########## This file is automatically generated. Any changes to this file will be lost. ##########
2+
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3+
NAME = Gaussian_FIFO_Pipelined
4+
LOCAL_CONFIG = -legup-config=config.tcl
5+
SRCS = gaussian_filter.cpp
6+
GUI_BASE_DIR =
7+
LEVEL = $(LEGUP_ROOT_DIR)/examples
8+
9+
10+
USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(LEGUP_ROOT_DIR)/smarthls-library
11+
1112
ifneq ("$(wildcard $(GUI_BASE_DIR)Makefile.user)","")
1213
include $(GUI_BASE_DIR)Makefile.user
13-
endif
14-
include $(LEVEL)/Makefile.common
14+
endif
15+
include $(LEVEL)/Makefile.common
16+

Training1/Gaussian_Memory_Interface/makefile renamed to Training1/Gaussian_Memory_Interface/Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
########## This file is automatically generated. Any changes to this file will be lost. ##########
2-
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3-
NAME = Gaussian_Memory_Interface
4-
LOCAL_CONFIG = -legup-config=config.tcl
5-
SRCS = gaussian_filter.cpp
6-
GUI_BASE_DIR =
7-
LEVEL = $(LEGUP_ROOT_DIR)/examples
8-
EXTRA_SW_COMPILATION_FLAG+= -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes
9-
CPP_FLAG+= -I$(LEGUP_ROOT_DIR)/smarthls-library
10-
EXTRA_LD_LIBRARY_PATH+= $(LEGUP_ROOT_DIR)/smarthls-library
1+
########## This file is automatically generated. Any changes to this file will be lost. ##########
2+
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3+
NAME = Gaussian_Memory_Interface
4+
LOCAL_CONFIG = -legup-config=config.tcl
5+
SRCS = gaussian_filter.cpp
6+
GUI_BASE_DIR =
7+
LEVEL = $(LEGUP_ROOT_DIR)/examples
8+
9+
10+
USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(LEGUP_ROOT_DIR)/smarthls-library
11+
1112
ifneq ("$(wildcard $(GUI_BASE_DIR)Makefile.user)","")
1213
include $(GUI_BASE_DIR)Makefile.user
13-
endif
14-
include $(LEVEL)/Makefile.common
14+
endif
15+
include $(LEVEL)/Makefile.common
16+

Training1/Gaussian_Memory_Interface_Pipelined/makefile renamed to Training1/Gaussian_Memory_Interface_Pipelined/Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
########## This file is automatically generated. Any changes to this file will be lost. ##########
2-
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3-
NAME = Gaussian_Memory_Interface_Pipelined
4-
LOCAL_CONFIG = -legup-config=config.tcl
5-
SRCS = gaussian_filter.cpp
6-
GUI_BASE_DIR =
7-
LEVEL = $(LEGUP_ROOT_DIR)/examples
8-
EXTRA_SW_COMPILATION_FLAG+= -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes
9-
CPP_FLAG+= -I$(LEGUP_ROOT_DIR)/smarthls-library
10-
EXTRA_LD_LIBRARY_PATH+= $(LEGUP_ROOT_DIR)/smarthls-library
1+
########## This file is automatically generated. Any changes to this file will be lost. ##########
2+
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3+
NAME = Gaussian_Memory_Interface_Pipelined
4+
LOCAL_CONFIG = -legup-config=config.tcl
5+
SRCS = gaussian_filter.cpp
6+
GUI_BASE_DIR =
7+
LEVEL = $(LEGUP_ROOT_DIR)/examples
8+
9+
10+
USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(LEGUP_ROOT_DIR)/smarthls-library
11+
1112
ifneq ("$(wildcard $(GUI_BASE_DIR)Makefile.user)","")
1213
include $(GUI_BASE_DIR)Makefile.user
13-
endif
14-
include $(LEVEL)/Makefile.common
14+
endif
15+
include $(LEVEL)/Makefile.common
16+

Training1/RGB2YCbCr/makefile renamed to Training1/RGB2YCbCr/Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
########## This file is automatically generated. Any changes to this file will be lost. ##########
2-
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3-
NAME = RGB2YCbCr
4-
LOCAL_CONFIG = -legup-config=config.tcl
5-
SRCS = RGB2YCbCr.cpp
6-
GUI_BASE_DIR =
7-
LEVEL = $(LEGUP_ROOT_DIR)/examples
8-
EXTRA_SW_COMPILATION_FLAG+= -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes
9-
CPP_FLAG+= -I$(LEGUP_ROOT_DIR)/smarthls-library
10-
EXTRA_LD_LIBRARY_PATH+= $(LEGUP_ROOT_DIR)/smarthls-library
1+
########## This file is automatically generated. Any changes to this file will be lost. ##########
2+
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3+
NAME = RGB2YCbCr
4+
LOCAL_CONFIG = -legup-config=config.tcl
5+
SRCS = RGB2YCbCr.cpp
6+
GUI_BASE_DIR =
7+
LEVEL = $(LEGUP_ROOT_DIR)/examples
8+
9+
10+
USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(LEGUP_ROOT_DIR)/smarthls-library
11+
1112
ifneq ("$(wildcard $(GUI_BASE_DIR)Makefile.user)","")
1213
include $(GUI_BASE_DIR)Makefile.user
13-
endif
14-
include $(LEVEL)/Makefile.common
14+
endif
15+
include $(LEVEL)/Makefile.common
16+

‎Training1/SmartHLS_Training_Session_1.pdf‎

100644100755
-128 KB
Binary file not shown.

Training1/YCbCr2RGB/makefile renamed to Training1/YCbCr2RGB/Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
########## This file is automatically generated. Any changes to this file will be lost. ##########
2-
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3-
NAME = YCbCr2RGB
4-
LOCAL_CONFIG = -legup-config=config.tcl
5-
SRCS = YCbCr2RGB.cpp
6-
GUI_BASE_DIR =
7-
LEVEL = $(LEGUP_ROOT_DIR)/examples
8-
EXTRA_SW_COMPILATION_FLAG+= -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes
9-
CPP_FLAG+= -I$(LEGUP_ROOT_DIR)/smarthls-library
10-
EXTRA_LD_LIBRARY_PATH+= $(LEGUP_ROOT_DIR)/smarthls-library
1+
########## This file is automatically generated. Any changes to this file will be lost. ##########
2+
########## If you have your own custom Makefile, please name it Makefile.user. ##########
3+
NAME = YCbCr2RGB
4+
LOCAL_CONFIG = -legup-config=config.tcl
5+
SRCS = YCbCr2RGB.cpp
6+
GUI_BASE_DIR =
7+
LEVEL = $(LEGUP_ROOT_DIR)/examples
8+
9+
10+
USER_CXX_FLAG += -O3 -pg -Wall -Wno-strict-aliasing -Wno-unused-label -Wno-unknown-pragmas -Wno-attributes -I$(LEGUP_ROOT_DIR)/smarthls-library
11+
1112
ifneq ("$(wildcard $(GUI_BASE_DIR)Makefile.user)","")
1213
include $(GUI_BASE_DIR)Makefile.user
13-
endif
14-
include $(LEVEL)/Makefile.common
14+
endif
15+
include $(LEVEL)/Makefile.common
16+

0 commit comments

Comments
 (0)