update HostTranslator with debug tools

common/debug.hpp

@@ -0,0 +1,14 @@
+// This file is used for defining debug tools
+
+#ifndef __DEBUG_TOOL__
+#define __DEBUG_TOOL__
+
+#include <stdio.h>
+
+#ifdef DEBUG
+#define DEBUG_INFO(...) fprintf(stderr, __VA_ARGS__)
+#else
+#define DEBUG_INFO(...)
+#endif // DEBUG
+
+#endif

compilation/HostTranslation/CMakeLists.txt

@@ -13,6 +13,7 @@ set(LIB_NAME cudaRuntime2cpuRuntime)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_BUILD_TYPE Debug)
 include_directories(./include/x86)
+include_directories(../../common)
 
 file(GLOB proj_HEADERS "include/x86/*.h")
 file(GLOB proj_SOURCES "src/x86/*.cpp")

compilation/HostTranslation/src/x86/GenerateHostStub.cpp

@@ -1,7 +0,0 @@
-/**
- *  Generate a file for Cuda Kernel Function Attributes
- *
- *
- *
- *
- */

compilation/HostTranslation/src/x86/InitializeDevice.cpp

@@ -1,6 +0,0 @@
-/*
-
-  Initialize the cudaDevice as first statements if not set by the User
-  (cudaSetDevice)
-
-*/

compilation/HostTranslation/src/x86/RemoveCudaBuiltin.cpp

@@ -2,6 +2,7 @@
  * Remove Clang cuda builtin functions and variables
  */
 #include "RemoveCudaBuiltin.h"
+#include "debug.hpp"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalValue.h"
 #include "llvm/IR/IRBuilder.h"
@@ -46,8 +47,7 @@ void RemoveCudaBuiltin(llvm::Module *M) {
           continue;
         if (Ctors[i]->hasName() &&
             Ctors[i]->getName().str().find("__cuda") == std::string::npos) {
-          std::cout << "keep: " << Ctors[i]->getName().str() << std::endl
+          DEBUG_INFO("keep: %s\n", Ctors[i]->getName().str().c_str());
-                    << std::flush;
           CAList.push_back(OldCA->getOperand(i));
         }
       }

compilation/HostTranslation/src/x86/ReplaceCudaBuiltin.cpp

@@ -1,4 +1,5 @@
 #include "ReplaceCudaBuiltin.h"
+#include "debug.hpp"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalValue.h"
 #include "llvm/IR/IRBuilder.h"
@@ -123,8 +124,8 @@ void ReplaceKernelLaunch(llvm::Module *M) {
 
                 cuda_register_kernel_names.insert(
                     functionOperand->getName().str());
-                std::cout << "Cuda Register Global Kernel: "
+                DEBUG_INFO("Cuda Register Global Kernel: %s\n",
-                          << functionOperand->getName().str() << std::endl;
+                           functionOperand->getName().str().c_str());
               }
             }
           }
@@ -161,10 +162,10 @@ void ReplaceKernelLaunch(llvm::Module *M) {
                     dyn_cast<Function>(callOperand->stripPointerCasts());
 
                 FunctionType *ft = calledFunction->getFunctionType();
-                std::cout << " Parent (Caller) Function Name: " << func_name
+                DEBUG_INFO("Parent (Caller) Function Name: %s, "
-                          << ", cudaLaunchKernel Function: "
+                           "cudaLaunchKernel Function: %s, args : %d\n",
-                          << functionOperand->getName().str() << ", args "
+                           func_name, functionOperand->getName().str().c_str(),
-                          << functionOperand->arg_size() << std::endl;
+                           functionOperand->arg_size());
                 auto rep = kernels.find(functionOperand->getName().str());
                 if (rep != kernels.end()) {
                   Function *FC = rep->second;
@@ -205,8 +206,7 @@ void ReplaceKernelLaunch(llvm::Module *M) {
                   newName = newName.substr(i);
                   break;
                 }
-
+                DEBUG_INFO("Change Kernel Name to: %s\n", newName.c_str());
-                std::cout << "Change Kernel Name to: " << newName << std::endl;
 
                 Function *F =
                     Function::Create(FT, Function::ExternalLinkage, newName, M);
@@ -225,9 +225,8 @@ void ReplaceKernelLaunch(llvm::Module *M) {
               // for both cudaKernelLaunch calls and regular function call
               host_changed = true;
               calledFunction->setName(calledFunction->getName() + "_host");
-              std::cout << std::endl;
+              DEBUG_INFO("Change Host Function Name to: %s\n",
-              std::cout << "Change Host Function Name To: "
+                         calledFunction->getName().str().c_str());
-                        << calledFunction->getName().str() << std::endl;
             }
           }
         }

