Add runtime page_size

RossComputerGuy · RossComputerGuy · commit b967d489fd6d · 2023-10-03T17:15:52.000-07:00
diff --git a/lib/std/c.zig b/lib/std/c.zig
@@ -79,6 +79,7 @@ pub usingnamespace switch (builtin.os.tag) {
         pub extern "c" fn getrusage(who: c_int, usage: *c.rusage) c_int;
 
         pub extern "c" fn sched_yield() c_int;
+        pub extern "c" fn sysconf(sc: c_int) c_long;
 
         pub extern "c" fn sigaction(sig: c_int, noalias act: ?*const c.Sigaction, noalias oact: ?*c.Sigaction) c_int;
         pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const c.sigset_t, noalias oset: ?*c.sigset_t) c_int;
diff --git a/lib/std/mem.zig b/lib/std/mem.zig
@@ -10,16 +10,67 @@ const testing = std.testing;
 const Endian = std.builtin.Endian;
 const native_endian = builtin.cpu.arch.endian();
 
+pub const PageSizeCheck = enum {
+    /// Does nothing if the page size is invalid
+    unsafe,
+    /// Throws an error if the page size is invalid
+    throw,
+    /// Asserts if the page size is invalid
+    assert,
+    /// Panics if the page size is invalid
+    panic,
+
+    pub fn makeType(comptime self: PageSizeCheck) type {
+        return switch (self) {
+            .assert, .unsafe, .panic => usize,
+            .throw => error{InvalidPageSize}!usize,
+        };
+    }
+};
+
+pub const PageSizeOptions = struct {
+    /// Value sanity check method
+    check: PageSizeCheck = .assert,
+    /// Use the comptime version of page size if the OS does not report it.
+    comptime_fallback: bool = true,
+};
+
+/// Runtime known minimum page size.
+pub fn getPageSize(comptime options: PageSizeOptions) PageSizeCheck.makeType(options.check) {
+    const value: usize = switch (builtin.os.tag) {
+        .linux => if (builtin.link_libc) @intCast(std.c.sysconf(std.os.linux.SC.PAGESIZE)) else std.os.linux.getauxval(std.elf.AT_PAGESZ),
+        else => if (options.comptime_fallback) page_size else 0,
+    };
+
+    return switch (options.check) {
+        .unsafe => value,
+        .assert => {
+            assert(value != 0);
+            return value;
+        },
+        .panic => {
+            if (value == 0) @panic("Invalid page size");
+            return value;
+        },
+        .throw => if (value == 0) return error.InvalidPageSize else value,
+    };
+}
+
 /// Compile time known minimum page size.
 /// https://github.com/ziglang/zig/issues/4082
