kbz_8/VulkanDriver
1
0
Fork 0
Code Issues Pull Requests actions.actions Packages Projects Releases Wiki Activity

switching to fully multithreaded compute pipelines executions
All checks were successful
Build / build (push) Successful in 1m58s
Details
Test / build_and_test (push) Successful in 1h37m16s
Details

Browse Source
This commit is contained in:
kbz_8
2026-03-08 02:30:57 +01:00
parent 961ee791b3
commit d354e7667d
2 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.zig.zon
View File

@@ -59,8 +59,8 @@
.lazy = true, .lazy = true,
}, },
.SPIRV_Interpreter = .{ .SPIRV_Interpreter = .{
.url = "git+https://git.kbz8.me/kbz_8/SPIRV-Interpreter#e09a41754ffa115ba1668f82698140b2b727b7fd", .url = "git+https://git.kbz8.me/kbz_8/SPIRV-Interpreter#ad013d23fcf287d7354a05251ad0140f5fb883f7",
.hash = "SPIRV_Interpreter-0.0.1-ajmpn5eJAwCe-SNkaCifjF0UUqE6cww18VpqO0Qip_mp", .hash = "SPIRV_Interpreter-0.0.1-ajmpnwSPAwD5VW4PJc1fUX0Q7niFovZyIHfhM7jZ2kkB",
}, },
}, },

58
src/soft/device/ComputeRoutines.zig
View File

@@ -50,21 +50,9 @@ pub fn dispatch(self: *Self, group_count_x: u32, group_count_y: u32, group_count
const invocations_per_workgroup = spv_module.local_size_x * spv_module.local_size_y * spv_module.local_size_z; const invocations_per_workgroup = spv_module.local_size_x * spv_module.local_size_y * spv_module.local_size_z;
//var wg: std.Thread.WaitGroup = .{}; var wg: std.Thread.WaitGroup = .{};
for (0..@min(self.batch_size, group_count)) |batch_id| { for (0..@min(self.batch_size, group_count)) |batch_id| {
//self.device.workers.spawnWg(&wg, runWrapper, .{ self.device.workers.spawnWg(&wg, runWrapper, .{
// RunData{
// .self = self,
// .batch_id = batch_id,
// .group_count = group_count,
// .group_count_x = @as(usize, @intCast(group_count_x)),
// .group_count_y = @as(usize, @intCast(group_count_y)),
// .group_count_z = @as(usize, @intCast(group_count_z)),
// .invocations_per_workgroup = invocations_per_workgroup,
// .pipeline = pipeline,
// },
//});
runWrapper(
RunData{ RunData{
.self = self, .self = self,
.batch_id = batch_id, .batch_id = batch_id,
@@ -75,9 +63,21 @@ pub fn dispatch(self: *Self, group_count_x: u32, group_count_y: u32, group_count
.invocations_per_workgroup = invocations_per_workgroup, .invocations_per_workgroup = invocations_per_workgroup,
.pipeline = pipeline, .pipeline = pipeline,
}, },
); });
//runWrapper(
// RunData{
// .self = self,
// .batch_id = batch_id,
// .group_count = group_count,
// .group_count_x = @as(usize, @intCast(group_count_x)),
// .group_count_y = @as(usize, @intCast(group_count_y)),
// .group_count_z = @as(usize, @intCast(group_count_z)),
// .invocations_per_workgroup = invocations_per_workgroup,
// .pipeline = pipeline,
// },
//);
} }
//self.device.workers.waitAndWork(&wg); self.device.workers.waitAndWork(&wg);
} }
fn runWrapper(data: RunData) void { fn runWrapper(data: RunData) void {
@@ -97,7 +97,7 @@ inline fn run(data: RunData) !void {
const entry = try rt.getEntryPointByName(shader.entry); const entry = try rt.getEntryPointByName(shader.entry);
try data.self.syncDescriptorSets(allocator, rt, true); try data.self.writeDescriptorSets(rt);
var group_index: usize = data.batch_id; var group_index: usize = data.batch_id;
while (group_index < data.group_count) : (group_index += data.self.batch_size) { while (group_index < data.group_count) : (group_index += data.self.batch_size) {
@@ -135,13 +135,12 @@ inline fn run(data: RunData) !void {
=> {}, => {},
else => return err, else => return err,
}; };
try rt.flushDescriptorSets(allocator);
} }
try data.self.syncDescriptorSets(allocator, rt, false);
} }
} }
fn syncDescriptorSets(self: *Self, allocator: std.mem.Allocator, rt: *spv.Runtime, write: bool) !void { fn writeDescriptorSets(self: *Self, rt: *spv.Runtime) !void {
sets: for (self.state.sets[0..], 0..) |set, set_index| { sets: for (self.state.sets[0..], 0..) |set, set_index| {
if (set == null) if (set == null)
continue :sets; continue :sets;
@@ -151,20 +150,11 @@ fn syncDescriptorSets(self: *Self, allocator: std.mem.Allocator, rt: *spv.Runtim
.buffer => |buffer_data| if (buffer_data.object) |buffer| { .buffer => |buffer_data| if (buffer_data.object) |buffer| {
const memory = if (buffer.interface.memory) |memory| memory else continue :bindings; const memory = if (buffer.interface.memory) |memory| memory else continue :bindings;
const map: []u8 = @as([*]u8, @ptrCast(try memory.map(buffer_data.offset, buffer_data.size)))[0..buffer_data.size]; const map: []u8 = @as([*]u8, @ptrCast(try memory.map(buffer_data.offset, buffer_data.size)))[0..buffer_data.size];
if (write) { try rt.writeDescriptorSet(
try rt.writeDescriptorSet( map,
allocator, @as(u32, @intCast(set_index)),
map, @as(u32, @intCast(binding_index)),
@as(u32, @intCast(set_index)), );
@as(u32, @intCast(binding_index)),
);
} else {
try rt.readDescriptorSet(
map,
@as(u32, @intCast(set_index)),
@as(u32, @intCast(binding_index)),
);
}
}, },
else => {}, else => {},
} }