Updated 2018.3 xfOpenCV version

HLS_Use_Model/AXI_Sample/xf_config_params.h

@@ -1,6 +1,16 @@
 /* Optimization type */
 
-#define RO 0 // Resource Optimized (8-pixel implementation)
-#define NO 1 // Normal Operation (1-pixel implementation)
+#define RO  0 // Resource Optimized (8-pixel implementation)
+#define NO  1 // Normal Operation (1-pixel implementation)
+
+
+#define GRAY 1
+
+#define FILTER_SIZE 3
+
+#define KERNEL_SHAPE XF_SHAPE_CROSS
+
+#define ITERATIONS 1
+
 
 

HLS_Use_Model/AXI_Sample/xf_dilation_accel.cpp

@@ -30,8 +30,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "xf_dilation_config.h"
 
-void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_dst)
+void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_dst, unsigned char kernel[FILTER_SIZE*FILTER_SIZE])
 {
 
-	xf::dilate<XF_BORDER_CONSTANT,TYPE ,HEIGHT, WIDTH,NPC1>(_src, _dst);
+
+	xf::dilate<XF_BORDER_REPLICATE, TYPE ,HEIGHT, WIDTH, KERNEL_SHAPE, FILTER_SIZE, FILTER_SIZE, ITERATIONS, NPC1>(_src, _dst, kernel);
+
 }

HLS_Use_Model/AXI_Sample/xf_headers.h

@@ -1,63 +1,65 @@
 /***************************************************************************
-Copyright (c) 2018, Xilinx, Inc.
-All rights reserved.
+ Copyright (c) 2018, Xilinx, Inc.
+ All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
+ 3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-***************************************************************************/
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CXFSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+ ***************************************************************************/
 #ifndef _XF_HEADERS_H_
 #define _XF_HEADERS_H_
 
+
 #include <stdio.h>
 #include <stdlib.h>
-
-
+#include <stdint.h>
+#include "ap_int.h"
+#include "hls_stream.h"
 
 #if __SDSCC__
 #undef __ARM_NEON__
 #undef __ARM_NEON
 #include "opencv2/opencv.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc/imgproc.hpp"
 #define __ARM_NEON__
 #define __ARM_NEON
 #else
-#include "opencv2/opencv.hpp"
+#include "opencv/cv.h"
+#include "opencv/highgui.h"
 #include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
 #endif
 
 
+
 #if __SDSCC__
 #include "sds_lib.h"
 #define TIME_STAMP_INIT  unsigned int clock_start, clock_end;  clock_start = sds_clock_counter();
 #define TIME_STAMP  { clock_end = sds_clock_counter(); printf("elapsed time %lu \n", clock_end-clock_start); clock_start = sds_clock_counter();  }
 #endif
 
 #include "common/xf_sw_utils.h"
-#include "common/xf_axi.h"
-#endif//_XF_HEADERS_H_
 
+
+#endif//_XF_HEADERS_H_

HLS_Use_Model/AXI_Sample/xf_ip_accel_app.cpp

@@ -1,8 +1,8 @@
 #include "xf_dilation_config.h"
 
-void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_dst);
+void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_dst, unsigned char kernel[FILTER_SIZE*FILTER_SIZE]);
 
