From e0cd4329112528a8b94543241c7c8776b45855b5 Mon Sep 17 00:00:00 2001 From: sdausr Date: Mon, 1 Nov 2021 20:28:30 -0600 Subject: [PATCH 1/2] create master branch from next branch --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7ca498696b..d78ed6f5c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('pipeline-library')_ -FullVitisLibPipeline (branch: 'next', libname: 'Vitis_Libraries', TARGETS: 'hls_csim:hls_csynth:hls_cosim:hls_vivado_impl:vitis_sw_emu:vitis_hw_emu:vitis_hw_build:vitis_aie_sim:vitis_aie_x86sim', TOOLVERSION: '2021.2_stable_latest') +FullVitisLibPipeline (branch: 'master', libname: 'Vitis_Libraries', TARGETS: 'hls_csim:hls_csynth:hls_cosim:hls_vivado_impl:vitis_sw_emu:vitis_hw_emu:vitis_hw_build:vitis_aie_sim:vitis_aie_x86sim', TOOLVERSION: '2021.2_released') From 7b77fc26cadc64948815d73998b34004b693a41d Mon Sep 17 00:00:00 2001 From: Ryos Suzuki Date: Fri, 5 Nov 2021 00:55:54 +0900 Subject: [PATCH 2/2] Changed the structure of the if statement so that Vitis HLS can generate code with II = 1. --- vision/L1/include/imgproc/xf_remap.hpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vision/L1/include/imgproc/xf_remap.hpp b/vision/L1/include/imgproc/xf_remap.hpp index 97c29db33f..d7429c264e 100644 --- a/vision/L1/include/imgproc/xf_remap.hpp +++ b/vision/L1/include/imgproc/xf_remap.hpp @@ -254,15 +254,13 @@ void xFRemapLI(xf::cv::Mat& src, if (store_row) { // Store every 3rd row in a buffer lineBuf[pl][(j / 2) - 1] = pixval[pl]; + if (i != 0) { + bufUram[pl][((i - 1) / 2) % (WIN_ROW / 2)][(j / 2) - 1].range(71, 48) = pixval[pl]; + } } else { // Read the stored row and fill in prev_pixval[pl] = lineBuf[pl][(j / 2) - 1]; - } - - if (i != 0) { - if (store_row) { - bufUram[pl][((i - 1) / 2) % (WIN_ROW / 2)][(j / 2) - 1].range(71, 48) = pixval[pl]; - } else { + if (i != 0) { pixval_2[pl].range(23, 0) = prev_pixval[pl]; pixval_2[pl].range(47, 24) = pixval[pl]; bufUram[pl][((i - 1) / 2) % (WIN_ROW / 2)][(j / 2) - 1].range(47, 0) = pixval_2[pl];