[libc] delete hdrgen #117220
Merged
[libc] delete hdrgen #117220
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nickdesaulniers
requested review from
petrhosek,
jhuber6,
lntue,
aaryanshukla,
michaelrj-google and
RoseZhang03
|
@llvm/pr-subscribers-libc Author: Nick Desaulniers (nickdesaulniers) ChangesThanks to the effort of @RoseZhang03 and @aaryanshukla under the guidance of This PR:
It does not rename newhdrgen to just hdrgen. Will follow up with a distinct PR Link: #117209 Patch is 243.67 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/117220.diff 36 Files Affected:
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
index 77b659b2ef2322..d00888b8801dc5 100644
--- a/libc/CMakeLists.txt
+++ b/libc/CMakeLists.txt
@@ -54,27 +54,12 @@ set(LIBC_NAMESPACE ${default_namespace}
add_subdirectory(newhdrgen)
-if(LLVM_LIBC_FULL_BUILD OR LLVM_LIBC_GPU_BUILD)
- if(NOT LIBC_HDRGEN_EXE)
- # We need to set up hdrgen first since other targets depend on it.
- add_subdirectory(utils/LibcTableGenUtil)
- add_subdirectory(utils/HdrGen)
- # Calling add_tablegen sets variables like LIBC_TABLEGEN_EXE in
- # PARENT_SCOPE which get lost until saved in the cache.
- set(LIBC_TABLEGEN_EXE "${LIBC_TABLEGEN_EXE}" CACHE INTERNAL "")
- set(LIBC_TABLEGEN_TARGET "${LIBC_TABLEGEN_TARGET}" CACHE INTERNAL "")
- else()
- message(STATUS "Will use ${LIBC_HDRGEN_EXE} for libc header generation.")
- endif()
-endif()
# We will build the GPU utilities if we are not doing a runtimes build.
option(LIBC_BUILD_GPU_LOADER "Always build the GPU loader utilities" OFF)
if(LIBC_BUILD_GPU_LOADER OR (LLVM_LIBC_GPU_BUILD AND NOT LLVM_RUNTIMES_BUILD))
add_subdirectory(utils/gpu)
endif()
-option(LIBC_USE_NEW_HEADER_GEN "Generate header files using new headergen instead of the old one" ON)
-
set(NEED_LIBC_HDRGEN FALSE)
if(NOT LLVM_RUNTIMES_BUILD)
if("libc" IN_LIST LLVM_ENABLE_RUNTIMES)
@@ -88,8 +73,7 @@ if(NOT LLVM_RUNTIMES_BUILD)
endforeach()
endif()
endif()
-option(LIBC_HDRGEN_ONLY "Only build the 'libc-hdrgen' executable" OFF)
-if(LIBC_HDRGEN_ONLY OR NEED_LIBC_HDRGEN)
+if(NEED_LIBC_HDRGEN)
# When libc is build as part of the runtimes/bootstrap build's CMake run, we
# only need to build the host tools to build the libc. So, we just do enough
# to build libc-hdrgen and return.
diff --git a/libc/cmake/modules/LLVMLibCHeaderRules.cmake b/libc/cmake/modules/LLVMLibCHeaderRules.cmake
index 76c4e1f2d3244c..766225cbeab404 100644
--- a/libc/cmake/modules/LLVMLibCHeaderRules.cmake
+++ b/libc/cmake/modules/LLVMLibCHeaderRules.cmake
@@ -220,46 +220,13 @@ function(add_gen_header target_name)
set(gen_hdr_script "${LIBC_BUILD_SCRIPTS_DIR}/gen_hdr.py")
- file(GLOB td_includes ${LIBC_SOURCE_DIR}/spec/*.td)
-
set(ENTRYPOINT_NAME_LIST_ARG ${TARGET_ENTRYPOINT_NAME_LIST})
list(TRANSFORM ENTRYPOINT_NAME_LIST_ARG PREPEND "--e=")
- if(LIBC_HDRGEN_EXE)
- set(hdrgen_exe ${LIBC_HDRGEN_EXE})
- else()
- set(hdrgen_exe ${LIBC_TABLEGEN_EXE})
- set(hdrgen_deps "${LIBC_TABLEGEN_EXE};${LIBC_TABLEGEN_TARGET}")
- endif()
- add_custom_command(
- OUTPUT ${out_file}
- COMMAND ${hdrgen_exe} -o ${out_file} --header ${ADD_GEN_HDR_GEN_HDR}
- --def ${in_file} ${replacement_params} -I ${LIBC_SOURCE_DIR}
- ${ENTRYPOINT_NAME_LIST_ARG}
- ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td
-
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${in_file} ${fq_data_files} ${td_includes}
- ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td
- ${hdrgen_deps}
- )
-
if(LIBC_TARGET_OS_IS_GPU)
file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/llvm-libc-decls)
file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/llvm-libc-decls/gpu)
set(decl_out_file ${LIBC_INCLUDE_DIR}/llvm-libc-decls/${relative_path})
- add_custom_command(
- OUTPUT ${decl_out_file}
- COMMAND ${hdrgen_exe} -o ${decl_out_file}
- --header ${ADD_GEN_HDR_GEN_HDR} --def ${in_file} --export-decls
- ${replacement_params} -I ${LIBC_SOURCE_DIR} ${ENTRYPOINT_NAME_LIST_ARG}
- ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td
-
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${in_file} ${fq_data_files} ${td_includes}
- ${LIBC_SOURCE_DIR}/config/${LIBC_TARGET_OS}/api.td
- ${hdrgen_deps}
- )
endif()
if(ADD_GEN_HDR_DEPENDS)
diff --git a/libc/config/baremetal/api.td b/libc/config/baremetal/api.td
deleted file mode 100644
index 7421d86fabeb08..00000000000000
--- a/libc/config/baremetal/api.td
+++ /dev/null
@@ -1,59 +0,0 @@
-include "config/public_api.td"
-
-include "spec/stdc.td"
-include "spec/stdc_ext.td"
-include "spec/bsd_ext.td"
-include "spec/llvm_libc_stdfix_ext.td"
-
-
-def CTypeAPI : PublicAPI<"ctype.h"> {
-}
-
-def FEnvAPI : PublicAPI<"fenv.h"> {
- let Types = ["fenv_t", "fexcept_t"];
-}
-
-def IntTypesAPI : PublicAPI<"inttypes.h"> {
- let Types = ["imaxdiv_t"];
-}
-
-def MathAPI : PublicAPI<"math.h"> {
- let Types = ["double_t", "float_t"];
-}
-
-def StdIOAPI : PublicAPI<"stdio.h"> {
- let Types = ["size_t"];
-}
-
-def StdlibAPI : PublicAPI<"stdlib.h"> {
- let Types = [
- "div_t",
- "ldiv_t",
- "lldiv_t",
- "size_t",
- "__bsearchcompare_t",
- "__qsortcompare_t",
- ];
-}
-
-def StringAPI : PublicAPI<"string.h"> {
- let Types = ["size_t"];
-}
-
-def TimeAPI : PublicAPI<"time.h"> {
- let Types = [
- "clock_t",
- "time_t",
- "struct tm",
- "struct timespec",
- ];
-}
-
-def UCharAPI : PublicAPI<"uchar.h"> {
- let Types = [
- "mbstate_t",
- "char8_t",
- "char16_t",
- "char32_t",
- ];
-}
diff --git a/libc/config/gpu/api.td b/libc/config/gpu/api.td
deleted file mode 100644
index 995ff31c4ac9e9..00000000000000
--- a/libc/config/gpu/api.td
+++ /dev/null
@@ -1,50 +0,0 @@
-include "config/public_api.td"
-
-include "spec/stdc.td"
-include "spec/posix.td"
-include "spec/gpu_ext.td"
-include "spec/gnu_ext.td"
-include "spec/stdc_ext.td"
-include "spec/llvm_libc_ext.td"
-
-
-def StringAPI : PublicAPI<"string.h"> {
- let Types = ["size_t"];
-}
-
-def StdlibAPI : PublicAPI<"stdlib.h"> {
- let Types = [
- "div_t",
- "ldiv_t",
- "lldiv_t",
- "size_t",
- "__bsearchcompare_t",
- "__qsortcompare_t",
- "__qsortrcompare_t",
- "__atexithandler_t",
- ];
-}
-
-def FenvAPI: PublicAPI<"fenv.h"> {
- let Types = ["fenv_t"];
-}
-
-def StdIOAPI : PublicAPI<"stdio.h"> {
- let Types = [
- "FILE",
- "off_t",
- "size_t",
- ];
-}
-
-def IntTypesAPI : PublicAPI<"inttypes.h"> {
- let Types = ["imaxdiv_t"];
-}
-
-def TimeAPI : PublicAPI<"time.h"> {
- let Types = [
- "clock_t",
- "time_t",
- "struct timespec",
- ];
-}
diff --git a/libc/config/linux/api.td b/libc/config/linux/api.td
deleted file mode 100644
index a00e0f61b90df7..00000000000000
--- a/libc/config/linux/api.td
+++ /dev/null
@@ -1,276 +0,0 @@
-include "config/public_api.td"
-
-include "spec/stdc.td"
-include "spec/posix.td"
-include "spec/linux.td"
-include "spec/gnu_ext.td"
-include "spec/bsd_ext.td"
-include "spec/stdc_ext.td"
-include "spec/llvm_libc_ext.td"
-include "spec/llvm_libc_stdfix_ext.td"
-
-def CTypeAPI : PublicAPI<"ctype.h"> {
-}
-
-def FCntlAPI : PublicAPI<"fcntl.h"> {
- let Types = [
- "mode_t",
- "off_t",
- ];
-}
-
-def IntTypesAPI : PublicAPI<"inttypes.h"> {
- let Types = ["imaxdiv_t"];
-}
-
-def MathAPI : PublicAPI<"math.h"> {
- let Types = ["double_t", "float_t", "float128"];
-}
-
-def FenvAPI: PublicAPI<"fenv.h"> {
- let Types = ["fenv_t", "fexcept_t"];
-}
-
-def StringAPI : PublicAPI<"string.h"> {
- let Types = ["size_t"];
-}
-
-def StdIOAPI : PublicAPI<"stdio.h"> {
- let Macros = [
- SimpleMacroDef<"stderr", "stderr">,
- SimpleMacroDef<"stdin", "stdin">,
- SimpleMacroDef<"stdout", "stdout">,
- ];
- let Types = [
- "FILE",
- "cookie_io_functions_t",
- "off_t",
- "size_t",
- ];
-}
-
-def StdlibAPI : PublicAPI<"stdlib.h"> {
- let Types = [
- "div_t",
- "ldiv_t",
- "lldiv_t",
- "size_t",
- "__bsearchcompare_t",
- "__qsortcompare_t",
- "__qsortrcompare_t",
- "__atexithandler_t",
- ];
-}
-
-def TimeAPI : PublicAPI<"time.h"> {
- let Types = [
- "clock_t",
- "time_t",
- "struct tm",
- "struct timespec",
- "struct timeval",
- "clockid_t",
- ];
-}
-
-def SchedAPI : PublicAPI<"sched.h"> {
- let Types = [
- "pid_t",
- "size_t",
- "cpu_set_t",
- "struct sched_param",
- // Needed according to posix standard
- "time_t",
- "struct timespec",
- ];
-}
-
-def SysMManAPI : PublicAPI<"sys/mman.h"> {
- let Types = ["off_t", "size_t", "mode_t"];
-}
-
-def SignalAPI : PublicAPI<"signal.h"> {
- let Types = [
- "sig_atomic_t",
- "sigset_t",
- "struct sigaction",
- "union sigval",
- "siginfo_t",
- "stack_t",
- "pid_t",
- ];
-}
-
-def ThreadsAPI : PublicAPI<"threads.h"> {
- let Macros = [
- SimpleMacroDef<"ONCE_FLAG_INIT", "{0}">,
- ];
-
- let Types = [
- "__call_once_func_t",
- "once_flag",
- "cnd_t",
- "mtx_t",
- "thrd_t",
- "thrd_start_t",
- "tss_t",
- "tss_dtor_t",
- ];
-
- let Enumerations = [
- "mtx_plain",
- "mtx_recursive",
- "mtx_timed",
- "thrd_timedout",
- "thrd_success",
- "thrd_busy",
- "thrd_error",
- "thrd_nomem",
- ];
-}
-
-def PThreadAPI : PublicAPI<"pthread.h"> {
- let Types = [
- "__atfork_callback_t",
- "__pthread_once_func_t",
- "__pthread_start_t",
- "__pthread_tss_dtor_t",
- "pthread_attr_t",
- "pthread_condattr_t",
- "pthread_key_t",
- "pthread_mutex_t",
- "pthread_mutexattr_t",
- "pthread_once_t",
- "pthread_rwlockattr_t",
- "pthread_rwlock_t",
- "pthread_spinlock_t",
- "pthread_t",
- ];
-}
-
-def DirentAPI : PublicAPI<"dirent.h"> {
- let Types = [
- "ino_t",
- "DIR",
- "struct dirent",
- ];
-}
-
-def UniStdAPI : PublicAPI<"unistd.h"> {
- let Types = ["__exec_argv_t", "__exec_envp_t", "off_t", "pid_t", "size_t",
- "ssize_t", "uid_t", "__getoptargv_t"];
-}
-
-def WCharAPI : PublicAPI<"wchar.h"> {
- let Types = [
- "wchar_t",
- "wint_t",
- "size_t",
- ];
-}
-
-def UCharAPI : PublicAPI<"uchar.h"> {
- let Types = [
- "mbstate_t",
- "char8_t",
- "char16_t",
- "char32_t",
- ];
-}
-
-def SysRandomAPI : PublicAPI<"sys/random.h"> {
- let Types = ["size_t", "ssize_t"];
-}
-
-def SysSelectAPI : PublicAPI<"sys/select.h"> {
- let Types = ["fd_set", "sigset_t", "suseconds_t", "time_t", "struct timespec",
- "struct timeval"];
-}
-
-def SysSocketAPI : PublicAPI<"sys/socket.h"> {
- let Types = [
- "sa_family_t",
- "socklen_t",
- "struct sockaddr",
- "struct sockaddr_un",
- "struct msghdr",
- "struct iovec",
- "size_t",
- "ssize_t",
- ];
-}
-
-def SysResourceAPI : PublicAPI<"sys/resource.h"> {
- let Types = ["rlim_t", "struct rlimit"];
-}
-
-def SysStatAPI : PublicAPI<"sys/stat.h"> {
- let Types = ["mode_t", "dev_t", "ino_t", "nlink_t", "uid_t", "gid_t", "off_t",
- "struct timespec", "struct timeval", "blksize_t", "blkcnt_t",
- "struct stat"];
-}
-
-def SysWaitAPI : PublicAPI<"sys/wait.h"> {
- let Types = ["pid_t", "struct rusage", "siginfo_t"];
-}
-
-def SysSendfileAPI : PublicAPI<"sys/sendfile.h"> {
- let Types = ["off_t", "size_t", "ssize_t"];
-}
-
-def SysTypesAPI : PublicAPI<"sys/types.h"> {
- let Types = [
- "blkcnt_t",
- "blksize_t",
- "clockid_t",
- "dev_t",
- "gid_t",
- "ino_t",
- "mode_t",
- "nlink_t",
- "off_t",
- "pid_t",
- "pthread_attr_t",
- "pthread_condattr_t",
- "pthread_key_t",
- "pthread_mutex_t",
- "pthread_mutexattr_t",
- "pthread_once_t",
- "pthread_rwlockattr_t",
- "pthread_rwlock_t",
- "pthread_t",
- "size_t",
- "ssize_t",
- "suseconds_t",
- "time_t",
- "uid_t"
- ];
-}
-
-def SysUtsNameAPI : PublicAPI<"sys/utsname.h"> {
- let Types = ["struct utsname"];
-}
-
-def SysEpollAPI : PublicAPI<"sys/epoll.h"> {
- let Types = ["struct epoll_event", "struct epoll_data", "sigset_t", "struct timespec"];
-}
-
-def SpawnAPI : PublicAPI<"spawn.h"> {
- let Types = ["mode_t", "pid_t", "posix_spawnattr_t", "posix_spawn_file_actions_t"];
-}
-
-def TermiosAPI : PublicAPI<"termios.h"> {
- let Types = ["cc_t", "pid_t", "speed_t", "struct termios", "tcflag_t"];
-}
-
-def SetJmpAPI : PublicAPI<"setjmp.h"> {
- let Types = ["jmp_buf"];
-}
-
-def SearchAPI : PublicAPI<"search.h"> {
- let Types = ["ACTION", "ENTRY", "struct hsearch_data", "__lsearchcompare_t"];
-}
-
-def SysStatvfsAPI : PublicAPI<"sys/statvfs.h"> {
- let Types = ["struct statvfs"];
-}
diff --git a/libc/config/public_api.td b/libc/config/public_api.td
deleted file mode 100644
index 1b34506c643c32..00000000000000
--- a/libc/config/public_api.td
+++ /dev/null
@@ -1,26 +0,0 @@
-include "spec/spec.td"
-
-class MacroDef<string name> {
- string Name = name;
- string Defn = "";
-}
-
-class SimpleMacroDef<string name, string value> : MacroDef<name> {
- let Defn = !strconcat("#define ", name, " ", value);
-}
-
-class MacroDefineIfNot<string name, string value> : MacroDef<name> {
- let Defn = !strconcat("#ifndef ", name, "\n",
- "#define " , name, " ", value, "\n",
- "#endif // ", name);
-}
-
-class PublicAPI<string name> {
- string HeaderName = name;
- list<MacroDef> Macros = [];
- list<string> Types = [];
- list<string> Enumerations = [];
- list<string> Structs = [];
- list<string> Functions = [];
- list<string> Objects = [];
-}
diff --git a/libc/docs/dev/header_generation.rst b/libc/docs/dev/header_generation.rst
index ec4206217ca777..0730b9a40c26a1 100644
--- a/libc/docs/dev/header_generation.rst
+++ b/libc/docs/dev/header_generation.rst
@@ -38,9 +38,6 @@ Required Versions:
``build/projects/libc/include/sys``.
-New Headergen is turned on by default, but if you want to use old Headergen,
-you can include this statement when building: ``-DLIBC_USE_NEW_HEADER_GEN=OFF``
-
To add a function to the YAML files, you can either manually enter it in the
YAML file corresponding to the header it belongs to or add it through the
command line.
diff --git a/libc/docs/gpu/building.rst b/libc/docs/gpu/building.rst
index 37dccdab6dc340..6a2d1f23c0bcdf 100644
--- a/libc/docs/gpu/building.rst
+++ b/libc/docs/gpu/building.rst
@@ -86,16 +86,13 @@ compiler. These tools must all be up-to-date with the libc source.
-DCMAKE_C_COMPILER=$HOST_C_COMPILER \
-DCMAKE_CXX_COMPILER=$HOST_CXX_COMPILER \
-DLLVM_LIBC_FULL_BUILD=ON \
- -DLIBC_HDRGEN_ONLY=ON \ # Only build the 'libc-hdrgen' tool
-DCMAKE_BUILD_TYPE=Release # Release suggested to make "clang" fast
$> ninja # Build the 'clang' compiler
- $> ninja libc-hdrgen # Build the 'libc-hdrgen' tool
-Once this has finished the build directory should contain the ``clang`` compiler
-and the ``libc-hdrgen`` executable. We will use the ``clang`` compiler to build
-the GPU code and the ``libc-hdrgen`` tool to create the necessary headers. We
-use these tools to bootstrap the build out of the runtimes directory targeting a
-GPU architecture.
+Once this has finished the build directory should contain the ``clang``
+compiler executable. We will use the ``clang`` compiler to build the GPU code.
+We use these tools to bootstrap the build out of the runtimes directory
+targeting a GPU architecture.
.. code-block:: sh
@@ -105,7 +102,6 @@ GPU architecture.
$> TARGET_TRIPLE=<amdgcn-amd-amdhsa or nvptx64-nvidia-cuda>
$> TARGET_C_COMPILER=</path/to/clang>
$> TARGET_CXX_COMPILER=</path/to/clang++>
- $> HDRGEN=</path/to/libc-hdrgen>
$> cmake ../runtimes \ # Point to the runtimes build
-G Ninja \
-DLLVM_ENABLE_RUNTIMES=libc \
@@ -113,7 +109,6 @@ GPU architecture.
-DCMAKE_CXX_COMPILER=$TARGET_CXX_COMPILER \
-DLLVM_LIBC_FULL_BUILD=ON \
-DLLVM_RUNTIMES_TARGET=$TARGET_TRIPLE \
- -DLIBC_HDRGEN_EXE=$HDRGEN \
-DCMAKE_BUILD_TYPE=Release
$> ninja install
diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index 91611026df105c..483e63da48deae 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -18,24 +18,14 @@ add_header(
)
macro(add_header_macro TARGET_NAME YAML_FILE DEF_FILE GEN_HDR DEPENDS)
- if (LIBC_USE_NEW_HEADER_GEN)
- add_gen_header2(
- ${TARGET_NAME}
- YAML_FILE ${YAML_FILE}
- DEF_FILE ${DEF_FILE}
- GEN_HDR ${GEN_HDR}
- ${DEPENDS}
- ${ARGN}
- )
- else()
- add_gen_header(
- ${TARGET_NAME}
- DEF_FILE ${DEF_FILE}
- GEN_HDR ${GEN_HDR}
- ${DEPENDS}
- ${ARGN}
- )
- endif()
+ add_gen_header2(
+ ${TARGET_NAME}
+ YAML_FILE ${YAML_FILE}
+ DEF_FILE ${DEF_FILE}
+ GEN_HDR ${GEN_HDR}
+ ${DEPENDS}
+ ${ARGN}
+ )
endmacro()
add_header_macro(
diff --git a/libc/spec/bsd_ext.td b/libc/spec/bsd_ext.td
deleted file mode 100644
index 2b91324e36db9a..00000000000000
--- a/libc/spec/bsd_ext.td
+++ /dev/null
@@ -1,87 +0,0 @@
-def BsdExtensions : StandardSpec<"BSDExtensions"> {
- HeaderSpec Math = HeaderSpec<
- "math.h",
- [], // Macros
- [], // Types
- [], // Enumerations
- [
- FunctionSpec<"isnan", RetValSpec<IntType>, [ArgSpec<DoubleType>]>,
- FunctionSpec<"isnanf", RetValSpec<IntType>, [ArgSpec<FloatType>]>,
- FunctionSpec<"isnanl", RetValSpec<IntType>, [ArgSpec<LongDoubleType>]>,
- ]
- >;
-
- HeaderSpec String = HeaderSpec<
- "string.h",
- [], // Macros
- [], // Types
- [], // Enumerations
- [
- FunctionSpec<
- "strlcat",
- RetValSpec<SizeTType>,
- [ArgSpec<CharRestrictedPtr>, ArgSpec<ConstCharRestrictedPtr>, ArgSpec<SizeTType>]
- >,
- FunctionSpec<
- "strlcpy",
- RetValSpec<SizeTType>,
- [ArgSpec<CharRestrictedPtr>, ArgSpec<ConstCharRestrictedPtr>, ArgSpec<SizeTType>]
- >,
- FunctionSpec<
- "strsep",
- RetValSpec<CharPtr>,
- [ArgSpec<CharRestrictedPtrPtr>, ArgSpec<ConstCharRestrictedPtr>]
- >,
- ]
- >;
-
- HeaderSpec Strings = HeaderSpec<
- "strings.h",
- [], // Macros
- [], // Types
- [], // Enumerations
- [
- FunctionSpec<
- "strcasecmp",
- RetValSpec<IntType>,
- [ArgSpec<ConstCharPtr>, ArgSpec<ConstCharPtr>]
- >,
- FunctionSpec<
- "strncasecmp",
- RetValSpec<IntType>,
- [ArgSpec<ConstCharPtr>, ArgSpec<ConstCharPtr>, ArgSpec<SizeTType>]
- >,
- FunctionSpec<
- "index",
- RetValSpec<CharPtr>,
- [ArgSpec<ConstCharPtr>, ArgSpec<IntType>]
- >,
- FunctionSpec<
- "rindex",
- RetValSpec<CharPtr>,
- [ArgSpec<ConstCharPtr>, ArgSpec<IntType>]
- >,
- ]
- >;
-
- HeaderSpec SysWait = HeaderSpec<
- "sys/wait.h",
- [], // Macros
- [StructRUsage], // Types
- [], // Enumerations
- [
- FunctionSpec<
- "wait4",
- RetValSpec<PidT>,
- [ArgSpec<PidT>, ArgSpec<IntPtr>, ArgSpec<IntType>, ArgSpec<StructRUsagePtr>]
- >
- ]
- >;
-
- let Headers = [
- Math,
- String,
- Strings,
- SysWait,
- ];
-}
diff --git a/libc/spec/gnu_ext.td b/libc/spec/gnu_ext.td
deleted file mode 100644
index 64121aed9574f2..00000000000000
--- a/libc/spec/gnu_ext.td
+++ /dev/null
@@ -1,316 +0,0 @@
-def CpuSetT : NamedType<"cpu_set_t">;
-def CpuSetPtr : PtrType<CpuSetT>;
-def ConstCpuSetPtr : ConstType<CpuSetPtr>;
-
-def QSortRCompareT : NamedType<"__qsortrcompare_t">;
-def StructHsearchData : NamedType<"struct hsearch_data">;
-def StructHsearchDataPtr : PtrType<StructHsearchData>;
-
-def GnuExtensions : StandardSpec<"GNUExtensions"> {
- NamedType CookieIOFunctionsT = NamedType<"cookie_io_functions_t">;
- HeaderSpec CType = HeaderSpec<
- "ctype.h",
- [], // Macros
- [], // Types
- [], // Enumerations
- [
- FunctionSpec<
- "toascii",
- RetValSpec<IntType>,
- [ArgSpec<IntType>]
- >,
- ]
- >;
-
- HeaderSpec Malloc = HeaderSpec<
- "malloc.h",
- [], // Macros
- [], // Types
- [], // Enumerations
- [
- FunctionSpec<"mallopt", RetValSpec<IntType>, [ArgSpec<IntType>, ArgSpec<IntType>]>,
- ]
- >;
-
- HeaderSpec Math = HeaderSpec<
- "math.h",
- [], // Macros
- [], // Types
- [], // Enumerations
- [
- FunctionSpec<
- "sincosf",
- RetValSpec<VoidType>,
- [ArgSpec<FloatType>, ArgSpec<FloatPtr>, ArgSpec<FloatPtr>]
- >,
- FunctionSpec<
- "lgamma_r",
- RetValSpec<DoubleType>,
- [ArgSpec<DoubleType>, ArgSpec<IntPtr>]
- >,
- ...
[truncated]
|
nickdesaulniers
force-pushed
the
excise_hdrgen
branch
from
3cbf6d0 to
9e0e0ab
Compare
nickdesaulniers
requested review from
SchrodingerZhu,
overmighty,
Prabhuk and
frobtech
jhuber6
reviewed
Nov 21, 2024
libc/CMakeLists.txt
Outdated
| # We will build the GPU utilities if we are not doing a runtimes build. | ||
| option(LIBC_BUILD_GPU_LOADER "Always build the GPU loader utilities" OFF) | ||
| if(LIBC_BUILD_GPU_LOADER OR (LLVM_LIBC_GPU_BUILD AND NOT LLVM_RUNTIMES_BUILD)) | ||
| add_subdirectory(utils/gpu) | ||
| endif() | ||
|
|
||
| option(LIBC_USE_NEW_HEADER_GEN "Generate header files using new headergen instead of the old one" ON) | ||
|
|
||
| set(NEED_LIBC_HDRGEN FALSE) |
There was a problem hiding this comment.
This can be deleted?
Suggested change
| set(NEED_LIBC_HDRGEN FALSE) |
There was a problem hiding this comment.
Unsure. Let me check the original context under which it was added.
9dbedca
There was a problem hiding this comment.
also related c4f236e
There was a problem hiding this comment.
FYI the GPU build still uses that logic to make the amdhsa-loader and nvptx-loader utilities.
There was a problem hiding this comment.
right, I think I left the important bits intact in 46251c628e4e4aee38f15419fcc67cc8b6c4d827, PTAL.
There was a problem hiding this comment.
I've removed everything, in 1c11706f1181. But looking at 5274a46, I'm not sure if we should be returning early if(LLVM_ENABLE_RUNTIMES AND NOT LLVM_RUNTIMES_BUILD). PTAL
overmighty
reviewed
Nov 21, 2024
libc/CMakeLists.txt
Outdated
Comment on lines
76
to
79
| if(NEED_LIBC_HDRGEN) | ||
| # When libc is build as part of the runtimes/bootstrap build's CMake run, we | ||
| # only need to build the host tools to build the libc. So, we just do enough | ||
| # to build libc-hdrgen and return. |
There was a problem hiding this comment.
Shouldn't NEED_LIBC_HDRGEN be renamed to something else and the comment below be updated? Might want to add a TODO comment here.
michaelrj-google
approved these changes
Nov 21, 2024
| @@ -18,24 +18,14 @@ add_header( | |||
| ) | |||
|
|
|||
| macro(add_header_macro TARGET_NAME YAML_FILE DEF_FILE GEN_HDR DEPENDS) | |||
There was a problem hiding this comment.
nit: Add a TODO to clean this up
There was a problem hiding this comment.
ae75b6b1c9b90bdc1335cfdd96b38accc47f248e
I tried replacing invocations of add_header_macro with just add_gen_header, but this seemed to run into issues. Not sure if every function invocation of add_gen_header would need explicit DEF_FILE and GEN_HDR spelled out?
There was a problem hiding this comment.
I believe they will need explicit DEF_FILE and GEN_HDR. The macro for add_gen_header2 (lines22-29) should be used, but can be renamed to add_gen_header
|
Tests passed, LGTM once the buildbots are ready |
|
The post submit buildbots with the libc tag are all moved to newhdrgen now. I'll wait for explicit acks from @petrhosek and @jhuber6 before attempting to [crash] land this. |
petrhosek
approved these changes
Nov 22, 2024
nickdesaulniers
force-pushed
the
excise_hdrgen
branch
from
ae75b6b to
e743244
Compare
|
"Test documentation build" looks new to me in presubmit.
Pretty sure
ugh, I forget where the presubmit testing stuff is located... |
https://github.com/llvm/llvm-project/blob/main/.github/workflows/docs.yml#L159-L165 |
jhuber6
reviewed
Dec 3, 2024
There was a problem hiding this comment.
The GPU loader utilities still need this weird "forced projects" thing.
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
index 73ab38227768..fd82359022cf 100644
--- a/libc/CMakeLists.txt
+++ b/libc/CMakeLists.txt
@@ -50,16 +50,28 @@ set(LIBC_NAMESPACE ${default_namespace}
CACHE STRING "The namespace to use to enclose internal implementations. Must start with '__llvm_libc'."
)
-
-add_subdirectory(newhdrgen)
-
-
# We will build the GPU utilities if we are not doing a runtimes build.
option(LIBC_BUILD_GPU_LOADER "Always build the GPU loader utilities" OFF)
-if(LIBC_BUILD_GPU_LOADER OR (LLVM_LIBC_GPU_BUILD AND NOT LLVM_RUNTIMES_BUILD))
- add_subdirectory(utils/gpu)
+if(LIBC_BUILD_GPU_LOADER OR NOT LLVM_RUNTIMES_BUILD)
+ foreach(_name ${LLVM_RUNTIME_TARGETS})
+ if("libc" IN_LIST RUNTIMES_${_name}_LLVM_ENABLE_RUNTIMES)
+ if("${_name}" STREQUAL "amdgcn-amd-amdhsa" OR "${_name}" STREQUAL "nvptx64-nvidia-cuda")
+ set(LIBC_NEED_LOADER_UTILS TRUE)
+ endif()
+ endif()
+ endforeach()
+ if("${LIBC_TARGET_TRIPLE}" STREQUAL "amdgcn-amd-amdhsa" OR
+ "${LIBC_TARGET_TRIPLE}" STREQUAL "nvptx64-nvidia-cuda")
+ set(LIBC_NEED_LOADER_UTILS TRUE)
+ endif()
+ if(LIBC_NEED_LOADER_UTILS)
+ add_subdirectory(utils/gpu)
+ return()
+ endif()
endif()
+add_subdirectory(newhdrgen)
+
option(LIBC_CMAKE_VERBOSE_LOGGING
"Log details warnings and notifications during CMake configuration." OFF)
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 03c1486c45ee..cb7a8bf6cbf8 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -190,6 +190,10 @@ if("${LIBC_TARGET_TRIPLE}" STREQUAL "amdgcn-amd-amdhsa" OR
"${LIBC_TARGET_TRIPLE}" STREQUAL "nvptx64-nvidia-cuda")
set(LLVM_LIBC_GPU_BUILD ON)
endif()
+if (NOT "libc" IN_LIST LLVM_ENABLE_PROJECTS AND LLVM_LIBC_GPU_BUILD)
+ message(STATUS "Enabling libc project to build libc testing tools")
+ list(APPEND LLVM_ENABLE_PROJECTS "libc")
+endif()
# LLVM_ENABLE_PROJECTS_USED is `ON` if the user has ever used the
# `LLVM_ENABLE_PROJECTS` CMake cache variable. This exists forThis seemed to work for me.
Wait, that should be orthogonal to old vs new hdrgen. If anything, we probably need to rethink #117265. |
It's fine, it doesn't build anything |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/71/builds/11780 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/179/builds/11520 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/131/builds/11614 Here is the relevant piece of the build log for the reference |
|
Ack, need to remove |
nickdesaulniers
added a commit
to nickdesaulniers/llvm-zorg
that referenced
this pull request
Dec 3, 2024
This was removed with the removal of "old" hdrgen in llvm/llvm-project#117220.
nickdesaulniers
added a commit
to llvm/llvm-zorg
that referenced
this pull request
Dec 3, 2024
This was removed with the removal of "old" hdrgen in llvm/llvm-project#117220.
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/196/builds/1844 Here is the relevant piece of the build log for the reference |
This was referenced Dec 3, 2024
nickdesaulniers
added a commit
to nickdesaulniers/llvm-project
that referenced
this pull request
Dec 4, 2024
Further cleanups from old hdrgen removal. I didn't realize there were cmake variables related to old hdrgen spread out throughout more of the source tree. Link: llvm#117220 Link: llvm#117208
|
Hi, I think something in the Windows configs may have been missed. we're seeing the following CMake error on our Windows bot: I assume there's just some missing CMake line for windows that was missed, but I'm not super familiar w/ the libc build. Do you have an idea of where that would be? |
|
oh, it looks like you added the headers.txt file for other platforms in this patch, so I guess that just needs to be handled for Windows too. |
nickdesaulniers
added a commit
to nickdesaulniers/llvm-project
that referenced
this pull request
Dec 4, 2024
nickdesaulniers
added a commit
that referenced
this pull request
Dec 4, 2024
Link: #117220 (comment) --------- Co-authored-by: Michael Jones <michaelrj@google.com>
nickdesaulniers
added a commit
to nickdesaulniers/llvm-project
that referenced
this pull request
Dec 4, 2024
Further cleanups from old hdrgen removal. I didn't realize there were cmake variables related to old hdrgen spread out throughout more of the source tree. Link: llvm#117220 Link: llvm#117208
nickdesaulniers
added a commit
that referenced
this pull request
Dec 4, 2024
nickdesaulniers
added a commit
to nickdesaulniers/llvm-project
that referenced
this pull request
Dec 10, 2024
FWICT, it was unused even before llvm#117220. Link: llvm#117220
nickdesaulniers
added a commit
that referenced
this pull request
Dec 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks to the effort of @RoseZhang03 and @aaryanshukla under the guidance of
@michaelrj-google and @amykhuang, we now have newhdrgen and no longer have a
dependency on TableGen and thus LLVM in order to start bootstrapping a full
build.
This PR removes:
hdrgen.
It does not rename newhdrgen to just hdrgen. Will follow up with a distinct PR
for that.
Link: #117209
Link: #117254
Fixes: #117208