Updated p2p simple and p2p bandwidth design to support multiple cards (#405)

Author: Bhaskar VishnuVardhan Chebrolu

host/p2p_bandwidth/Makefile

@@ -56,9 +56,11 @@ SDCARD := sd_card
 #Include Libraries
 include $(ABS_COMMON_REPO)/common/includes/opencl/opencl.mk
 include $(ABS_COMMON_REPO)/common/includes/xcl2/xcl2.mk
-CXXFLAGS += $(xcl2_CXXFLAGS)
-LDFLAGS += $(xcl2_LDFLAGS)
-HOST_SRCS += $(xcl2_SRCS)
+include $(ABS_COMMON_REPO)/common/includes/cmdparser/cmdparser.mk
+include $(ABS_COMMON_REPO)/common/includes/logger/logger.mk
+CXXFLAGS += $(xcl2_CXXFLAGS) $(cmdparser_CXXFLAGS) $(logger_CXXFLAGS)
+LDFLAGS += $(xcl2_LDFLAGS) $(cmdparser_LDFLAGS) $(logger_LDFLAGS)
+HOST_SRCS += $(xcl2_SRCS) $(cmdparser_SRCS) $(logger_SRCS)
 CXXFLAGS += $(opencl_CXXFLAGS) -Wall -O0 -g -std=c++11
 LDFLAGS += $(opencl_LDFLAGS)
 
@@ -81,7 +83,7 @@ endif
 
 
 EXECUTABLE = host
-CMD_ARGS = $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1
+CMD_ARGS = $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1 -d 0
 EMCONFIG_DIR = $(TEMP_DIR)
 EMU_DIR = $(SDCARD)/data/emulation
 
@@ -141,27 +143,27 @@ endif
 ifeq ($(TARGET),$(filter $(TARGET),sw_emu hw_emu))
 ifeq ($(HOST_ARCH), x86)
 	$(CP) $(EMCONFIG_DIR)/emconfig.json .
-	XCL_EMULATION_MODE=$(TARGET) ./$(EXECUTABLE) $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1
+	XCL_EMULATION_MODE=$(TARGET) ./$(EXECUTABLE) $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1 -d 0
 else
 	$(ABS_COMMON_REPO)/common/utility/run_emulation.pl "./${LAUNCH_EMULATOR} | tee run_app.log" "./${RUN_APP_SCRIPT} $(TARGET)" "${RESULT_STRING}" "7"
 endif
 else
 ifeq ($(HOST_ARCH), x86)
-	./$(EXECUTABLE) $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1
+	./$(EXECUTABLE) $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1 -d 0
 endif
 endif
 
 .PHONY: test
 test: $(EXECUTABLE)
 ifeq ($(TARGET),$(filter $(TARGET),sw_emu hw_emu))
 ifeq ($(HOST_ARCH), x86)
-	XCL_EMULATION_MODE=$(TARGET) ./$(EXECUTABLE) $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1
+	XCL_EMULATION_MODE=$(TARGET) ./$(EXECUTABLE) $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1 -d 0
 else
 	$(ABS_COMMON_REPO)/common/utility/run_emulation.pl "./${LAUNCH_EMULATOR} | tee embedded_run.log" "./${RUN_APP_SCRIPT} $(TARGET)" "${RESULT_STRING}" "7"
 endif
 else
 ifeq ($(HOST_ARCH), x86)
-	./$(EXECUTABLE) $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1
+	./$(EXECUTABLE) $(BUILD_DIR)/copy_kernel.xclbin -r /dev/nvme0n1 -d 0
 else
 	$(ECHO) "Please copy the content of sd_card folder and data to an SD Card and run on the board"
 endif
@@ -170,7 +172,7 @@ endif
 
 sd_card: gen_run_app
 ifneq ($(HOST_ARCH), x86)
-	$(VPP) -t $(TARGET) --platform $(DEVICE) -p $(BUILD_DIR)/copy_kernel.xclbin --package.out_dir $(PACKAGE_OUT) --package.rootfs $(EDGE_COMMON_SW)/rootfs.ext4 --package.sd_file $(SD_IMAGE_FILE) --package.sd_file xrt.ini --package.sd_file $(RUN_APP_SCRIPT) --package.sd_file $(EXECUTABLE) --package.sd_file -r --package.sd_file /dev/nvme0n1 -o copy_kernel.xclbin
+	$(VPP) -t $(TARGET) --platform $(DEVICE) -p $(BUILD_DIR)/copy_kernel.xclbin --package.out_dir $(PACKAGE_OUT) --package.rootfs $(EDGE_COMMON_SW)/rootfs.ext4 --package.sd_file $(SD_IMAGE_FILE) --package.sd_file xrt.ini --package.sd_file $(RUN_APP_SCRIPT) --package.sd_file $(EXECUTABLE) --package.sd_file -r --package.sd_file /dev/nvme0n1 --package.sd_file -d --package.sd_file 0 -o copy_kernel.xclbin
 endif
 
 # Cleaning stuff

host/p2p_bandwidth/README.md

@@ -30,7 +30,7 @@ src/host.cpp
 ##  COMMAND LINE ARGUMENTS
 Once the environment has been configured, the application can be executed by
 ```
-./host <copy_kernel XCLBIN> -r /dev/nvme0n1
+./host <copy_kernel XCLBIN> -r /dev/nvme0n1 -d 0
 ```
 
 ##  COMMANDS FOR WINDOWS FLOW

host/p2p_bandwidth/description.json

@@ -29,10 +29,9 @@
      "runtime": [
         "OpenCL"
     ], 
-        "match_ini": "false",
     "launch": [
         {
-            "cmd_args": "BUILD/copy_kernel.xclbin -r /dev/nvme0n1", 
+            "cmd_args": "BUILD/copy_kernel.xclbin -r /dev/nvme0n1 -d 0", 
             "name": "generic launch for all flows"
         }
     ], 
@@ -41,10 +40,14 @@
         "compiler": {
             "sources": [
                 "REPO_DIR/common/includes/xcl2",
+                "REPO_DIR/common/includes/cmdparser",
+                "REPO_DIR/common/includes/logger",
 		"src/host.cpp"
             ], 
             "includepaths": [
-                "REPO_DIR/common/includes/xcl2"
+                "REPO_DIR/common/includes/xcl2",
+                "REPO_DIR/common/includes/cmdparser",
+                "REPO_DIR/common/includes/logger"
             ]
         },
         "linker" : {

host/p2p_bandwidth/src/host.cpp

@@ -51,6 +51,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // and XDMA (x). Conceptually, x, c and p happens consecutively. The pipeline
 // is designed so that c(n) and x(n) will happen in parallel with p(n+1).
 
+#include "cmdlineparser.h"
 #include <chrono>
 #include <fcntl.h>
 #include <iomanip>
@@ -366,7 +367,7 @@ void exec_read_test() {
 }
 
 void usage() {
-  cout << "Options: <-r|-w> <path-to-SSD>" << endl;
+  cout << "Options: <-r|-w> <path-to-SSD> <-d> <device id>" << endl;
   exit(EXIT_FAILURE);
 }
 
@@ -388,7 +389,7 @@ int main(int argc, char **argv) {
   bool isWrite;
   char *filename;
 
-  if (argc != 4)
+  if (argc != 6)
     usage();
   else if (strcmp(argv[2], "-r") == 0)
     isWrite = false;
@@ -434,6 +435,17 @@ int main(int argc, char **argv) {
     exit(EXIT_FAILURE);
   }
   cl_device_id device = devices.front();
+  cl_uint dev_id = 0;
+
+  // Command Line Parser
+  sda::utils::CmdLineParser parser;
+
+  parser.addSwitch("--device", "-d", "device id", "0");
+  dev_id = atoi((parser.value("device")).c_str());
+  if(dev_id <= num_devices)
+      device = devices[dev_id];
+  else
+      cout << "The device_id provided using -d flag is outside the range of available devices\n";
 
   context = clCreateContext(0, 1, &device, nullptr, nullptr, &err);
   if (err != CL_SUCCESS)

host/p2p_bandwidth/utils.mk

@@ -80,7 +80,7 @@ ifeq ($(TARGET),$(filter $(TARGET),sw_emu hw_emu))
 	$(ECHO) 'export XILINX_VITIS=/mnt' >> run_app.sh
 	$(ECHO) 'export XCL_EMULATION_MODE=$(TARGET)' >> run_app.sh
 endif
-	$(ECHO) './$(EXECUTABLE) copy_kernel.xclbin -r nvme0n1' >> run_app.sh
+	$(ECHO) './$(EXECUTABLE) copy_kernel.xclbin -r nvme0n1 -d 0' >> run_app.sh
 	$(ECHO) 'return_code=$$?' >> run_app.sh
 	$(ECHO) 'if [ $$return_code -ne 0 ]; then' >> run_app.sh
 	$(ECHO) 'echo "ERROR: host run failed, RC=$$return_code"' >> run_app.sh

host/p2p_bandwidth/xrt.ini

@@ -1,7 +1,2 @@
 [Debug]
 profile=true
-device_profile=true
-
-[Runtime] 
-ert=false
-

host/p2p_simple/Makefile

@@ -79,6 +79,8 @@ ifneq ($(TARGET), hw)
 endif
 
 
+# Kernel linker flags
+LDCLFLAGS += --config ./adder.ini
 
 EXECUTABLE = host
 CMD_ARGS = $(BUILD_DIR)/adder.xclbin /dev/nvme0n1

host/p2p_simple/adder.ini

@@ -0,0 +1 @@
+kernel_frequency=290

host/p2p_simple/description.json

@@ -31,7 +31,6 @@
      "runtime": [
         "OpenCL"
     ], 
-        "match_ini": "false",
     "launch": [
         {
             "cmd_args": "BUILD/adder.xclbin /dev/nvme0n1", 
@@ -54,10 +53,11 @@
             "accelerators": [
                 {
                     "name": "adder", 
-                    "location": "src/adder.cpp"
+                    "location": "src/adder.cpp"                    
                 }
             ], 
-            "name": "adder"
+            "name": "adder",
+            "ldclflags": "--config PROJECT/adder.ini"
         }
     ],
     "contributors": [