xf::remap() function optimization (URAM utilization)

.gitignore

@@ -0,0 +1,5 @@
+/**/ide/**/*.*sdf
+/**/ide/**/*.tss
+/**/ide/**/*.suo
+/**/ide/**/Debug
+/**/ide/**/Release

aws_demo/README.md

@@ -0,0 +1,130 @@
+AWS Demo 
+======================
+The AWS Demo is set of examples demonstrate how use xfOpenCV library in kernels build for Amazone F1 instance. Each example could be build to run on FPGA (only F1 instance with "*FPGA Developer AMI*" could be used) or emulated for debug purpose in HW or SW emulation mode (any instance with "*FPGA Developer AMI*"could be used). 
+
+## EXAMPLES FILE HIERARCHY
+Each example is organized into the following folders 
+
+
+|  Folder Name | Contents |
+| :----- | :------ 
+| <example name> | **Root folder of example.** Folder contains input image(s), headers with kernel configuration and declaration, makefile, source code of host application, kernel wrapper and kernel.|
+|      hw |**Folder for FPGA flow.**  |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;afi |**Folder for AWS FPGA binary file generation.** After successful build folder will contain the kernel container  binary (`<kernel name>.xclbin`) to generate AWS FPGA binary file for Amazon F1 instance and register AFI. During generation all intermediate files will be stored there. |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;run |**Run folder of the example.** After successful build folder will contain host application executable. All result, intermediate and reference images generated by kernel and application will be stored there. Kernel container  |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;hw_emu |**Folder for HW emulation flow.**  |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;run |**Emulation folder of the example.** After successful build folder will contain host application executable and kernel container (`<kernel name>.xclbin`) for HW emulation. Emulation logs and data, result, intermediate and reference images generated by kernel emulation and application will be stored there.  |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sw_emu |**Folder for HW emulation flow.**  |
+| &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;run |**Emulation folder of the example.** After successful build folder will contain host application executable and kernel container (`<kernel name>.xclbin`) for HW emulation. Emulation logs and data, result, intermediate and reference images generated by kernel emulation and application will be stored there.  |
+
+
+## HOW TO BUILD EXAMPLE
+Place xfOpenCV library (`xfopencv` folder) together with Amazon's FPGA framework
+```
+project_data
+ ├─ aws-fpga
+ └─ xfopencv
+```
+
+If you would like to have other folder structure you need tune [`aws_demo/common_makefile`](common_makefile). For more information please see [make_description.md](make_description.md) 
+
+### Prepare environment
+Run following code to prepare environment for build.
+```
+cd $AWS_FPGA_REPO_DIR 
+source sdaccel_setup.sh 
+source $XILINX_SDX/settings64.sh
+```
+
+### Build example for SW/HW emulation
+
+1. Go to root folder of example.
+2. Build whole example (`all`), kernel part only (`krnl`) or host application only (`host`) for HW (`hw_emu`) or SW (`sw_emu`) emulation with the following command:
+```
+make TARGET=hw_emu|sw_emu all|host|krnl
+```
+
+To erase all build data including host application executable and kernel binary files use following command:
+```
+make TARGET=hw_emu|sw_emu clean
+```
+
+### Build example for FPGA
+
+To build examples for FPGA F1 instance you will need access to [**AWS CLI**](https://aws.amazon.com/cli/) and [**S3**](https://aws.amazon.com/s3/). Please refer to **_[What Is the AWS Command Line Interface?](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-welcome.html)_** and **_[Getting Started with Amazon S3](https://aws.amazon.com/s3/getting-started/)_**.     
+1. Go to root folder of example.
+2. Build whole example (`all`), kernel part only (`krnl`) or host application only (`host`) for HW (`hw_emu`) or SW (`sw_emu`) emulation with the following command:
+```
+make TARGET=hw all|host|krnl
+```
+3. After kernel build complete go to ***afi*** folder to generate AWS FPGA binary file for Amazon F1 instance and register AFI
+4. Setup **[AWS CLI](https://aws.amazon.com/cli/)**  (see **_[What Is the AWS Command Line Interface?](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-welcome.html)_**)
+5. Run script placed in ***afi*** folder to generate AWS FPGA binary file for Amazon F1 instance and register AFI 
+```
+source ./gen_afi.sh
+```
+Script will create S3 bucket for FPGA image and launch image generation in background process. When script finish the FPGA image will not be ready.
+6. Wait until FPGA image will be generated. To check generation completion periodically run following command:
+```
+aws ec2 describe-fpga-images --fpga-image-id <afi id>
+```
+You can get `<afi id>` from script message or from file **`*_afi_id.txt`**. During generation you will see following message:
+```
+...
+     "State": {
+                "Code": "pending"
+              },
+...
+```   
+The FPGA image is ready if command print `available`:
+```
+...
+     "State": {
+                "Code": "available"
+              },
+...
+```   
+
+7. Copy `<kernel name>.awsxclbin` into ***hw/run*** folder  
+
+To erase all build data including host application executable but except content of ***afi*** folder use following command:
+```
+make TARGET=hw clean
+```
+
+## HOW TO RUN EXAMPLE
+
+### Prepare environment
+If you relaunch Amazon instance after build you need to repeat environment preparation step:
+```
+cd $AWS_FPGA_REPO_DIR 
+source sdaccel_setup.sh 
+source $XILINX_SDX/settings64.sh
+```
+### Run SW/HW emulation of example 
+
+1. Go to emulation folder of example (**`hw_emu/run`** or **`sw_emu/run`**).
+2. Set desired emulation option in `sdaccel.ini` file
+3. Launch emulation with the following command:
+```
+source run.sh 
+```
+
+### Run example on FPGA 
+
+1. Go to run folder of example (**`hw/run`**).
+2. Launch shell
+```
+sudo sh
+```
+3. Launch application with the following command:
+```
+source run.sh 
+```
+
+## REVISION HISTORY
+
+Date      | Readme Version | Release Notes
+--------  |----------------|-------------------------
+May 2018  | 1.0            | Initial version.
+

aws_demo/common_makefile

@@ -0,0 +1,196 @@
+########################################
+#                                      #
+#             Tools section            #
+#                                      #
+########################################
+
+XILINX_SDX ?= /opt/Xilinx/SDx/2017.1.op
+XILINX_HLS ?= $(XILINX_SDX)/Vivado_HLS
+
+
+SDX_CXX ?= $(XILINX_SDX)/bin/xcpp
+XOCC ?= $(XILINX_SDX)/bin/xocc
+
+RM = rm -f
+RMDIR = rm -rf
+
+ifeq "$(AWS_PLATFORM)" "$(AWS_PLATFORM_1DDR)"
+  XILINX_SDX_RUNTIME=/opt/Xilinx/2017.1.rte.1ddr/runtime/lib/x86_64
+else ifeq "$(AWS_PLATFORM)" "$(AWS_PLATFORM_4DDR)"
+  XILINX_SDX_RUNTIME=/opt/Xilinx/2017.1.rte.4ddr/runtime/lib/x86_64
+else ifeq "$(AWS_PLATFORM)" "$(AWS_PLATFORM_4DDR_DEBUG)"
+  XILINX_SDX_RUNTIME=/opt/Xilinx/2017.1.rte.4ddr_debug/runtime/lib/x86_64
+endif
+
+XFOPENCV ?= /home/centos/src/project_data/xfopencv
+
+TARGET ?= hw_emu
+
+########################################
+#                                      #
+#             Host section             #
+#                                      #
+########################################
+
+HOST_SDx_SRC ?=  xcl2
+
+SDx_LIB_DIR ?= $(SDACCEL_DIR)/examples/xilinx/libs/xcl2
+
+CXXFLAGS += -DSDX_PLATFORM=$(AWS_PLATFORM) -D__USE_XOPEN2K8 
+CXXFLAGS += -I$(XILINX_SDX)/runtime/include/1_2/ 
+CXXFLAGS += -I$(XILINX_SDX)/include/         
+CXXFLAGS += -I$(XFOPENCV)/include/  
+CXXFLAGS += -I$(SDx_LIB_DIR)/
+CXXFLAGS += -I$(XILINX_HLS)/include
+CXXFLAGS += -O2 -Wall -c -fmessage-length=0 -std=c++14
+
+#--- Specify OpenCV libraries ---#
+
+LDFLAGS += -L$(XILINX_SDX)/lnx64/tools/opencv
+LDFLAGS += -lopencv_core
+LDFLAGS += -lopencv_imgproc
+LDFLAGS += -lopencv_highgui
+
+#--- Specify common libraries ---#
+
+LDFLAGS += -L$(XILINX_SDX)/lib/lnx64.o 
+LDFLAGS += -lstdc++
+LDFLAGS += -lpthread 
+LDFLAGS += -lrt
+
+#--- Specify AWS libraries ---#
+
+LDFLAGS += -L$(XILINX_SDX_RUNTIME) 
+LDFLAGS += -lxilinxopencl
+
+#--- Specify runtime libraries ---#
+
+LDFLAGS += -Wl,-rpath,$(XILINX_SDX)/lnx64/tools/opencv
+LDFLAGS += -Wl,-rpath,$(XILINX_SDX)/lib/lnx64.o 
+LDFLAGS += -Wl,-rpath,$(XILINX_SDX_RUNTIME)
+
+#--- Specify objects ---#
+
+HOST_AWS_DIR = ./
+HOST_BLD_DIR = $(TARGET)/build/host
+HOST_RUN_DIR = $(TARGET)/run
+
+HOST_AWS_OBJ +=  $(addsuffix .o, $(addprefix $(HOST_BLD_DIR)/, $(HOST_AWS_SRC)) )
+HOST_SDx_OBJ +=  $(addsuffix .o, $(addprefix $(HOST_BLD_DIR)/, $(HOST_SDx_SRC)) )
+
+HOST_OBJ = $(HOST_AWS_OBJ) $(HOST_SDx_OBJ)
+
+HOST_EXE ?= $(HOST_RUN_DIR)/$(TEST_NAME)
+
+BUILD_SUBDIRS += $(HOST_BLD_DIR)
+
+
+########################################
+#                                      #
+#            Kernel section            #
+#                                      #
+########################################
+
+XOCC_OPTS += --platform $(AWS_PLATFORM) 
+XOCC_OPTS += --save-temps  
+XOCC_OPTS += --report system
+
+XOCC_INCL += -I$(XFOPENCV)/include
+XOCC_INCL += -I/opt/Xilinx/SDx/2017.4/include/ocv
+
+KERNEL_BLD_DIR = $(TARGET)/build/kernel
+
+ifeq "$(TARGET)" "hw"
+  KERNEL_RUN_DIR = $(TARGET)/afi
+else
+  KERNEL_RUN_DIR = $(TARGET)/run
+  XOCC_OPTS += -g
+endif
+
+BUILD_SUBDIRS += $(KERNEL_BLD_DIR)
+
+KERNEL_OBJ += $(addsuffix .xo    , $(addprefix $(KERNEL_BLD_DIR)/, $(KERNEL)) )
+KERNEL_BIN += $(addsuffix .xclbin, $(addprefix $(KERNEL_RUN_DIR)/, $(KERNEL)) )
+
+
+########################################
+#                                      #
+#            Build section             #
+#                                      #
+########################################
+
+.PHONY: all
+
+all: host krnl
+
+host: $(HOST_EXE)
+
+krnl: $(KERNEL_BIN)
+
+clean:
+	$(RMDIR) $(BUILD_SUBDIRS)
+	$(RMDIR) .Xil
+	$(RMDIR) $(HOST_RUN_DIR)/TempConfig
+	$(RM)    $(HOST_RUN_DIR)/*.jpg $(HOST_RUN_DIR)/*.png $(HOST_RUN_DIR)/*.log $(HOST_RUN_DIR)/*.csv $(HOST_RUN_DIR)/*.html
+	$(RM)    $(KERNEL_BIN)
+	$(RM)    $(HOST_EXE)
+	$(RM)    $(HOST_EXE)/*.*xclbin
+
+.PHONY: all
+
+#--- Kernel rules ---#
+
+$(KERNEL_OBJ): $(KERNEL_BLD_DIR)/%.xo : %_kernel_aws.cpp
+	@echo " "
+	@echo "================================================================"
+	@echo "Compilation of $< to $@"
+	@echo "================================================================"
+	@echo " "
+	@mkdir -p $(@D)
+	$(XOCC) -c -t $(TARGET)  $(XOCC_OPTS) $(XOCC_INCL) -k $(*F) --max_memory_ports $(*F) -I$(<D) --xp misc:solution_name=$(KERNEL_BLD_DIR)/$(*F)_compile -o$(@) $(<)
+
+
+
+$(KERNEL_BIN): $(KERNEL_RUN_DIR)/%.xclbin : $(KERNEL_BLD_DIR)/%.xo
+	@echo " "
+	@echo "================================================================"
+	@echo "Linking of $@  ($(@D))"
+	@echo "================================================================"
+	@echo " "
+	mkdir -p $(KERNEL_RUN_DIR)
+	$(XOCC) -l -t $(TARGET) $(XOCC_OPTS) --jobs 8 --nk $(*F):1 --xp misc:solution_name=$(KERNEL_BLD_DIR)/$(*F)_link -o$(@) $(+)
+
+
+#--- Host rules ---#
+
+$(HOST_AWS_OBJ): $(HOST_BLD_DIR)/%.o : $(HOST_AWS_DIR)/%.cpp 
+	@echo " "
+	@echo "================================================================"
+	@echo "Compilation of $< to $@"
+	@echo "================================================================"
+	@echo " "
+	@mkdir -p $(HOST_BLD_DIR)                                       
+	$(SDX_CXX) $(CXXFLAGS) -o $(@) $(<)
+
+
+$(HOST_SDx_OBJ): $(HOST_BLD_DIR)/%.o : $(SDx_LIB_DIR)/%.cpp 
+	@echo " "
+	@echo "================================================================"
+	@echo "Compilation of $< to $@"
+	@echo "================================================================"
+	@echo " "
+	@mkdir -p $(HOST_BLD_DIR)                                       
+	$(SDX_CXX) $(CXXFLAGS) -o $(@) $(<)
+
+
+$(HOST_EXE): $(HOST_OBJ)
+	@echo " "
+	@echo "================================================================"
+	@echo "Linking of $@  ($(@D))"
+	@echo "================================================================"
+	@echo " "
+	mkdir -p $(HOST_RUN_DIR)
+	$(SDX_CXX) -o "$@" $(+) $(LDFLAGS) 
+
+
+

aws_demo/gaussianfilter/hw/afi/gen_afi.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+echo aws s3 rm --recursive s3://xfg
+aws s3 rm --recursive s3://xfg
+
+echo aws s3 rb s3://xfg
+aws s3 rb s3://xfg
+
+
+echo aws s3 mb s3://xfg
+aws s3 mb s3://xfg
+
+aws s3 mb s3://xfg/dcp
+touch FILES_GO_HERE.txt
+aws s3 cp FILES_GO_HERE.txt s3://xfg/dcp/
+
+
+aws s3 mb s3://xfg/log
+touch LOGS_FILES_GO_HERE.txt
+aws s3 cp LOGS_FILES_GO_HERE.txt s3://xfg/log/  
+
+aws s3 ls --recursive s3://xfg
+
+rm -f FILES_GO_HERE.txt
+rm -f LOGS_FILES_GO_HERE.txt
+
+$SDACCEL_DIR/tools/create_sdaccel_afi.sh -xclbin=xf_gaussian_filter.xclbin -s3_bucket=xfg -s3_dcp_key=dcp -s3_logs_key=log
+
+cat *afi_id*
+
+echo "use following command to check afi ready"
+echo "aws ec2 describe-fpga-images --fpga-image-id <afi id>"

aws_demo/gaussianfilter/hw/run/run.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+source /opt/Xilinx/SDx/2017.1.rte.4ddr/setup.sh
+
+./gaussian_filter_test ../../im0.jpg

aws_demo/gaussianfilter/hw_emu/run/run.sh

@@ -0,0 +1,5 @@
+emconfigutil -f $AWS_PLATFORM
+
+export XCL_EMULATION_MODE=hw_emu
+
+./gaussian_filter_test ../../im0.jpg

aws_demo/gaussianfilter/hw_emu/run/sdaccel.ini

@@ -0,0 +1,5 @@
+[Debug]
+timeline_trace=true
+device_profile=true
+app_debug=true
+profile=true