rename

Cargo.lock

@@ -325,7 +325,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "edlang_codegen_mlir"
+name = "edlang_codegen_llvm"
 version = "0.1.0"
 dependencies = [
  "bumpalo",
@@ -348,7 +348,7 @@ dependencies = [
  "color-eyre",
  "edlang_ast",
  "edlang_check",
- "edlang_codegen_mlir",
+ "edlang_codegen_llvm",
  "edlang_ir",
  "edlang_lowering",
  "edlang_parser",

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 resolver = "2"
 
-members = [ "bin/edlang", "lib/edlang_ast", "lib/edlang_check", "lib/edlang_codegen_mlir", "lib/edlang_driver", "lib/edlang_ir", "lib/edlang_lowering","lib/edlang_parser", "lib/edlang_session", "lib/edlang_span"]
+members = [ "bin/edlang", "lib/edlang_ast", "lib/edlang_check", "lib/edlang_codegen_llvm", "lib/edlang_driver", "lib/edlang_ir", "lib/edlang_lowering","lib/edlang_parser", "lib/edlang_session", "lib/edlang_span"]
 
 [profile.release]
 lto = true

lib/edlang_codegen_llvm/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
-name = "edlang_codegen_mlir"
+name = "edlang_codegen_llvm"
 version = "0.1.0"
 authors = ["Edgar Luque <edgar@edgarluque.com>"]
-description = "edlang MLIR codegen"
+description = "edlang LLVM codegen"
 edition = "2021"
 keywords = ["llvm", "compiler"]
 license = "AGPL-3.0-only"

lib/edlang_codegen_llvm/src/codegen.rs

@@ -8,8 +8,7 @@ use inkwell::{
     builder::{Builder, BuilderError},
     context::Context,
     debug_info::{
-        AsDIScope, DICompileUnit, DIFile, DIFlagsConstants, DILexicalBlock, DILocation, DIScope,
+        AsDIScope, DICompileUnit, DIFlagsConstants, DILocation, DIScope, DIType, DebugInfoBuilder,
-        DISubprogram, DIType, DebugInfoBuilder,
     },
     module::Module,
     targets::{InitializationConfig, Target, TargetData, TargetMachine},

lib/edlang_codegen_mlir/build.rs

@@ -1,16 +0,0 @@
-use std::env::var;
-
-fn main() {
-    let mlir_path = var("MLIR_SYS_170_PREFIX").expect("MLIR path should be set.");
-
-    cc::Build::new()
-        .cpp(true)
-        .flag("-std=c++17")
-        .flag_if_supported("-Wno-unused-parameter")
-        .flag_if_supported("-Wno-comment")
-        .include(&format!("{mlir_path}/include"))
-        .file("src/wrappers.cpp")
-        .compile("ffi");
-
-    println!("cargo:rerun-if-changed=src/wrappers.cpp");
-}

lib/edlang_codegen_mlir/src/wrappers.cpp

@@ -1,23 +0,0 @@
-#include <llvm-c/Support.h>
-#include <llvm/IR/LLVMContext.h>
-#include <llvm/IR/Module.h>
-#include <mlir/CAPI/IR.h>
-#include <mlir/CAPI/Support.h>
-#include <mlir/CAPI/Wrap.h>
-#include <mlir/Dialect/LLVMIR/LLVMTypes.h>
-#include <mlir/IR/Types.h>
-#include <mlir/Target/LLVMIR/ModuleTranslation.h>
-
-extern "C" LLVMModuleRef mlirTranslateModuleToLLVMIR(MlirOperation module,
-                                          LLVMContextRef context) {
-  mlir::Operation *moduleOp = unwrap(module);
-
-  llvm::LLVMContext *ctx = llvm::unwrap(context);
-
-  std::unique_ptr<llvm::Module> llvmModule = mlir::translateModuleToLLVMIR(
-      moduleOp, *ctx);
-
-  LLVMModuleRef moduleRef = llvm::wrap(llvmModule.release());
-
-  return moduleRef;
-}

lib/edlang_driver/Cargo.toml

@@ -16,7 +16,7 @@ clap = { version = "4.4.16", features = ["derive"] }
 color-eyre = "0.6.2"
 edlang_ast = { version = "0.1.0", path = "../edlang_ast" }
 edlang_check = { version = "0.1.0", path = "../edlang_check" }
-edlang_codegen_mlir = { version = "0.1.0", path = "../edlang_codegen_mlir" }
+edlang_codegen_llvm = { version = "0.1.0", path = "../edlang_codegen_llvm" }
 edlang_ir = { version = "0.1.0", path = "../edlang_ir" }
 edlang_lowering = { version = "0.1.0", path = "../edlang_lowering" }
 edlang_parser = { version = "0.1.0", path = "../edlang_parser" }

lib/edlang_driver/src/lib.rs

@@ -2,7 +2,7 @@ use std::{error::Error, path::PathBuf, time::Instant};
 
 use ariadne::Source;
 use clap::Parser;
-use edlang_codegen_mlir::linker::{link_binary, link_shared_lib};
+use edlang_codegen_llvm::linker::{link_binary, link_shared_lib};
 use edlang_lowering::lower_modules;
 use edlang_session::{DebugInfo, OptLevel, Session};
 
@@ -95,7 +95,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
         return Ok(());
     }
 
-    let object_path = edlang_codegen_mlir::compile(&session, &program_ir)?;
+    let object_path = edlang_codegen_llvm::compile(&session, &program_ir)?;
 
     if session.library {
         link_shared_lib(&object_path, &session.output_file.with_extension("so"))?;