github/concrete
1
1
Fork 0
mirror of https://github.com/zama-ai/concrete.git synced 2026-02-09 03:55:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(runtime): disable main wrapping and provide _dfr_terminate new termination call for the runtime.

Browse Source
This commit is contained in:
Antoniu Pop
2022-03-14 13:35:35 +00:00
committed by Ayoub Benaissa
parent 44ebd426f9
commit 27318ff29a
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/include/concretelang/Runtime/runtime_api.h
View File

@@ -36,7 +36,6 @@ void _dfr_deallocate_future_data(void *);
void _dfr_start();
void _dfr_stop();
void _dfr_pre_main();
void _dfr_post_main();
void _dfr_terminate();
}
#endif

2
compiler/lib/Runtime/CMakeLists.txt
View File

@@ -5,7 +5,7 @@ add_library(ConcretelangRuntime SHARED
if(CONCRETELANG_PARALLEL_EXECUTION_ENABLED)
add_library(DFRuntime SHARED DFRuntime.cpp)
target_link_libraries(DFRuntime PUBLIC pthread m dl HPX::hpx HPX::iostreams_component -rdynamic -Wl,-wrap,main)
target_link_libraries(DFRuntime PUBLIC pthread m dl HPX::hpx HPX::iostreams_component -rdynamic)
install(TARGETS DFRuntime EXPORT DFRuntime)
install(EXPORT DFRuntime DESTINATION "./")

49
compiler/lib/Runtime/DFRuntime.cpp
View File

@@ -282,7 +282,13 @@ static inline void _dfr_start_impl(int argc, char *argv[]) {
/* Start/stop functions to be called from within user code (or during
JIT invocation). These serve to pause/resume the runtime
scheduler and to clean up used resources. */
void _dfr_start() { hpx::resume(); }
void _dfr_start() {
uint64_t uninitialised = 0;
if (init_guard.compare_exchange_strong(uninitialised, 1))
_dfr_start_impl(0, nullptr);
else
hpx::resume();
}
void _dfr_stop() {
hpx::suspend();
@@ -301,6 +307,14 @@ void _dfr_stop() {
}
}
void _dfr_terminate() {
uint64_t initialised = 1;
if (init_guard.compare_exchange_strong(initialised, 2)) {
hpx::resume();
_dfr_stop_impl();
}
}
/*******************/
/* Main wrapper. */
/*******************/
@@ -309,38 +323,27 @@ extern int main(int argc, char *argv[]); // __attribute__((weak));
extern int __real_main(int argc, char *argv[]) __attribute__((weak));
int __wrap_main(int argc, char *argv[]) {
int r;
// Initialize and immediately suspend the HPX runtime.
_dfr_start_impl(0, nullptr);
hpx::suspend();
// Initialize and immediately suspend the HPX runtime if not yet done.
uint64_t uninitialised = 0;
if (init_guard.compare_exchange_strong(uninitialised, 1)) {
_dfr_start_impl(0, nullptr);
hpx::suspend();
}
// Run the actual main function. Within there should be a call to
// _dfr_start to resume execution of the HPX scheduler if needed.
r = __real_main(argc, argv);
// By default all _dfr_start should be matched to a _dfr_stop, so we
// need to resume before being able to finalize.
hpx::resume();
_dfr_stop_impl();
uint64_t initialised = 1;
if (init_guard.compare_exchange_strong(initialised, 2)) {
hpx::resume();
_dfr_stop_impl();
}
return r;
}
}
void _dfr_pre_main() {
uint64_t uninitialised = 0;
uint64_t initialised = 1;
if (init_guard.compare_exchange_strong(uninitialised, initialised)) {
_dfr_start_impl(0, nullptr);
hpx::suspend();
}
}
void _dfr_post_main() {
uint64_t initialised = 1;
uint64_t finalised = 2;
if (init_guard.compare_exchange_strong(initialised, finalised)) {
hpx::resume();
_dfr_stop_impl();
}
}
/**********************/
/* Debug interface. */