mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

target: update spirv features

Browse source
This commit is contained in:
Ali Cheraghi 2025-02-14 15:32:20 +03:30
parent 29e46633ce
commit 1b0c7f51ef
No known key found for this signature in database
GPG key ID: 7AD1F6DBB6B5A0DA
3 changed files with 1221 additions and 426 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/std/Target.zig
View file

@ -1184,7 +1184,7 @@ pub const Cpu = struct {
pub const Set = struct {
ints: [usize_count]usize,
pub const needed_bit_count = 288;
pub const needed_bit_count = 398;
pub const byte_count = (needed_bit_count + 7) / 8;
pub const usize_count = (byte_count + (@sizeOf(usize) - 1)) / @sizeOf(usize);
pub const Index = std.math.Log2Int(std.meta.Int(.unsigned, usize_count * @bitSizeOf(usize)));

1592
lib/std/Target/spirv.zig
View file

File diff suppressed because it is too large Load diff

49
tools/update_spirv_features.zig
View file

@ -77,7 +77,7 @@ pub fn main() !void {
var scanner = std.json.Scanner.initCompleteInput(allocator, registry_json);
var diagnostics = std.json.Diagnostics{};
scanner.enableDiagnostics(&diagnostics);
const registry = std.json.parseFromTokenSourceLeaky(g.CoreRegistry, allocator, &scanner, .{}) catch |err| {
const registry = std.json.parseFromTokenSourceLeaky(g.CoreRegistry, allocator, &scanner, .{ .ignore_unknown_fields = true }) catch |err| {
std.debug.print("line,col: {},{}\n", .{ diagnostics.getLine(), diagnostics.getColumn() });
return err;
};
@ -188,12 +188,12 @@ pub fn main() !void {
cap.enumerant,
});
if (cap.version) |ver_str| {
if (!std.mem.eql(u8, ver_str, "None")) {
if (cap.version) |ver_str| blk: {
if (std.mem.eql(u8, ver_str, "None")) break :blk;
const ver = try Version.parse(ver_str);
try w.print(" .v{}_{},\n", .{ ver.major, ver.minor });
}
}
for (cap.capabilities) |cap_dep| {
try w.print(" .{p_},\n", .{std.zig.fmtId(cap_dep)});
@ -215,6 +215,37 @@ pub fn main() !void {
\\ break :blk result;
\\};
\\
\\pub const cpu = struct {
\\ pub const generic: CpuModel = .{
\\ .name = "generic",
\\ .llvm_name = "generic",
\\ .features = featureSet(&[_]Feature{ .v1_0 }),
\\ };
\\
\\ pub const vulkan_v1_2: CpuModel = .{
\\ .name = "vulkan_v1_2",
\\ .llvm_name = null,
\\ .features = featureSet(&[_]Feature{
\\ .v1_5,
\\ .Shader,
\\ .PhysicalStorageBufferAddresses,
\\ .VariablePointers,
\\ .VariablePointersStorageBuffer,
\\ .SPV_KHR_physical_storage_buffer,
\\ }),
\\ };
\\
\\ pub const opencl_v2: CpuModel = .{
\\ .name = "opencl_v2",
\\ .llvm_name = null,
\\ .features = featureSet(&[_]Feature{
\\ .v1_2,
\\ .Kernel,
\\ .Addresses,
\\ .GenericPointer,
\\ }),
\\ };
\\};
);
try bw.flush();
@ -265,12 +296,15 @@ fn gather_extensions(allocator: Allocator, spirv_registry_root: []const u8) ![]c
// As the specs are inconsistent on this next part, just skip any newlines/minuses
var ext_start = name_strings_offset + name_strings.len + 1;
while (ext_spec[ext_start] == '\n' or ext_spec[ext_start] == '-') {
while (std.ascii.isWhitespace(ext_spec[ext_start]) or ext_spec[ext_start] == '-') {
ext_start += 1;
}
const ext_end = std.mem.indexOfScalarPos(u8, ext_spec, ext_start, '\n') orelse return error.InvalidRegistry;
const ext = ext_spec[ext_start..ext_end];
const ext = std.mem.trim(u8, ext_spec[ext_start..ext_end], &std.ascii.whitespace);
// Ignore invalid/incomplete extensions
if (std.mem.eql(u8, ext, "{extension_name}")) continue;
std.debug.assert(std.mem.startsWith(u8, ext, "SPV_")); // Sanity check, all extensions should have a name like SPV_VENDOR_extension.
@ -283,8 +317,7 @@ fn gather_extensions(allocator: Allocator, spirv_registry_root: []const u8) ![]c
fn insertVersion(versions: *std.ArrayList(Version), version: ?[]const u8) !void {
const ver_str = version orelse return;
if (std.mem.eql(u8, ver_str, "None"))
return;
if (std.mem.eql(u8, ver_str, "None")) return;
const ver = try Version.parse(ver_str);
for (versions.items) |existing_ver| {