Updated xfOpenCV 2019.1 version

.gitignore

@@ -0,0 +1 @@
+*.db

HLS_Use_Model/Standalone_HLS_AXI_Example/script.tcl

@@ -0,0 +1,49 @@
+#***************************************************************************
+#	Copyright (c) 2019, 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:
+
+#	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.
+
+#	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.
+
+#***************************************************************************/
+
+
+############################################################
+## Copyright (C) 1986-2019 Xilinx, Inc. All Rights Reserved.
+############################################################
+open_project dilation_project
+set_top ip_accel_app
+add_files ./xf_ip_accel_app.cpp -cflags "-D__SDSVHLS__ -I../../include --std=c++0x"
+add_files ./xf_dilation_accel.cpp -cflags "-D__SDSVHLS__ -I../../include --std=c++0x"
+add_files -tb ./testcase55.jpg
+add_files -tb ./xf_dilation_tb.cpp -cflags "-D__SDSVHLS__ -I../../include --std=c++0x"
+open_solution "solution1"
+set_part {xczu9eg-ffvb1156-2-i} -tool vivado
+create_clock -period 10 -name default
+#source "./dilation_color/solution1/directives.tcl"
+csim_design -argv {testcase55.jpg} -clean -compiler gcc
+csynth_design
+cosim_design -argv {testcase55.jpg}
+#export_design -format ip_catalog
+

examples/warpaffine/xf_warpaffine_accel.cpp → HLS_Use_Model/Standalone_HLS_AXI_Example/xf_config_params.h

@@ -1,5 +1,5 @@
 /***************************************************************************
-Copyright (c) 2018, Xilinx, Inc.
+Copyright (c) 2019, Xilinx, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 
@@ -28,17 +28,18 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
+/* Optimization type */
+#define RO  0 // Resource Optimized (8-pixel implementation)
+#define NO  1 // Normal Operation (1-pixel implementation)
 
-#include "xf_warpaffine_config.h"
+
+#define GRAY 1
+
+#define FILTER_SIZE 3
+
+#define KERNEL_SHAPE XF_SHAPE_CROSS
+
+#define ITERATIONS 1
 
 
-void warpaffine_accel(xf::Mat<XF_8UC1, HEIGHT, WIDTH, XF_NPPC8> &imgInput,xf::Mat<XF_8UC1, HEIGHT, WIDTH, XF_NPPC8> &imgOutput,float *transform_matrix)
-{
-	#if NO
-	xf::warpAffine<INTER_POLATION, XF_8UC1, HEIGHT, WIDTH, XF_NPPC1>(imgInput, imgOutput, transform_matrix);
-	#endif
-	#if RO
-	xf::warpAffine<INTER_POLATION, XF_8UC1, HEIGHT, WIDTH, XF_NPPC8>(imgInput, imgOutput, transform_matrix);
-	#endif
-}
 

HLS_Use_Model/AXI_Sample/xf_dilation_accel.cpp → HLS_Use_Model/Standalone_HLS_AXI_Example/xf_dilation_accel.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-Copyright (c) 2018, Xilinx, Inc.
+Copyright (c) 2019, Xilinx, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 
@@ -34,6 +34,6 @@ void dilation_accel(xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> &_src,xf::Mat<TYPE, HEIGH
 {
 
 
-	xf::dilate<XF_BORDER_REPLICATE, TYPE ,HEIGHT, WIDTH, KERNEL_SHAPE, FILTER_SIZE, FILTER_SIZE, ITERATIONS, NPC1>(_src, _dst, kernel);
+	xf::dilate<XF_BORDER_CONSTANT, TYPE ,HEIGHT, WIDTH, KERNEL_SHAPE, FILTER_SIZE, FILTER_SIZE, ITERATIONS, NPC1>(_src, _dst,kernel);
 
 }

HLS_Use_Model/AXI_Sample/xf_dilation_config.h → HLS_Use_Model/Standalone_HLS_AXI_Example/xf_dilation_config.h

@@ -1,29 +1,29 @@
 /***************************************************************************
-Copyright (c) 2018, Xilinx, Inc.
+Copyright (c) 2019, Xilinx, Inc.
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
+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,
+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
+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
+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,
+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.
 
 ***************************************************************************/
@@ -41,8 +41,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 /* config width and height */
-#define WIDTH 	3840
-#define HEIGHT	2160
+#define WIDTH 	1920
+#define HEIGHT	1080
 
 
 /*  define the input and output types  */
@@ -53,8 +53,14 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #if RO
 #define NPC1 XF_NPPC8
 #endif
-
+#if GRAY
 #define TYPE XF_8UC1
+#else
+#define TYPE XF_8UC3
+#endif
+
+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]);
 