-void ip_accel_app(hls::stream< ap_axiu<8,1,1,1> >& _src,hls::stream< ap_axiu<8,1,1,1> >& _dst,int height,int width)
+void ip_accel_app(hls::stream< ap_axiu<8,1,1,1> >& _src,hls::stream< ap_axiu<8,1,1,1> >& _dst,int height,int width, unsigned char kernel[FILTER_SIZE*FILTER_SIZE])
 {
 #pragma HLS INTERFACE axis register both  port=_src
 #pragma HLS INTERFACE axis register both  port=_dst
@@ -16,7 +16,7 @@ void ip_accel_app(hls::stream< ap_axiu<8,1,1,1> >& _src,hls::stream< ap_axiu<8,1
 
 	xf::AXIvideo2xfMat(_src, imgInput1);
 
-	 dilation_accel(imgInput1,imgOutput1);
+	 dilation_accel(imgInput1,imgOutput1, kernel);
 
 	xf::xfMat2AXIvideo(imgOutput1, _dst);
 

HLS_Use_Model/Standalone_HLS_Example/script.tcl

@@ -3,9 +3,9 @@
 ############################################################
 open_project dilation_project
 set_top dilation_accel
-add_files ./xf_dilation_accel.cpp -cflags "-D__XFCV_HLS_MODE__ -I../../include -I../../include/src --std=c++0x"
+add_files ./xf_dilation_accel.cpp -cflags "-D__XFCV_HLS_MODE__ -I../../include --std=c++0x"
 add_files -tb ./testcase55.jpg
-add_files -tb ./xf_dilation_tb.cpp -cflags "-D__XFCV_HLS_MODE__ -I../../include -I../../include/src --std=c++0x"
+add_files -tb ./xf_dilation_tb.cpp -cflags "-D__XFCV_HLS_MODE__ -I../../include --std=c++0x"
 open_solution "solution1"
 set_part {xczu9eg-ffvb1156-2-i} -tool vivado
 create_clock -period 10 -name default

HLS_Use_Model/Standalone_HLS_Example/xf_config_params.h

@@ -1,7 +1,16 @@
 /* Optimization type */
 
-#define RO 0 // Resource Optimized (8-pixel implementation)
-#define NO 1 // Normal Operation (1-pixel implementation)
+#define RO  0 // Resource Optimized (8-pixel implementation)
+#define NO  1 // Normal Operation (1-pixel implementation)
+
+
+#define GRAY 1
+
+#define FILTER_SIZE 3
+
+#define KERNEL_SHAPE XF_SHAPE_CROSS
+
+#define ITERATIONS 1
 
 
 

HLS_Use_Model/Standalone_HLS_Example/xf_dilation_accel.cpp

@@ -30,8 +30,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "xf_dilation_config.h"
 
-void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_dst)
+void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_dst, unsigned char kernel[FILTER_SIZE*FILTER_SIZE])
 {
 
-	xf::dilate<XF_BORDER_CONSTANT,TYPE ,HEIGHT, WIDTH,NPC1>(_src, _dst);
+
+	xf::dilate<XF_BORDER_REPLICATE, TYPE ,HEIGHT, WIDTH, KERNEL_SHAPE, FILTER_SIZE, FILTER_SIZE, ITERATIONS, NPC1>(_src, _dst,kernel);
+
 }

HLS_Use_Model/Standalone_HLS_Example/xf_dilation_config.h

@@ -40,8 +40,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 /* config width and height */
-#define WIDTH 	1920
-#define HEIGHT	1080
+#define WIDTH 	3840
+#define HEIGHT	2160
 
 
 /*  define the input and output types  */
@@ -55,9 +55,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define TYPE XF_8UC1
 
-void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_dst);
-
-
+void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_dst, unsigned char kernel[FILTER_SIZE*FILTER_SIZE]);
 #endif // _XF_DILATION_CONFIG_H_
 
 

HLS_Use_Model/Standalone_HLS_Example/xf_dilation_tb.cpp

@@ -45,9 +45,10 @@ int main(int argc, char** argv)
 
 	cv::Mat in_img,in_img1,out_img,ocv_ref;
 	cv::Mat in_gray,in_gray1,diff;
-
+#if GRAY
 	// reading in the color image
 	in_gray = cv::imread(argv[1], 0);
+#endif
 
 
 	if (in_gray.data == NULL)
@@ -57,24 +58,39 @@ int main(int argc, char** argv)
 	}
 
 
-
-		//cvtColor(in_gray,in_gray,CV_BGR2GRAY);
+#if GRAY
 		// create memory for output images
 		ocv_ref.create(in_gray.rows,in_gray.cols,CV_8UC1);
 		out_img.create(in_gray.rows,in_gray.cols,CV_8UC1);
 		diff.create(in_gray.rows,in_gray.cols,CV_8UC1);
