mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanups to previous commit

Browse Source 
* fix a merge conflict discovered upon rebasing latest master
 * rename Target.Cpu.Feature.Set.subSet to isSuperSetOf
 * convert a comment into an assert
This commit is contained in:
Andrew Kelley 2021-06-11 14:01:13 -07:00
parent 7ba175cd8b
commit da4081fe21
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/std/build.zig
View File

@ -637,21 +637,15 @@ pub const Builder = struct {
"target",
"The CPU architecture, OS, and ABI to build for",
);
const mcpu = self.option([]const u8, "cpu", "Target CPU");
const mcpu = self.option([]const u8, "cpu", "Target CPU features to add or subtract");
const triple = maybe_triple orelse return args.default_target;
const cpu_features = self.option(
[]const u8,
"mcpu",
"The list of CPU features to add or subtract",
);
var diags: CrossTarget.ParseOptions.Diagnostics = .{};
const selected_target = CrossTarget.parse(.{
.arch_os_abi = triple,
.cpu_features = mcpu,
.diagnostics = &diags,
.cpu_features = cpu_features,
}) catch |err| switch (err) {
error.UnknownCpuModel => {
warn("Unknown CPU: '{s}'\nAvailable CPUs for architecture '{s}':\n", .{
@ -716,7 +710,7 @@ pub const Builder = struct {
if (mem.eql(u8, t_triple, selected_canonicalized_triple)) {
mismatch_triple = false;
whitelist_item = t;
if (t.getCpuFeatures().subSet(selected_target.getCpuFeatures())) {
if (t.getCpuFeatures().isSuperSetOf(selected_target.getCpuFeatures())) {
mismatch_cpu_features = false;
break :whitelist_check;
} else {
@ -733,7 +727,8 @@ pub const Builder = struct {
warn(" {s}\n", .{t_triple});
}
warn("\n", .{});
} else { // mismatch_cpu_features
} else {
assert(mismatch_cpu_features);
const whitelist_cpu = whitelist_item.getCpu();
const selected_cpu = selected_target.getCpu();
warn("Chosen CPU model '{s}' does not match one of the supported targets:\n", .{

10
lib/std/target.zig
View File

@ -668,11 +668,11 @@ pub const Target = struct {
return mem.eql(usize, &set.ints, &other_set.ints);
}
/// Is the other set a sub set of this set
pub fn subSet(set: Set, other_set: Set) bool {
return std.meta.eql((@as(std.meta.Vector(usize_count, usize), set.ints) &
@as(std.meta.Vector(usize_count, usize), other_set.ints)),
@as(std.meta.Vector(usize_count, usize), other_set.ints));
pub fn isSuperSetOf(set: Set, other_set: Set) bool {
const V = std.meta.Vector(usize_count, usize);
const set_v: V = set.ints;
const other_v: V = other_set.ints;
return @reduce(.And, (set_v & other_v) == other_v);
}
};