From 54950fc2ad2949c3187a8a0a4d4b1b661a85e068 Mon Sep 17 00:00:00 2001 From: Edgar Luque Date: Thu, 18 Jan 2024 07:33:47 +0100 Subject: [PATCH] upd --- Cargo.lock | 40 +++++++++++++------------- lib/edlang_codegen_mlir/Cargo.toml | 2 +- lib/edlang_codegen_mlir/src/codegen.rs | 7 ++--- lib/edlang_codegen_mlir/src/lib.rs | 1 - lib/edlang_codegen_mlir/src/util.rs | 6 ---- 5 files changed, 24 insertions(+), 32 deletions(-) delete mode 100644 lib/edlang_codegen_mlir/src/util.rs diff --git a/Cargo.lock b/Cargo.lock index 207fd705f..4ac654de2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.7" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" +checksum = "3fde6067df7359f2d6335ec1a50c1f8f825801687d10da0cc4c6b08e3f6afd15" dependencies = [ "anstyle", "anstyle-parse", @@ -148,7 +148,7 @@ version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cexpr", "clang-sys", "lazy_static", @@ -171,7 +171,7 @@ version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cexpr", "clang-sys", "lazy_static", @@ -211,9 +211,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bumpalo" @@ -258,9 +258,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.16" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e54881c004cec7895b0068a0a954cd5d62da01aef83fa35b1e594497bf5445" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.16" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cb82d7f531603d2fd1f507441cdd35184fa81beff7bd489570de7f773460bb" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -702,9 +702,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "home" @@ -838,7 +838,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall", ] @@ -860,9 +860,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "llvm-sys" @@ -937,9 +937,9 @@ dependencies = [ [[package]] name = "melior" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634f33663d2bcac794409829caf83a08967249e5429f34ec20c92230a85c025a" +checksum = "878012ddccd6fdd099a4d98cebdecbaed9bc5eb325d0778ab9d4f4a52c67c18e" dependencies = [ "dashmap", "melior-macro", @@ -1137,9 +1137,9 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "plist" @@ -1298,7 +1298,7 @@ version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", diff --git a/lib/edlang_codegen_mlir/Cargo.toml b/lib/edlang_codegen_mlir/Cargo.toml index 719e1898f..360396258 100644 --- a/lib/edlang_codegen_mlir/Cargo.toml +++ b/lib/edlang_codegen_mlir/Cargo.toml @@ -16,7 +16,7 @@ edlang_ast = { version = "0.1.0", path = "../edlang_ast" } edlang_parser = { version = "0.1.0", path = "../edlang_parser" } edlang_session = { version = "0.1.0", path = "../edlang_session" } llvm-sys = "170.0.1" -melior = { version = "0.15.0", features = ["ods-dialects"] } +melior = { version = "0.15.2", features = ["ods-dialects"] } mlir-sys = "0.2.1" tracing = { workspace = true } diff --git a/lib/edlang_codegen_mlir/src/codegen.rs b/lib/edlang_codegen_mlir/src/codegen.rs index e8850ded1..d5bf3b361 100644 --- a/lib/edlang_codegen_mlir/src/codegen.rs +++ b/lib/edlang_codegen_mlir/src/codegen.rs @@ -14,13 +14,12 @@ use melior::{ ir::{ attribute::{FlatSymbolRefAttribute, IntegerAttribute, StringAttribute, TypeAttribute}, r#type::{FunctionType, IntegerType, MemRefType}, - Attribute, Block, BlockRef, Location, Module as MeliorModule, Region, Type, TypeLike, - Value, ValueLike, + Attribute, Block, BlockRef, Location, Module as MeliorModule, Region, Type, Value, + ValueLike, }, Context as MeliorContext, }; -use crate::util::call_site; #[derive(Debug, Clone)] pub struct LocalVar<'ctx, 'parent: 'ctx> { pub ast_type: edlang_ast::Type, @@ -645,7 +644,7 @@ fn compile_fn_call<'ctx, 'parent: 'ctx>( &info.name.name, get_location(context, session, scope_ctx.function.unwrap().span.lo), ); - let location = call_site(location_callee, location_caller); + let location = Location::call_site(location_callee, location_caller); let target_fn = scope_ctx .functions diff --git a/lib/edlang_codegen_mlir/src/lib.rs b/lib/edlang_codegen_mlir/src/lib.rs index 4470915be..ab8867428 100644 --- a/lib/edlang_codegen_mlir/src/lib.rs +++ b/lib/edlang_codegen_mlir/src/lib.rs @@ -32,7 +32,6 @@ pub mod codegen; mod context; mod ffi; pub mod linker; -mod util; pub fn compile(session: &Session, program: &Module) -> Result> { let context = Context::new(); diff --git a/lib/edlang_codegen_mlir/src/util.rs b/lib/edlang_codegen_mlir/src/util.rs deleted file mode 100644 index 3f449382e..000000000 --- a/lib/edlang_codegen_mlir/src/util.rs +++ /dev/null @@ -1,6 +0,0 @@ -use melior::{ir::Location, Context}; -use mlir_sys::mlirLocationCallSiteGet; - -pub fn call_site<'c>(callee: Location<'c>, caller: Location<'c>) -> Location<'c> { - unsafe { Location::from_raw(mlirLocationCallSiteGet(callee.to_raw(), caller.to_raw())) } -}