From 5cadfc34b41d45132a6f61119ab574f1cf7c3f4a Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Wed, 6 May 2026 22:39:22 +0200 Subject: [PATCH] investigating memory issues --- .gitea/workflows/Test.yml | 2 +- build.zig | 15 ++++++--------- build.zig.zon | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/Test.yml b/.gitea/workflows/Test.yml index 8a27b06..1200c5c 100644 --- a/.gitea/workflows/Test.yml +++ b/.gitea/workflows/Test.yml @@ -61,7 +61,7 @@ jobs: which deqp-runner && deqp-runner --version || echo "deqp-runner not found" - name: Run Vulkan CTS - run: zig build cts-soft --release=fast -- -j3 + run: zig build cts-soft --release=fast -- -j3 --deqp-test-oom=disable continue-on-error: true - name: Verify tests diff --git a/build.zig b/build.zig index cc4f6d9..4613a09 100644 --- a/build.zig +++ b/build.zig @@ -224,7 +224,7 @@ fn addCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *const Implemen }, })); - const mustpass = try cts.path("mustpass/master/vk-default.txt").getPath3(b, null).toString(b.allocator); + const mustpass = try cts.path("vk-default.txt").getPath3(b, null).toString(b.allocator); const cts_exe_path = try cts_exe_name.getPath3(b, null).toString(b.allocator); @@ -241,6 +241,9 @@ fn addCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *const Implemen run.addArg(cts_exe_path); }, .valgrind => { + run.addArg("-s"); + run.addArg("--leak-check=full"); + run.addArg("--show-leak-kinds=all"); run.addArg("--track-origins=yes"); run.addArg(cts_exe_path); }, @@ -297,23 +300,17 @@ fn addMultithreadedCTS(b: *std.Build, target: std.Build.ResolvedTarget, impl: *c }, })); - var mustpass_override: ?[]const u8 = null; var jobs_count: ?usize = null; if (b.args) |args| { for (args) |arg| { - if (std.mem.startsWith(u8, arg, "--mustpass-list")) { - mustpass_override = arg["--mustpass-list=".len..]; - } else if (std.mem.startsWith(u8, arg, "-j")) { + if (std.mem.startsWith(u8, arg, "-j")) { jobs_count = try std.fmt.parseInt(usize, arg["-j".len..], 10); } } } - const mustpass_path = try cts.path(if (mustpass_override) |override| - b.fmt("mustpass/{s}/vk-default.txt", .{override}) - else - "mustpass/master/vk-default.txt").getPath3(b, null).toString(b.allocator); + const mustpass_path = try cts.path("mustpass/master/vk-default.txt").getPath3(b, null).toString(b.allocator); const cts_exe_path = try cts_exe_name.getPath3(b, null).toString(b.allocator); const run = b.addSystemCommand(&[_][]const u8{"deqp-runner"}); diff --git a/build.zig.zon b/build.zig.zon index fb30134..cc3e06c 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -22,8 +22,8 @@ .hash = "zmath-0.11.0-dev-wjwivdMsAwD-xaLj76YHUq3t9JDH-X16xuMTmnDzqbu2", }, .cts_bin = .{ - .url = "git+https://git.kbz8.me/kbz_8/Vulkan-CTS-bin#19ce2da05f8176348064a9fc6688847e5f76a46e", - .hash = "N-V-__8AAHDV0xtS93nAGaYd7YWxBLnvHDEplwIpC29izSGa", + .url = "git+https://git.kbz8.me/kbz_8/Vulkan-CTS-bin.git#a5f787d80f14f136e3cb3e1185c35e298846c1d7", + .hash = "N-V-__8AAMpOQxkHCKTw9i-NwmmQ3ks1ndFDXcVLlic4KjK3", }, .cpuinfo = .{ .url = "git+https://github.com/Kbz-8/cpuinfo.git#c9bea4f6c166a495ee0ce117821f9627d4aed118",