diff options
| -rw-r--r-- | lib/std/Target.zig | 58 | ||||
| -rw-r--r-- | src/Sema.zig | 2 | ||||
| -rw-r--r-- | src/target.zig | 6 |
3 files changed, 33 insertions, 33 deletions
diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 3fb9587c82..eeb755aa20 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -1944,35 +1944,6 @@ pub const Cpu = struct { return Model.baseline(arch, os).toCpu(arch); } - /// Returns whether this architecture supports `address_space`. If `context` is `null`, this - /// function simply answers the general question of whether the architecture has any concept - /// of `address_space`; if non-`null`, the function additionally checks whether - /// `address_space` is valid in that context. - pub fn supportsAddressSpace( - cpu: Cpu, - address_space: std.builtin.AddressSpace, - context: ?std.builtin.AddressSpace.Context, - ) bool { - const arch = cpu.arch; - - const is_nvptx = arch.isNvptx(); - const is_spirv = arch.isSpirV(); - const is_gpu = is_nvptx or is_spirv or arch == .amdgcn; - - return switch (address_space) { - .generic => true, - .fs, .gs, .ss => (arch == .x86_64 or arch == .x86) and (context == null or context == .pointer), - .flash, .flash1, .flash2, .flash3, .flash4, .flash5 => arch == .avr, // TODO this should also check how many flash banks the cpu has - .cog, .hub => arch == .propeller, - .lut => arch == .propeller and cpu.has(.propeller, .p2), - - .global, .local, .shared => is_gpu, - .constant => is_gpu and (context == null or context == .constant), - .param => is_nvptx, - .input, .output, .uniform, .push_constant, .storage_buffer, .physical_storage_buffer => is_spirv, - }; - } - /// Returns true if `feature` is enabled. pub fn has(cpu: Cpu, comptime family: Arch.Family, feature: @field(Target, @tagName(family)).Feature) bool { if (family != cpu.arch.family()) return false; @@ -2132,6 +2103,35 @@ pub fn requiresLibC(target: *const Target) bool { }; } +/// Returns whether this target supports `address_space`. If `context` is `null`, this +/// function simply answers the general question of whether the target has any concept +/// of `address_space`; if non-`null`, the function additionally checks whether +/// `address_space` is valid in that context. +pub fn supportsAddressSpace( + target: Target, + address_space: std.builtin.AddressSpace, + context: ?std.builtin.AddressSpace.Context, +) bool { + const arch = target.cpu.arch; + + const is_nvptx = arch.isNvptx(); + const is_spirv = arch.isSpirV(); + const is_gpu = is_nvptx or is_spirv or arch == .amdgcn; + + return switch (address_space) { + .generic => true, + .fs, .gs, .ss => (arch == .x86_64 or arch == .x86) and (context == null or context == .pointer), + .flash, .flash1, .flash2, .flash3, .flash4, .flash5 => arch == .avr, // TODO this should also check how many flash banks the cpu has + .cog, .hub => arch == .propeller, + .lut => arch == .propeller and std.Target.propeller.featureSetHas(target.cpu.features, .p2), + + .global, .local, .shared => is_gpu, + .constant => is_gpu and (context == null or context == .constant), + .param => is_nvptx, + .input, .output, .uniform, .push_constant, .storage_buffer, .physical_storage_buffer => is_spirv, + }; +} + pub const DynamicLinker = struct { /// Contains the memory used to store the dynamic linker path. This field /// should not be used directly. See `get` and `set`. This field exists so diff --git a/src/Sema.zig b/src/Sema.zig index 725c9d00e5..209d012b24 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -36508,7 +36508,7 @@ pub fn analyzeAsAddressSpace( const address_space = try sema.interpretBuiltinType(block, src, addrspace_val, std.builtin.AddressSpace); const target = pt.zcu.getTarget(); - if (!target.cpu.supportsAddressSpace(address_space, ctx)) { + if (!target.supportsAddressSpace(address_space, ctx)) { // TODO error messages could be made more elaborate here const entity = switch (ctx) { .function => "functions", diff --git a/src/target.zig b/src/target.zig index 12af14de9d..3a1b9f93af 100644 --- a/src/target.zig +++ b/src/target.zig @@ -539,10 +539,10 @@ pub fn addrSpaceCastIsValid( to: AddressSpace, ) bool { switch (target.cpu.arch) { - .x86_64, .x86 => return target.cpu.supportsAddressSpace(from, null) and target.cpu.supportsAddressSpace(to, null), + .x86_64, .x86 => return target.supportsAddressSpace(from, null) and target.supportsAddressSpace(to, null), .nvptx64, .nvptx, .amdgcn => { - const to_generic = target.cpu.supportsAddressSpace(from, null) and to == .generic; - const from_generic = target.cpu.supportsAddressSpace(to, null) and from == .generic; + const to_generic = target.supportsAddressSpace(from, null) and to == .generic; + const from_generic = target.supportsAddressSpace(to, null) and from == .generic; return to_generic or from_generic; }, else => return from == .generic and to == .generic, |