-pub const page_size = switch (builtin.cpu.arch) {
-    .wasm32, .wasm64 => 64 * 1024,
-    .aarch64 => switch (builtin.os.tag) {
-        .macos, .ios, .watchos, .tvos => 16 * 1024,
+pub const page_size = blk: {
+    const value = builtin.target.page_size orelse switch (builtin.cpu.arch) {
+        .wasm32, .wasm64 => 64 * 1024,
+        .aarch64 => switch (builtin.os.tag) {
+            .macos, .ios, .watchos, .tvos => 16 * 1024,
+            else => 4 * 1024,
+        },
+        .sparc64 => 8 * 1024,
         else => 4 * 1024,
-    },
-    .sparc64 => 8 * 1024,
-    else => 4 * 1024,
+    };
+    
+    if (value == 0) @compileError("Page size is not valid");
+    break :blk value;
 };
 
 /// The standard library currently thoroughly depends on byte size
diff --git a/lib/std/os/linux/arm-eabi.zig b/lib/std/os/linux/arm-eabi.zig
@@ -356,3 +356,27 @@ pub const ucontext_t = extern struct {
 };
 
 pub const Elf_Symndx = u32;
+
+pub const SC = struct {
+    pub const socket = 1;
+    pub const bind = 2;
+    pub const connect = 3;
+    pub const listen = 4;
+    pub const accept = 5;
+    pub const getsockname = 6;
+    pub const getpeername = 7;
+    pub const socketpair = 8;
+    pub const send = 9;
+    pub const recv = 10;
+    pub const sendto = 11;
+    pub const recvfrom = 12;
+    pub const shutdown = 13;
+    pub const setsockopt = 14;
+    pub const getsockopt = 15;
+    pub const sendmsg = 16;
+    pub const recvmsg = 17;
+    pub const accept4 = 18;
+    pub const recvmmsg = 19;
+    pub const sendmmsg = 20;
+    pub const PAGESIZE = 30;
+};
diff --git a/lib/std/os/linux/arm64.zig b/lib/std/os/linux/arm64.zig
@@ -301,3 +301,27 @@ pub const ucontext_t = extern struct {
 };
 
 pub const Elf_Symndx = u32;
+
+pub const SC = struct {
+    pub const socket = 1;
+    pub const bind = 2;
+    pub const connect = 3;
+    pub const listen = 4;
+    pub const accept = 5;
+    pub const getsockname = 6;
+    pub const getpeername = 7;
+    pub const socketpair = 8;
+    pub const send = 9;
+    pub const recv = 10;
+    pub const sendto = 11;
+    pub const recvfrom = 12;
+    pub const shutdown = 13;
+    pub const setsockopt = 14;
+    pub const getsockopt = 15;
+    pub const sendmsg = 16;
+    pub const recvmsg = 17;
+    pub const accept4 = 18;
+    pub const recvmmsg = 19;
+    pub const sendmmsg = 20;
+    pub const PAGESIZE = 30;
+};
diff --git a/lib/std/os/linux/x86.zig b/lib/std/os/linux/x86.zig
@@ -385,6 +385,7 @@ pub const SC = struct {
     pub const accept4 = 18;
     pub const recvmmsg = 19;
     pub const sendmmsg = 20;
+    pub const PAGESIZE = 30;
 };
 
 fn gpRegisterOffset(comptime reg_index: comptime_int) usize {
diff --git a/lib/std/os/linux/x86_64.zig b/lib/std/os/linux/x86_64.zig
@@ -489,3 +489,27 @@ pub inline fn getcontext(context: *ucontext_t) usize {
         : "cc", "memory", "rcx", "rdx", "rsi", "r8", "r10", "r11"
     );
 }
+
+pub const SC = struct {
+    pub const socket = 1;
+    pub const bind = 2;
+    pub const connect = 3;
+    pub const listen = 4;
+    pub const accept = 5;
+    pub const getsockname = 6;
+    pub const getpeername = 7;
+    pub const socketpair = 8;
+    pub const send = 9;
+    pub const recv = 10;
+    pub const sendto = 11;
+    pub const recvfrom = 12;
+    pub const shutdown = 13;
+    pub const setsockopt = 14;
+    pub const getsockopt = 15;
+    pub const sendmsg = 16;
+    pub const recvmsg = 17;
+    pub const accept4 = 18;
+    pub const recvmmsg = 19;
+    pub const sendmmsg = 20;
+    pub const PAGESIZE = 30;
+};
diff --git a/lib/std/target.zig b/lib/std/target.zig
@@ -8,6 +8,7 @@ pub const Target = struct {
     os: Os,
     abi: Abi,
     ofmt: ObjectFormat,
+    page_size: ?usize = null,
 
     pub const Os = struct {
         tag: Tag,
@@ -449,6 +450,10 @@ pub const Target = struct {
                 => false,
             };
         }
+
+        pub fn compare(self: Os, other: Os) bool {
+            return self.tag == other.tag and self.isAtLeast(other.tag, other.getVersionRange());
+        }
     };
 
     pub const aarch64 = @import("target/aarch64.zig");
@@ -1360,8 +1365,16 @@ pub const Target = struct {
         pub fn baseline(arch: Arch) Cpu {
             return Model.baseline(arch).toCpu(arch);
         }
+
+        pub fn compare(self: Cpu, other: Cpu) bool {
+            return self.arch == other.arch and std.mem.eql(u8, self.model.name, other.model.name) and self.features.eql(other.features);
+        }
     };
 
+    pub fn useHostPageSize(self: Target, other: Target) bool {
+        return self.cpu.compare(other.cpu) and self.os.compare(other.os);
+    }
+
     pub fn zigTriple(self: Target, allocator: mem.Allocator) ![]u8 {
         return std.zig.CrossTarget.fromTarget(self).zigTriple(allocator);
     }
diff --git a/lib/std/zig/CrossTarget.zig b/lib/std/zig/CrossTarget.zig
@@ -45,6 +45,9 @@ dynamic_linker: DynamicLinker = DynamicLinker{},
 /// `null` means default for the cpu/arch/os combo.
 ofmt: ?Target.ObjectFormat = null,
 
+/// `null` means to dynamically get the page size or use the platform default.
+page_size: ?usize = null,
+
 pub const CpuModel = union(enum) {
     /// Always native
     native,
@@ -81,6 +84,7 @@ pub fn fromTarget(target: Target) CrossTarget {
             target.os.version_range.linux.glibc
         else
             null,
+        .page_size = target.page_size,
     };
     result.updateOsVersionRange(target.os);
 
@@ -176,6 +180,7 @@ pub fn toTarget(self: CrossTarget) Target {
         .os = self.getOs(),
         .abi = self.getAbi(),
         .ofmt = self.getObjectFormat(),
+        .page_size = self.page_size,
     };
 }
 
diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig
@@ -644,6 +644,7 @@ pub fn abiAndDynamicLinkerFromFile(
             .os = os,
             .abi = cross_target.abi orelse Target.Abi.default(cpu.arch, os),
             .ofmt = cross_target.ofmt orelse Target.ObjectFormat.default(os.tag, cpu.arch),
+            .page_size = cross_target.page_size,
         },
         .dynamic_linker = cross_target.dynamic_linker,
     };
