Removing compile warnings (#401)

Author: Virat Agarwal

cpp_kernels/gmem_2banks/Makefile

@@ -78,12 +78,12 @@ CLFLAGS += -t $(TARGET) --platform $(DEVICE) --save-temps
 ifneq ($(TARGET), hw)
 	CLFLAGS += -g
 endif
-CLFLAGS +=  --max_memory_ports apply_watermark
+CLFLAGS_apply_watermark +=  --config ./bandwidth.ini
 
 
 
 # Adding config files to linker
-LDCLFLAGS += --config apply_watermark.ini 
+LDCLFLAGS_apply_watermark += --config apply_watermark.ini 
 EXECUTABLE = host
 CMD_ARGS = $(BUILD_DIR)/apply_watermark.xclbin ./data/input.bmp ./data/golden.bmp
 EMCONFIG_DIR = $(TEMP_DIR)
@@ -107,10 +107,10 @@ build: check-vitis $(BINARY_CONTAINERS)
 # Building kernel
 $(TEMP_DIR)/apply_watermark.xo: src/apply_watermark.cpp
 	mkdir -p $(TEMP_DIR)
-	$(VPP) $(CLFLAGS) --temp_dir $(TEMP_DIR) -c -k apply_watermark -I'$(<D)' -o'$@' '$<'
+	$(VPP) $(CLFLAGS) $(CLFLAGS_apply_watermark) --temp_dir $(TEMP_DIR) -c -k apply_watermark -I'$(<D)' -o'$@' '$<'
 $(BUILD_DIR)/apply_watermark.xclbin: $(BINARY_CONTAINER_apply_watermark_OBJS)
 	mkdir -p $(BUILD_DIR)
-	$(VPP) $(CLFLAGS) --temp_dir $(BUILD_DIR) -l $(LDCLFLAGS) -o'$@' $(+)
+	$(VPP) $(CLFLAGS) --temp_dir $(BUILD_DIR) -l $(LDCLFLAGS) $(LDCLFLAGS_apply_watermark) -o'$@' $(+)
 
 # Building Host
 $(EXECUTABLE): check-xrt $(HOST_SRCS) $(HOST_HDRS)

cpp_kernels/gmem_2banks/bandwidth.ini

@@ -0,0 +1,2 @@
+[advanced]
+prop=solution.hls_pre_tcl=hls_config.tcl 

cpp_kernels/gmem_2banks/description.json

@@ -35,6 +35,12 @@
             ]
         }
     }, 
+    "v++": {
+        "build_datafiles" : [            
+            "PROJECT/hls_config.tcl",
+            "PROJECT/bandwidth.ini"
+        ]
+     },
     "key_concepts": [
         "Multiple Banks"
     ], 
