authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-09 18:20:53-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-09 18:20:53-07:00
loge025ad7b46e3be08e17e70444f909d351ddc6718
tree2ebf40110da3bd49a6292e4daa2afe0be5baa271
parent828d23956d44b71f8b2394c6d7ab08c23d22fcc3

std.mem: fix simd.suggestVectorLength merge conflict

Commits 2f8e4347b1f9c2bf093ac48a636576c22359c1ff and 6a32d58876995f18b35ffd89b8875a99417c29cf had a conflict that was undetected by source control.

1 files changed, 1 insertions(+), 1 deletions(-)

lib/std/mem.zig+1-1
...@@ -665,7 +665,7 @@ fn eqlBytes(a: []const u8, b: []const u8) bool {...@@ -665,7 +665,7 @@ fn eqlBytes(a: []const u8, b: []const u8) bool {
665665
666 // Figure out the fastest way to scan through the input in chunks.666 // Figure out the fastest way to scan through the input in chunks.
667 // Uses vectors when supported and falls back to usize/words when not.667 // Uses vectors when supported and falls back to usize/words when not.
668 const Scan = if (std.simd.suggestVectorSize(u8)) |vec_size|668 const Scan = if (std.simd.suggestVectorLength(u8)) |vec_size|
669 struct {669 struct {
670 pub const size = vec_size;670 pub const size = vec_size;
671 pub const Chunk = @Vector(size, u8);671 pub const Chunk = @Vector(size, u8);