Skip to content

Commit 795d1b5

Browse files
SDA USRGitHub Enterprise
SDA USR
authored and
GitHub Enterprise
committed
Merge pull request #230 from RepoOps/xf_opencv-20210203-083448
Axi co-sim fix, xcl2.cpp update, doc and readme update
2 parents f1f033b + ab41d07 commit 795d1b5

File tree

5 files changed

+36
-32
lines changed

5 files changed

+36
-32
lines changed

‎vision/L1/examples/axiconv/xf_axiconv_accel.cpp‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@
1616

1717
#include "xf_axiconv_config.h"
1818

19-
void axiconv_accel(hls::stream<ap_axiu<8, 1, 1, 1> >& _src,
20-
hls::stream<ap_axiu<8, 1, 1, 1> >& _dst,
21-
int rows,
22-
int cols) {
19+
void axiconv_accel(hls::stream<ap_axiu<8, 1, 1, 1> >& src, hls::stream<ap_axiu<8, 1, 1, 1> >& dst, int rows, int cols) {
2320
// clang-format off
24-
#pragma HLS INTERFACE axis port=_src
25-
#pragma HLS INTERFACE axis port=_dst
21+
#pragma HLS INTERFACE axis port=src
22+
#pragma HLS INTERFACE axis port=dst
2623
#pragma HLS INTERFACE s_axilite port=rows
2724
#pragma HLS INTERFACE s_axilite port=cols
2825
#pragma HLS INTERFACE s_axilite port=return
@@ -33,8 +30,8 @@ void axiconv_accel(hls::stream<ap_axiu<8, 1, 1, 1> >& _src,
3330
#pragma HLS dataflow
3431
// clang-format on
3532

36-
xf::cv::AXIvideo2xfMat(_src, src_mat);
37-
xf::cv::xfMat2AXIvideo(src_mat, _dst);
33+
xf::cv::AXIvideo2xfMat(src, src_mat);
34+
xf::cv::xfMat2AXIvideo(src_mat, dst);
3835

3936
return;
4037
}

‎vision/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ The Vitis Vision library is designed to work with Zynq, Zynq Ultrascale+, and Al
1919

2020
Vitis 2020.2 Development Environment is required to work with the library.
2121

22+
OpenCV must be installed. All Vitis Vision functions are tested against OpenCV version 3.4.2.
23+
2224
**Vitis Flow:**
2325

2426
U200 platform, available in the Vitis tool, is required to build and run the library functions on U200 PCIe board. Same applies for U50 and Zynq based platforms.
@@ -89,5 +91,4 @@ This library is written by developers at
8991

9092
#### Known Issues:
9193
1. Windows OS has path length limitations, kernel names must be smaller than 25 characters.
92-
2. 'axiconv' function in L1 fails cosim because of a known HLS issue.
93-
3. 'bilateralfilter' function RO configuration is not supported.
94+
2. 'bilateralfilter' function RO configuration is not supported.

‎vision/docs/api-reference.rst‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2835,10 +2835,10 @@ parameters:
28352835
+-----------------------+----------------------------------------------+
28362836
| DST_T | Output pixel type. Only XF_2UC1 is |
28372837
| | supported. The output in case of |
2838-
| | NPC=XF_NPPC1 is 8-bit and packing four 2-bit |
2839-
| | pixel values into 8-bit. The output in case |
2840-
| | of NPC=XF_NPPC8 is 16-bit, 8-bit, 2-bit |
2841-
| | pixel values are packing into 16-bit. |
2838+
| | NPC=XF_NPPC1 is 8-bit, where four 2-bit pixel|
2839+
| | values are packed into 8-bit. The output in |
2840+
| | case of NPC=XF_NPPC8 is 16-bit, where 8 2-bit|
2841+
| | pixel values are packed into 16-bit. |
28422842
+-----------------------+----------------------------------------------+
28432843
| ROWS | Maximum height of input and output image |
28442844
+-----------------------+----------------------------------------------+
@@ -2876,9 +2876,15 @@ parameters:
28762876
+-----------------------+----------------------------------------------+
28772877
| Parameter | Description |
28782878
+=======================+==============================================+
2879-
| SRC_T | Input pixel type |
2879+
| SRC_T | Input pixel type. Only XF_2UC1 is |
2880+
| | supported. The input in case of NPC=XF_NPPC1 |
2881+
| | is 8-bit, where four 2-bit pixel values |
2882+
| | are packed into 8-bit. The input in case of |
2883+
| | of NPC=XF_NPPC8 is 16-bit, where 8 2-bit |
2884+
| | pixel values are packed into 16-bit. |
28802885
+-----------------------+----------------------------------------------+
2881-
| DST_T | Output pixel type |
2886+
| DST_T | Output pixel type. Only 8-bit, unsigned, 1 |
2887+
| | channel is supported (XF_8UC1) |
28822888
+-----------------------+----------------------------------------------+
28832889
| ROWS | Maximum height of input and output image |
28842890
+-----------------------+----------------------------------------------+
@@ -7689,7 +7695,7 @@ The following table describes the template and the function parameters.
76897695
+---------------+------------------------------------------------------+
76907696
| \_dst_mat | Output ROI image |
76917697
+---------------+------------------------------------------------------+
7692-
| roi | ROI is a ``xf::cv::Rect`` object that consists of the |
7698+
| roi | ROI is a ``xf::cv::Rect`` object that consists of |
76937699
| | top left corner of the rectangle along with the |
76947700
| | height and width of the rectangle. |
76957701
+---------------+------------------------------------------------------+
@@ -7699,7 +7705,7 @@ The following table describes the template and the function parameters.
76997705

77007706

77017707
The following table summarizes the resource utilization of crop function
7702-
in normal mode (NPC=1) for 3 ROIs (480x640, 100x200, 300x300) as
7708+
in normal mode (NPC=1) for 3 ROIs (480x640, 100x200, 300x300) in memory mapped mode as
77037709
generated in the Vivado HLS 2019.1 tool for the Xilinx
77047710
xczu9eg-ffvb1156-2-i-es2 FPGA.
77057711

@@ -7710,15 +7716,15 @@ xczu9eg-ffvb1156-2-i-es2 FPGA.
77107716
+ +-----------------------------+-----------------------------+
77117717
| | 1 pixel per clock operation | 8 pixel per clock operation |
77127718
+ +-----------------------------+-----------------------------+
7713-
| | 300 MHz | 150 MHz |
7719+
| | 300 MHz | 300 MHz |
77147720
+=============================+=============================+=============================+
7715-
| BRAM_18K | 6 | 8 |
7721+
| BRAM_18K | 0 | 0 |
77167722
+-----------------------------+-----------------------------+-----------------------------+
7717-
| DSP48E | 10 | 10 |
7723+
| DSP48E | 2 | 2 |
77187724
+-----------------------------+-----------------------------+-----------------------------+
7719-
| FF | 17482 | 16995 |
7725+
| FF | 1163 | 2358 |
77207726
+-----------------------------+-----------------------------+-----------------------------+
7721-
| LUT | 16831 | 15305 |
7727+
| LUT | 909 | 3140 |
77227728
+-----------------------------+-----------------------------+-----------------------------+
77237729

77247730

‎vision/docs/getting-started-with-vitis-vision.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Prerequisites
3434
#. libOpenCL.so must be installed if not present along with the
3535
platform.
3636

37-
.. note:: All Vitis Vision functions were tested against OpenCV version - 3.4
37+
.. note:: All Vitis Vision functions were tested against OpenCV version - 3.4.2
3838

3939
Vitis Design Methodology
4040
=========================

‎vision/ext/xcl2/xcl2.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,16 @@ std::string find_binary_file(const std::string& _device_name, const std::string&
180180
}
181181

182182
const char* aws_file_patterns[] = {
183-
"%1$s/%2$s.%3$s.%4$s.awsxclbin", // <kernel>.<target>.<device>.awsxclbin
184-
"%1$s/%2$s.%3$s.%5$s.awsxclbin", // <kernel>.<target>.<device_versionless>.awsxclbin
185-
"%1$s/binary_container_1.awsxclbin", // default for gui projects
186-
"%1$s/%2$s.awsxclbin", // <kernel>.awsxclbin
183+
"%1$s/%2$s.%3$s.%4$s.awsxclbin", // <kernel>.<target>.<device>.awsxclbin
184+
"%1$s/%2$s.%3$s.%4$.0s%5$s.awsxclbin", // <kernel>.<target>.<device_versionless>.awsxclbin
185+
"%1$s/binary_container_1.awsxclbin", // default for gui projects
186+
"%1$s/%2$s.awsxclbin", // <kernel>.awsxclbin
187187
NULL};
188188

189-
const char* file_patterns[] = {"%1$s/%2$s.%3$s.%4$s.xclbin", // <kernel>.<target>.<device>.xclbin
190-
"%1$s/%2$s.%3$s.%5$s.xclbin", // <kernel>.<target>.<device_versionless>.xclbin
191-
"%1$s/binary_container_1.xclbin", // default for gui projects
192-
"%1$s/%2$s.xclbin", // <kernel>.xclbin
189+
const char* file_patterns[] = {"%1$s/%2$s.%3$s.%4$s.xclbin", // <kernel>.<target>.<device>.xclbin
190+
"%1$s/%2$s.%3$s.%4$.0s%5$s.xclbin", // <kernel>.<target>.<device_versionless>.xclbin
191+
"%1$s/binary_container_1.xclbin", // default for gui projects
192+
"%1$s/%2$s.xclbin", // <kernel>.xclbin
193193
NULL};
194194
char xclbin_file_name[PATH_MAX];
195195
memset(xclbin_file_name, 0, PATH_MAX);

0 commit comments

Comments
 (0)