[llvm] a6f7cb5 - [Support] Prefer AUX vector for page size (#126863)

[via llvm-commits]

Author: Tristan Ross
Date: 2025-02-13T11:39:49+11:00
New Revision: a6f7cb54d3c268ea4748a0ff783b4b030c3195d9

URL: https://github.com/llvm/llvm-project/commit/a6f7cb54d3c268ea4748a0ff783b4b030c3195d9
DIFF: https://github.com/llvm/llvm-project/commit/a6f7cb54d3c268ea4748a0ff783b4b030c3195d9.diff

LOG: [Support] Prefer AUX vector for page size (#126863)

Prefers the page size to come from the AUX vector, `getpagesize` is
removed from POSIX.1-2001. Also throws in a couple asserts to ensure the
page size is a valid value.

Added: 
    

Modified: 
    llvm/cmake/config-ix.cmake
    llvm/include/llvm/Config/config.h.cmake
    llvm/lib/Support/Unix/Process.inc

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake
index 767774812ade5..e2f14398fd857 100644
--- a/llvm/cmake/config-ix.cmake
+++ b/llvm/cmake/config-ix.cmake
@@ -21,6 +21,7 @@ if (ANDROID OR CYGWIN OR CMAKE_SYSTEM_NAME MATCHES "AIX|DragonFly|FreeBSD|Haiku|
   set(HAVE_MACH_MACH_H 0)
   set(HAVE_MALLOC_MALLOC_H 0)
   set(HAVE_PTHREAD_H 1)
+  set(HAVE_SYS_AUXV_H 1)
   set(HAVE_SYS_MMAN_H 1)
   set(HAVE_SYSEXITS_H 1)
   set(HAVE_UNISTD_H 1)
@@ -52,6 +53,7 @@ else()
   check_include_file(mach/mach.h HAVE_MACH_MACH_H)
   check_include_file(malloc/malloc.h HAVE_MALLOC_MALLOC_H)
   check_include_file(pthread.h HAVE_PTHREAD_H)
+  check_include_file(sys/auxv.h HAVE_SYS_AUXV_H)
   check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
   check_include_file(sysexits.h HAVE_SYSEXITS_H)
   check_include_file(unistd.h HAVE_UNISTD_H)

diff  --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake
index f6f10ea4f4f83..d4f5935b245b7 100644
--- a/llvm/include/llvm/Config/config.h.cmake
+++ b/llvm/include/llvm/Config/config.h.cmake
@@ -295,4 +295,6 @@
 
 #cmakedefine HAVE_BUILTIN_THREAD_POINTER ${HAVE_BUILTIN_THREAD_POINTER}
 
+#cmakedefine HAVE_SYS_AUXV_H ${HAVE_SYS_AUXV_H}
+
 #endif

diff  --git a/llvm/lib/Support/Unix/Process.inc b/llvm/lib/Support/Unix/Process.inc
index 550b0de2e0455..43509190fccfb 100644
--- a/llvm/lib/Support/Unix/Process.inc
+++ b/llvm/lib/Support/Unix/Process.inc
@@ -31,6 +31,9 @@
 #ifdef HAVE_MALLOC_MALLOC_H
 #include <malloc/malloc.h>
 #endif
+#ifdef HAVE_SYS_AUXV_H
+#include <sys/auxv.h>
+#endif
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only generic UNIX code that
@@ -63,7 +66,9 @@ Process::Pid Process::getProcessId() {
 // On Cygwin, getpagesize() returns 64k(AllocationGranularity) and
 // offset in mmap(3) should be aligned to the AllocationGranularity.
 Expected<unsigned> Process::getPageSize() {
-#if defined(HAVE_GETPAGESIZE)
+#if defined(HAVE_SYS_AUXV_H)
+  static const int page_size = ::getauxval(AT_PAGESZ);
+#elif defined(HAVE_GETPAGESIZE)
   static const int page_size = ::getpagesize();
 #elif defined(HAVE_SYSCONF)
   static long page_size = ::sysconf(_SC_PAGE_SIZE);
@@ -73,6 +78,8 @@ Expected<unsigned> Process::getPageSize() {
   if (page_size == -1)
     return errorCodeToError(errnoAsErrorCode());
 
+  assert(page_size > 0 && "Page size cannot be 0");
+  assert((page_size % 1024) == 0 && "Page size must be aligned by 1024");
   return static_cast<unsigned>(page_size);
 }