fixing example
All checks were successful
Build / build (push) Successful in 3m15s
Test / build (push) Successful in 9m50s

This commit is contained in:
2026-03-12 01:06:20 +01:00
parent 7dd86b021d
commit 72faa35357
4 changed files with 65 additions and 10 deletions

View File

@@ -30,13 +30,17 @@ pub fn main() !void {
var runner_cache: std.ArrayList(Runner) = try .initCapacity(allocator, screen_height); var runner_cache: std.ArrayList(Runner) = try .initCapacity(allocator, screen_height);
defer { defer {
for (runner_cache.items) |*runner| { for (runner_cache.items) |*runner| {
runner.rt.deinit(allocator); allocator.free(runner.heap);
} }
runner_cache.deinit(allocator); runner_cache.deinit(allocator);
} }
for (0..screen_height) |_| { for (0..screen_height) |_| {
var rt = try spv.Runtime.init(allocator, &module); const heap = try allocator.alloc(u8, module.needed_runtime_bytes);
errdefer allocator.free(heap);
var buffer_allocator: std.heap.FixedBufferAllocator = .init(heap);
var rt = try spv.Runtime.init(buffer_allocator.allocator(), &module);
(try runner_cache.addOne(allocator)).* = .{ (try runner_cache.addOne(allocator)).* = .{
.allocator = allocator, .allocator = allocator,
.surface = surface, .surface = surface,
@@ -46,6 +50,7 @@ pub fn main() !void {
.time = try rt.getResultByName("time"), .time = try rt.getResultByName("time"),
.pos = try rt.getResultByName("pos"), .pos = try rt.getResultByName("pos"),
.res = try rt.getResultByName("res"), .res = try rt.getResultByName("res"),
.heap = heap,
}; };
} }
@@ -105,6 +110,7 @@ const Runner = struct {
time: spv.SpvWord, time: spv.SpvWord,
pos: spv.SpvWord, pos: spv.SpvWord,
res: spv.SpvWord, res: spv.SpvWord,
heap: []u8,
fn runWrapper(self: *Self, y: usize, pixel_map: [*]u32, timer: f32) void { fn runWrapper(self: *Self, y: usize, pixel_map: [*]u32, timer: f32) void {
@call(.always_inline, Self.run, .{ self, y, pixel_map, timer }) catch |err| { @call(.always_inline, Self.run, .{ self, y, pixel_map, timer }) catch |err| {
@@ -122,11 +128,11 @@ const Runner = struct {
var output: [4]f32 = undefined; var output: [4]f32 = undefined;
for (0..screen_width) |x| { for (0..screen_width) |x| {
try rt.writeInput(&.{timer}, self.time); try rt.writeInput(std.mem.asBytes(&timer), self.time);
try rt.writeInput(&.{ @floatFromInt(screen_width), @floatFromInt(screen_height) }, self.res); try rt.writeInput(std.mem.asBytes(&[_]f32{ @floatFromInt(screen_width), @floatFromInt(screen_height) }), self.res);
try rt.writeInput(&.{ @floatFromInt(x), @floatFromInt(y) }, self.pos); try rt.writeInput(std.mem.asBytes(&[_]f32{ @floatFromInt(x), @floatFromInt(y) }), self.pos);
try rt.callEntryPoint(self.allocator, self.entry); try rt.callEntryPoint(self.allocator, self.entry);
try rt.readOutput(output[0..], self.color); try rt.readOutput(std.mem.asBytes(output[0..]), self.color);
const rgba = self.surface.mapRgba( const rgba = self.surface.mapRgba(
@intCast(@max(@min(@as(i32, @intFromFloat(output[0] * 255.0)), 255), 0)), @intCast(@max(@min(@as(i32, @intFromFloat(output[0] * 255.0)), 255), 0)),

View File

@@ -38,6 +38,44 @@ pub const ModuleError = error{
OutOfMemory, OutOfMemory,
}; };
const AllocatorWrapper = struct {
child_allocator: std.mem.Allocator,
total_bytes_allocated: usize = 0,
pub fn allocator(self: *AllocatorWrapper) std.mem.Allocator {
return .{
.ptr = self,
.vtable = &.{
.alloc = alloc,
.resize = resize,
.remap = remap,
.free = free,
},
};
}
fn alloc(ctx: *anyopaque, n: usize, alignment: std.mem.Alignment, ra: usize) ?[*]u8 {
const self: *AllocatorWrapper = @ptrCast(@alignCast(ctx));
self.total_bytes_allocated += alignment.toByteUnits() + n;
return self.child_allocator.rawAlloc(n, alignment, ra);
}
fn resize(ctx: *anyopaque, buf: []u8, alignment: std.mem.Alignment, new_len: usize, ret_addr: usize) bool {
const self: *AllocatorWrapper = @ptrCast(@alignCast(ctx));
return self.child_allocator.rawResize(buf, alignment, new_len, ret_addr);
}
fn remap(context: *anyopaque, memory: []u8, alignment: std.mem.Alignment, new_len: usize, return_address: usize) ?[*]u8 {
const self: *AllocatorWrapper = @ptrCast(@alignCast(context));
return self.child_allocator.rawRemap(memory, alignment, new_len, return_address);
}
fn free(ctx: *anyopaque, buf: []u8, alignment: std.mem.Alignment, ret_addr: usize) void {
const self: *AllocatorWrapper = @ptrCast(@alignCast(ctx));
return self.child_allocator.rawFree(buf, alignment, ret_addr);
}
};
options: ModuleOptions, options: ModuleOptions,
it: WordIterator, it: WordIterator,
@@ -77,6 +115,8 @@ bindings: [lib.SPIRV_MAX_SET][lib.SPIRV_MAX_SET_BINDINGS]SpvWord,
builtins: std.EnumMap(spv.SpvBuiltIn, SpvWord), builtins: std.EnumMap(spv.SpvBuiltIn, SpvWord),
push_constants: []Value, push_constants: []Value,
needed_runtime_bytes: usize,
pub fn init(allocator: std.mem.Allocator, source: []const SpvWord, options: ModuleOptions) ModuleError!Self { pub fn init(allocator: std.mem.Allocator, source: []const SpvWord, options: ModuleOptions) ModuleError!Self {
var self: Self = std.mem.zeroInit(Self, .{ var self: Self = std.mem.zeroInit(Self, .{
.options = options, .options = options,
@@ -92,6 +132,8 @@ pub fn init(allocator: std.mem.Allocator, source: []const SpvWord, options: Modu
op.initRuntimeDispatcher(); op.initRuntimeDispatcher();
var wrapped_allocator: AllocatorWrapper = .{ .child_allocator = allocator };
self.it = WordIterator.init(self.code); self.it = WordIterator.init(self.code);
const magic = self.it.next() catch return ModuleError.InvalidSpirV; const magic = self.it.next() catch return ModuleError.InvalidSpirV;
@@ -111,7 +153,7 @@ pub fn init(allocator: std.mem.Allocator, source: []const SpvWord, options: Modu
self.generator_version = @intCast(generator & 0x0000FFFF); self.generator_version = @intCast(generator & 0x0000FFFF);
self.bound = self.it.next() catch return ModuleError.InvalidSpirV; self.bound = self.it.next() catch return ModuleError.InvalidSpirV;
self.results = allocator.alloc(Result, self.bound) catch return ModuleError.OutOfMemory; self.results = wrapped_allocator.allocator().alloc(Result, self.bound) catch return ModuleError.OutOfMemory;
errdefer allocator.free(self.results); errdefer allocator.free(self.results);
for (self.results) |*result| { for (self.results) |*result| {
@@ -167,6 +209,8 @@ pub fn init(allocator: std.mem.Allocator, source: []const SpvWord, options: Modu
}); });
} }
self.needed_runtime_bytes += wrapped_allocator.total_bytes_allocated;
//@import("pretty").print(allocator, self.results, .{ //@import("pretty").print(allocator, self.results, .{
// .tab_size = 4, // .tab_size = 4,
// .max_depth = 0, // .max_depth = 0,
@@ -192,6 +236,8 @@ fn pass(self: *Self, allocator: std.mem.Allocator) ModuleError!void {
var rt = Runtime.init(allocator, self) catch return ModuleError.OutOfMemory; var rt = Runtime.init(allocator, self) catch return ModuleError.OutOfMemory;
defer rt.deinit(allocator); defer rt.deinit(allocator);
var wrapped_allocator: AllocatorWrapper = .{ .child_allocator = allocator };
while (rt.it.nextOrNull()) |opcode_data| { while (rt.it.nextOrNull()) |opcode_data| {
const word_count = ((opcode_data & (~spv.SpvOpCodeMask)) >> spv.SpvWordCountShift) - 1; const word_count = ((opcode_data & (~spv.SpvOpCodeMask)) >> spv.SpvWordCountShift) - 1;
const opcode = (opcode_data & spv.SpvOpCodeMask); const opcode = (opcode_data & spv.SpvOpCodeMask);
@@ -199,12 +245,14 @@ fn pass(self: *Self, allocator: std.mem.Allocator) ModuleError!void {
var it_tmp = rt.it; // Save because operations may iter on this iterator var it_tmp = rt.it; // Save because operations may iter on this iterator
if (std.enums.fromInt(spv.SpvOp, opcode)) |spv_op| { if (std.enums.fromInt(spv.SpvOp, opcode)) |spv_op| {
if (op.SetupDispatcher.get(spv_op)) |pfn| { if (op.SetupDispatcher.get(spv_op)) |pfn| {
pfn(allocator, word_count, &rt) catch return ModuleError.InvalidSpirV; pfn(wrapped_allocator.allocator(), word_count, &rt) catch return ModuleError.InvalidSpirV;
} }
} }
_ = it_tmp.skipN(word_count); _ = it_tmp.skipN(word_count);
rt.it = it_tmp; rt.it = it_tmp;
} }
self.needed_runtime_bytes += wrapped_allocator.total_bytes_allocated;
} }
fn populateMaps(self: *Self) ModuleError!void { fn populateMaps(self: *Self) ModuleError!void {

View File

@@ -113,7 +113,8 @@ pub fn callEntryPoint(self: *Self, allocator: std.mem.Allocator, entry_point_ind
if (entry_point_result.variant) |variant| { if (entry_point_result.variant) |variant| {
switch (variant) { switch (variant) {
.Function => |f| { .Function => |f| {
if (!self.it.jumpToSourceLocation(f.source_location)) return RuntimeError.InvalidEntryPoint; if (!self.it.jumpToSourceLocation(f.source_location))
return RuntimeError.InvalidEntryPoint;
self.function_stack.append(allocator, .{ self.function_stack.append(allocator, .{
.source_location = f.source_location, .source_location = f.source_location,
.result = entry_point_result, .result = entry_point_result,

View File

@@ -21,7 +21,7 @@
//! //!
//! try rt.callEntryPoint(allocator, try rt.getEntryPointByName("main")); //! try rt.callEntryPoint(allocator, try rt.getEntryPointByName("main"));
//! var output: [4]f32 = undefined; //! var output: [4]f32 = undefined;
//! try rt.readOutput(f32, output[0..output.len], try rt.getResultByName("color")); //! try rt.readOutput(std.mem.asBytes(output[0..output.len]), try rt.getResultByName("color"));
//! std.log.info("Output: Vec4{any}", .{output}); //! std.log.info("Output: Vec4{any}", .{output});
//! } //! }
//! std.log.info("Successfully executed", .{}); //! std.log.info("Successfully executed", .{});