[libc][NFC] Move RPC opcodes to the 'shared/' directory as well

Author: jhuber6

libc/include/CMakeLists.txt

@@ -767,7 +767,6 @@ if(LIBC_TARGET_OS_IS_GPU)
     gpu/rpc.h
     DEPENDS
       .llvm_libc_common_h
-      .llvm-libc-types.rpc_opcodes_t
   )
 endif()
 

libc/include/llvm-libc-types/CMakeLists.txt

@@ -122,7 +122,6 @@ add_header(struct_sockaddr_un HDR struct_sockaddr_un.h DEPENDS .sa_family_t)
 add_header(struct_sockaddr HDR struct_sockaddr.h DEPENDS .sa_family_t)
 add_header(struct_iovec HDR struct_iovec.h DEPENDS .size_t)
 add_header(struct_msghdr HDR struct_msghdr.h DEPENDS .size_t .socklen_t .struct_iovec)
-add_header(rpc_opcodes_t HDR rpc_opcodes_t.h)
 add_header(ACTION HDR ACTION.h)
 add_header(ENTRY HDR ENTRY.h)
 add_header(struct_hsearch_data HDR struct_hsearch_data.h)

libc/include/llvm-libc-types/rpc_opcodes_t.h renamed to libc/shared/rpc_opcodes.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_LIBC_TYPES_RPC_OPCODES_T_H
-#define LLVM_LIBC_TYPES_RPC_OPCODES_T_H
+#ifndef LLVM_LIBC_SHARED_RPC_OPCODES_H
+#define LLVM_LIBC_SHARED_RPC_OPCODES_H
 
 #define LLVM_LIBC_RPC_BASE 'c'
 #define LLVM_LIBC_OPCODE(n) (LLVM_LIBC_RPC_BASE << 24 | n)
@@ -46,4 +46,4 @@ typedef enum {
   RPC_LAST = 0xFFFFFFFF,
 } rpc_opcode_t;
 
-#endif // LLVM_LIBC_TYPES_RPC_OPCODES_T_H
+#endif // LLVM_LIBC_SHARED_RPC_OPCODES_H

libc/src/__support/RPC/rpc_client.h

@@ -10,8 +10,8 @@
 #define LLVM_LIBC_SRC___SUPPORT_RPC_RPC_CLIENT_H
 
 #include "shared/rpc.h"
+#include "shared/rpc_opcodes.h"
 
-#include "include/llvm-libc-types/rpc_opcodes_t.h"
 #include "src/__support/CPP/type_traits.h"
 #include "src/__support/macros/config.h"
 

libc/utils/gpu/loader/Loader.h

@@ -11,9 +11,10 @@
 
 #include "utils/gpu/server/llvmlibc_rpc_server.h"
 
-#include "include/llvm-libc-types/rpc_opcodes_t.h"
 #include "include/llvm-libc-types/test_rpc_opcodes_t.h"
+
 #include "shared/rpc.h"
+#include "shared/rpc_opcodes.h"
 
 #include <cstddef>
 #include <cstdint>

libc/utils/gpu/server/CMakeLists.txt

@@ -26,10 +26,6 @@ target_compile_definitions(llvmlibc_rpc_server PUBLIC
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/llvmlibc_rpc_server.h
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
         COMPONENT libc-headers)
-install(FILES ${LIBC_SOURCE_DIR}/include/llvm-libc-types/rpc_opcodes_t.h
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        RENAME llvmlibc_rpc_opcodes.h
-        COMPONENT libc-headers)
 install(TARGETS llvmlibc_rpc_server
         ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}"
         COMPONENT libc)

libc/utils/gpu/server/rpc_server.cpp

@@ -15,10 +15,10 @@
 #include <limits.h>
 
 #include "shared/rpc.h"
+#include "shared/rpc_opcodes.h"
 
 #include "llvmlibc_rpc_server.h"
 
-#include "include/llvm-libc-types/rpc_opcodes_t.h"
 #include "src/__support/arg_list.h"
 #include "src/stdio/printf_core/converter.h"
 #include "src/stdio/printf_core/parser.h"

offload/plugins-nextgen/common/src/RPC.cpp

@@ -14,9 +14,9 @@
 
 // TODO: This should be included unconditionally and cleaned up.
 #if defined(LIBOMPTARGET_RPC_SUPPORT)
-#include "include/llvm-libc-types/rpc_opcodes_t.h"
 #include "llvmlibc_rpc_server.h"
 #include "shared/rpc.h"
+#include "shared/rpc_opcodes.h"
 #endif
 
 using namespace llvm;