MLIR: #5 Command Line Flags - Rename files

Robertorosmaninho · Feb 8, 2020 · 98df976 · 98df976
1 parent 63e65ca
commit 98df976
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -373,7 +373,7 @@ set(DRV_SRC
     driver/exe_path.cpp
     driver/targetmachine.cpp
     driver/toobj.cpp
-    driver/tomlir.cpp
+    driver/tomlirfile.cpp
     driver/tool.cpp
     driver/archiver.cpp
     driver/linker.cpp
@@ -400,7 +400,7 @@ set(DRV_HDR
     driver/linker.h
     driver/plugins.h
     driver/targetmachine.h
-    driver/tomlir.cpp
+    driver/tomlirfile.h
     driver/toobj.h
     driver/tool.h
 )

diff --git a/driver/codegenerator.cpp b/driver/codegenerator.cpp
@@ -18,7 +18,7 @@
 #include "driver/cl_options_instrumentation.h"
 #include "driver/linker.h"
 #include "driver/toobj.h"
-#include "driver/tomlir.h"
+#include "driver/tomlirfile.h"
 #include "gen/dynamiccompile.h"
 #include "gen/logger.h"
 #include "gen/modules.h"
@@ -256,6 +256,7 @@ void CodeGenerator::finishLLModule(Module *m) {
     insertBitcodeFiles(ir_->module, ir_->context(), global.params.bitcodeFiles);
   }
 
+  writeMLIRModule(m, mlirContext_, m->objfile.toChars(), ir_);
   writeAndFreeLLModule(m->objfile.toChars());
 }
 

diff --git a/driver/codegenerator.h b/driver/codegenerator.h
@@ -20,6 +20,7 @@
 #pragma once
 
 #include "gen/irstate.h"
+#include "mlir/IR/MLIRContext.h"
 
 namespace ldc {
 

diff --git a/driver/tomlir.cpp → driver/tomlirfile.cpp b/driver/tomlir.cpp → driver/tomlirfile.cpp
@@ -2,7 +2,7 @@
 // Created by Roberto Rosmaninho on 09/10/19.
 //
 
-#include "tomlir.h"
+#include "tomlirfile.h"
 
 #include "dmd/errors.h"
 #include "driver/cl_options.h"
@@ -38,6 +38,7 @@
 #include "llvm/IR/Module.h"
 #include <cstddef>
 #include <fstream>
+#include <mlir/IR/Module.h>
 
 #ifdef LDC_LLVM_SUPPORTED_TARGET_SPIRV
 namespace llvm {
@@ -46,11 +47,13 @@ namespace llvm {
 #endif
 
 #include "gen/logger.h"
+#include "mlir/IR/Module.h"
 #include "dmd/globals.h"
 #include "gen/MLIR/MLIRGen.h"
+#include "dmd/expression.h"
 
 void writeMLIRModule(Module *m, mlir::MLIRContext &mlirContext,
-                     const char *filename){
+                     const char *filename, IRState *irs){
   const auto outputFlags = {global.params.output_o, global.params.output_bc,
                             global.params.output_ll, global.params.output_s,
                             global.params.output_mlir};
@@ -79,15 +82,11 @@ void writeMLIRModule(Module *m, mlir::MLIRContext &mlirContext,
             errinfo.message().c_str());
       fatal();
     }
-    mlir::OwningModuleRef module = ldc_mlir::mlirGen(mlirContext, m);
+    mlir::OwningModuleRef module = ldc_mlir::mlirGen(mlirContext, m, irs);
     if(!module){
       IF_LOG Logger::println("Cannot write MLIR file to '%s'", llpath.c_str());
       fatal();
     }
     module->print(aos);
-    //AssemblyAnnotator annotator(m->getDataLayout());
-    //m->print(aos, &annotator);
   }
-
-
-}
+}
diff --git a/driver/tomlir.h → driver/tomlirfile.h b/driver/tomlir.h → driver/tomlirfile.h
@@ -5,10 +5,10 @@
 #ifndef LDC_TOMLIR_H
 #define LDC_TOMLIR_H
 
+#include "gen/irstate.h"
 #include "dmd/module.h"
 #include "mlir/IR/MLIRContext.h"
 
 void writeMLIRModule(Module *m, mlir::MLIRContext &mlirContext,
-                                                  const char *filename);
-
+    const char *filename, IRState *irs);
 #endif // LDC_TOMLIR_H