Initial modifications for multiple function support

.gitignore

@@ -27,3 +27,6 @@
 *.exe
 *.out
 *.app
+
+# Python
+*.pyc

.ycm_extra_conf.py

@@ -0,0 +1,148 @@
+# Generated by YCM Generator at 2017-02-08 22:21:21.129815
+
+# This file is NOT licensed under the GPLv3, which is the license for the rest
+# of YouCompleteMe.
+#
+# Here's the license text for this file:
+#
+# This is free and unencumbered software released into the public domain.
+#
+# Anyone is free to copy, modify, publish, use, compile, sell, or
+# distribute this software, either in source code form or as a compiled
+# binary, for any purpose, commercial or non-commercial, and by any
+# means.
+#
+# In jurisdictions that recognize copyright laws, the author or authors
+# of this software dedicate any and all copyright interest in the
+# software to the public domain. We make this dedication for the benefit
+# of the public at large and to the detriment of our heirs and
+# successors. We intend this dedication to be an overt act of
+# relinquishment in perpetuity of all present and future rights to this
+# software under copyright law.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# For more information, please refer to <http://unlicense.org/>
+
+import os
+import ycm_core
+
+flags = [
+    '-x',
+    'c++',
+    '-D_GNU_SOURCE',
+    '-D__STDC_CONSTANT_MACROS',
+    '-D__STDC_FORMAT_MACROS',
+    '-D__STDC_LIMIT_MACROS',
+    '-Depp_rt_agg_EXPORTS',
+    '-Depp_rt_rle_EXPORTS',
+    '-I/home/ska124/ModuleInstall/llvm-3.8.1/include',
+    '-I/home/ska124/Repos/epp/include',
+    '-Werror',
+    '-Wno-deprecated-declarations',
+    '-std=c++1y',
+]
+
+
+# Set this to the absolute path to the folder (NOT the file!) containing the
+# compile_commands.json file to use that instead of 'flags'. See here for
+# more details: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+#
+# You can get CMake to generate this file for you by adding:
+#   set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
+# to your CMakeLists.txt file.
+#
+# Most projects will NOT need to set this to anything; you can just change the
+# 'flags' list of compilation flags. Notice that YCM itself uses that approach.
+compilation_database_folder = ''
+
+if os.path.exists( compilation_database_folder ):
+  database = ycm_core.CompilationDatabase( compilation_database_folder )
+else:
+  database = None
+
+SOURCE_EXTENSIONS = [ '.C', '.cpp', '.cxx', '.cc', '.c', '.m', '.mm' ]
+
+def DirectoryOfThisScript():
+  return os.path.dirname( os.path.abspath( __file__ ) )
+
+
+def MakeRelativePathsInFlagsAbsolute( flags, working_directory ):
+  if not working_directory:
+    return list( flags )
+  new_flags = []
+  make_next_absolute = False
+  path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ]
+  for flag in flags:
+    new_flag = flag
+
+    if make_next_absolute:
+      make_next_absolute = False
+      if not flag.startswith( '/' ):
+        new_flag = os.path.join( working_directory, flag )
+
+    for path_flag in path_flags:
+      if flag == path_flag:
+        make_next_absolute = True
+        break
+
+      if flag.startswith( path_flag ):
+        path = flag[ len( path_flag ): ]
+        new_flag = path_flag + os.path.join( working_directory, path )
+        break
+
+    if new_flag:
+      new_flags.append( new_flag )
+  return new_flags
+
+
+def IsHeaderFile( filename ):
+  extension = os.path.splitext( filename )[ 1 ]
+  return extension in [ '.H', '.h', '.hxx', '.hpp', '.hh' ]
+
+
+def GetCompilationInfoForFile( filename ):
+  # The compilation_commands.json file generated by CMake does not have entries
+  # for header files. So we do our best by asking the db for flags for a
+  # corresponding source file, if any. If one exists, the flags for that file
+  # should be good enough.
+  if IsHeaderFile( filename ):
+    basename = os.path.splitext( filename )[ 0 ]
+    for extension in SOURCE_EXTENSIONS:
+      replacement_file = basename + extension
+      if os.path.exists( replacement_file ):
+        compilation_info = database.GetCompilationInfoForFile(
+          replacement_file )
+        if compilation_info.compiler_flags_:
+          return compilation_info
+    return None
+  return database.GetCompilationInfoForFile( filename )
+
+
+def FlagsForFile( filename, **kwargs ):
+  if database:
+    # Bear in mind that compilation_info.compiler_flags_ does NOT return a
+    # python list, but a "list-like" StringVec object
+    compilation_info = GetCompilationInfoForFile( filename )
+    if not compilation_info:
+      return None
+
+    final_flags = MakeRelativePathsInFlagsAbsolute(
+      compilation_info.compiler_flags_,
+      compilation_info.compiler_working_dir_ )
+
+  else:
+    relative_to = DirectoryOfThisScript()
+    final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to )
+
+  return {
+    'flags': final_flags,
+    'do_cache': True
+  }
+

