Skip to content

Commit 1a2ecbb

Browse files
authored
[libc] Remove 'llvm-gpu-none' directory from build (#82816)
Summary: This directory is leftover from when we handled both AMDGPU and NVPTX in the same build and merged them into a pseudo triple. Now the only thing it contains is the RPC server header. This gets rid of it, but now that it's in the base install directory we should make it clear that it's an LLVM libc header.
1 parent a3a316e commit 1a2ecbb

File tree

6 files changed

+8
-14
lines changed

6 files changed

+8
-14
lines changed

libc/docs/gpu/rpc.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Some operations are too divergent to provide generic implementations for, such
104104
as allocating device accessible memory. For these cases, we provide a callback
105105
registration scheme to add a custom handler for any given opcode through the
106106
port API. More information can be found in the installed header
107-
``<install>/include/gpu-none-llvm/rpc_server.h``.
107+
``<install>/include/llvmlibc_rpc_server.h``.
108108

109109
Client Example
110110
--------------
@@ -194,7 +194,7 @@ but the following example shows how it can be used by a standard user.
194194
#include <cstdlib>
195195
#include <cuda_runtime.h>
196196
197-
#include <gpu-none-llvm/rpc_server.h>
197+
#include <llvmlibc_rpc_server.h>
198198
199199
[[noreturn]] void handle_error(cudaError_t err) {
200200
fprintf(stderr, "CUDA error: %s\n", cudaGetErrorString(err));

libc/utils/gpu/loader/Loader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_UTILS_GPU_LOADER_LOADER_H
1010
#define LLVM_LIBC_UTILS_GPU_LOADER_LOADER_H
1111

12-
#include "utils/gpu/server/rpc_server.h"
12+
#include "utils/gpu/server/llvmlibc_rpc_server.h"
1313

1414
#include "include/llvm-libc-types/test_rpc_opcodes_t.h"
1515

libc/utils/gpu/server/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ if(LLVM_RUNTIMES_TARGET OR LIBC_TARGET_TRIPLE)
2121
endif()
2222

2323
# Install the server and associated header.
24-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/rpc_server.h
25-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gpu-none-llvm/
24+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/llvmlibc_rpc_server.h
25+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
2626
COMPONENT libc-headers)
2727
install(TARGETS llvmlibc_rpc_server
2828
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"

libc/utils/gpu/server/rpc_server.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "rpc_server.h"
9+
#include "llvmlibc_rpc_server.h"
1010

1111
#include "src/__support/RPC/rpc.h"
1212
#include "src/stdio/gpu/file.h"

openmp/libomptarget/plugins-nextgen/common/src/RPC.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,8 @@
1212

1313
#include "PluginInterface.h"
1414

15-
// This header file may be present in-tree or from an LLVM installation. The
16-
// installed version lives alongside the GPU headers so we do not want to
17-
// include it directly.
18-
#if __has_include(<gpu-none-llvm/rpc_server.h>)
19-
#include <gpu-none-llvm/rpc_server.h>
20-
#elif defined(LIBOMPTARGET_RPC_SUPPORT)
21-
// Just pull this out of the source if available.
22-
#include "rpc_server.h"
15+
#if defined(LIBOMPTARGET_RPC_SUPPORT)
16+
#include "llvmlibc_rpc_server.h"
2317
#endif
2418

2519
using namespace llvm;

0 commit comments

Comments
 (0)