Merge pull request #169 from emankov/master

emankov · web-flow · commit 3aa2ae93b9a5 · 2020-08-06T14:20:12.000+03:00
[HIPIFY] Formatting
diff --git a/src/CUDA2HIP.cpp b/src/CUDA2HIP.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps CUDA header names to HIP header names
-const std::map <llvm::StringRef, hipCounter> CUDA_INCLUDE_MAP{
+const std::map <llvm::StringRef, hipCounter> CUDA_INCLUDE_MAP {
   // CUDA includes
   {"cuda.h",                    {"hip/hip_runtime.h",            "", CONV_INCLUDE_CUDA_MAIN_H, API_DRIVER}},
   {"cuda_runtime.h",            {"hip/hip_runtime.h",            "", CONV_INCLUDE_CUDA_MAIN_H, API_RUNTIME}},
@@ -82,11 +82,10 @@ const std::map <llvm::StringRef, hipCounter> CUDA_INCLUDE_MAP{
   {"caffe2/core/common_cudnn.h",                            {"caffe2/core/hip/common_miopen.h",                       "", CONV_INCLUDE, API_CAFFE2}},
 };
 
-const std::map<llvm::StringRef, hipCounter>& CUDA_RENAMES_MAP() {
+const std::map<llvm::StringRef, hipCounter> &CUDA_RENAMES_MAP() {
   static std::map<llvm::StringRef, hipCounter> ret;
-  if (!ret.empty()) {
+  if (!ret.empty())
     return ret;
-  }
   // First run, so compute the union map.
   ret.insert(CUDA_DRIVER_TYPE_NAME_MAP.begin(), CUDA_DRIVER_TYPE_NAME_MAP.end());
   ret.insert(CUDA_DRIVER_FUNCTION_MAP.begin(), CUDA_DRIVER_FUNCTION_MAP.end());
diff --git a/src/CUDA2HIP.h b/src/CUDA2HIP.h
@@ -78,4 +78,4 @@ extern const std::map<llvm::StringRef, hipCounter> CUDA_CUB_TYPE_NAME_MAP;
   * looking in the lookup table for the type of element they are processing, however, saving
   * a great deal of time.
   */
-const std::map<llvm::StringRef, hipCounter>& CUDA_RENAMES_MAP();
+const std::map<llvm::StringRef, hipCounter> &CUDA_RENAMES_MAP();
diff --git a/src/CUDA2HIP_BLAS_API_functions.cpp b/src/CUDA2HIP_BLAS_API_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all functions
-const std::map<llvm::StringRef, hipCounter> CUDA_BLAS_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_BLAS_FUNCTION_MAP {
 
   // Blas management functions
   {"cublasInit",                     {"hipblasInit",                     "",                                         CONV_LIB_FUNC, API_BLAS, UNSUPPORTED}},
diff --git a/src/CUDA2HIP_BLAS_API_types.cpp b/src/CUDA2HIP_BLAS_API_types.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all functions
-const std::map<llvm::StringRef, hipCounter> CUDA_BLAS_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_BLAS_TYPE_NAME_MAP {
   // Blas defines
   {"CUBLAS_VER_MAJOR",              {"HIPBLAS_VER_MAJOR",                "", CONV_DEFINE, API_BLAS, HIP_UNSUPPORTED}},
   {"CUBLAS_VER_MINOR",              {"HIPBLAS_VER_MINOR",                "", CONV_DEFINE, API_BLAS, HIP_UNSUPPORTED}},
diff --git a/src/CUDA2HIP_CAFFE2_API_functions.cpp b/src/CUDA2HIP_CAFFE2_API_functions.cpp
@@ -23,6 +23,6 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps the names of CUDA SPARSE API functions to the corresponding HIP functions
-const std::map<llvm::StringRef, hipCounter> CUDA_CAFFE2_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_CAFFE2_FUNCTION_MAP {
   {"cuda_stream",                                   {"hip_stream",                               "", CONV_LIB_FUNC, API_CAFFE2}},
-};
+};
diff --git a/src/CUDA2HIP_CAFFE2_API_types.cpp b/src/CUDA2HIP_CAFFE2_API_types.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all types
-const std::map<llvm::StringRef, hipCounter> CUDA_CAFFE2_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_CAFFE2_TYPE_NAME_MAP {
 
   // 5. Defines
   {"REGISTER_CUDA_OPERATOR",                                  {"REGISTER_HIP_OPERATOR",                                        "", CONV_DEFINE, API_CAFFE2}},
diff --git a/src/CUDA2HIP_CUB_API_types.cpp b/src/CUDA2HIP_CUB_API_types.cpp
@@ -23,6 +23,6 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps the names of CUDA CUB API types to the corresponding HIP types
-const std::map<llvm::StringRef, hipCounter> CUDA_CUB_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_CUB_TYPE_NAME_MAP {
   {"cub",  {"hipcub",  "", CONV_TYPE, API_CUB}},
 };
diff --git a/src/CUDA2HIP_Complex_API_functions.cpp b/src/CUDA2HIP_Complex_API_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps the names of CUDA Complex API functions to the corresponding HIP functions
-const std::map<llvm::StringRef, hipCounter> CUDA_COMPLEX_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_COMPLEX_FUNCTION_MAP {
   {"cuCrealf",               {"hipCrealf",               "", CONV_COMPLEX, API_COMPLEX}},
   {"cuCimagf",               {"hipCimagf",               "", CONV_COMPLEX, API_COMPLEX}},
   {"make_cuFloatComplex",    {"make_hipFloatComplex",    "", CONV_COMPLEX, API_COMPLEX}},
diff --git a/src/CUDA2HIP_Complex_API_types.cpp b/src/CUDA2HIP_Complex_API_types.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps the names of CUDA Complex API types to the corresponding HIP types
-const std::map<llvm::StringRef, hipCounter> CUDA_COMPLEX_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_COMPLEX_TYPE_NAME_MAP {
   {"cuFloatComplex",  {"hipFloatComplex",  "", CONV_TYPE, API_COMPLEX}},
   {"cuDoubleComplex", {"hipDoubleComplex", "", CONV_TYPE, API_COMPLEX}},
   {"cuComplex",       {"hipComplex",       "", CONV_TYPE, API_COMPLEX}},
diff --git a/src/CUDA2HIP_DNN_API_functions.cpp b/src/CUDA2HIP_DNN_API_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all functions
-const std::map<llvm::StringRef, hipCounter> CUDA_DNN_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_DNN_FUNCTION_MAP {
 
   {"cudnnGetVersion",                                     {"hipdnnGetVersion",                                     "", CONV_LIB_FUNC, API_DNN}},
   {"cudnnGetCudartVersion",                               {"hipdnnGetCudartVersion",                               "", CONV_LIB_FUNC, API_DNN, HIP_UNSUPPORTED}},
diff --git a/src/CUDA2HIP_DNN_API_types.cpp b/src/CUDA2HIP_DNN_API_types.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all functions
-const std::map<llvm::StringRef, hipCounter> CUDA_DNN_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_DNN_TYPE_NAME_MAP {
   // cuDNN defines
   {"CUDNN_VERSION",                                       {"HIPDNN_VERSION",                                       "", CONV_NUMERIC_LITERAL, API_DNN}},    //  7000
   {"CUDNN_DIM_MAX",                                       {"HIPDNN_DIM_MAX",                                       "", CONV_NUMERIC_LITERAL, API_DNN, HIP_UNSUPPORTED}},    //  8
diff --git a/src/CUDA2HIP_Device_functions.cpp b/src/CUDA2HIP_Device_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps CUDA header names to HIP header names
-const std::map<llvm::StringRef, hipCounter> CUDA_DEVICE_FUNC_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_DEVICE_FUNC_MAP {
   // math functions
   {"abs",             {"", "", CONV_DEVICE_FUNC, API_RUNTIME}},
   {"labs",            {"", "", CONV_DEVICE_FUNC, API_RUNTIME}},
diff --git a/src/CUDA2HIP_Driver_API_functions.cpp b/src/CUDA2HIP_Driver_API_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all CUDA Driver API functions
-const std::map<llvm::StringRef, hipCounter> CUDA_DRIVER_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_DRIVER_FUNCTION_MAP {
   // 5.2. Error Handling
   // no analogue
   // NOTE: cudaGetErrorName and cuGetErrorName have different signatures
diff --git a/src/CUDA2HIP_Driver_API_types.cpp b/src/CUDA2HIP_Driver_API_types.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps the names of CUDA DRIVER API types to the corresponding HIP types
-const std::map<llvm::StringRef, hipCounter> CUDA_DRIVER_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_DRIVER_TYPE_NAME_MAP {
 
   // 1. Structs
 
diff --git a/src/CUDA2HIP_FFT_API_functions.cpp b/src/CUDA2HIP_FFT_API_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all functions
-const std::map<llvm::StringRef, hipCounter> CUDA_FFT_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_FFT_FUNCTION_MAP {
   {"cufftPlan1d",                                         {"hipfftPlan1d",                                         "", CONV_LIB_FUNC, API_FFT}},
   {"cufftPlan2d",                                         {"hipfftPlan2d",                                         "", CONV_LIB_FUNC, API_FFT}},
   {"cufftPlan3d",                                         {"hipfftPlan3d",                                         "", CONV_LIB_FUNC, API_FFT}},
diff --git a/src/CUDA2HIP_FFT_API_types.cpp b/src/CUDA2HIP_FFT_API_types.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all functions
-const std::map<llvm::StringRef, hipCounter> CUDA_FFT_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_FFT_TYPE_NAME_MAP {
 
   // cuFFT defines
   {"CUFFT_FORWARD",                                       {"HIPFFT_FORWARD",                                       "", CONV_NUMERIC_LITERAL, API_DNN}},    // -1
diff --git a/src/CUDA2HIP_Perl.cpp b/src/CUDA2HIP_Perl.cpp
@@ -292,7 +292,7 @@ namespace perl {
     *streamPtr.get() << tab << return_k << "}" << endl;
   }
 
-  void generateDeprecatedAndUnsupportedFunctions(unique_ptr<ostream>& streamPtr) {
+  void generateDeprecatedAndUnsupportedFunctions(unique_ptr<ostream> &streamPtr) {
     stringstream sDeprecated, sUnsupported, sCommon;
     sCommon << tab << my << "$line_num = shift;" << endl;
     sCommon << tab << my_k << "\n" << tab << foreach_func;
diff --git a/src/CUDA2HIP_RAND_API_functions.cpp b/src/CUDA2HIP_RAND_API_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all functions
-const std::map<llvm::StringRef, hipCounter> CUDA_RAND_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_RAND_FUNCTION_MAP {
   // RAND Host functions
   {"curandCreateGenerator",                         {"hiprandCreateGenerator",                         "", CONV_LIB_FUNC, API_RAND}},
   {"curandCreateGeneratorHost",                     {"hiprandCreateGeneratorHost",                     "", CONV_LIB_FUNC, API_RAND}},
diff --git a/src/CUDA2HIP_RAND_API_types.cpp b/src/CUDA2HIP_RAND_API_types.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all functions
-const std::map<llvm::StringRef, hipCounter> CUDA_RAND_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_RAND_TYPE_NAME_MAP {
   // RAND defines
   {"CURAND_VER_MAJOR",              {"HIPRAND_VER_MAJOR",              "", CONV_DEFINE, API_RAND, HIP_UNSUPPORTED}},
   {"CURAND_VER_MINOR",              {"HIPRAND_VER_MINOR",              "", CONV_DEFINE, API_RAND, HIP_UNSUPPORTED}},
diff --git a/src/CUDA2HIP_Runtime_API_functions.cpp b/src/CUDA2HIP_Runtime_API_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Map of all CUDA Runtime API functions
-const std::map<llvm::StringRef, hipCounter> CUDA_RUNTIME_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_RUNTIME_FUNCTION_MAP {
   // 5.1. Device Management
   // no analogue
   {"cudaChooseDevice",                                        {"hipChooseDevice",                                        "", CONV_DEVICE, API_RUNTIME}},
diff --git a/src/CUDA2HIP_SPARSE_API_functions.cpp b/src/CUDA2HIP_SPARSE_API_functions.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps the names of CUDA SPARSE API functions to the corresponding HIP functions
-const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_FUNCTION_MAP {
   // 5. cuSPARSE Helper Function Reference
   {"cusparseCreate",                              {"hipsparseCreate",                              "", CONV_LIB_FUNC, API_SPARSE}},
   {"cusparseCreateSolveAnalysisInfo",             {"hipsparseCreateSolveAnalysisInfo",             "", CONV_LIB_FUNC, API_SPARSE, HIP_UNSUPPORTED}},
diff --git a/src/CUDA2HIP_SPARSE_API_types.cpp b/src/CUDA2HIP_SPARSE_API_types.cpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include "CUDA2HIP.h"
 
 // Maps the names of CUDA SPARSE API types to the corresponding HIP types
-const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_TYPE_NAME_MAP{
+const std::map<llvm::StringRef, hipCounter> CUDA_SPARSE_TYPE_NAME_MAP {
 
   // 1. Structs
   {"cusparseContext",                           {"hipsparseContext",                           "", CONV_TYPE, API_SPARSE, HIP_UNSUPPORTED}},
diff --git a/src/Statistics.cpp b/src/Statistics.cpp
@@ -141,26 +141,20 @@ namespace {
 
 template<typename ST, typename ST2>
 void conditionalPrint(ST *stream1,
-                      ST2* stream2,
-                      const std::string& s1,
-                      const std::string& s2) {
-  if (stream1) {
-    *stream1 << s1;
-  }
-  if (stream2) {
-    *stream2 << s2;
-  }
+                      ST2 *stream2,
+                      const std::string &s1,
+                      const std::string &s2) {
+  if (stream1) *stream1 << s1;
+  if (stream2) *stream2 << s2;
 }
 
 // Print a named stat value to both the terminal and the CSV file.
 template<typename T>
-void printStat(std::ostream *csv, llvm::raw_ostream* printOut, const std::string &name, T value) {
-  if (printOut) {
+void printStat(std::ostream *csv, llvm::raw_ostream *printOut, const std::string &name, T value) {
+  if (printOut)
     *printOut << "  " << name << ": " << value << "\n";
-  }
-  if (csv) {
+  if (csv)
     *csv << name << ";" << value << "\n";
-  }
 }
 
 } // Anonymous namespace
@@ -172,26 +166,22 @@ void StatCounter::incrementCounter(const hipCounter &counter, const std::string
 }
 
 void StatCounter::add(const StatCounter &other) {
-  for (const auto &p : other.counters) {
+  for (const auto &p : other.counters)
     counters[p.first] += p.second;
-  }
-  for (int i = 0; i < NUM_API_TYPES; ++i) {
+  for (int i = 0; i < NUM_API_TYPES; ++i)
     apiCounters[i] += other.apiCounters[i];
-  }
-  for (int i = 0; i < NUM_CONV_TYPES; ++i) {
+  for (int i = 0; i < NUM_CONV_TYPES; ++i)
     convTypeCounters[i] += other.convTypeCounters[i];
-  }
 }
 
 int StatCounter::getConvSum() {
   int acc = 0;
-  for (const int &i : convTypeCounters) {
+  for (const int &i : convTypeCounters)
     acc += i;
-  }
   return acc;
 }
 
-void StatCounter::print(std::ostream* csv, llvm::raw_ostream* printOut, const std::string &prefix) {
+void StatCounter::print(std::ostream *csv, llvm::raw_ostream *printOut, const std::string &prefix) {
   for (int i = 0; i < NUM_CONV_TYPES; ++i) {
     if (convTypeCounters[i] > 0) {
       conditionalPrint(csv, printOut, "\nCUDA ref type;Count\n", "[HIPIFY] info: " + prefix + " refs by type:\n");
@@ -254,12 +244,8 @@ void Statistics::add(const Statistics &other) {
   totalBytes += other.totalBytes;
   touchedLines += other.touchedLines;
   totalLines += other.totalLines;
-  if (other.hasErrors && !hasErrors) {
-    hasErrors = true;
-  }
-  if (startTime > other.startTime) {
-    startTime = other.startTime;
-  }
+  if (other.hasErrors && !hasErrors) hasErrors = true;
+  if (startTime > other.startTime)   startTime = other.startTime;
 }
 
 void Statistics::lineTouched(int lineNumber) {
@@ -277,7 +263,7 @@ void Statistics::markCompletion() {
 
 ///////// Output functions //////////
 
-void Statistics::print(std::ostream* csv, llvm::raw_ostream* printOut, bool skipHeader) {
+void Statistics::print(std::ostream *csv, llvm::raw_ostream *printOut, bool skipHeader) {
   if (!skipHeader) {
     std::string str = "file \'" + fileName + "\' statistics:\n";
     conditionalPrint(csv, printOut, "\n" + str, "\n[HIPIFY] info: " + str);
@@ -308,7 +294,7 @@ void Statistics::print(std::ostream* csv, llvm::raw_ostream* printOut, bool skip
   unsupported.print(csv, printOut, "UNCONVERTED");
 }
 
-void Statistics::printAggregate(std::ostream *csv, llvm::raw_ostream* printOut) {
+void Statistics::printAggregate(std::ostream *csv, llvm::raw_ostream *printOut) {
   Statistics globalStats = getAggregate();
   // A file is considered "converted" if we made any changes to it.
   int convertedFiles = 0;
@@ -358,7 +344,7 @@ bool Statistics::isRocUnsupported(const hipCounter &counter) {
   return ROC_UNSUPPORTED == (counter.supportDegree & ROC_UNSUPPORTED);
 }
 
-bool Statistics::isDeprecated(const hipCounter& counter) {
+bool Statistics::isDeprecated(const hipCounter &counter) {
   return DEPRECATED == (counter.supportDegree & DEPRECATED);
 }
 
@@ -374,4 +360,4 @@ bool Statistics::isUnsupported(const hipCounter &counter) {
 }
 
 std::map<std::string, Statistics> Statistics::stats = {};
-Statistics* Statistics::currentStatistics = nullptr;
+Statistics *Statistics::currentStatistics = nullptr;
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp
@@ -27,23 +27,19 @@ THE SOFTWARE.
 using namespace llvm;
 
 llvm::StringRef unquoteStr(llvm::StringRef s) {
-  if (s.size() > 1 && s.front() == '"' && s.back() == '"') {
+  if (s.size() > 1 && s.front() == '"' && s.back() == '"')
     return s.substr(1, s.size() - 2);
-  }
   return s;
 }
 
 void removePrefixIfPresent(std::string &s, const std::string &prefix) {
-  if (s.find(prefix) != 0) {
-    return;
-  }
+  if (s.find(prefix) != 0) return;
   s.erase(0, prefix.size());
 }
 
 std::string getAbsoluteFilePath(const std::string &sFile, std::error_code &EC) {
-  if (sFile.empty()) {
+  if (sFile.empty())
     return sFile;
-  }
   if (!sys::fs::exists(sFile)) {
     llvm::errs() << "\n" << sHipify << sError << "source file: " << sFile << " doesn't exist\n";
     EC = std::error_code(static_cast<int>(std::errc::no_such_file_or_directory), std::generic_category());
@@ -61,9 +57,8 @@ std::string getAbsoluteFilePath(const std::string &sFile, std::error_code &EC) {
 
 std::string getAbsoluteDirectoryPath(const std::string &sDir, std::error_code &EC,
   const std::string &sDirType, bool bCreateDir) {
-  if (sDir.empty()) {
+  if (sDir.empty())
     return sDir;
-  }
   EC = std::error_code();
   SmallString<256> dirAbsPath;
   if (sys::fs::exists(sDir)) {
@@ -72,8 +67,7 @@ std::string getAbsoluteDirectoryPath(const std::string &sDir, std::error_code &E
       EC = std::error_code(static_cast<int>(std::errc::not_a_directory), std::generic_category());
       return "";
     }
-  }
-  else {
+  } else {
     if (bCreateDir) {
       EC = sys::fs::create_directory(sDir);
       if (EC) {
diff --git a/src/main.cpp b/src/main.cpp
@@ -185,10 +185,9 @@ int main(int argc, const char **argv) {
     if (it+1 != new_argv.end()) sCompilationDatabaseDir = *(it+1);
     else bNoCompilationDatabaseDir = true;
   } else {
-    for (auto& s : new_argv) {
+    for (auto &s : new_argv) {
       std::string str = std::string(s);
-      size_t found = str.find("-p=");
-      if (found != std::string::npos) {
+      if (str.find("-p=") != std::string::npos) {
         bCompilationDatabase = true;
         sCompilationDatabaseDir = str.substr(3, str.size()-3);
         if (sCompilationDatabaseDir.empty()) {