-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] );
 #endif // _XF_DILATION_CONFIG_H_
+
+

HLS_Use_Model/AXI_Sample/xf_dilation_tb.cpp → HLS_Use_Model/Standalone_HLS_AXI_Example/xf_dilation_tb.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
-Copyright (c) 2018, Xilinx, Inc.
+Copyright (c) 2019, Xilinx, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

HLS_Use_Model/AXI_Sample/xf_headers.h → HLS_Use_Model/Standalone_HLS_AXI_Example/xf_headers.h

@@ -1,5 +1,5 @@
 /***************************************************************************
- Copyright (c) 2018, Xilinx, Inc.
+ Copyright (c) 2019, Xilinx, Inc.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without modification,
@@ -22,7 +22,7 @@
  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,
+ 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.
 

HLS_Use_Model/Standalone_HLS_AXI_Example/xf_ip_accel_app.cpp

@@ -0,0 +1,54 @@
+/***************************************************************************
+Copyright (c) 2019, 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:
+
+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.
+
+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.
+
+***************************************************************************/
+
+#include "xf_dilation_config.h"
+
+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, unsigned char kernel[FILTER_SIZE*FILTER_SIZE])
+{
+#pragma HLS INTERFACE axis register both  port=_src
+#pragma HLS INTERFACE axis register both  port=_dst
+
+	 xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> imgInput1(height,width);
+	 xf::Mat<TYPE, HEIGHT, WIDTH, NPC1> imgOutput1(height,width);
+
+#pragma HLS stream variable=imgInput1.data dim=1 depth=1
+#pragma HLS stream variable=imgOutput1.data dim=1 depth=1
+	#pragma HLS dataflow
+
+	xf::AXIvideo2xfMat(_src, imgInput1);
+
+	 dilation_accel(imgInput1,imgOutput1, kernel);
+
+	xf::xfMat2AXIvideo(imgOutput1, _dst);
+
+
+}

HLS_Use_Model/Standalone_HLS_Example/script.tcl

@@ -1,11 +1,41 @@
+#***************************************************************************
+#	Copyright (c) 2019, 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:
+
+#	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.
+
+#	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.
+
+#***************************************************************************/
+
 ############################################################
 ## Copyright (C) 1986-2018 Xilinx, Inc. All Rights Reserved.
 ############################################################
 open_project dilation_project
 set_top dilation_accel
-add_files ./xf_dilation_accel.cpp -cflags "-D__XFCV_HLS_MODE__ -I../../include --std=c++0x"
+add_files ./xf_dilation_accel.cpp -cflags "-D__SDSVHLS__ -I../../include --std=c++0x"
 add_files -tb ./testcase55.jpg
-add_files -tb ./xf_dilation_tb.cpp -cflags "-D__XFCV_HLS_MODE__ -I../../include --std=c++0x"
+add_files -tb ./xf_dilation_tb.cpp -cflags "-D__SDSVHLS__ -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,5 +1,34 @@
-/* Optimization type */
+/***************************************************************************
+Copyright (c) 2019, 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:
+
+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.
 
+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.
+
+***************************************************************************/
+
+/* Optimization type */
 #define RO  0 // Resource Optimized (8-pixel implementation)
 #define NO  1 // Normal Operation (1-pixel implementation)