temp test 2

Author: bgrb1

nautilus/src/nautilus/compiler/backends/mlir/LLVMIROptimizer.cpp

@@ -2,7 +2,7 @@
 
 #include "nautilus/compiler/backends/mlir/LLVMIROptimizer.hpp"
 #include "nautilus/compiler/DumpHandler.hpp"
-#include "nautilus/compiler/backends/mlir/LLVMInliningUtils.h"
+#include "nautilus/compiler/backends/mlir/LLVMInliningUtils.hpp"
 #include <llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IRReader/IRReader.h>

nautilus/src/nautilus/compiler/backends/mlir/LLVMInliningUtils.cpp

@@ -1,4 +1,4 @@
-#include "nautilus/compiler/backends/mlir/LLVMInliningUtils.h"
+#include "nautilus/compiler/backends/mlir/LLVMInliningUtils.hpp"
 #include "fmt/format.h"
 #include "nautilus/inline.hpp"
 #include "llvm/IR/DebugInfo.h"

nautilus/src/nautilus/compiler/backends/mlir/LLVMInliningUtils.h renamed to nautilus/src/nautilus/compiler/backends/mlir/LLVMInliningUtils.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "LLVMInliningUtils.h"
+#include "LLVMInliningUtils.hpp"
 #include <llvm/Transforms/Utils/Cloning.h>
 
 namespace nautilus::compiler::mlir {

nautilus/src/nautilus/llvm-passes/CMakeLists.txt

@@ -39,8 +39,8 @@ if(NAUTILUS_INLINE_SUPPORTED)
     target_include_directories(InliningPass PRIVATE ${LLVM_INCLUDE_DIRS})
     target_compile_definitions(InliningPass PRIVATE ${LLVM_DEFINITIONS})
     set_target_properties(InliningPass PROPERTIES
-            COMPILE_OPTIONS "-Wno-unused-parameter;-Wno-unused-variable;-Wno-extra-semi;-Wno-deprecated-copy-with-dtor"
-            LINK_OPTIONS ""
+            COMPILE_OPTIONS "-Wno-unused-parameter;-Wno-unused-variable;-Wno-extra-semi;-Wno-deprecated-copy-with-dtor;-stdlib=libstdc++"
+            LINK_OPTIONS "-stdlib=libstdc++"
     ) #override global compile and link flags for the pass
 
     target_link_libraries(InliningPass

nautilus/src/nautilus/llvm-passes/CloningUtils.h renamed to nautilus/src/nautilus/llvm-passes/CloningUtils.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "InliningUtils.h"
+#include "InliningUtils.hpp"
 #include "llvm/Bitcode/BitcodeWriter.h"
 #include "llvm/IR/DIBuilder.h"
 #include "llvm/IR/Function.h"
@@ -26,6 +26,7 @@ static llvm::Function* findSymbolRegistrationFunction(llvm::Module& M);
 inline llvm::PreservedAnalyses NautilusInlineRegistrationPass::run(llvm::Module& M, llvm::ModuleAnalysisManager& MAM) {
 	auto& ctx = M.getContext();
 
+	llvm::errs() << "Running NautilusInlineRegistrationPass on" << M.getModuleIdentifier() << "\n";
 	// Find registration functions
 	auto* bitcodeRegistrationFunction = findBitcodeRegistrationFunction(M);
 	auto* symbolRegistrationFunction = findSymbolRegistrationFunction(M);
@@ -52,6 +53,7 @@ inline llvm::PreservedAnalyses NautilusInlineRegistrationPass::run(llvm::Module&
 				}
 			}
 			if (toInline) {
+				llvm::errs() << "found inlinable function: " << F.getName() << "\n";
 				if (!clonedM) {
 					clonedM = CloneModule(M);
 				}
@@ -81,7 +83,7 @@ inline llvm::PreservedAnalyses NautilusInlineRegistrationPass::run(llvm::Module&
 						}
 						ptr = newPtr;
 					}
-
+					llvm::errs() << "inserting registration calls " << std::get<1>(*result).size() << "\n";
 					// Insert registry calls into the initializer function to populate them at runtime
 					insertBitcodeRegistryCall(ctorBuilder, bitcodeRegistrationFunction, F, std::get<0>(*result));
 					insertSymbolRegistryCalls(ctorBuilder, symbolRegistrationFunction, std::get<1>(*result));

nautilus/src/nautilus/llvm-passes/FunctionInliningPass.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CloningUtils.h"
+#include "CloningUtils.hpp"
 #include "llvm/Bitcode/BitcodeWriter.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DIBuilder.h"