merge vision

weberxzq · Sep 30, 2019 · 3bdf363 · 3bdf363
2 parents a927af0 + cd483c7
commit 3bdf363
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 54 deletions.
diff --git a/vision/L1/README.md b/vision/L1/README.md
@@ -21,4 +21,6 @@ source < part-to-XRT-installation-directory >/setenv.sh
 
 export DEVICE=< path-to-platform-directory >/< platform >.xpfm
 
-make run CSIM=1 CSYNTH=1 COSIM=0
+make run CSIM=1 CSYNTH=1 COSIM=0
+
+Note : Please read "Getting started with HLS" section of [Vitis Vision documentation] (https://xilinx.github.io/Vitis_Libraries/vision/) for special cases, constraints and other full details.
diff --git a/vision/L1/examples/accumulatesquared/build/run_hls.tcl b/vision/L1/examples/accumulatesquared/build/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/examples/accumulateweighted/build/run_hls.tcl b/vision/L1/examples/accumulateweighted/build/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/examples/addweighted/build/run_hls.tcl b/vision/L1/examples/addweighted/build/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/examples/autowhitebalance/build/run_hls.tcl b/vision/L1/examples/autowhitebalance/build/run_hls.tcl
@@ -27,7 +27,7 @@ open_project -reset $PROJ
 
 add_files ${XF_PROJ_ROOT}/L1/examples/autowhitebalance/xf_autowhitebalance_accel.cpp -cflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x" -csimflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x"
 add_files -tb ${XF_PROJ_ROOT}/L1/examples/autowhitebalance/xf_autowhitebalance_tb.cpp -cflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x" -csimflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x"
-set_top autowhitebalance_accel
+set_top badpixelcorrection_accel
 
 open_solution -reset $SOLN
 
@@ -43,7 +43,7 @@ if {$CSYNTH == 1} {
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/autowhitebalance/data/im0.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/autowhitebalance/data/128x128.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/examples/badpixelcorrection/build/run_hls.tcl b/vision/L1/examples/badpixelcorrection/build/run_hls.tcl
@@ -27,7 +27,7 @@ open_project -reset $PROJ
 
 add_files ${XF_PROJ_ROOT}/L1/examples/badpixelcorrection/xf_badpixelcorrection_accel.cpp -cflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x" -csimflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x"
 add_files -tb ${XF_PROJ_ROOT}/L1/examples/badpixelcorrection/xf_badpixelcorrection_tb.cpp -cflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x" -csimflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x"
-set_top autowhitebalance_accel
+set_top badpixelcorrection_accel
 
 open_solution -reset $SOLN
 
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/accumulatesquared/accumulate_squared_NO/run_hls.tcl b/vision/L1/tests/accumulatesquared/accumulate_squared_NO/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulatesquared/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/accumulatesquared/accumulate_squared_NO_RGBA/run_hls.tcl b/vision/L1/tests/accumulatesquared/accumulate_squared_NO_RGBA/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulatesquared/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/accumulatesquared/accumulate_squared_RO/run_hls.tcl b/vision/L1/tests/accumulatesquared/accumulate_squared_RO/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulatesquared/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/accumulateweighted/accumulate_weighted_NO/run_hls.tcl b/vision/L1/tests/accumulateweighted/accumulate_weighted_NO/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/accumulateweighted/accumulate_weighted_NO_RGBA/run_hls.tcl b/vision/L1/tests/accumulateweighted/accumulate_weighted_NO_RGBA/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/accumulateweighted/accumulate_weighted_RO/run_hls.tcl b/vision/L1/tests/accumulateweighted/accumulate_weighted_RO/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_2.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128_1.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/addweighted/addweighted_no/run_hls.tcl b/vision/L1/tests/addweighted/addweighted_no/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/addweighted/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/addweighted/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/addweighted/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/addweighted/data/128x128_2.png " 
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/addweighted/addweighted_ro/run_hls.tcl b/vision/L1/tests/addweighted/addweighted_ro/run_hls.tcl
@@ -35,15 +35,15 @@ set_part $XPART
 create_clock -period $CLKP
 
 if {$CSIM == 1} {
-  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png " -clean
+  csim_design -compiler gcc -argv " ${XF_PROJ_ROOT}/L1/examples/addweighted/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/addweighted/data/128x128_2.png " -clean
 }
 
 if {$CSYNTH == 1} {
   csynth_design
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png ${XF_PROJ_ROOT}/L1/examples/accumulate/data/128x128.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/addweighted/data/128x128_1.png ${XF_PROJ_ROOT}/L1/examples/addweighted/data/128x128_2.png " 
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/autowhitebalance/AWB_NO_GRAYWB/run_hls.tcl b/vision/L1/tests/autowhitebalance/AWB_NO_GRAYWB/run_hls.tcl
@@ -43,7 +43,7 @@ if {$CSYNTH == 1} {
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/autowhitebalance/data/im0.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/autowhitebalance/data/128x128.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/autowhitebalance/AWB_NO_SIMPLE/run_hls.tcl b/vision/L1/tests/autowhitebalance/AWB_NO_SIMPLE/run_hls.tcl
@@ -43,7 +43,7 @@ if {$CSYNTH == 1} {
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/autowhitebalance/data/im0.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/autowhitebalance/data/128x128.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit
diff --git a/vision/L1/tests/badpixelcorrection/BPC_1PIXEL/run_hls.tcl b/vision/L1/tests/badpixelcorrection/BPC_1PIXEL/run_hls.tcl
@@ -27,7 +27,7 @@ open_project -reset $PROJ
 
 add_files ${XF_PROJ_ROOT}/L1/examples/badpixelcorrection/xf_badpixelcorrection_accel.cpp -cflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x" -csimflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x"
 add_files -tb ${XF_PROJ_ROOT}/L1/examples/badpixelcorrection/xf_badpixelcorrection_tb.cpp -cflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x" -csimflags "-I${XF_PROJ_ROOT}/L1/include -I ./ -D__SDSVHLS__ -std=c++0x"
-set_top autowhitebalance_accel
+set_top badpixelcorrection_accel
 
 open_solution -reset $SOLN
 
@@ -43,7 +43,7 @@ if {$CSYNTH == 1} {
 }
 
 if {$COSIM == 1} {
-  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/badpixelcorrection/data/im0.png "
+  cosim_design -argv " ${XF_PROJ_ROOT}/L1/examples/badpixelcorrection/data/hd.png "
 }
 
 if {$VIVADO_SYN == 1} {
@@ -58,4 +58,4 @@ if {$QOR_CHECK == 1} {
   puts "QoR check not implemented yet"
 }
 
-exit
+exit