-		///////////////// 	Opencv  Reference  ////////////////////////
-		cv::Mat element = cv::getStructuringElement( 0,cv::Size(3, 3), cv::Point(-1, -1));
-		cv::dilate(in_gray, ocv_ref, element, cv::Point(-1, -1), 1, cv::BORDER_CONSTANT);
-		cv::imwrite("out_ocv.jpg", ocv_ref);
+#endif
 
 
 
+		cv::Mat element = cv::getStructuringElement( KERNEL_SHAPE,cv::Size(FILTER_SIZE, FILTER_SIZE), cv::Point(-1, -1));
+		cv::dilate(in_gray, ocv_ref, element, cv::Point(-1, -1), ITERATIONS, cv::BORDER_CONSTANT);
+		cv::imwrite("out_ocv.jpg", ocv_ref);
+	/////////////////////	End of OpenCV reference	 ////////////////
+
+	////////////////////	HLS TOP function call	/////////////////
+
 	static xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> imgInput(in_gray.rows,in_gray.cols);
 	static xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> imgOutput(in_gray.rows,in_gray.cols);
 
 
-	//imgInput = xf::imread<TYPE, HEIGHT, WIDTH, NPC1>(argv[1], 0);
+#if __SDSCC__
+	unsigned char *structure_element=(unsigned char *)sds_alloc_non_cacheable(sizeof(unsigned char)*FILTER_SIZE*FILTER_SIZE);
+#else
+	unsigned char structure_element[FILTER_SIZE*FILTER_SIZE];
+#endif
+
+
+	for(int i=0;i<(FILTER_SIZE*FILTER_SIZE);i++)
+	{
+		structure_element[i]=element.data[i];
+	}
+
+//	unsigned char iterations=2;
 
 	imgInput.copyTo(in_gray.data);
 
@@ -85,7 +101,7 @@ int main(int argc, char** argv)
 	hw_ctr.start();
 	#endif
 
-	dilation_accel(imgInput, imgOutput);
+	dilation_accel(imgInput, imgOutput, structure_element);
 
 	#if __SDSCC__
 	hw_ctr.stop();

HLS_Use_Model/Standalone_HLS_Example/xf_headers.h

@@ -1,63 +1,65 @@
 /***************************************************************************
-Copyright (c) 2018, Xilinx, Inc.
-All rights reserved.
+ Copyright (c) 2018, Xilinx, Inc.
+ All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
 
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
 
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
 
-3. Neither the name of the copyright holder nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
+ 3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-***************************************************************************/
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CXFSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+ ***************************************************************************/
 #ifndef _XF_HEADERS_H_
 #define _XF_HEADERS_H_
 
+
 #include <stdio.h>
 #include <stdlib.h>
-
-
+#include <stdint.h>
+#include "ap_int.h"
+#include "hls_stream.h"
 
 #if __SDSCC__
 #undef __ARM_NEON__
 #undef __ARM_NEON
 #include "opencv2/opencv.hpp"
-#include "opencv2/imgproc/imgproc.hpp"
 #include "opencv2/highgui/highgui.hpp"
+#include "opencv2/imgproc/imgproc.hpp"
 #define __ARM_NEON__
 #define __ARM_NEON
 #else
-#include "opencv2/opencv.hpp"
+#include "opencv/cv.h"
+#include "opencv/highgui.h"
 #include "opencv2/imgproc/imgproc.hpp"
-#include "opencv2/highgui/highgui.hpp"
 #endif
 
 
+
 #if __SDSCC__
 #include "sds_lib.h"
 #define TIME_STAMP_INIT  unsigned int clock_start, clock_end;  clock_start = sds_clock_counter();
 #define TIME_STAMP  { clock_end = sds_clock_counter(); printf("elapsed time %lu \n", clock_end-clock_start); clock_start = sds_clock_counter();  }
 #endif
 
 #include "common/xf_sw_utils.h"
-#include "common/xf_axi.h"
-#endif//_XF_HEADERS_H_
 
+
+#endif//_XF_HEADERS_H_