cudasift - added cl args for HIP and SYCL

Author: rmukhopa

cudaSift/HIP/CMakeLists.txt

@@ -57,6 +57,10 @@ include_directories(${OpenCV_INCLUDE_DIRS})
 
 set(SOURCES
   ${CMAKE_SOURCE_DIR}/../common/Utility.cpp
+  ${CMAKE_SOURCE_DIR}/../common/workload_params.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/CommandLineParser.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/TestBenchBase.cpp
+  ${CMAKE_SOURCE_DIR}/../../infrastructure/Utilities.cpp  
   cudaImage.cpp
   cudaImage.h
   cudaSiftH.cpp
@@ -71,6 +75,7 @@ set(SOURCES
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/../common/
+  ${CMAKE_SOURCE_DIR}/../../infrastructure
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${HIP_INCLUDE_DIRS}
 )

cudaSift/HIP/mainSift.cpp

@@ -38,6 +38,9 @@
 #include "Utility.h"
 #include "cudaImage.h"
 #include "cudaSift.h"
+#include "../common/workload_params.h"
+#include "Utilities.h"
+#include "CommandLineParser.h"
 
 int ImproveHomography(SiftData &data, float *homography, int numLoops, float minScore, float maxAmbiguity, float thresh);
 void PrintMatchData(SiftData &siftData1, SiftData &siftData2, CudaImage &img);
@@ -48,7 +51,7 @@ double ScaleUp(CudaImage &res, CudaImage &src);
 ///////////////////////////////////////////////////////////////////////////////
 // Main program
 ///////////////////////////////////////////////////////////////////////////////
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
   auto totalProgTimer_start = std::chrono::steady_clock::now();
   int devNum = 0, imgSet = 0;
@@ -57,6 +60,9 @@ int main(int argc, char **argv)
   if (argc > 2)
     imgSet = std::atoi(argv[2]);
 
+  common::WorkloadParams workload_params(argc, argv);
+  std::string inputDataLoc = workload_params.getInputDataLoc();
+
   float totTime = 0.0;
   float imageInitTime = 0.0;
   float extractSiftTime = 0.0;
@@ -78,13 +84,13 @@ int main(int argc, char **argv)
     std::string inp_file_1, inp_file_2;
     if (imgSet)
     {
-      inp_file_1 = "../../inputData/left.pgm";
-      inp_file_2 = "../../inputData/righ.pgm";
+      inp_file_1 = inputDataLoc + "/left.pgm";
+      inp_file_2 = inputDataLoc + "/righ.pgm";
     }
     else
     {
-      inp_file_1 = "../../inputData/img1.png";
-      inp_file_2 = "../../inputData/img2.png";
+      inp_file_1 = inputDataLoc + "/img1.png";
+      inp_file_2 = inputDataLoc + "/img2.png";
     }
 
     if (!std::filesystem::exists(inp_file_1))

cudaSift/SYCL/CMakeLists.txt

@@ -55,6 +55,10 @@ endif()
 
 set(SOURCES
     ${CMAKE_SOURCE_DIR}/../common/Utility.cpp
+    ${CMAKE_SOURCE_DIR}/../common/workload_params.cpp
+    ${CMAKE_SOURCE_DIR}/../../infrastructure/CommandLineParser.cpp
+    ${CMAKE_SOURCE_DIR}/../../infrastructure/TestBenchBase.cpp
+    ${CMAKE_SOURCE_DIR}/../../infrastructure/Utilities.cpp  
     cudaImage.dp.cpp
     cudaImage.h
     cudaSiftH.dp.cpp
@@ -68,6 +72,7 @@ set(SOURCES
 
 include_directories(
     ${CMAKE_SOURCE_DIR}/../common/
+    ${CMAKE_SOURCE_DIR}/../../infrastructure
     ${CMAKE_SOURCE_DIR}
     ${OpenCV_INCLUDE_DIRS}
 )

cudaSift/SYCL/mainSift.cpp

@@ -38,6 +38,9 @@
 #include "cudaSift.h"
 #include "infra/infra.hpp"
 #include "Utility.h"
+#include "../common/workload_params.h"
+#include "Utilities.h"
+#include "CommandLineParser.h"
 
 #ifndef KERNEL_USE_PROFILE
 #define KERNEL_USE_PROFILE 0
@@ -53,7 +56,7 @@ double ScaleUp(CudaImage &res, CudaImage &src);
 ///////////////////////////////////////////////////////////////////////////////
 // Main program
 ///////////////////////////////////////////////////////////////////////////////
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
 {
   auto totalProgTimer_start = std::chrono::steady_clock::now();
   int devNum = 0, imgSet = 0;
@@ -62,6 +65,9 @@ int main(int argc, char **argv)
   if (argc > 2)
     imgSet = std::atoi(argv[2]);
 
+  common::WorkloadParams workload_params(argc, argv);
+  std::string inputDataLoc = workload_params.getInputDataLoc();
+
   float totTime = 0.0;
   float imageInitTime = 0.0;
   float extractSiftTime = 0.0;
@@ -91,13 +97,13 @@ int main(int argc, char **argv)
     std::string inp_file_1, inp_file_2;
     if (imgSet)
     {
-      inp_file_1 = "../../inputData/left.pgm";
-      inp_file_2 = "../../inputData/righ.pgm";
+      inp_file_1 = inputDataLoc + "/left.pgm";
+      inp_file_2 = inputDataLoc + "/righ.pgm";
     }
     else
     {
-      inp_file_1 = "../../inputData/img1.png";
-      inp_file_2 = "../../inputData/img2.png";
+      inp_file_1 = inputDataLoc + "/img1.png";
+      inp_file_2 = inputDataLoc + "/img2.png";
     }
 
     if (!std::filesystem::exists(inp_file_1))