maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ORC] Handle void and no-argument async wrapper calls.

This commit is contained in:
Lang Hames 2021-08-19 12:19:36 +10:00
parent 12b1dc0467
commit 8a36750236
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h
View File

@ -547,6 +547,18 @@ public:
return WrapperFunction<SPSEmpty(SPSTagTs...)>::call(Caller, BE, Args...);
}
template <typename AsyncCallerFn, typename SendDeserializedResultFn,
typename... ArgTs>
static void callAsync(AsyncCallerFn &&Caller,
SendDeserializedResultFn &&SendDeserializedResult,
const ArgTs &...Args) {
WrapperFunction<SPSEmpty(SPSTagTs...)>::callAsync(
Caller,
[SDR = std::move(SendDeserializedResult)](
Error SerializeErr, SPSEmpty E) { SDR(std::move(SerializeErr)); },
Args...);
}
using WrapperFunction<SPSEmpty(SPSTagTs...)>::handle;
using WrapperFunction<SPSEmpty(SPSTagTs...)>::handleAsync;
};

23
llvm/unittests/ExecutionEngine/Orc/ExecutionSessionWrapperFunctionCallsTest.cpp
View File

@ -30,6 +30,11 @@ static void addAsyncWrapper(unique_function<void(int32_t)> SendResult,
SendResult(X + Y);
}
static llvm::orc::shared::detail::CWrapperFunctionResult
voidWrapper(const char *ArgData, size_t ArgSize) {
return WrapperFunction<void()>::handle(ArgData, ArgSize, []() {}).release();
}
TEST(ExecutionSessionWrapperFunctionCalls, RunWrapperTemplate) {
ExecutionSession ES(cantFail(SelfExecutorProcessControl::Create()));
@ -40,12 +45,24 @@ TEST(ExecutionSessionWrapperFunctionCalls, RunWrapperTemplate) {
EXPECT_EQ(Result, 5);
}
TEST(ExecutionSessionWrapperFunctionCalls, RunWrapperAsyncTemplate) {
TEST(ExecutionSessionWrapperFunctionCalls, RunVoidWrapperAsyncTemplate) {
ExecutionSession ES(cantFail(SelfExecutorProcessControl::Create()));
std::promise<MSVCPError> RP;
ES.callSPSWrapperAsync<void()>(
[&](Error SerializationErr) {
RP.set_value(std::move(SerializationErr));
},
pointerToJITTargetAddress(voidWrapper));
Error Err = RP.get_future().get();
EXPECT_THAT_ERROR(std::move(Err), Succeeded());
}
TEST(ExecutionSessionWrapperFunctionCalls, RunNonVoidWrapperAsyncTemplate) {
ExecutionSession ES(cantFail(SelfExecutorProcessControl::Create()));
std::promise<MSVCPExpected<int32_t>> RP;
using Sig = int32_t(int32_t, int32_t);
ES.callSPSWrapperAsync<Sig>(
ES.callSPSWrapperAsync<int32_t(int32_t, int32_t)>(
[&](Error SerializationErr, int32_t R) {
if (SerializationErr)
RP.set_value(std::move(SerializationErr));