include/EPPProfile.h

@@ -3,6 +3,7 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Pass.h"
+#include "llvm/ADT/DenseMap.h"
 
 #include "EPPEncode.h"
 
@@ -11,6 +12,7 @@ struct EPPProfile : public llvm::ModulePass {
     static char ID;
 
     llvm::LoopInfo *LI;
+    llvm::DenseMap<llvm::Function *, uint32_t> FunctionIds;
 
     EPPProfile() : llvm::ModulePass(ID), LI(nullptr) {}
 

lib/epp/EPPProfile.cpp

@@ -14,7 +14,6 @@
 #include "llvm/Transforms/Utils/ModuleUtils.h"
 
 #include "AltCFG.h"
-//#include "Common.h"
 #include "EPPEncode.h"
 #include "EPPProfile.h"
 #include <cassert>
@@ -29,30 +28,35 @@ extern cl::list<std::string> FunctionList;
 extern bool isTargetFunction(const Function &f,
                              const cl::list<std::string> &FunctionList);
 
-bool EPPProfile::doInitialization(Module &m) {
-    assert(FunctionList.size() == 1 &&
-           "Only one function can be marked for profiling");
+bool EPPProfile::doInitialization(Module &M) {
+    uint32_t Id = 0;
+    for(auto &F : M) {
+        FunctionIds[&F] = Id++; 
+    }
+
     return false;
 }
 
-bool EPPProfile::doFinalization(Module &m) { return false; }
+bool EPPProfile::doFinalization(Module &M) { 
+    return false; 
+}
 
 bool EPPProfile::runOnModule(Module &module) {
     DEBUG(errs() << "Running Profile\n");
     auto &Ctx = module.getContext();
 
     for (auto &func : module) {
-        if (isTargetFunction(func, FunctionList)) {
+        //if (isTargetFunction(func, FunctionList)) {
             LI        = &getAnalysis<LoopInfoWrapperPass>(func).getLoopInfo();
             auto &enc = getAnalysis<EPPEncode>(func);
             instrument(func, enc);
-        }
+        //}
     }
 
     auto *voidTy = Type::getVoidTy(Ctx);
-
+    auto *int32Ty = Type::getInt32Ty(Ctx);
     auto *init =
-        module.getOrInsertFunction("PaThPrOfIlInG_init", voidTy, nullptr);
+        module.getOrInsertFunction("PaThPrOfIlInG_init", voidTy, int32Ty, nullptr);
     appendToGlobalCtors(module, llvm::cast<Function>(init), 0);
 
     auto *printer =
@@ -76,6 +80,13 @@ void EPPProfile::instrument(Function &F, EPPEncode &Enc) {
     Module *M    = F.getParent();
     auto &Ctx    = M->getContext();
     auto *voidTy = Type::getVoidTy(Ctx);
+    auto *FuncIdTy = Type::getInt32Ty(Ctx);
+
+    auto FuncId = FunctionIds[&F];
+
+    // 1. Lookup the Function to Function ID mapping here
+    // 2. Create a constant int for the id
+    // 3. Pass the id in the logpath2 function call
 
 #ifndef RT32
     auto *CtrTy = Type::getInt128Ty(Ctx);
@@ -84,9 +95,10 @@ void EPPProfile::instrument(Function &F, EPPEncode &Enc) {
     auto *CtrTy = Type::getInt64Ty(Ctx);
     auto *Zap   = ConstantInt::getIntegerValue(CtrTy, APInt(64, 0, true));
 #endif
-
+
+    auto *FIdArg = ConstantInt::getIntegerValue(FuncIdTy, APInt(32, FuncId, true));
     auto *logFun2 = M->getOrInsertFunction("PaThPrOfIlInG_logPath2", voidTy,
-                                           CtrTy, nullptr);
+                                           CtrTy, FuncIdTy, nullptr);
 
     auto *Ctr = new AllocaInst(CtrTy, nullptr, "epp.ctr",
                                &*F.getEntryBlock().getFirstInsertionPt());
@@ -113,10 +125,10 @@ void EPPProfile::instrument(Function &F, EPPEncode &Enc) {
         }
     };
 
-    auto InsertLogPath = [&logFun2, &Ctr, &CtrTy, &Zap](BasicBlock *BB) {
+    auto InsertLogPath = [&logFun2, &Ctr, &CtrTy, &Zap, &FIdArg](BasicBlock *BB) {
         auto logPos = BB->getTerminator();
         auto *LI    = new LoadInst(Ctr, "ld.epp.ctr", logPos);
-        auto *CI    = CallInst::Create(logFun2, {LI}, "");
+        auto *CI    = CallInst::Create(logFun2, {LI, FIdArg}, "");
         CI->insertAfter(LI);
         (new StoreInst(Zap, Ctr))->insertAfter(CI);
     };