authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-08-04 11:20:13+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-10-07 00:30:51+02:00
log45a40c4fa8609de2a1e2cd9c6366e7f31def4fd7
treee1ac1b80acaee2e6d0aff94e33af037fd6ec9d8c
parent16e1906e3de92c1a4000f4f082773c6b36a5febd
signature Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

llvm: update address spaces to LLVM 23

Note: https://codeberg.org/ziglang/zig/issues/31190#issuecomment-20523923

5 files changed, 58 insertions(+), 91 deletions(-)

lib/std/Target.zig-1
......@@ -2401,7 +2401,6 @@ pub fn supportsAddressSpace(
24012401 .param => is_nvptx,
24022402 .input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,
24032403 .physical_storage_buffer => arch == .spirv64,
2404 .externref, .funcref => target.cpu.has(.wasm, .reference_types),
24052404 };
24062405}
24072406
lib/std/lang.zig-4
......@@ -615,10 +615,6 @@ pub const AddressSpace = enum(u5) {
615615
616616 /// This address space only addresses the "lookup" ram
617617 lut,
618
619 // Web Assembly
620 externref,
621 funcref,
622618};
623619
624620/// This data structure is used by the Zig language code generation and
lib/std/zig/llvm/Builder.zig+25-7
......@@ -2840,7 +2840,6 @@ pub const AddrSpace = enum(u24) {
28402840 pub const gs: AddrSpace = @fromBackingInt(256);
28412841 pub const fs: AddrSpace = @fromBackingInt(257);
28422842 pub const ss: AddrSpace = @fromBackingInt(258);
2843
28442843 pub const ptr32_sptr: AddrSpace = @fromBackingInt(270);
28452844 pub const ptr32_uptr: AddrSpace = @fromBackingInt(271);
28462845 pub const ptr64: AddrSpace = @fromBackingInt(272);
......@@ -2858,17 +2857,19 @@ pub const AddrSpace = enum(u24) {
28582857 pub const program5: AddrSpace = @fromBackingInt(6);
28592858 };
28602859
2861 // See llvm/lib/Target/NVPTX/NVPTX.h
2860 // See llvm/include/llvm/Support/NVPTXAddrSpace.h
28622861 pub const nvptx = struct {
28632862 pub const generic: AddrSpace = @fromBackingInt(0);
28642863 pub const global: AddrSpace = @fromBackingInt(1);
2865 pub const constant: AddrSpace = @fromBackingInt(2);
28662864 pub const shared: AddrSpace = @fromBackingInt(3);
2867 pub const param: AddrSpace = @fromBackingInt(4);
2865 pub const constant: AddrSpace = @fromBackingInt(4);
28682866 pub const local: AddrSpace = @fromBackingInt(5);
2867 pub const tensor: AddrSpace = @fromBackingInt(6);
2868 pub const shared_cluster: AddrSpace = @fromBackingInt(7);
2869 pub const entry_param: AddrSpace = @fromBackingInt(101);
28692870 };
28702871
2871 // See llvm/lib/Target/AMDGPU/AMDGPU.h
2872 // See llvm/include/llvm/Support/AMDGPUAddrSpace.h
28722873 pub const amdgpu = struct {
28732874 pub const flat: AddrSpace = @fromBackingInt(0);
28742875 pub const global: AddrSpace = @fromBackingInt(1);
......@@ -2901,6 +2902,7 @@ pub const AddrSpace = enum(u24) {
29012902 pub const streamout_register: AddrSpace = @fromBackingInt(128);
29022903 };
29032904
2905 // See llvm/lib/Target/SPIRV/SPIRVUtils.h
29042906 pub const spirv = struct {
29052907 pub const function: AddrSpace = @fromBackingInt(0);
29062908 pub const cross_workgroup: AddrSpace = @fromBackingInt(1);
......@@ -2910,14 +2912,30 @@ pub const AddrSpace = enum(u24) {
29102912 pub const device_only_intel: AddrSpace = @fromBackingInt(5);
29112913 pub const host_only_intel: AddrSpace = @fromBackingInt(6);
29122914 pub const input: AddrSpace = @fromBackingInt(7);
2915 pub const output: AddrSpace = @fromBackingInt(8);
2916 pub const code_section_intel: AddrSpace = @fromBackingInt(9);
2917 pub const private: AddrSpace = @fromBackingInt(10);
2918 pub const storage_buffer: AddrSpace = @fromBackingInt(11);
2919 pub const uniform: AddrSpace = @fromBackingInt(12);
2920 pub const push_constant: AddrSpace = @fromBackingInt(13);
29132921 };
29142922
29152923 // See llvm/include/llvm/CodeGen/WasmAddressSpaces.h
29162924 pub const wasm = struct {
29172925 pub const default: AddrSpace = @fromBackingInt(0);
29182926 pub const variable: AddrSpace = @fromBackingInt(1);
2919 pub const externref: AddrSpace = @fromBackingInt(10);
2920 pub const funcref: AddrSpace = @fromBackingInt(20);
2927 };
2928
2929 // See llvm/lib/TargetParser/TargetDataLayout.cpp
2930 pub const riscv = struct {
2931 pub const purecap: AddrSpace = @fromBackingInt(200);
2932 };
2933
2934 // See llvm/lib/Target/AArch64/AArch64ISelLowering.h
2935 pub const aarch64 = struct {
2936 pub const ptr32_sptr: AddrSpace = @fromBackingInt(270);
2937 pub const ptr32_uptr: AddrSpace = @fromBackingInt(271);
2938 pub const ptr64: AddrSpace = @fromBackingInt(272);
29212939 };
29222940
29232941 pub fn format(addr_space: AddrSpace, w: *Writer) Writer.Error!void {
src/codegen/llvm.zig+33-77
......@@ -4434,88 +4434,44 @@ pub fn toLlvmCallConvTag(cc_tag: std.lang.CallingConvention.Tag, target: *const
44344434
44354435/// Convert a zig-address space to an llvm address space.
44364436pub fn toLlvmAddressSpace(address_space: std.lang.AddressSpace, target: *const std.Target) Builder.AddrSpace {
4437 for (llvmAddrSpaceInfo(target)) |info| if (info.zig == address_space) return info.llvm;
4438 unreachable;
4439}
4440
4441const AddrSpaceInfo = struct {
4442 zig: ?std.lang.AddressSpace,
4443 llvm: Builder.AddrSpace,
4444 non_integral: bool = false,
4445 size: ?u16 = null,
4446 abi: ?u16 = null,
4447 pref: ?u16 = null,
4448 idx: ?u16 = null,
4449 force_in_data_layout: bool = false,
4450};
4451fn llvmAddrSpaceInfo(target: *const std.Target) []const AddrSpaceInfo {
44524437 return switch (target.cpu.arch) {
4453 .x86, .x86_64 => &.{
4454 .{ .zig = .generic, .llvm = .default },
4455 .{ .zig = .gs, .llvm = Builder.AddrSpace.x86.gs },
4456 .{ .zig = .fs, .llvm = Builder.AddrSpace.x86.fs },
4457 .{ .zig = .ss, .llvm = Builder.AddrSpace.x86.ss },
4458 .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr32_sptr, .size = 32, .abi = 32, .force_in_data_layout = true },
4459 .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr32_uptr, .size = 32, .abi = 32, .force_in_data_layout = true },
4460 .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr64, .size = 64, .abi = 64, .force_in_data_layout = true },
4461 },
4462 .nvptx, .nvptx64 => &.{
4463 .{ .zig = .generic, .llvm = Builder.AddrSpace.nvptx.generic },
4464 .{ .zig = .global, .llvm = Builder.AddrSpace.nvptx.global },
4465 .{ .zig = .constant, .llvm = Builder.AddrSpace.nvptx.constant },
4466 .{ .zig = .param, .llvm = Builder.AddrSpace.nvptx.param },
4467 .{ .zig = .shared, .llvm = Builder.AddrSpace.nvptx.shared },
4468 .{ .zig = .local, .llvm = Builder.AddrSpace.nvptx.local },
4469 },
4470 .amdgcn => &.{
4471 .{ .zig = .generic, .llvm = Builder.AddrSpace.amdgpu.flat, .force_in_data_layout = true },
4472 .{ .zig = .global, .llvm = Builder.AddrSpace.amdgpu.global, .force_in_data_layout = true },
4473 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.region, .size = 32, .abi = 32 },
4474 .{ .zig = .shared, .llvm = Builder.AddrSpace.amdgpu.local, .size = 32, .abi = 32 },
4475 .{ .zig = .constant, .llvm = Builder.AddrSpace.amdgpu.constant, .force_in_data_layout = true },
4476 .{ .zig = .local, .llvm = Builder.AddrSpace.amdgpu.private, .size = 32, .abi = 32 },
4477 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_32bit, .size = 32, .abi = 32 },
4478 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_fat_pointer, .non_integral = true, .size = 160, .abi = 256, .idx = 32 },
4479 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_resource, .non_integral = true, .size = 128, .abi = 128 },
4480 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_strided_pointer, .non_integral = true, .size = 192, .abi = 256, .idx = 32 },
4481 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_0 },
4482 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_1 },
4483 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_2 },
4484 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_3 },
4485 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_4 },
4486 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_5 },
4487 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_6 },
4488 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_7 },
4489 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_8 },
4490 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_9 },
4491 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_10 },
4492 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_11 },
4493 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_12 },
4494 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_13 },
4495 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_14 },
4496 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_15 },
4497 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.streamout_register },
4438 .amdgcn => switch (address_space) {
4439 .generic => Builder.AddrSpace.amdgpu.flat,
4440 .global => Builder.AddrSpace.amdgpu.global,
4441 .shared => Builder.AddrSpace.amdgpu.local,
4442 .constant => Builder.AddrSpace.amdgpu.constant,
4443 .local => Builder.AddrSpace.amdgpu.private,
4444 else => unreachable,
44984445 },
4499 .avr => &.{
4500 .{ .zig = .generic, .llvm = Builder.AddrSpace.avr.data, .abi = 8 },
4501 .{ .zig = .flash, .llvm = Builder.AddrSpace.avr.program, .abi = 8 },
4502 .{ .zig = .flash1, .llvm = Builder.AddrSpace.avr.program1, .abi = 8 },
4503 .{ .zig = .flash2, .llvm = Builder.AddrSpace.avr.program2, .abi = 8 },
4504 .{ .zig = .flash3, .llvm = Builder.AddrSpace.avr.program3, .abi = 8 },
4505 .{ .zig = .flash4, .llvm = Builder.AddrSpace.avr.program4, .abi = 8 },
4506 .{ .zig = .flash5, .llvm = Builder.AddrSpace.avr.program5, .abi = 8 },
4446 .avr => switch (address_space) {
4447 .generic => Builder.AddrSpace.avr.data,
4448 .flash => Builder.AddrSpace.avr.program,
4449 .flash1 => Builder.AddrSpace.avr.program1,
4450 .flash2 => Builder.AddrSpace.avr.program2,
4451 .flash3 => Builder.AddrSpace.avr.program3,
4452 .flash4 => Builder.AddrSpace.avr.program4,
4453 .flash5 => Builder.AddrSpace.avr.program5,
4454 else => unreachable,
45074455 },
4508 .wasm32, .wasm64 => &.{
4509 .{ .zig = .generic, .llvm = Builder.AddrSpace.wasm.default, .force_in_data_layout = true },
4510 .{ .zig = null, .llvm = Builder.AddrSpace.wasm.variable, .non_integral = true },
4511 .{ .zig = .externref, .llvm = Builder.AddrSpace.wasm.externref, .non_integral = true, .size = 8, .abi = 8 },
4512 .{ .zig = .funcref, .llvm = Builder.AddrSpace.wasm.funcref, .non_integral = true, .size = 8, .abi = 8 },
4456 .nvptx, .nvptx64 => switch (address_space) {
4457 .generic => Builder.AddrSpace.nvptx.generic,
4458 .global => Builder.AddrSpace.nvptx.global,
4459 .constant => Builder.AddrSpace.nvptx.constant,
4460 .param => Builder.AddrSpace.nvptx.entry_param,
4461 .shared => Builder.AddrSpace.nvptx.shared,
4462 .local => Builder.AddrSpace.nvptx.local,
4463 else => unreachable,
45134464 },
4514 .m68k => &.{
4515 .{ .zig = .generic, .llvm = .default, .abi = 16, .pref = 32 },
4465 .x86, .x86_64 => switch (address_space) {
4466 .generic => .default,
4467 .gs => Builder.AddrSpace.x86.gs,
4468 .fs => Builder.AddrSpace.x86.fs,
4469 .ss => Builder.AddrSpace.x86.ss,
4470 else => unreachable,
45164471 },
4517 else => &.{
4518 .{ .zig = .generic, .llvm = .default },
4472 else => switch (address_space) {
4473 .generic => .default,
4474 else => unreachable,
45194475 },
45204476 };
45214477}
src/codegen/spirv/CodeGen.zig-2
......@@ -845,8 +845,6 @@ pub fn storageClass(cg: *const CodeGen, as: std.lang.AddressSpace) spec.StorageC
845845 .cog,
846846 .lut,
847847 .hub,
848 .externref,
849 .funcref,
850848 => unreachable,
851849 };
852850}