[NFC][hipcc] move getSelfPath into utils

Change-Id: Id30812ea088b7f6dcfb256a092b648a97923f931

Author: jmmartinez

amd/hipcc/src/hipBin_base.h

@@ -327,7 +327,7 @@ void HipBinBase::constructHipPath() {
   if (!hip_path_name.empty()) {
     variables_.hipPathEnv_ = hip_path_name;
   } else if (envVariables_.hipPathEnv_.empty()) {
-    fs::path full_path(hipBinUtilPtr_->getSelfPath());
+    fs::path full_path(hipcc::utils::getSelfPath());
     variables_.hipPathEnv_ = (full_path.parent_path()).string();
   } else {
     variables_.hipPathEnv_ = envVariables_.hipPathEnv_;

amd/hipcc/src/hipBin_util.h

@@ -88,7 +88,6 @@ class HipBinUtil {
   }
   virtual ~HipBinUtil();
   // Common helper functions
-  string getSelfPath() const;
   vector<string> splitStr(string fullStr, char delimiter) const;
   string replaceStr(const string& s, const string& toReplace,
                     const string& replaceWith) const;
@@ -131,35 +130,6 @@ string HipBinUtil::mktempFile(string name) {
   return fileName;
 }
 
-// gets the path of the executable name
-string HipBinUtil::getSelfPath() const {
-  int MAX_PATH_CHAR = 1024;
-  int bufferSize = 0;
-  string path;
-  #if defined(_WIN32) || defined(_WIN64)
-    TCHAR buffer[MAX_PATH] = { 0 };
-    bufferSize = GetModuleFileName(NULL, buffer, MAX_PATH_CHAR);
-    TSIZE pos = TSTR(buffer).find_last_of(ENDLINE);
-    TSTR wide = TSTR(buffer).substr(0, pos);
-    path = string(wide.begin(), wide.end());
-  #else
-    char buff[MAX_PATH_CHAR];
-    ssize_t len = ::readlink("/proc/self/exe", buff, sizeof(buff) - 1);
-    if (len > 0) {
-      buff[len] = '\0';
-      path = string(buff);
-      fs::path exePath(path);
-      path = exePath.parent_path().string();
-    } else {
-      std::cerr << "readlink: Error reading the exe path" << endl;
-      perror("readlink");
-      exit(-1);
-    }
-  #endif
-  return path;
-}
-
-
 // removes the empty spaces and end lines
 string HipBinUtil::trim(string str) const {
   string strChomp = str;

amd/hipcc/src/utils.cpp

@@ -1 +1,50 @@
 #include "utils.h"
+#include "filesystem.h"
+
+#if defined(_WIN32) || defined(_WIN64)
+#include <io.h>
+#include <tchar.h>
+#include <windows.h>
+#ifdef _UNICODE
+typedef wchar_t TCHAR;
+typedef std::wstring TSTR;
+typedef std::wstring::size_type TSIZE;
+#define ENDLINE L"/\\"
+#else
+typedef char TCHAR;
+typedef std::string TSTR;
+typedef std::string::size_type TSIZE;
+#define ENDLINE "/\\"
+#endif
+#else
+#include <unistd.h>
+#endif
+
+#include <iostream>
+
+std::string hipcc::utils::getSelfPath() {
+  int MAX_PATH_CHAR = 1024;
+  int bufferSize = 0;
+  std::string path;
+#if defined(_WIN32) || defined(_WIN64)
+  TCHAR buffer[MAX_PATH] = {0};
+  bufferSize = GetModuleFileName(NULL, buffer, MAX_PATH_CHAR);
+  TSIZE pos = TSTR(buffer).find_last_of(ENDLINE);
+  TSTR wide = TSTR(buffer).substr(0, pos);
+  path = std::string(wide.begin(), wide.end());
+#else
+  char buff[MAX_PATH_CHAR];
+  ssize_t len = ::readlink("/proc/self/exe", buff, sizeof(buff) - 1);
+  if (len > 0) {
+    buff[len] = '\0';
+    path = std::string(buff);
+    fs::path exePath(path);
+    path = exePath.parent_path().string();
+  } else {
+    std::cerr << "readlink: Error reading the exe path" << std::endl;
+    perror("readlink");
+    exit(-1);
+  }
+#endif
+  return path;
+}

amd/hipcc/src/utils.h

@@ -1,8 +1,14 @@
 #ifndef HIP_UTILS_H
 #define HIP_UTILS_H
 
+#include <string>
+
 namespace hipcc {
-namespace utils {}
+namespace utils {
+// gets the path of the executable name
+std::string getSelfPath();
+
+} // namespace utils
 } // namespace hipcc
 
 #endif