compilation/KernelTranslation/CMakeLists.txt

@@ -13,6 +13,7 @@ set(LIB_NAME spmd2mpmd)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_BUILD_TYPE Debug)
 include_directories(./include/x86)
+include_directories(../../common)
 
 file(GLOB proj_HEADERS "include/x86/*.h")
 file(GLOB proj_SOURCES "src/x86/*.cpp")

compilation/KernelTranslation/include/x86/tool.h

@@ -5,12 +5,6 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
 
-#ifdef DEBUG
-#define DEBUG_INFO(...) fprintf(stderr, __VA_ARGS__)
-#else
-#define DEBUG_INFO(...)
-#endif // DEBUG
-
 llvm::Module *LoadModuleFromFilr(char *file_name);
 void DumpModule(llvm::Module *M, char *file_name);
 bool isKernelFunction(llvm::Module *M, llvm::Function *F);

compilation/KernelTranslation/src/x86/generate_x86_format.cpp

@@ -1,4 +1,5 @@
 #include "generate_x86_format.h"
+#include "debug.hpp"
 #include "tool.h"
 #include "llvm/Analysis/TargetLibraryInfo.h"
 #include "llvm/Analysis/TargetTransformInfo.h"

compilation/KernelTranslation/src/x86/handle_sync.cpp

@@ -1,4 +1,5 @@
 #include "handle_sync.h"
+#include "debug.hpp"
 #include "tool.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalValue.h"

compilation/KernelTranslation/src/x86/init.cpp

@@ -1,4 +1,5 @@
 #include "init.h"
+#include "debug.hpp"
 #include "memory_hierarchy.h"
 #include "tool.h"
 #include <fstream>

compilation/KernelTranslation/src/x86/insert_sync.cpp

@@ -1,5 +1,6 @@
 #include "insert_sync.h"
 #include "assert.h"
+#include "debug.hpp"
 #include "handle_sync.h"
 #include "tool.h"
 #include "llvm/ADT/SmallVector.h"

compilation/KernelTranslation/src/x86/insert_warp_loop.cpp

@@ -1,5 +1,6 @@
 
 #include "insert_warp_loop.h"
+#include "debug.hpp"
 #include "handle_sync.h"
 #include "tool.h"
 #include <assert.h>

compilation/KernelTranslation/src/x86/memory_hierarchy.cpp

@@ -1,4 +1,5 @@
 #include "memory_hierarchy.h"
+#include "debug.hpp"
 #include "llvm/IR/CFG.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalValue.h"

compilation/KernelTranslation/src/x86/performance.cpp

@@ -1,4 +1,5 @@
 #include "performance.h"
+#include "debug.hpp"
 #include "tool.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringRef.h"

compilation/KernelTranslation/src/x86/tool.cpp

@@ -1,4 +1,5 @@
 #include "tool.h"
+#include "debug.hpp"
 #include "llvm/Bitcode/BitcodeWriter.h"
 #include "llvm/Config/llvm-config.h"
 #include "llvm/IR/Constants.h"

compilation/KernelTranslation/src/x86/warp_func.cpp

@@ -1,5 +1,6 @@
 
 #include "warp_func.h"
+#include "debug.hpp"
 #include "tool.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalValue.h"