authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-08-12 19:34:01-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-09-19 09:37:32-07:00
logcad594372e8c24070ed5e869e2cd83bd09ff359d
tree2cc2f3380005e9a2437cf060764d5efb7ad97c02
parent749b88c7f3391b542e1558483dbab32dbe8c6962

llvm: update address space definitions to LLVM 17

2 files changed, 17 insertions(+), 14 deletions(-)

src/codegen/llvm.zig+8-7
...@@ -10509,16 +10509,17 @@ fn llvmAddrSpaceInfo(target: std.Target) []const AddrSpaceInfo {...@@ -10509,16 +10509,17 @@ fn llvmAddrSpaceInfo(target: std.Target) []const AddrSpaceInfo {
10509 .{ .zig = .constant, .llvm = Builder.AddrSpace.amdgpu.constant, .force_in_data_layout = true },10509 .{ .zig = .constant, .llvm = Builder.AddrSpace.amdgpu.constant, .force_in_data_layout = true },
10510 .{ .zig = .local, .llvm = Builder.AddrSpace.amdgpu.private, .size = 32, .abi = 32 },10510 .{ .zig = .local, .llvm = Builder.AddrSpace.amdgpu.private, .size = 32, .abi = 32 },
10511 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_32bit, .size = 32, .abi = 32 },10511 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_32bit, .size = 32, .abi = 32 },
10512 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_fat_pointer, .non_integral = true },10512 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_fat_pointer, .non_integral = true, .size = 160, .abi = 256, .idx = 32 },
10513 .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_resource, .non_integral = true, .size = 128, .abi = 128 },
10513 },10514 },
10514 .avr => &.{10515 .avr => &.{
10515 .{ .zig = .generic, .llvm = .default, .abi = 8 },10516 .{ .zig = .generic, .llvm = .default, .abi = 8 },
10516 .{ .zig = .flash, .llvm = Builder.AddrSpace.avr.flash, .abi = 8 },10517 .{ .zig = .flash, .llvm = Builder.AddrSpace.avr.program, .abi = 8 },
10517 .{ .zig = .flash1, .llvm = Builder.AddrSpace.avr.flash1, .abi = 8 },10518 .{ .zig = .flash1, .llvm = Builder.AddrSpace.avr.program1, .abi = 8 },
10518 .{ .zig = .flash2, .llvm = Builder.AddrSpace.avr.flash2, .abi = 8 },10519 .{ .zig = .flash2, .llvm = Builder.AddrSpace.avr.program2, .abi = 8 },
10519 .{ .zig = .flash3, .llvm = Builder.AddrSpace.avr.flash3, .abi = 8 },10520 .{ .zig = .flash3, .llvm = Builder.AddrSpace.avr.program3, .abi = 8 },
10520 .{ .zig = .flash4, .llvm = Builder.AddrSpace.avr.flash4, .abi = 8 },10521 .{ .zig = .flash4, .llvm = Builder.AddrSpace.avr.program4, .abi = 8 },
10521 .{ .zig = .flash5, .llvm = Builder.AddrSpace.avr.flash5, .abi = 8 },10522 .{ .zig = .flash5, .llvm = Builder.AddrSpace.avr.program5, .abi = 8 },
10522 },10523 },
10523 .wasm32, .wasm64 => &.{10524 .wasm32, .wasm64 => &.{
10524 .{ .zig = .generic, .llvm = .default, .force_in_data_layout = true },10525 .{ .zig = .generic, .llvm = .default, .force_in_data_layout = true },
src/codegen/llvm/Builder.zig+9-7
...@@ -1873,12 +1873,13 @@ pub const AddrSpace = enum(u24) {...@@ -1873,12 +1873,13 @@ pub const AddrSpace = enum(u24) {
18731873
1874 // See llvm/lib/Target/AVR/AVR.h1874 // See llvm/lib/Target/AVR/AVR.h
1875 pub const avr = struct {1875 pub const avr = struct {
1876 pub const flash: AddrSpace = @enumFromInt(1);1876 pub const data: AddrSpace = @enumFromInt(0);
1877 pub const flash1: AddrSpace = @enumFromInt(2);1877 pub const program: AddrSpace = @enumFromInt(1);
1878 pub const flash2: AddrSpace = @enumFromInt(3);1878 pub const program1: AddrSpace = @enumFromInt(2);
1879 pub const flash3: AddrSpace = @enumFromInt(4);1879 pub const program2: AddrSpace = @enumFromInt(3);
1880 pub const flash4: AddrSpace = @enumFromInt(5);1880 pub const program3: AddrSpace = @enumFromInt(4);
1881 pub const flash5: AddrSpace = @enumFromInt(6);1881 pub const program4: AddrSpace = @enumFromInt(5);
1882 pub const program5: AddrSpace = @enumFromInt(6);
1882 };1883 };
18831884
1884 // See llvm/lib/Target/NVPTX/NVPTX.h1885 // See llvm/lib/Target/NVPTX/NVPTX.h
...@@ -1901,6 +1902,7 @@ pub const AddrSpace = enum(u24) {...@@ -1901,6 +1902,7 @@ pub const AddrSpace = enum(u24) {
1901 pub const private: AddrSpace = @enumFromInt(5);1902 pub const private: AddrSpace = @enumFromInt(5);
1902 pub const constant_32bit: AddrSpace = @enumFromInt(6);1903 pub const constant_32bit: AddrSpace = @enumFromInt(6);
1903 pub const buffer_fat_pointer: AddrSpace = @enumFromInt(7);1904 pub const buffer_fat_pointer: AddrSpace = @enumFromInt(7);
1905 pub const buffer_resource: AddrSpace = @enumFromInt(8);
1904 pub const param_d: AddrSpace = @enumFromInt(6);1906 pub const param_d: AddrSpace = @enumFromInt(6);
1905 pub const param_i: AddrSpace = @enumFromInt(7);1907 pub const param_i: AddrSpace = @enumFromInt(7);
1906 pub const constant_buffer_0: AddrSpace = @enumFromInt(8);1908 pub const constant_buffer_0: AddrSpace = @enumFromInt(8);
...@@ -1921,7 +1923,7 @@ pub const AddrSpace = enum(u24) {...@@ -1921,7 +1923,7 @@ pub const AddrSpace = enum(u24) {
1921 pub const constant_buffer_15: AddrSpace = @enumFromInt(23);1923 pub const constant_buffer_15: AddrSpace = @enumFromInt(23);
1922 };1924 };
19231925
1924 // See llvm/lib/Target/WebAssembly/Utils/WebAssemblyTypeUtilities.h1926 // See llvm/include/llvm/CodeGen/WasmAddressSpaces.h
1925 pub const wasm = struct {1927 pub const wasm = struct {
1926 pub const variable: AddrSpace = @enumFromInt(1);1928 pub const variable: AddrSpace = @enumFromInt(1);
1927 pub const externref: AddrSpace = @enumFromInt(10);1929 pub const externref: AddrSpace = @enumFromInt(10);