@@ -921,6 +922,7 @@ fn defaultAbiAndDynamicLinker(cpu: Target.Cpu, os: Target.Os, cross_target: Cros
         .os = os,
         .abi = cross_target.abi orelse Target.Abi.default(cpu.arch, os),
         .ofmt = cross_target.ofmt orelse Target.ObjectFormat.default(os.tag, cpu.arch),
+        .page_size = cross_target.page_size,
     };
     return NativeTargetInfo{
         .target = target,
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -6119,7 +6119,7 @@ pub fn getZigBackend(comp: Compilation) std.builtin.CompilerBackend {
     };
 }
 
-pub fn generateBuiltinZigSource(comp: *Compilation, allocator: Allocator) Allocator.Error![:0]u8 {
+pub fn generateBuiltinZigSource(comp: *Compilation, allocator: Allocator) error{OutOfMemory,InvalidPageSize}![:0]u8 {
     const tracy_trace = trace(@src());
     defer tracy_trace.end();
 
@@ -6267,6 +6267,7 @@ pub fn generateBuiltinZigSource(comp: *Compilation, allocator: Allocator) Alloca
         \\    .os = os,
         \\    .abi = abi,
         \\    .ofmt = object_format,
+        \\    .page_size = {?},
         \\}};
         \\pub const object_format = std.Target.ObjectFormat.{};
         \\pub const mode = std.builtin.OptimizeMode.{};
@@ -6282,6 +6283,7 @@ pub fn generateBuiltinZigSource(comp: *Compilation, allocator: Allocator) Alloca
         \\pub const omit_frame_pointer = {};
         \\
     , .{
+        target.page_size orelse (if (comp.bin_file.options.is_native_os and comp.bin_file.options.is_native_abi) try std.mem.getPageSize(.{ .check = .throw }) else null),
         std.zig.fmtId(@tagName(target.ofmt)),
         std.zig.fmtId(@tagName(comp.bin_file.options.optimize_mode)),
         link_libc,
