[libc-commits] [libc] [libc][NFC] Move GPU allocator implementation to common header (PR #84690)
Joseph Huber via libc-commits
libc-commits at lists.llvm.org
Sun Mar 10 12:47:12 PDT 2024
https://github.com/jhuber6 created https://github.com/llvm/llvm-project/pull/84690
Summary:
This is a NFC move preceding more radical functional changes to the
allocator implementation. We just move it to a common utility so it will
be easier to write these in tandem.
>From 58a8f0eecc8c075e96f7355fc81a2030a35da60a Mon Sep 17 00:00:00 2001
From: Joseph Huber <huberjn at outlook.com>
Date: Mon, 4 Mar 2024 06:56:51 -0600
Subject: [PATCH] [libc][NFC] Move GPU allocator implementation to common
header
Summary:
This is a NFC move preceding more radical functional changes to the
allocator implementation. We just move it to a common utility so it will
be easier to write these in tandem.
---
libc/src/__support/GPU/CMakeLists.txt | 12 +++++++
libc/src/__support/GPU/allocator.cpp | 45 +++++++++++++++++++++++++++
libc/src/__support/GPU/allocator.h | 23 ++++++++++++++
libc/src/stdlib/gpu/CMakeLists.txt | 4 +--
libc/src/stdlib/gpu/free.cpp | 11 ++-----
libc/src/stdlib/gpu/malloc.cpp | 12 ++-----
6 files changed, 88 insertions(+), 19 deletions(-)
create mode 100644 libc/src/__support/GPU/allocator.cpp
create mode 100644 libc/src/__support/GPU/allocator.h
diff --git a/libc/src/__support/GPU/CMakeLists.txt b/libc/src/__support/GPU/CMakeLists.txt
index c181b2ed43c839..28fd9a1ebcc97e 100644
--- a/libc/src/__support/GPU/CMakeLists.txt
+++ b/libc/src/__support/GPU/CMakeLists.txt
@@ -12,3 +12,15 @@ add_header_library(
DEPENDS
${target_gpu_utils}
)
+
+add_object_library(
+ allocator
+ SRCS
+ allocator.cpp
+ HDRS
+ allocator.h
+ DEPENDS
+ libc.src.__support.common
+ libc.src.__support.GPU.utils
+ libc.src.__support.RPC.rpc_client
+)
diff --git a/libc/src/__support/GPU/allocator.cpp b/libc/src/__support/GPU/allocator.cpp
new file mode 100644
index 00000000000000..a049959964cfc2
--- /dev/null
+++ b/libc/src/__support/GPU/allocator.cpp
@@ -0,0 +1,45 @@
+//===-- GPU memory allocator implementation ---------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "allocator.h"
+
+#include "src/__support/GPU/utils.h"
+#include "src/__support/RPC/rpc_client.h"
+
+namespace LIBC_NAMESPACE {
+namespace {
+
+void *rpc_allocate(uint64_t size) {
+ void *ptr = nullptr;
+ rpc::Client::Port port = rpc::client.open<RPC_MALLOC>();
+ port.send_and_recv([=](rpc::Buffer *buffer) { buffer->data[0] = size; },
+ [&](rpc::Buffer *buffer) {
+ ptr = reinterpret_cast<void *>(buffer->data[0]);
+ });
+ port.close();
+ return ptr;
+}
+
+void rpc_free(void *ptr) {
+ rpc::Client::Port port = rpc::client.open<RPC_FREE>();
+ port.send([=](rpc::Buffer *buffer) {
+ buffer->data[0] = reinterpret_cast<uintptr_t>(ptr);
+ });
+ port.close();
+}
+
+} // namespace
+
+namespace gpu {
+
+void *allocate(uint64_t size) { return rpc_allocate(size); }
+
+void deallocate(void *ptr) { rpc_free(ptr); }
+
+} // namespace gpu
+} // namespace LIBC_NAMESPACE
diff --git a/libc/src/__support/GPU/allocator.h b/libc/src/__support/GPU/allocator.h
new file mode 100644
index 00000000000000..99eeb6826cc284
--- /dev/null
+++ b/libc/src/__support/GPU/allocator.h
@@ -0,0 +1,23 @@
+//===-- GPU memory allocator implementation ---------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC___SUPPORT_GPU_ALLOCATOR_H
+#define LLVM_LIBC_SRC___SUPPORT_GPU_ALLOCATOR_H
+
+#include <stdint.h>
+
+namespace LIBC_NAMESPACE {
+namespace gpu {
+
+void *allocate(uint64_t size);
+void deallocate(void *ptr);
+
+} // namespace gpu
+} // namespace LIBC_NAMESPACE
+
+#endif // LLVM_LIBC_SRC___SUPPORT_GPU_ALLOCATOR_H
diff --git a/libc/src/stdlib/gpu/CMakeLists.txt b/libc/src/stdlib/gpu/CMakeLists.txt
index 71ae10648d004e..f8a11ec3ffb002 100644
--- a/libc/src/stdlib/gpu/CMakeLists.txt
+++ b/libc/src/stdlib/gpu/CMakeLists.txt
@@ -6,7 +6,7 @@ add_entrypoint_object(
../malloc.h
DEPENDS
libc.include.stdlib
- libc.src.__support.RPC.rpc_client
+ libc.src.__support.GPU.allocator
)
add_entrypoint_object(
@@ -28,5 +28,5 @@ add_entrypoint_object(
../abort.h
DEPENDS
libc.include.stdlib
- libc.src.__support.RPC.rpc_client
+ libc.src.__support.GPU.allocator
)
diff --git a/libc/src/stdlib/gpu/free.cpp b/libc/src/stdlib/gpu/free.cpp
index 3a41e5febad0bb..fb5703b78ae6c9 100644
--- a/libc/src/stdlib/gpu/free.cpp
+++ b/libc/src/stdlib/gpu/free.cpp
@@ -7,17 +7,12 @@
//===----------------------------------------------------------------------===//
#include "src/stdlib/free.h"
-#include "src/__support/RPC/rpc_client.h"
+
+#include "src/__support/GPU/allocator.h"
#include "src/__support/common.h"
namespace LIBC_NAMESPACE {
-LLVM_LIBC_FUNCTION(void, free, (void *ptr)) {
- rpc::Client::Port port = rpc::client.open<RPC_FREE>();
- port.send([=](rpc::Buffer *buffer) {
- buffer->data[0] = reinterpret_cast<uintptr_t>(ptr);
- });
- port.close();
-}
+LLVM_LIBC_FUNCTION(void, free, (void *ptr)) { gpu::deallocate(ptr); }
} // namespace LIBC_NAMESPACE
diff --git a/libc/src/stdlib/gpu/malloc.cpp b/libc/src/stdlib/gpu/malloc.cpp
index a2196907830513..93558231d0811e 100644
--- a/libc/src/stdlib/gpu/malloc.cpp
+++ b/libc/src/stdlib/gpu/malloc.cpp
@@ -7,20 +7,14 @@
//===----------------------------------------------------------------------===//
#include "src/stdlib/malloc.h"
-#include "src/__support/RPC/rpc_client.h"
+
+#include "src/__support/GPU/allocator.h"
#include "src/__support/common.h"
namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(void *, malloc, (size_t size)) {
- void *ptr = nullptr;
- rpc::Client::Port port = rpc::client.open<RPC_MALLOC>();
- port.send_and_recv([=](rpc::Buffer *buffer) { buffer->data[0] = size; },
- [&](rpc::Buffer *buffer) {
- ptr = reinterpret_cast<void *>(buffer->data[0]);
- });
- port.close();
- return ptr;
+ return gpu::allocate(size);
}
} // namespace LIBC_NAMESPACE
More information about the libc-commits
mailing list