authorgravatar for david@vortan.devDavid Rubin <david@vortan.dev> 2024-11-30 16:08:26-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-01-17 12:34:15-08:00
logf278038923c33ddf710f0328a07ce18613a94130
treeb42bd7588d552c7b186f26bb03bcad0970f1b744
parentb07958e6b7dee73372bb4a6907c5bc884a426bc8

replace `compiler_rt` memcpy with a better version

3 files changed, 130 insertions(+), 39 deletions(-)

lib/compiler_rt.zig-1
...@@ -233,7 +233,6 @@ comptime {...@@ -233,7 +233,6 @@ comptime {
233233
234 _ = @import("compiler_rt/memcpy.zig");234 _ = @import("compiler_rt/memcpy.zig");
235 _ = @import("compiler_rt/memset.zig");235 _ = @import("compiler_rt/memset.zig");
236 _ = @import("compiler_rt/memmove.zig");
237 _ = @import("compiler_rt/memcmp.zig");236 _ = @import("compiler_rt/memcmp.zig");
238 _ = @import("compiler_rt/bcmp.zig");237 _ = @import("compiler_rt/bcmp.zig");
239 _ = @import("compiler_rt/ssp.zig");238 _ = @import("compiler_rt/ssp.zig");
lib/compiler_rt/memcpy.zig+130-13
...@@ -5,24 +5,141 @@ const builtin = @import("builtin");...@@ -5,24 +5,141 @@ const builtin = @import("builtin");
5comptime {5comptime {
6 if (builtin.object_format != .c) {6 if (builtin.object_format != .c) {
7 @export(&memcpy, .{ .name = "memcpy", .linkage = common.linkage, .visibility = common.visibility });7 @export(&memcpy, .{ .name = "memcpy", .linkage = common.linkage, .visibility = common.visibility });
8 @export(&memcpy, .{ .name = "memmove", .linkage = common.linkage, .visibility = common.visibility });
8 }9 }
9}10}
1011
11pub fn memcpy(noalias dest: ?[*]u8, noalias src: ?[*]const u8, len: usize) callconv(.C) ?[*]u8 {12// a port of https://github.com/facebook/folly/blob/1c8bc50e88804e2a7361a57cd9b551dd10f6c5fd/folly/memcpy.S
12 @setRuntimeSafety(false);13pub fn memcpy(maybe_dest: ?[*]u8, maybe_src: ?[*]const u8, len: usize) callconv(.C) ?[*]u8 {
1314 if (len == 0) {
14 if (len != 0) {15 @branchHint(.unlikely);
15 var d = dest.?;16 return maybe_dest;
16 var s = src.?;17 }
17 var n = len;18
18 while (true) {19 const dest = maybe_dest.?;
19 d[0] = s[0];20 const src = maybe_src.?;
20 n -= 1;21
21 if (n == 0) break;22 if (len < 8) {
22 d += 1;23 @branchHint(.unlikely);
23 s += 1;24 if (len == 1) {
25 @branchHint(.unlikely);
26 dest[0] = src[0];
27 } else if (len >= 4) {
28 @branchHint(.unlikely);
29 blockCopy(dest, src, 4, len);
30 } else {
31 blockCopy(dest, src, 2, len);
24 }32 }
33 return dest;
25 }34 }
2635
36 if (len > 32) {
37 @branchHint(.unlikely);
38 if (len > 256) {
39 @branchHint(.unlikely);
40 copyMove(dest, src, len);
41 return dest;
42 }
43 copyLong(dest, src, len);
44 return dest;
45 }
46
47 if (len > 16) {
48 @branchHint(.unlikely);
49 blockCopy(dest, src, 16, len);
50 return dest;
51 }
52
53 blockCopy(dest, src, 8, len);
54
27 return dest;55 return dest;
28}56}
57
58inline fn blockCopy(dest: [*]u8, src: [*]const u8, block_size: comptime_int, len: usize) void {
59 const first = @as(*align(1) const @Vector(block_size, u8), src[0..block_size]).*;
60 const second = @as(*align(1) const @Vector(block_size, u8), src[len - block_size ..][0..block_size]).*;
61 dest[0..block_size].* = first;
62 dest[len - block_size ..][0..block_size].* = second;
63}
64
65inline fn copyLong(dest: [*]u8, src: [*]const u8, len: usize) void {
66 var array: [8]@Vector(32, u8) = undefined;
67
68 inline for (.{ 64, 128, 192, 256 }, 0..) |N, i| {
69 array[i * 2] = src[(N / 2) - 32 ..][0..32].*;
70 array[(i * 2) + 1] = src[len - N / 2 ..][0..32].*;
71
72 if (len <= N) {
73 @branchHint(.unlikely);
74 for (0..i + 1) |j| {
75 dest[j * 32 ..][0..32].* = array[j * 2];
76 dest[len - ((j * 32) + 32) ..][0..32].* = array[(j * 2) + 1];
77 }
78 return;
79 }
80 }
81}
82
83inline fn copyMove(dest: [*]u8, src: [*]const u8, len: usize) void {
84 if (@intFromPtr(src) >= @intFromPtr(dest)) {
85 @branchHint(.unlikely);
86 copyForward(dest, src, len);
87 } else if (@intFromPtr(src) + len > @intFromPtr(dest)) {
88 @branchHint(.unlikely);
89 overlapBwd(dest, src, len);
90 } else {
91 copyForward(dest, src, len);
92 }
93}
94
95inline fn copyForward(dest: [*]u8, src: [*]const u8, len: usize) void {
96 const tail: @Vector(32, u8) = src[len - 32 ..][0..32].*;
97
98 const N: usize = len & ~@as(usize, 127);
99 var i: usize = 0;
100
101 while (i < N) : (i += 128) {
102 dest[i..][0..32].* = src[i..][0..32].*;
103 dest[i + 32 ..][0..32].* = src[i + 32 ..][0..32].*;
104 dest[i + 64 ..][0..32].* = src[i + 64 ..][0..32].*;
105 dest[i + 96 ..][0..32].* = src[i + 96 ..][0..32].*;
106 }
107
108 if (len - i <= 32) {
109 @branchHint(.unlikely);
110 dest[len - 32 ..][0..32].* = tail;
111 } else {
112 copyLong(dest[i..], src[i..], len - i);
113 }
114}
115
116inline fn overlapBwd(dest: [*]u8, src: [*]const u8, len: usize) void {
117 var array: [5]@Vector(32, u8) = undefined;
118 array[0] = src[len - 32 ..][0..32].*;
119 inline for (1..5) |i| array[i] = src[(i - 1) << 5 ..][0..32].*;
120
121 const end: usize = (@intFromPtr(dest) + len - 32) & 31;
122 const range = len - end;
123 var s = src + range;
124 var d = dest + range;
125
126 while (@intFromPtr(s) > @intFromPtr(src + 128)) {
127 // zig fmt: off
128 const first = @as(*align(1) const @Vector(32, u8), @ptrCast(s - 32)).*;
129 const second = @as(*align(1) const @Vector(32, u8), @ptrCast(s - 64)).*;
130 const third = @as(*align(1) const @Vector(32, u8), @ptrCast(s - 96)).*;
131 const fourth = @as(*align(1) const @Vector(32, u8), @ptrCast(s - 128)).*;
132
133 @as(*align(32) @Vector(32, u8), @alignCast(@ptrCast(d - 32))).* = first;
134 @as(*align(32) @Vector(32, u8), @alignCast(@ptrCast(d - 64))).* = second;
135 @as(*align(32) @Vector(32, u8), @alignCast(@ptrCast(d - 96))).* = third;
136 @as(*align(32) @Vector(32, u8), @alignCast(@ptrCast(d - 128))).* = fourth;
137 // zig fmt: on
138
139 s -= 128;
140 d -= 128;
141 }
142
143 inline for (array[1..], 0..) |vec, i| dest[i * 32 ..][0..32].* = vec;
144 dest[len - 32 ..][0..32].* = array[0];
145}
lib/compiler_rt/memmove.zig deleted-25
...@@ -1,25 +0,0 @@
1const std = @import("std");
2const common = @import("./common.zig");
3
4comptime {
5 @export(&memmove, .{ .name = "memmove", .linkage = common.linkage, .visibility = common.visibility });
6}
7
8pub fn memmove(dest: ?[*]u8, src: ?[*]const u8, n: usize) callconv(.C) ?[*]u8 {
9 @setRuntimeSafety(false);
10
11 if (@intFromPtr(dest) < @intFromPtr(src)) {
12 var index: usize = 0;
13 while (index != n) : (index += 1) {
14 dest.?[index] = src.?[index];
15 }
16 } else {
17 var index = n;
18 while (index != 0) {
19 index -= 1;
20 dest.?[index] = src.?[index];
21 }
22 }
23
24 return dest;
25}