From 49a48995d533d5984ab274725a413e724f22ab7a Mon Sep 17 00:00:00 2001 From: Edgar Luque Date: Fri, 9 Feb 2024 09:06:20 +0100 Subject: [PATCH] rename --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- .../Cargo.toml | 4 ++-- .../src/codegen.rs | 3 +-- .../src/lib.rs | 0 .../src/linker.rs | 0 lib/edlang_codegen_mlir/build.rs | 16 ------------- lib/edlang_codegen_mlir/src/wrappers.cpp | 23 ------------------- lib/edlang_driver/Cargo.toml | 2 +- lib/edlang_driver/src/lib.rs | 4 ++-- 10 files changed, 9 insertions(+), 49 deletions(-) rename lib/{edlang_codegen_mlir => edlang_codegen_llvm}/Cargo.toml (92%) rename lib/{edlang_codegen_mlir => edlang_codegen_llvm}/src/codegen.rs (99%) rename lib/{edlang_codegen_mlir => edlang_codegen_llvm}/src/lib.rs (100%) rename lib/{edlang_codegen_mlir => edlang_codegen_llvm}/src/linker.rs (100%) delete mode 100644 lib/edlang_codegen_mlir/build.rs delete mode 100644 lib/edlang_codegen_mlir/src/wrappers.cpp diff --git a/Cargo.lock b/Cargo.lock index af63c1a88..ee3d1c6d4 100644 --- a/Cargo.lock +++ b/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", diff --git a/Cargo.toml b/Cargo.toml index d70f2dda0..98706e9ed 100644 --- a/Cargo.toml +++ b/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 diff --git a/lib/edlang_codegen_mlir/Cargo.toml b/lib/edlang_codegen_llvm/Cargo.toml similarity index 92% rename from lib/edlang_codegen_mlir/Cargo.toml rename to lib/edlang_codegen_llvm/Cargo.toml index 36f599bce..3e56fab1d 100644 --- a/lib/edlang_codegen_mlir/Cargo.toml +++ b/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 "] -description = "edlang MLIR codegen" +description = "edlang LLVM codegen" edition = "2021" keywords = ["llvm", "compiler"] license = "AGPL-3.0-only" diff --git a/lib/edlang_codegen_mlir/src/codegen.rs b/lib/edlang_codegen_llvm/src/codegen.rs similarity index 99% rename from lib/edlang_codegen_mlir/src/codegen.rs rename to lib/edlang_codegen_llvm/src/codegen.rs index f4df370de..1d799d173 100644 --- a/lib/edlang_codegen_mlir/src/codegen.rs +++ b/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, - DISubprogram, DIType, DebugInfoBuilder, + AsDIScope, DICompileUnit, DIFlagsConstants, DILocation, DIScope, DIType, DebugInfoBuilder, }, module::Module, targets::{InitializationConfig, Target, TargetData, TargetMachine}, diff --git a/lib/edlang_codegen_mlir/src/lib.rs b/lib/edlang_codegen_llvm/src/lib.rs similarity index 100% rename from lib/edlang_codegen_mlir/src/lib.rs rename to lib/edlang_codegen_llvm/src/lib.rs diff --git a/lib/edlang_codegen_mlir/src/linker.rs b/lib/edlang_codegen_llvm/src/linker.rs similarity index 100% rename from lib/edlang_codegen_mlir/src/linker.rs rename to lib/edlang_codegen_llvm/src/linker.rs diff --git a/lib/edlang_codegen_mlir/build.rs b/lib/edlang_codegen_mlir/build.rs deleted file mode 100644 index d4eaaff68..000000000 --- a/lib/edlang_codegen_mlir/build.rs +++ /dev/null @@ -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"); -} diff --git a/lib/edlang_codegen_mlir/src/wrappers.cpp b/lib/edlang_codegen_mlir/src/wrappers.cpp deleted file mode 100644 index 004136f08..000000000 --- a/lib/edlang_codegen_mlir/src/wrappers.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -extern "C" LLVMModuleRef mlirTranslateModuleToLLVMIR(MlirOperation module, - LLVMContextRef context) { - mlir::Operation *moduleOp = unwrap(module); - - llvm::LLVMContext *ctx = llvm::unwrap(context); - - std::unique_ptr llvmModule = mlir::translateModuleToLLVMIR( - moduleOp, *ctx); - - LLVMModuleRef moduleRef = llvm::wrap(llvmModule.release()); - - return moduleRef; -} diff --git a/lib/edlang_driver/Cargo.toml b/lib/edlang_driver/Cargo.toml index 34eb1397e..e67210d3a 100644 --- a/lib/edlang_driver/Cargo.toml +++ b/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" } diff --git a/lib/edlang_driver/src/lib.rs b/lib/edlang_driver/src/lib.rs index b5e229b63..e9571fb43 100644 --- a/lib/edlang_driver/src/lib.rs +++ b/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> { 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"))?;