Prefix ABI (#197)

* Prefix ABI

* Fix format

Co-authored-by: William S. Moses <[email protected]>

Author: ivanradanov

tools/mlir-clang/Lib/clang-mlir.cc

@@ -57,6 +57,9 @@ static cl::opt<bool>
 static cl::opt<bool> memRefABI("memref-abi", cl::init(true),
                                cl::desc("Use memrefs when possible"));
 
+cl::opt<std::string> PrefixABI("prefix-abi", cl::init(""),
+                               cl::desc("Prefix for emitted symbols"));
+
 static cl::opt<bool>
     CombinedStructABI("struct-abi", cl::init(true),
                       cl::desc("Use literal LLVM ABI for structs"));
@@ -3955,6 +3958,8 @@ MLIRASTConsumer::GetOrCreateLLVMFunction(const FunctionDecl *FD) {
   else
     name = CGM.getMangledName(FD).str();
 
+  name = (PrefixABI + name);
+
   if (llvmFunctions.find(name) != llvmFunctions.end()) {
     return llvmFunctions[name];
   }
@@ -4025,6 +4030,8 @@ MLIRASTConsumer::GetOrCreateLLVMGlobal(const ValueDecl *FD,
                                        std::string prefix) {
   std::string name = prefix + CGM.getMangledName(FD).str();
 
+  name = (PrefixABI + name);
+
   if (llvmGlobals.find(name) != llvmGlobals.end()) {
     return llvmGlobals[name];
   }
@@ -4163,6 +4170,8 @@ MLIRASTConsumer::GetOrCreateGlobal(const ValueDecl *FD, std::string prefix,
                                    bool tryInit) {
   std::string name = prefix + CGM.getMangledName(FD).str();
 
+  name = (PrefixABI + name);
+
   if (globals.find(name) != globals.end()) {
     return globals[name];
   }
@@ -4321,6 +4330,8 @@ mlir::FuncOp MLIRASTConsumer::GetOrCreateMLIRFunction(const FunctionDecl *FD) {
   else
     name = CGM.getMangledName(FD).str();
 
+  name = (PrefixABI + name);
+
   assert(name != "free");
 
   llvm::GlobalValue::LinkageTypes LV;

tools/mlir-clang/Lib/clang-mlir.h

@@ -9,13 +9,6 @@
 #ifndef CLANG_MLIR_H
 #define CLANG_MLIR_H
 
-#include "clang/AST/ASTConsumer.h"
-#include "clang/AST/StmtVisitor.h"
-#include "clang/Lex/HeaderSearch.h"
-#include "clang/Lex/HeaderSearchOptions.h"
-#include "clang/Lex/Preprocessor.h"
-#include "clang/Lex/PreprocessorOptions.h"
-
 #include "AffineUtils.h"
 #include "ValueCategory.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
@@ -33,7 +26,14 @@
 #include "mlir/Target/LLVMIR/TypeToLLVM.h"
 #include "polygeist/Ops.h"
 #include "pragmaHandler.h"
+#include "clang/AST/ASTConsumer.h"
+#include "clang/AST/StmtVisitor.h"
+#include "clang/Lex/HeaderSearch.h"
+#include "clang/Lex/HeaderSearchOptions.h"
+#include "clang/Lex/Preprocessor.h"
+#include "clang/Lex/PreprocessorOptions.h"
 #include "llvm/IR/DerivedTypes.h"
+#include "llvm/Support/CommandLine.h"
 
 #include "clang/../../lib/CodeGen/CGRecordLayout.h"
 #include "clang/../../lib/CodeGen/CodeGenModule.h"
@@ -42,6 +42,8 @@
 using namespace clang;
 using namespace mlir;
 
+extern llvm::cl::opt<std::string> PrefixABI;
+
 struct LoopContext {
   mlir::Value keepRunning;
   mlir::Value noBreak;