finishing bitwise operatoins
All checks were successful
Build / build (push) Successful in 1m3s
Test / build (push) Successful in 6m4s

This commit is contained in:
2026-01-20 00:32:50 +01:00
parent 9fb8cbea05
commit 35099b33e1
9 changed files with 260 additions and 62 deletions

149
test/bitwise.zig git.filemode.normal_file
View File

@@ -0,0 +1,149 @@
const std = @import("std");
const root = @import("root.zig");
const compileNzsl = root.compileNzsl;
const case = root.case;
const Operations = enum {
BitwiseAnd,
BitwiseOr,
BitwiseXor,
ShiftLeft,
ShiftRight,
ShiftRightArithmetic,
};
test "Bitwise primitives" {
const allocator = std.testing.allocator;
const types = [_]type{ i32, u32 };
var operations = std.EnumMap(Operations, []const u8).init(.{
.BitwiseAnd = "&",
.BitwiseOr = "|",
.BitwiseXor = "^",
.ShiftLeft = "<<",
.ShiftRight = ">>",
.ShiftRightArithmetic = ">>",
});
var it = operations.iterator();
while (it.next()) |op| {
inline for (types) |T| {
const op1: T = case.random(T);
const op2: T = @mod(case.random(T), @bitSizeOf(T));
const expected = switch (op.key) {
.BitwiseAnd => op1 & op2,
.BitwiseOr => op1 | op2,
.BitwiseXor => op1 ^ op2,
.ShiftLeft => op1 << @intCast(op2),
.ShiftRight, .ShiftRightArithmetic => op1 >> @intCast(op2),
};
const shader = try std.fmt.allocPrint(
allocator,
\\ [nzsl_version("1.1")]
\\ [feature(float64)]
\\ module;
\\
\\ struct FragOut
\\ {{
\\ [location(0)] color: vec4[{s}]
\\ }}
\\
\\ [entry(frag)]
\\ fn main() -> FragOut
\\ {{
\\ let op1: {s} = {d};
\\ let op2: {s} = {d};
\\ let color = op1 {s} op2;
\\
\\ let output: FragOut;
\\ output.color = vec4[{s}](color, color, color, color);
\\ return output;
\\ }}
,
.{
@typeName(T),
@typeName(T),
op1,
@typeName(T),
op2,
op.value.*,
@typeName(T),
},
);
defer allocator.free(shader);
const code = try compileNzsl(allocator, shader);
defer allocator.free(code);
try case.expectOutput(T, 4, code, "color", &.{ expected, expected, expected, expected });
}
}
}
test "Bitwise vectors" {
const allocator = std.testing.allocator;
const types = [_]type{ i32, u32 };
var operations = std.EnumMap(Operations, []const u8).init(.{
.BitwiseAnd = "&",
.BitwiseOr = "|",
.BitwiseXor = "^",
.ShiftLeft = "<<",
.ShiftRight = ">>",
.ShiftRightArithmetic = ">>",
});
var it = operations.iterator();
while (it.next()) |op| {
inline for (2..5) |L| {
inline for (types) |T| {
const op1: case.Vec(L, T) = .{ .val = case.random(@Vector(L, T)) };
var op2: case.Vec(L, T) = .{ .val = case.random(@Vector(L, T)) };
for (0..L) |i| op2.val[i] = @mod(op2.val[i], @bitSizeOf(T));
const expected = switch (op.key) {
.BitwiseAnd => op1.val & op2.val,
.BitwiseOr => op1.val | op2.val,
.BitwiseXor => op1.val ^ op2.val,
.ShiftLeft => op1.val << @intCast(op2.val),
.ShiftRight, .ShiftRightArithmetic => op1.val >> @intCast(op2.val),
};
const shader = try std.fmt.allocPrint(
allocator,
\\ [nzsl_version("1.1")]
\\ [feature(float64)]
\\ module;
\\
\\ struct FragOut
\\ {{
\\ [location(0)] color: vec{d}[{s}]
\\ }}
\\
\\ [entry(frag)]
\\ fn main() -> FragOut
\\ {{
\\ let op1 = vec{d}[{s}]({f});
\\ let op2 = vec{d}[{s}]({f});
\\
\\ let output: FragOut;
\\ output.color = op1 {s} op2;
\\ return output;
\\ }}
,
.{
L,
@typeName(T),
L,
@typeName(T),
op1,
L,
@typeName(T),
op2,
op.value.*,
},
);
defer allocator.free(shader);
const code = try compileNzsl(allocator, shader);
defer allocator.free(code);
try case.expectOutput(T, L, code, "color", &@as([L]T, expected));
}
}
}
}

View File

@@ -11,19 +11,6 @@ const Operations = enum {
Mod,
};
fn Vec(comptime len: usize, comptime T: type) type {
return struct {
const Self = @This();
val: @Vector(len, T),
pub fn format(self: *const Self, w: *std.Io.Writer) std.Io.Writer.Error!void {
inline for (0..len) |i| {
try w.print("{d}", .{self.val[i]});
if (i < len - 1) try w.writeAll(", ");
}
}
};
}
// Tests all mathematical operation on all NZSL supported primitive types
test "Maths primitives" {
const allocator = std.testing.allocator;
@@ -106,8 +93,8 @@ test "Maths vectors" {
while (it.next()) |op| {
inline for (2..5) |L| {
inline for (types) |T| {
const base_color: Vec(L, T) = .{ .val = case.random(@Vector(L, T)) };
const ratio: Vec(L, T) = .{ .val = case.random(@Vector(L, T)) };
const base_color: case.Vec(L, T) = .{ .val = case.random(@Vector(L, T)) };
const ratio: case.Vec(L, T) = .{ .val = case.random(@Vector(L, T)) };
const expected = switch (op.key) {
.Add => if (@typeInfo(T) == .int) @addWithOverflow(base_color.val, ratio.val)[0] else base_color.val + ratio.val,
.Sub => if (@typeInfo(T) == .int) @subWithOverflow(base_color.val, ratio.val)[0] else base_color.val - ratio.val,

View File

@@ -53,11 +53,25 @@ pub const case = struct {
inline else => unreachable,
};
}
pub fn Vec(comptime len: usize, comptime T: type) type {
return struct {
const Self = @This();
val: @Vector(len, T),
pub fn format(self: *const Self, w: *std.Io.Writer) std.Io.Writer.Error!void {
inline for (0..len) |i| {
try w.print("{d}", .{self.val[i]});
if (i < len - 1) try w.writeAll(", ");
}
}
};
}
};
test {
std.testing.refAllDecls(@import("arrays.zig"));
std.testing.refAllDecls(@import("basics.zig"));
std.testing.refAllDecls(@import("bitwise.zig"));
std.testing.refAllDecls(@import("branching.zig"));
std.testing.refAllDecls(@import("casts.zig"));
std.testing.refAllDecls(@import("functions.zig"));