Adding cmdlineparser h2k (#412)

Author: Virat Agarwal

host/streaming_free_running_h2k/Makefile

@@ -58,9 +58,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)
 
@@ -86,7 +88,7 @@ endif
 
 
 EXECUTABLE = host
-CMD_ARGS = $(BUILD_DIR)/increment.xclbin
+CMD_ARGS = -x $(BUILD_DIR)/increment.xclbin
 EMCONFIG_DIR = $(TEMP_DIR)
 EMU_DIR = $(SDCARD)/data/emulation
 
@@ -146,27 +148,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)/increment.xclbin
+	XCL_EMULATION_MODE=$(TARGET) ./$(EXECUTABLE) -x $(BUILD_DIR)/increment.xclbin
 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)/increment.xclbin
+	./$(EXECUTABLE) -x $(BUILD_DIR)/increment.xclbin
 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)/increment.xclbin
+	XCL_EMULATION_MODE=$(TARGET) ./$(EXECUTABLE) -x $(BUILD_DIR)/increment.xclbin
 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)/increment.xclbin
+	./$(EXECUTABLE) -x $(BUILD_DIR)/increment.xclbin
 else
 	$(ECHO) "Please copy the content of sd_card folder and data to an SD Card and run on the board"
 endif

host/streaming_free_running_h2k/description.json

@@ -29,10 +29,14 @@
         "host_exe": "host", 
         "compiler": {
             "sources": [
-                "REPO_DIR/common/includes/xcl2"
+                "REPO_DIR/common/includes/xcl2",
+                "REPO_DIR/common/includes/cmdparser",
+                "REPO_DIR/common/includes/logger"
             ], 
             "includepaths": [
-                "REPO_DIR/common/includes/xcl2"
+                "REPO_DIR/common/includes/xcl2",
+                "REPO_DIR/common/includes/cmdparser",
+                "REPO_DIR/common/includes/logger"
             ]
         }
     }, 
@@ -49,7 +53,7 @@
     ],
     "launch": [
         {
-            "cmd_args": "BUILD/increment.xclbin", 
+            "cmd_args": "-x BUILD/increment.xclbin", 
             "name": "generic launch for all flows"
         }
     ], 

host/streaming_free_running_h2k/src/host.cpp

@@ -32,6 +32,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 **********/
+#include "cmdlineparser.h"
 #include <algorithm>
 #include <cstdlib>
 #include <iostream>
@@ -50,9 +51,6 @@ decltype(&clReadStream) xcl::Stream::readStream = nullptr;
 decltype(&clWriteStream) xcl::Stream::writeStream = nullptr;
 decltype(&clPollStreams) xcl::Stream::pollStreams = nullptr;
 
-auto constexpr Block_Size = 256 * 1024; // 256 K integer per block
-auto constexpr num_of_Blocks = 1024;
-
 ////////////////////RESET FUNCTION//////////////////////////////////
 int reset(int *a, int *sw_results, int *hw_results, unsigned int size) {
   // Fill the input vectors with data
@@ -78,12 +76,33 @@ bool verify(int *sw_results, int *hw_results, int size) {
 ////////MAIN FUNCTION//////////
 int main(int argc, char **argv) {
 
-  unsigned int num_Blocks = num_of_Blocks;
-
+  std::string Block_Count = "1024";
   if (xcl::is_emulation()) {
-    num_Blocks = 2;
+    Block_Count = "2";
   }
 
+  // Command Line Parser
+  sda::utils::CmdLineParser parser;
+
+  // Switches
+  //**************//"<Full Arg>",  "<Short Arg>", "<Description>", "<Default>"
+  parser.addSwitch("--xclbin_file", "-x", "input binary file string", "");
+  parser.addSwitch("--block_count", "-nb", "number of blocks", Block_Count);
+  parser.addSwitch("--block_size", "-bs", "Size of each block in KB", "256");
+  parser.parse(argc, argv);
+
+  // Read settings
+  std::string binaryFile = parser.value("xclbin_file");
+  unsigned int num_Blocks = stoi(parser.value("block_count"));
+  unsigned int Block_Size = stoi(parser.value("block_size"));
+
+  if (binaryFile.empty()) {
+    parser.printHelp();
+    exit(EXIT_FAILURE);
+  }
+
+  Block_Size *= 1000;
+
   unsigned int size = num_Blocks * Block_Size;
 
   // I/O Data Vectors
@@ -93,12 +112,6 @@ int main(int argc, char **argv) {
 
   reset(h_a.data(), sw_results.data(), hw_results.data(), size);
 
-  if (argc != 2) {
-    std::cout << "Usage: " << argv[0] << " <XCLBIN File>" << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  auto binaryFile = argv[1];
   std::cout << "\n Vector Addition of elements " << size << std::endl;
 
   // Bytes per Block

host/streaming_free_running_h2k/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) increment.xclbin' >> run_app.sh
+	$(ECHO) './$(EXECUTABLE) -x increment.xclbin' >> 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