[llvm] 838490d - [ORC] Switch from uint8_t to char buffers for TargetProcessControl::runWrapper.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Wed Jun 16 21:16:25 PDT 2021
Author: Lang Hames
Date: 2021-06-17T13:27:09+10:00
New Revision: 838490de7ede2a144094fa0f98cd91d8851d7e3d
URL: https://github.com/llvm/llvm-project/commit/838490de7ede2a144094fa0f98cd91d8851d7e3d
DIFF: https://github.com/llvm/llvm-project/commit/838490de7ede2a144094fa0f98cd91d8851d7e3d.diff
LOG: [ORC] Switch from uint8_t to char buffers for TargetProcessControl::runWrapper.
This matches WrapperFunctionResult's char buffer, cutting down on the number of
pointer casts needed.
Added:
Modified:
llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h
llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h
llvm/include/llvm/ExecutionEngine/Orc/TargetProcessControl.h
llvm/lib/ExecutionEngine/Orc/TargetProcessControl.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h b/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h
index 6ccc90e60b865..708612e838ca7 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h
@@ -356,7 +356,7 @@ class OrcRPCTargetProcessControlBase : public TargetProcessControl {
Expected<shared::WrapperFunctionResult>
runWrapper(JITTargetAddress WrapperFnAddr,
- ArrayRef<uint8_t> ArgBuffer) override {
+ ArrayRef<char> ArgBuffer) override {
DEBUG_WITH_TYPE("orc", {
dbgs() << "Running as wrapper function "
<< formatv("{0:x16}", WrapperFnAddr) << " with "
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h b/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
index 0ea483ba2abb0..849c947c18cc3 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/Shared/Serialization.h
@@ -58,6 +58,11 @@ template <> class SerializationTypeName<void> {
static const char *getName() { return "void"; }
};
+template <> class SerializationTypeName<char> {
+public:
+ static const char *getName() { return "char"; }
+};
+
template <> class SerializationTypeName<int8_t> {
public:
static const char *getName() { return "int8_t"; }
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h
index 458947cc4d443..9be6093bcc436 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h
@@ -358,7 +358,7 @@ class RunMain
class RunWrapper
: public shared::RPCFunction<RunWrapper,
shared::WrapperFunctionResult(
- JITTargetAddress, std::vector<uint8_t>)> {
+ JITTargetAddress, std::vector<char>)> {
public:
static const char *getName() { return "RunWrapper"; }
};
@@ -580,14 +580,12 @@ template <typename RPCEndpointT> class OrcRPCTPCServer {
ProgramNameOverride);
}
- shared::WrapperFunctionResult
- runWrapper(JITTargetAddress WrapperFnAddr,
- const std::vector<uint8_t> &ArgBuffer) {
+ shared::WrapperFunctionResult runWrapper(JITTargetAddress WrapperFnAddr,
+ const std::vector<char> &ArgBuffer) {
using WrapperFnTy = shared::detail::CWrapperFunctionResult (*)(
const char *Data, uint64_t Size);
auto *WrapperFn = jitTargetAddressToFunction<WrapperFnTy>(WrapperFnAddr);
- return WrapperFn(reinterpret_cast<const char *>(ArgBuffer.data()),
- ArgBuffer.size());
+ return WrapperFn(ArgBuffer.data(), ArgBuffer.size());
}
void closeConnection() { Finished = true; }
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcessControl.h b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcessControl.h
index edc7952519e68..a39495f538208 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/TargetProcessControl.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/TargetProcessControl.h
@@ -145,7 +145,7 @@ class TargetProcessControl {
/// \endcode{.cpp}
///
virtual Expected<shared::WrapperFunctionResult>
- runWrapper(JITTargetAddress WrapperFnAddr, ArrayRef<uint8_t> ArgBuffer) = 0;
+ runWrapper(JITTargetAddress WrapperFnAddr, ArrayRef<char> ArgBuffer) = 0;
/// Disconnect from the target process.
///
@@ -170,9 +170,7 @@ class TPCCaller {
: TPC(TPC), WrapperFnAddr(WrapperFnAddr) {}
Expected<shared::WrapperFunctionResult> operator()(const char *ArgData,
size_t ArgSize) const {
- return TPC.runWrapper(
- WrapperFnAddr,
- ArrayRef<uint8_t>(reinterpret_cast<const uint8_t *>(ArgData), ArgSize));
+ return TPC.runWrapper(WrapperFnAddr, ArrayRef<char>(ArgData, ArgSize));
}
private:
@@ -204,8 +202,7 @@ class SelfTargetProcessControl : public TargetProcessControl,
ArrayRef<std::string> Args) override;
Expected<shared::WrapperFunctionResult>
- runWrapper(JITTargetAddress WrapperFnAddr,
- ArrayRef<uint8_t> ArgBuffer) override;
+ runWrapper(JITTargetAddress WrapperFnAddr, ArrayRef<char> ArgBuffer) override;
Error disconnect() override;
diff --git a/llvm/lib/ExecutionEngine/Orc/TargetProcessControl.cpp b/llvm/lib/ExecutionEngine/Orc/TargetProcessControl.cpp
index 240adb41d628c..bc5cff43bd934 100644
--- a/llvm/lib/ExecutionEngine/Orc/TargetProcessControl.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/TargetProcessControl.cpp
@@ -104,12 +104,11 @@ SelfTargetProcessControl::runAsMain(JITTargetAddress MainFnAddr,
Expected<shared::WrapperFunctionResult>
SelfTargetProcessControl::runWrapper(JITTargetAddress WrapperFnAddr,
- ArrayRef<uint8_t> ArgBuffer) {
+ ArrayRef<char> ArgBuffer) {
using WrapperFnTy = shared::detail::CWrapperFunctionResult (*)(
const char *Data, uint64_t Size);
auto *WrapperFn = jitTargetAddressToFunction<WrapperFnTy>(WrapperFnAddr);
- return WrapperFn(reinterpret_cast<const char *>(ArgBuffer.data()),
- ArgBuffer.size());
+ return WrapperFn(ArgBuffer.data(), ArgBuffer.size());
}
Error SelfTargetProcessControl::disconnect() { return Error::success(); }
More information about the llvm-commits
mailing list