[Mlir-commits] [mlir] [mlir][ExecutionEngine] Add support for global constructors and destr… (PR #78070)
Fabian Mora
llvmlistbot at llvm.org
Sat Jan 13 14:37:07 PST 2024
https://github.com/fabianmcg created https://github.com/llvm/llvm-project/pull/78070
…uctors
This patch add support for executing global constructors and destructors in the `ExecutionEngine`.
>From 2feaa1c60b75bdf9657a2f5a5e12ba86d9c1f6a3 Mon Sep 17 00:00:00 2001
From: Fabian Mora <fmora.dev at gmail.com>
Date: Sat, 13 Jan 2024 22:31:42 +0000
Subject: [PATCH] [mlir][ExecutionEngine] Add support for global constructors
and destructors
This patch add support for executing global constructors and destructors in the
`ExecutionEngine`.
---
mlir/lib/ExecutionEngine/ExecutionEngine.cpp | 6 +++-
.../mlir-cpu-runner/global-constructors.mlir | 32 +++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 mlir/test/mlir-cpu-runner/global-constructors.mlir
diff --git a/mlir/lib/ExecutionEngine/ExecutionEngine.cpp b/mlir/lib/ExecutionEngine/ExecutionEngine.cpp
index 267ec236d3fd59..d911a177a1aebe 100644
--- a/mlir/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/mlir/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -219,6 +219,8 @@ ExecutionEngine::ExecutionEngine(bool enableObjectDump,
}
ExecutionEngine::~ExecutionEngine() {
+ // Execute the global destructors from the module being processed.
+ llvm::consumeError(jit->deinitialize(jit->getMainJITDylib()));
// Run all dynamic library destroy callbacks to prepare for the shutdown.
for (LibraryDestroyFn destroy : destroyFns)
destroy();
@@ -349,7 +351,6 @@ ExecutionEngine::create(Operation *m, const ExecutionEngineOptions &options,
jd.addGenerator(std::move(*loaded));
cantFail(objectLayer->add(jd, std::move(mb.get())));
}
-
return objectLayer;
};
@@ -396,6 +397,9 @@ ExecutionEngine::create(Operation *m, const ExecutionEngineOptions &options,
};
engine->registerSymbols(runtimeSymbolMap);
+ // Execute the global constructors from the module being processed.
+ cantFail(engine->jit->initialize(engine->jit->getMainJITDylib()));
+
return std::move(engine);
}
diff --git a/mlir/test/mlir-cpu-runner/global-constructors.mlir b/mlir/test/mlir-cpu-runner/global-constructors.mlir
new file mode 100644
index 00000000000000..7dbff7135f42d8
--- /dev/null
+++ b/mlir/test/mlir-cpu-runner/global-constructors.mlir
@@ -0,0 +1,32 @@
+// RUN: mlir-cpu-runner %s -e entry -entry-point-result=void \
+// RUN: -shared-libs=%mlir_c_runner_utils | \
+// RUN: FileCheck %s
+
+// Test that the `ctor` executes before `entry` and that `dtor` executes last.
+module {
+ llvm.func @printNewline()
+ llvm.func @printI64(i64)
+ llvm.mlir.global_ctors {ctors = [@ctor], priorities = [0 : i32]}
+ llvm.mlir.global_dtors {dtors = [@dtor], priorities = [0 : i32]}
+ llvm.func @entry() {
+ %0 = llvm.mlir.constant(2 : i64) : i64
+ llvm.call @printI64(%0) : (i64) -> ()
+ llvm.call @printNewline() : () -> ()
+ // CHECK: 2
+ llvm.return
+ }
+ llvm.func @ctor() {
+ %0 = llvm.mlir.constant(1 : i64) : i64
+ llvm.call @printI64(%0) : (i64) -> ()
+ llvm.call @printNewline() : () -> ()
+ // CHECK: 1
+ llvm.return
+ }
+ llvm.func @dtor() {
+ %0 = llvm.mlir.constant(1 : i64) : i64
+ llvm.call @printI64(%0) : (i64) -> ()
+ llvm.call @printNewline() : () -> ()
+ // CHECK: 3
+ llvm.return
+ }
+}
More information about the Mlir-commits
mailing list