@@ -53,7 +59,6 @@
         {
             "accelerators": [
                 {
-                    "max_memory_ports": "true", 
                     "compute_units": [
                         {
                             "arguments": [
@@ -69,7 +74,8 @@
                         }
                     ], 
                     "name": "apply_watermark", 
-                    "location": "src/apply_watermark.cpp"
+                    "location": "src/apply_watermark.cpp",
+                    "clflags": "--config PROJECT/bandwidth.ini"
                 }
             ], 
             "name": "apply_watermark"

cpp_kernels/gmem_2banks/hls_config.tcl

@@ -0,0 +1 @@
+config_interface -m_axi_auto_max_ports=true

cpp_kernels/gmem_2banks/src/apply_watermark.cpp

@@ -73,16 +73,6 @@ const unsigned int c_image_size =
 
 extern "C" {
 void apply_watermark(TYPE *input, TYPE *output, int width, int height) {
-// Using Separate interface bundle gmem0 and gmem1 for both argument
-// input and output. It will allow user to create two separate interfaces
-// and as a result allow kernel to access both interfaces simultaneous.
-#pragma HLS INTERFACE m_axi port = input offset = slave bundle = gmem0
-#pragma HLS INTERFACE m_axi port = output offset = slave bundle = gmem1
-#pragma HLS INTERFACE s_axilite port = input
-#pragma HLS INTERFACE s_axilite port = output
-#pragma HLS INTERFACE s_axilite port = width
-#pragma HLS INTERFACE s_axilite port = height
-#pragma HLS INTERFACE s_axilite port = return
 
   // WaterMark Image of 16x16 size
   int watermark[WATERMARK_HEIGHT][WATERMARK_WIDTH] = {

host/debug_profile/xrt.ini

@@ -2,4 +2,4 @@
 profile=true
 
 [Emulation]
-launch_waveform=batch
+debug_mode=batch

ocl_kernels/cl_gmem_2banks/Makefile

@@ -78,12 +78,12 @@ CLFLAGS += -t $(TARGET) --platform $(DEVICE) --save-temps
 ifneq ($(TARGET), hw)
 	CLFLAGS += -g
 endif
-CLFLAGS +=  --max_memory_ports apply_watermark
+CLFLAGS_apply_watermark +=  --config ./bandwidth.ini
 
 
 
 # Adding config files to linker
-LDCLFLAGS += --config apply_watermark.ini 
+LDCLFLAGS_apply_watermark += --config apply_watermark.ini 
 EXECUTABLE = host
 CMD_ARGS = $(BUILD_DIR)/apply_watermark.xclbin ./data/input.bmp ./data/golden.bmp
 EMCONFIG_DIR = $(TEMP_DIR)
@@ -107,10 +107,10 @@ build: check-vitis $(BINARY_CONTAINERS)
 # Building kernel
 $(TEMP_DIR)/apply_watermark.xo: src/apply_watermark.cl
 	mkdir -p $(TEMP_DIR)
-	$(VPP) $(CLFLAGS) --temp_dir $(TEMP_DIR) -c -k apply_watermark -I'$(<D)' -o'$@' '$<'
+	$(VPP) $(CLFLAGS) $(CLFLAGS_apply_watermark) --temp_dir $(TEMP_DIR) -c -k apply_watermark -I'$(<D)' -o'$@' '$<'
 $(BUILD_DIR)/apply_watermark.xclbin: $(BINARY_CONTAINER_apply_watermark_OBJS)
 	mkdir -p $(BUILD_DIR)
-	$(VPP) $(CLFLAGS) --temp_dir $(BUILD_DIR) -l $(LDCLFLAGS) -o'$@' $(+)
+	$(VPP) $(CLFLAGS) --temp_dir $(BUILD_DIR) -l $(LDCLFLAGS) $(LDCLFLAGS_apply_watermark) -o'$@' $(+)
 
 # Building Host
 $(EXECUTABLE): check-xrt $(HOST_SRCS) $(HOST_HDRS)

ocl_kernels/cl_gmem_2banks/bandwidth.ini

@@ -0,0 +1,2 @@
+[advanced]
+prop=solution.hls_pre_tcl=hls_config.tcl 

ocl_kernels/cl_gmem_2banks/description.json

@@ -35,11 +35,16 @@
             ]
         }
     }, 
+    "v++": {
+        "build_datafiles" : [            
+            "PROJECT/hls_config.tcl",
+            "PROJECT/bandwidth.ini"
+        ]
+     },
     "containers": [
         {
             "accelerators": [
                 {
-                    "max_memory_ports": "true", 
                     "compute_units": [
                         {
                             "arguments": [
@@ -55,7 +60,8 @@
                         }
                     ], 
                     "name": "apply_watermark", 
-                    "location": "src/apply_watermark.cl"
+                    "location": "src/apply_watermark.cl",
+                    "clflags": "--config PROJECT/bandwidth.ini"
                 }
             ], 
             "name": "apply_watermark"

ocl_kernels/cl_gmem_2banks/hls_config.tcl

@@ -0,0 +1 @@
+config_interface -m_axi_auto_max_ports=true