fix(compiler): do not optimize llvm twice

zama-ai · Sep 8, 2023 · 229bbc2 · 229bbc2
1 parent 74c4a7e
commit 229bbc2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/compilers/concrete-compiler/compiler/lib/Support/LLVMEmitFile.cpp b/compilers/concrete-compiler/compiler/lib/Support/LLVMEmitFile.cpp
@@ -148,6 +148,7 @@ llvm::Error emitObject(llvm::Module &module, string objectPath) {
   // https://llvm.org/docs/NewPassManager.html#status-of-the-new-and-legacy-pass-managers
   llvm::legacy::PassManager pm;
   auto FileType = llvm::CGFT_ObjectFile;
+  targetMachine->setOptLevel(llvm::CodeGenOpt::Level::Aggressive);
   if (targetMachine->addPassesToEmitFile(pm, objectFile->os(), nullptr,
                                          FileType, false)) {
     return StreamStringError("TheTargetMachine can't emit object file");

diff --git a/compilers/concrete-compiler/compiler/lib/Support/Pipeline.cpp b/compilers/concrete-compiler/compiler/lib/Support/Pipeline.cpp
@@ -527,8 +527,10 @@ lowerLLVMDialectToLLVMIR(mlir::MLIRContext &context,
 
 mlir::LogicalResult optimizeLLVMModule(llvm::LLVMContext &llvmContext,
                                        llvm::Module &module) {
+  // -O3 is done LLVMEmitFile.cpp
+  auto optLevel = llvm::CodeGenOpt::None;
   std::function<llvm::Error(llvm::Module *)> optPipeline =
-      mlir::makeOptimizingTransformer(3, 0, nullptr);
+      mlir::makeOptimizingTransformer(optLevel, 0, nullptr);
 
   if (optPipeline(&module))
     return mlir::failure();