Replacing remaining ABS_COMMON_REPO, CLFLAGS and LDCLFLAGS

Author: Virat Agarwal

common/utility/readme_gen/readme_gen.py

@@ -110,7 +110,7 @@ def commandargs(target,data):
                 arg = arg.replace('BUILD/', '<')
                 arg = arg.replace('PROJECT', '.')
                 arg = arg.replace('.xclbin', ' XCLBIN>') 
-                arg = arg.replace('REPO_DIR','$(ABS_COMMON_REPO)')
+                arg = arg.replace('REPO_DIR','$(XF_PROJ_ROOT)')
                 target.write(arg)
     else:
         target.write('./' + data["host"]["host_exe"])

cpp_kernels/critical_path/README.rst

@@ -32,7 +32,7 @@ Once the environment has been configured, the application can be executed by
 
 ::
 
-   ./critical_path -x <apply_watermark_GOOD XCLBIN> -i $(ABS_COMMON_REPO)/common/data/xilinx_img.bmp -c ./data/golden.bmp
+   ./critical_path -x <apply_watermark_GOOD XCLBIN> -i $(XF_PROJ_ROOT)/common/data/xilinx_img.bmp -c ./data/golden.bmp
 
 DETAILS
 -------

cpp_kernels/custom_datatype/README.rst

@@ -34,7 +34,7 @@ Once the environment has been configured, the application can be executed by
 
 ::
 
-   ./custom_datatype -x <rgb_to_hsv XCLBIN> -i $(ABS_COMMON_REPO)/common/data/xilinx_logo.bmp
+   ./custom_datatype -x <rgb_to_hsv XCLBIN> -i $(XF_PROJ_ROOT)/common/data/xilinx_logo.bmp
 
 DETAILS
 -------

cpp_kernels/gmem_2banks/README.rst

@@ -40,7 +40,7 @@ Once the environment has been configured, the application can be executed by
 
 ::
 
-   ./gmem_2banks -x <apply_watermark XCLBIN> -i $(ABS_COMMON_REPO)/common/data/xilinx_img.bmp -c ./data/golden.bmp
+   ./gmem_2banks -x <apply_watermark XCLBIN> -i $(XF_PROJ_ROOT)/common/data/xilinx_img.bmp -c ./data/golden.bmp
 
 DETAILS
 -------

cpp_kernels/kernel_chain/README.rst

@@ -67,4 +67,21 @@ and simple kernel.
    #pragma HLS INTERFACE s_axilite port = return bundle = control
    #pragma HLS INTERFACE ap_ctrl_chain port = return bundle = control
 
+Following is the real log reported while running the design on U200
+platform with 10 iterations:
+
+::
+
+    --------------------------------------------------
+                    Performance Summary                  
+    --------------------------------------------------
+    -------------------------+-------------------------
+     Kernel(10 iterations)   |    Wall-Clock Time (s)  
+    -------------------------+-------------------------
+     krnl_chain_mmult        | 0.00305935              
+     krnl_simple_mmult       | 0.00534336              
+    -------------------------+-------------------------
+     Speedup:                | 1.74657	                
+    -------------------------+-------------------------
+
 For more comprehensive documentation, `click here <http://xilinx.github.io/Vitis_Accel_Examples>`__.

cpp_kernels/kernel_global_bandwidth/config.mk

@@ -9,15 +9,15 @@ ddr_banks := 1
 endif
 
 ifeq ($(findstring zc, $(DEVICE)), zc)
-LDCLFLAGS+= --config $(ddr_banks)bank_zc.cfg
+VPP_LDFLAGS+= --config $(ddr_banks)bank_zc.cfg
 else
 ifeq ($(findstring samsung, $(DEVICE)), samsung)
-LDCLFLAGS+= --config samsung.cfg
+VPP_LDFLAGS+= --config samsung.cfg
 else
-LDCLFLAGS+= --config $(ddr_banks)bank.cfg
+VPP_LDFLAGS+= --config $(ddr_banks)bank.cfg
 endif
 endif
 
-CLFLAGS += -DNDDR_BANKS=$(ddr_banks)
+VPP_FLAGS += -DNDDR_BANKS=$(ddr_banks)
 
 CXXFLAGS += -DNDDR_BANKS=$(ddr_banks)

demo/kmeans/config.mk

@@ -4,5 +4,5 @@ NK:= 2
 PP:= 96
 
 CXXFLAGS += -D __USE_OPENCL__ -DNUM_CU=$(NK)
-CLFLAGS += -DPARALLEL_POINTS=$(PP)
+VPP_FLAGS += -DPARALLEL_POINTS=$(PP)
 

ocl_kernels/cl_gmem_2banks/README.rst

@@ -39,7 +39,7 @@ Once the environment has been configured, the application can be executed by
 
 ::
 
-   ./cl_gmem_2banks -x <apply_watermark XCLBIN> -i $(ABS_COMMON_REPO)/common/data/xilinx_img.bmp -c ./data/golden.bmp
+   ./cl_gmem_2banks -x <apply_watermark XCLBIN> -i $(XF_PROJ_ROOT)/common/data/xilinx_img.bmp -c ./data/golden.bmp
 
 DETAILS
 -------

rtl_kernels/rtl_streaming_k2k_mm/config.mk

@@ -7,7 +7,7 @@ $(TEMP_DIR)/myadder2.xo:
 	$(VIVADO) -mode batch -source ./src/gen_xo_myadder2.tcl -tclargs $(TEMP_DIR)/myadder2.xo myadder2 $(TARGET) $(B_NAME)/$(XSA).xpfm $(XSA)
 $(TEMP_DIR)/krnl_s2mm.xo: ./src/krnl_s2mm.cpp
 	mkdir -p $(TEMP_DIR)
-	$(VPP) $(CLFLAGS) -c -k krnl_s2mm -I'$(<D)' -o'$@' '$<'
+	$(VPP) $(VPP_FLAGS) -c -k krnl_s2mm -I'$(<D)' -o'$@' '$<'
 $(TEMP_DIR)/krnl_mm2s.xo: ./src/krnl_mm2s.cpp
 	mkdir -p $(TEMP_DIR)
-	$(VPP) $(CLFLAGS) -c -k krnl_mm2s -I'$(<D)' -o'$@' '$<'
+	$(VPP) $(VPP_FLAGS) -c -k krnl_mm2s -I'$(<D)' -o'$@' '$<'

rtl_kernels/rtl_vadd_mixed_c_vadd/config.mk

@@ -4,4 +4,4 @@ $(TEMP_DIR)/rtl_vadd.xo: scripts/package_kernel.tcl scripts/gen_rtl_vadd_xo.tcl
 	$(VIVADO) -mode batch -source scripts/gen_rtl_vadd_xo.tcl -tclargs $(TEMP_DIR)/rtl_vadd.xo vadd $(TARGET) $(DEVICE) $(XSA)
 $(TEMP_DIR)/krnl_vadd.xo: ./src/krnl_vadd.cpp
 	mkdir -p $(TEMP_DIR)
-	$(VPP) $(CLFLAGS) -c -k krnl_vadd -I'$(<D)' -o'$@' '$<' 
+	$(VPP) $(VPP_FLAGS) -c -k krnl_vadd -I'$(<D)' -o'$@' '$<'