Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move feature descriptions out of std.Target.Cpu.Feature #20977

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move feature descriptions out of std.Target.Cpu.Feature #20977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/std/Build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,8 +1383,8 @@ pub fn parseTargetQuery(options: std.Target.Query.ParseOptions) error{ParseFaile
diags.unknown_feature_name.?,
@tagName(diags.arch.?),
});
for (diags.arch.?.allFeaturesList()) |feature| {
std.debug.print(" {s}: {s}\n", .{ feature.name, feature.description });
for (diags.arch.?.allFeaturesList(), diags.arch.?.allFeaturesDescList()) |feature, desc| {
std.debug.print(" {s}: {s}\n", .{ feature.name, desc });
}
return error.ParseFailed;
},
Expand Down
37 changes: 34 additions & 3 deletions lib/std/Target.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,9 +847,6 @@ pub const Cpu = struct {
/// otherwise null.
llvm_name: ?[:0]const u8,

/// Human-friendly UTF-8 text.
description: []const u8,

/// Sparse `Set` of features this depends on.
dependencies: Set,

Expand Down Expand Up @@ -1407,6 +1404,40 @@ pub const Cpu = struct {
};
}

/// Human-friendly UTF-8 description text for all CPU features Zig is aware of.
/// Indexes correspond 1:1 with the return of `allFeaturesList`.
///
/// TODO: Move these descriptions strings back into `Cpu.Feature`.
/// See https://github.com/ziglang/zig/issues/21010
pub fn allFeaturesDescList(arch: Arch) []const []const u8 {
return switch (arch) {
.arm, .armeb, .thumb, .thumbeb => &arm.feature_descs,
.aarch64, .aarch64_be => &aarch64.feature_descs,
.arc => &arc.feature_descs,
.avr => &avr.feature_descs,
.bpfel, .bpfeb => &bpf.feature_descs,
.csky => &csky.feature_descs,
.hexagon => &hexagon.feature_descs,
.loongarch32, .loongarch64 => &loongarch.feature_descs,
.m68k => &m68k.feature_descs,
.mips, .mipsel, .mips64, .mips64el => &mips.feature_descs,
.msp430 => &msp430.feature_descs,
.powerpc, .powerpcle, .powerpc64, .powerpc64le => &powerpc.feature_descs,
.amdgcn => &amdgpu.feature_descs,
.riscv32, .riscv64 => &riscv.feature_descs,
.sparc, .sparc64 => &sparc.feature_descs,
.spirv32, .spirv64 => &spirv.feature_descs,
.s390x => &s390x.feature_descs,
.x86, .x86_64 => &x86.feature_descs,
.xtensa => &xtensa.feature_descs,
.nvptx, .nvptx64 => &nvptx.feature_descs,
.ve => &ve.feature_descs,
.wasm32, .wasm64 => &wasm.feature_descs,

else => &.{},
};
}

/// All processors Zig is aware of, sorted lexicographically by name.
pub fn allCpuModels(arch: Arch) []const *const Cpu.Model {
return switch (arch) {
Expand Down
Loading