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-09-05 14:54:30+02:00
logf8b64ff2fb65ebd9f27a694ce3a99793723392ab
treefed5fb94e0fbc2bd4e3f1494ed20f9ab4c580964
parentd6e5506482fdc01900e94853f9746717114529e9
signaturebadge-check 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
...@@ -2394,7 +2394,6 @@ pub fn supportsAddressSpace(...@@ -2394,7 +2394,6 @@ pub fn supportsAddressSpace(
2394 .param => is_nvptx,2394 .param => is_nvptx,
2395 .input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,2395 .input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,
2396 .physical_storage_buffer => arch == .spirv64,2396 .physical_storage_buffer => arch == .spirv64,
2397 .externref, .funcref => target.cpu.has(.wasm, .reference_types),
2398 };2397 };
2399}2398}
24002399
lib/std/lang.zig-4
...@@ -616,10 +616,6 @@ pub const AddressSpace = enum(u5) {...@@ -616,10 +616,6 @@ pub const AddressSpace = enum(u5) {
616616
617 /// This address space only addresses the "lookup" ram617 /// This address space only addresses the "lookup" ram
618 lut,618 lut,
619
620 // Web Assembly
621 externref,
622 funcref,
623};619};
624620
625/// This data structure is used by the Zig language code generation and621/// 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) {...@@ -2840,7 +2840,6 @@ pub const AddrSpace = enum(u24) {
2840 pub const gs: AddrSpace = @fromBackingInt(256);2840 pub const gs: AddrSpace = @fromBackingInt(256);
2841 pub const fs: AddrSpace = @fromBackingInt(257);2841 pub const fs: AddrSpace = @fromBackingInt(257);
2842 pub const ss: AddrSpace = @fromBackingInt(258);2842 pub const ss: AddrSpace = @fromBackingInt(258);
2843
2844 pub const ptr32_sptr: AddrSpace = @fromBackingInt(270);2843 pub const ptr32_sptr: AddrSpace = @fromBackingInt(270);
2845 pub const ptr32_uptr: AddrSpace = @fromBackingInt(271);2844 pub const ptr32_uptr: AddrSpace = @fromBackingInt(271);
2846 pub const ptr64: AddrSpace = @fromBackingInt(272);2845 pub const ptr64: AddrSpace = @fromBackingInt(272);
...@@ -2858,17 +2857,19 @@ pub const AddrSpace = enum(u24) {...@@ -2858,17 +2857,19 @@ pub const AddrSpace = enum(u24) {
2858 pub const program5: AddrSpace = @fromBackingInt(6);2857 pub const program5: AddrSpace = @fromBackingInt(6);
2859 };2858 };
28602859
2861 // See llvm/lib/Target/NVPTX/NVPTX.h2860 // See llvm/include/llvm/Support/NVPTXAddrSpace.h
2862 pub const nvptx = struct {2861 pub const nvptx = struct {
2863 pub const generic: AddrSpace = @fromBackingInt(0);2862 pub const generic: AddrSpace = @fromBackingInt(0);
2864 pub const global: AddrSpace = @fromBackingInt(1);2863 pub const global: AddrSpace = @fromBackingInt(1);
2865 pub const constant: AddrSpace = @fromBackingInt(2);
2866 pub const shared: AddrSpace = @fromBackingInt(3);2864 pub const shared: AddrSpace = @fromBackingInt(3);
2867 pub const param: AddrSpace = @fromBackingInt(4);2865 pub const constant: AddrSpace = @fromBackingInt(4);
2868 pub const local: AddrSpace = @fromBackingInt(5);2866 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);
2869 };2870 };
28702871
2871 // See llvm/lib/Target/AMDGPU/AMDGPU.h2872 // See llvm/include/llvm/Support/AMDGPUAddrSpace.h
2872 pub const amdgpu = struct {2873 pub const amdgpu = struct {
2873 pub const flat: AddrSpace = @fromBackingInt(0);2874 pub const flat: AddrSpace = @fromBackingInt(0);
2874 pub const global: AddrSpace = @fromBackingInt(1);2875 pub const global: AddrSpace = @fromBackingInt(1);
...@@ -2901,6 +2902,7 @@ pub const AddrSpace = enum(u24) {...@@ -2901,6 +2902,7 @@ pub const AddrSpace = enum(u24) {
2901 pub const streamout_register: AddrSpace = @fromBackingInt(128);2902 pub const streamout_register: AddrSpace = @fromBackingInt(128);
2902 };2903 };
29032904
2905 // See llvm/lib/Target/SPIRV/SPIRVUtils.h
2904 pub const spirv = struct {2906 pub const spirv = struct {
2905 pub const function: AddrSpace = @fromBackingInt(0);2907 pub const function: AddrSpace = @fromBackingInt(0);
2906 pub const cross_workgroup: AddrSpace = @fromBackingInt(1);2908 pub const cross_workgroup: AddrSpace = @fromBackingInt(1);
...@@ -2910,14 +2912,30 @@ pub const AddrSpace = enum(u24) {...@@ -2910,14 +2912,30 @@ pub const AddrSpace = enum(u24) {
2910 pub const device_only_intel: AddrSpace = @fromBackingInt(5);2912 pub const device_only_intel: AddrSpace = @fromBackingInt(5);
2911 pub const host_only_intel: AddrSpace = @fromBackingInt(6);2913 pub const host_only_intel: AddrSpace = @fromBackingInt(6);
2912 pub const input: AddrSpace = @fromBackingInt(7);2914 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);
2913 };2921 };
29142922
2915 // See llvm/include/llvm/CodeGen/WasmAddressSpaces.h2923 // See llvm/include/llvm/CodeGen/WasmAddressSpaces.h
2916 pub const wasm = struct {2924 pub const wasm = struct {
2917 pub const default: AddrSpace = @fromBackingInt(0);2925 pub const default: AddrSpace = @fromBackingInt(0);
2918 pub const variable: AddrSpace = @fromBackingInt(1);2926 pub const variable: AddrSpace = @fromBackingInt(1);
2919 pub const externref: AddrSpace = @fromBackingInt(10);2927 };
2920 pub const funcref: AddrSpace = @fromBackingInt(20);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);
2921 };2939 };
29222940
2923 pub fn format(addr_space: AddrSpace, w: *Writer) Writer.Error!void {2941 pub fn format(addr_space: AddrSpace, w: *Writer) Writer.Error!void {
src/codegen/llvm.zig+33-77
...@@ -4398,88 +4398,44 @@ pub fn toLlvmCallConvTag(cc_tag: std.lang.CallingConvention.Tag, target: *const...@@ -4398,88 +4398,44 @@ pub fn toLlvmCallConvTag(cc_tag: std.lang.CallingConvention.Tag, target: *const
43984398
4399/// Convert a zig-address space to an llvm address space.4399/// Convert a zig-address space to an llvm address space.
4400pub fn toLlvmAddressSpace(address_space: std.lang.AddressSpace, target: *const std.Target) Builder.AddrSpace {4400pub fn toLlvmAddressSpace(address_space: std.lang.AddressSpace, target: *const std.Target) Builder.AddrSpace {
4401 for (llvmAddrSpaceInfo(target)) |info| if (info.zig == address_space) return info.llvm;
4402 unreachable;
4403}
4404
4405const AddrSpaceInfo = struct {
4406 zig: ?std.lang.AddressSpace,
4407 llvm: Builder.AddrSpace,
4408 non_integral: bool = false,
4409 size: ?u16 = null,
4410 abi: ?u16 = null,
4411 pref: ?u16 = null,
4412 idx: ?u16 = null,
4413 force_in_data_layout: bool = false,
4414};
4415fn llvmAddrSpaceInfo(target: *const std.Target) []const AddrSpaceInfo {
4416 return switch (target.cpu.arch) {4401 return switch (target.cpu.arch) {
4417 .x86, .x86_64 => &.{4402 .amdgcn => switch (address_space) {
4418 .{ .zig = .generic, .llvm = .default },4403 .generic => Builder.AddrSpace.amdgpu.flat,
4419 .{ .zig = .gs, .llvm = Builder.AddrSpace.x86.gs },4404 .global => Builder.AddrSpace.amdgpu.global,
4420 .{ .zig = .fs, .llvm = Builder.AddrSpace.x86.fs },4405 .shared => Builder.AddrSpace.amdgpu.local,
4421 .{ .zig = .ss, .llvm = Builder.AddrSpace.x86.ss },4406 .constant => Builder.AddrSpace.amdgpu.constant,
4422 .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr32_sptr, .size = 32, .abi = 32, .force_in_data_layout = true },4407 .local => Builder.AddrSpace.amdgpu.private,
4423 .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr32_uptr, .size = 32, .abi = 32, .force_in_data_layout = true },4408 else => unreachable,
4424 .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr64, .size = 64, .abi = 64, .force_in_data_layout = true },
4425 },
4426 .nvptx, .nvptx64 => &.{
4427 .{ .zig = .generic, .llvm = Builder.AddrSpace.nvptx.generic },
4428 .{ .zig = .global, .llvm = Builder.AddrSpace.nvptx.global },
4429 .{ .zig = .constant, .llvm = Builder.AddrSpace.nvptx.constant },
4430 .{ .zig = .param, .llvm = Builder.AddrSpace.nvptx.param },
4431 .{ .zig = .shared, .llvm = Builder.AddrSpace.nvptx.shared },
4432 .{ .zig = .local, .llvm = Builder.AddrSpace.nvptx.local },
4433 },
4434 .amdgcn => &.{
4435 .{ .zig = .generic, .llvm = Builder.AddrSpace.amdgpu.flat, .force_in_data_layout = true },
4436 .{ .zig = .global, .llvm = Builder.AddrSpace.amdgpu.global, .force_in_data_layout = true },
4437 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.region, .size = 32, .abi = 32 },
4438 .{ .zig = .shared, .llvm = Builder.AddrSpace.amdgpu.local, .size = 32, .abi = 32 },
4439 .{ .zig = .constant, .llvm = Builder.AddrSpace.amdgpu.constant, .force_in_data_layout = true },
4440 .{ .zig = .local, .llvm = Builder.AddrSpace.amdgpu.private, .size = 32, .abi = 32 },
4441 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_32bit, .size = 32, .abi = 32 },
4442 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_fat_pointer, .non_integral = true, .size = 160, .abi = 256, .idx = 32 },
4443 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_resource, .non_integral = true, .size = 128, .abi = 128 },
4444 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_strided_pointer, .non_integral = true, .size = 192, .abi = 256, .idx = 32 },
4445 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_0 },
4446 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_1 },
4447 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_2 },
4448 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_3 },
4449 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_4 },
4450 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_5 },
4451 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_6 },
4452 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_7 },
4453 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_8 },
4454 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_9 },
4455 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_10 },
4456 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_11 },
4457 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_12 },
4458 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_13 },
4459 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_14 },
4460 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_15 },
4461 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.streamout_register },
4462 },4409 },
4463 .avr => &.{4410 .avr => switch (address_space) {
4464 .{ .zig = .generic, .llvm = Builder.AddrSpace.avr.data, .abi = 8 },4411 .generic => Builder.AddrSpace.avr.data,
4465 .{ .zig = .flash, .llvm = Builder.AddrSpace.avr.program, .abi = 8 },4412 .flash => Builder.AddrSpace.avr.program,
4466 .{ .zig = .flash1, .llvm = Builder.AddrSpace.avr.program1, .abi = 8 },4413 .flash1 => Builder.AddrSpace.avr.program1,
4467 .{ .zig = .flash2, .llvm = Builder.AddrSpace.avr.program2, .abi = 8 },4414 .flash2 => Builder.AddrSpace.avr.program2,
4468 .{ .zig = .flash3, .llvm = Builder.AddrSpace.avr.program3, .abi = 8 },4415 .flash3 => Builder.AddrSpace.avr.program3,
4469 .{ .zig = .flash4, .llvm = Builder.AddrSpace.avr.program4, .abi = 8 },4416 .flash4 => Builder.AddrSpace.avr.program4,
4470 .{ .zig = .flash5, .llvm = Builder.AddrSpace.avr.program5, .abi = 8 },4417 .flash5 => Builder.AddrSpace.avr.program5,
4418 else => unreachable,
4471 },4419 },
4472 .wasm32, .wasm64 => &.{4420 .nvptx, .nvptx64 => switch (address_space) {
4473 .{ .zig = .generic, .llvm = Builder.AddrSpace.wasm.default, .force_in_data_layout = true },4421 .generic => Builder.AddrSpace.nvptx.generic,
4474 .{ .zig = null, .llvm = Builder.AddrSpace.wasm.variable, .non_integral = true },4422 .global => Builder.AddrSpace.nvptx.global,
4475 .{ .zig = .externref, .llvm = Builder.AddrSpace.wasm.externref, .non_integral = true, .size = 8, .abi = 8 },4423 .constant => Builder.AddrSpace.nvptx.constant,
4476 .{ .zig = .funcref, .llvm = Builder.AddrSpace.wasm.funcref, .non_integral = true, .size = 8, .abi = 8 },4424 .param => Builder.AddrSpace.nvptx.entry_param,
4425 .shared => Builder.AddrSpace.nvptx.shared,
4426 .local => Builder.AddrSpace.nvptx.local,
4427 else => unreachable,
4477 },4428 },
4478 .m68k => &.{4429 .x86, .x86_64 => switch (address_space) {
4479 .{ .zig = .generic, .llvm = .default, .abi = 16, .pref = 32 },4430 .generic => .default,
4431 .gs => Builder.AddrSpace.x86.gs,
4432 .fs => Builder.AddrSpace.x86.fs,
4433 .ss => Builder.AddrSpace.x86.ss,
4434 else => unreachable,
4480 },4435 },
4481 else => &.{4436 else => switch (address_space) {
4482 .{ .zig = .generic, .llvm = .default },4437 .generic => .default,
4438 else => unreachable,
4483 },4439 },
4484 };4440 };
4485}4441}
src/codegen/spirv/CodeGen.zig-2
...@@ -842,8 +842,6 @@ pub fn storageClass(cg: *const CodeGen, as: std.lang.AddressSpace) spec.StorageC...@@ -842,8 +842,6 @@ pub fn storageClass(cg: *const CodeGen, as: std.lang.AddressSpace) spec.StorageC
842 .cog,842 .cog,
843 .lut,843 .lut,
844 .hub,844 .hub,
845 .externref,
846 .funcref,
847 => unreachable,845 => unreachable,
848 };846 };
849}847}