Skip to content

Commit 3fc55d3

Browse files
hanabi1224hanabi1224
committed
fix: ci build
1 parent 8f8a9f7 commit 3fc55d3

File tree

25 files changed

+90
-102
lines changed

25 files changed

+90
-102
lines changed

Diff for: ‎.github/dart.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ sudo ln -sf $PWD/dart-sdk/bin/dart /usr/local/bin/dart
99
popd
1010

1111
# dart3
12-
mkdir dart3sdk
13-
pushd dart3sdk
14-
wget https://storage.googleapis.com/dart-archive/channels/dev/release/latest/sdk/dartsdk-linux-x64-release.zip -O dartsdk.zip
15-
unzip -o dartsdk.zip
16-
sudo ln -sf $PWD/dart-sdk/bin/dart /usr/local/bin/dart3
17-
popd
18-
popd
19-
dart --version
20-
dart3 --version
12+
# mkdir dart3sdk
13+
# pushd dart3sdk
14+
# wget https://storage.googleapis.com/dart-archive/channels/dev/release/latest/sdk/dartsdk-linux-x64-release.zip -O dartsdk.zip
15+
# unzip -o dartsdk.zip
16+
# sudo ln -sf $PWD/dart-sdk/bin/dart /usr/local/bin/dart3
17+
# popd
18+
# popd
19+
# dart --version
20+
# dart3 --version

Diff for: ‎.github/odin.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/sh
22

3-
VERSION=dev-2023-04
3+
VERSION=dev-2023-07
44
FILE_NAME=odin-ubuntu-amd64-$VERSION.zip
55
sudo apt-get install -y aria2
66
mkdir /tmp/odin

Diff for: ‎.github/workflows/bench.yml

+4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
name: bench
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
25
on:
36
push:
47
branches: [main]
58
pull_request:
69
branches: [main]
710
workflow_dispatch:
11+
merge_group:
812
schedule:
913
- cron: "0 0 1 * *"
1014
env:

Diff for: ‎.github/workflows/cancel-stale.yml

-14
This file was deleted.

Diff for: ‎.github/workflows/site.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
name: site
2-
2+
concurrency:
3+
group: ${{ github.workflow }}-${{ github.ref }}
4+
cancel-in-progress: true
35
on:
46
# push:
57
# branches: [main]
68
pull_request:
79
branches: [main]
810
workflow_dispatch:
11+
merge_group:
912
jobs:
1013
build:
1114
runs-on: ${{ matrix.os }}

Diff for: ‎bench/algorithm/binarytrees/1.zig

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const global_allocator = std.heap.c_allocator;
99
pub fn main() !void {
1010
const stdout = std.io.getStdOut().writer();
1111
const n = try get_n();
12-
const max_depth = math.max(MIN_DEPTH + 2, n);
12+
const max_depth = @max(MIN_DEPTH + 2, n);
1313
{
1414
const stretch_depth = max_depth + 1;
1515
const stretch_tree = Node.make(stretch_depth, global_allocator).?;
@@ -21,7 +21,7 @@ pub fn main() !void {
2121

2222
var depth: usize = MIN_DEPTH;
2323
while (depth <= max_depth) : (depth += 2) {
24-
const iterations = @intCast(usize, 1) << @intCast(u6, max_depth - depth + MIN_DEPTH);
24+
const iterations = @as(usize, 1) << @as(u6, @intCast(max_depth - depth + MIN_DEPTH));
2525
var sum: usize = 0;
2626
var i: usize = 0;
2727
while (i < iterations) : (i += 1) {

Diff for: ‎bench/algorithm/edigits/1.zig

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ pub fn main() !void {
2828
defer a.deinit();
2929
var ten = try bigint.Managed.initSet(global_allocator, 10);
3030
defer ten.deinit();
31-
try bigint.Managed.pow(&a, &ten, @bitCast(u32, n - 1));
31+
try bigint.Managed.pow(&a, &ten, @as(u32, @bitCast(n - 1)));
3232
var tmp = try bigint.Managed.init(global_allocator);
3333
defer tmp.deinit();
3434
try bigint.Managed.mul(&tmp, &answer, &a);
3535
try bigint.Managed.divFloor(&answer, &a, &tmp, &q);
3636
var str = try answer.toString(global_allocator, 10, std.fmt.Case.lower);
3737
var i: usize = 0;
38-
var n_usize = @as(usize, @bitCast(u32, n));
38+
var n_usize = @as(usize, @as(u32, @bitCast(n)));
3939
while (i < n_usize) {
4040
var sb = [10:0]u8{ ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' };
4141
var j: usize = i;
@@ -99,8 +99,8 @@ fn test_k(n: i32, k: i32) bool {
9999
if (k < 0) {
100100
return false;
101101
}
102-
var float_k = @intToFloat(f64, k);
103-
var float_n = @intToFloat(f64, n);
102+
var float_k: f64 = @floatFromInt(k);
103+
var float_n: f64 = @floatFromInt(n);
104104
var ln_k_factorial = float_k * (math.ln(float_k) - 1.0) + 0.5 * math.ln(math.tau);
105105
var log_10_k_factorial = ln_k_factorial / math.ln10;
106106
return log_10_k_factorial >= float_n + 50.0;

Diff for: ‎bench/algorithm/fannkuch-redux/1.zig

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ pub fn main() !void {
5151
flips_count += 1;
5252
}
5353

54-
max_flips_count = std.math.max(max_flips_count, flips_count);
54+
max_flips_count = @max(max_flips_count, flips_count);
5555
if (perm_count % 2 == 0) {
56-
checksum += @intCast(isize, flips_count);
56+
checksum += @intCast(flips_count);
5757
} else {
58-
checksum -= @intCast(isize, flips_count);
58+
checksum -= @intCast(flips_count);
5959
}
6060

6161
while (true) : (r += 1) {

Diff for: ‎bench/algorithm/fannkuch-redux/2-m.zig

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const std = @import("std");
22

33
const max_n = 12;
4-
const Vec = std.meta.Vector(max_n, u8);
4+
const Vec = @Vector(max_n, u8);
55

66
fn runInParallel(tasks: []std.Thread, len: usize, comptime f: anytype, args: anytype) !void {
77
const len_per_task = @divTrunc(len, tasks.len + 1);
@@ -73,7 +73,7 @@ fn countAtPos(n: u8, start: usize) [max_n]u8 {
7373
while (i > 0) {
7474
i -= 1;
7575
const total_perms = factorialComptime(i);
76-
count[i] = i + 1 - @intCast(u8, r / total_perms);
76+
count[i] = i + 1 - @as(u8, @intCast(r / total_perms));
7777
r %= total_perms;
7878
}
7979
return count;
@@ -94,11 +94,11 @@ const Stats = struct {
9494

9595
fn nextPermutation(perm: Vec, count: []u8) ?Vec {
9696
const r = for (count, 0..) |v, i| {
97-
if (v != 1) break @intCast(u8, i);
97+
if (v != 1) break @as(u8, @intCast(i));
9898
} else return null;
9999
const next_perm = applyMask(perm, r + 1, nextPermMask);
100100
count[r] -= 1;
101-
for (count[0..r], 0..) |*v, i| v.* = @intCast(u8, i + 1);
101+
for (count[0..r], 0..) |*v, i| v.* = @intCast(i + 1);
102102
return next_perm;
103103
}
104104

@@ -109,9 +109,9 @@ fn pfannkuchenStats(first: usize, last: usize, n: u8, res: *Stats) void {
109109
var i = first;
110110
while (i < last) : (i += 1) {
111111
const flips = pfannkuchen(perm);
112-
const parity = 1 - @intCast(i32, i % 2) * 2;
113-
stats.max_flips = std.math.max(stats.max_flips, flips);
114-
stats.checksum += @intCast(i32, flips) * parity;
112+
const parity = 1 - @as(i32, @intCast(i % 2)) * 2;
113+
stats.max_flips = @max(stats.max_flips, flips);
114+
stats.checksum += @as(i32, @intCast(flips)) * parity;
115115
perm = nextPermutation(perm, count[0..n]) orelse break;
116116
}
117117
_ = @atomicRmw(u32, &res.max_flips, .Max, stats.max_flips, .SeqCst);

Diff for: ‎bench/algorithm/fannkuch-redux/2.zig

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const std = @import("std");
22

3-
const Vec = std.meta.Vector(16, u8);
3+
const Vec = @Vector(16, u8);
44

55
fn reverse_mask(n: u8) Vec {
66
// global constant is not used to workaround a compiler bug
@@ -52,14 +52,14 @@ pub fn main() !void {
5252
var parity: u1 = 0;
5353
while (true) : (parity +%= 1) {
5454
const flip_count = pfannkuchen(perm);
55-
max_flip_count = std.math.max(max_flip_count, flip_count);
56-
checksum += @intCast(i32, flip_count) * (1 - @intCast(i32, parity) * 2);
55+
max_flip_count = @max(max_flip_count, flip_count);
56+
checksum += @as(i32, @intCast(flip_count)) * (1 - @as(i32, @intCast(parity)) * 2);
5757
const r = for (count[0..n], 0..) |v, i| {
58-
if (v != 1) break @intCast(u8, i);
58+
if (v != 1) break @as(u8, @intCast(i));
5959
} else break;
6060
perm = apply_mask(perm, r + 1, next_perm_mask);
6161
count[r] -= 1;
62-
for (count[1..r], 0..) |*v, i| v.* = @intCast(u8, i + 2);
62+
for (count[1..r], 0..) |*v, i| v.* = @intCast(i + 2);
6363
}
6464

6565
const stdout = std.io.getStdOut().writer();

Diff for: ‎bench/algorithm/fannkuch-redux/3-i.zig

+5-5
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ inline fn reverse_array(array: u128, n: u4) u128 {
7575
0x0F_00_01_02_03_04_05_06_07_08_09_0A_0B_0C_0D_0E,
7676
0x00_01_02_03_04_05_06_07_08_09_0A_0B_0C_0D_0E_0F,
7777
};
78-
return @bitCast(u128, shuffle_epi8(@bitCast(u8x16, array), @bitCast(u8x16, MASK[n])));
78+
return @bitCast(shuffle_epi8(@bitCast(array), @bitCast(MASK[n])));
7979
}
8080

8181
inline fn rotate_array(array: u128, n: u4) u128 {
@@ -97,7 +97,7 @@ inline fn rotate_array(array: u128, n: u4) u128 {
9797
0x0F_00_0E_0D_0C_0B_0A_09_08_07_06_05_04_03_02_01,
9898
0x00_0F_0E_0D_0C_0B_0A_09_08_07_06_05_04_03_02_01,
9999
};
100-
return @bitCast(u128, shuffle_epi8(@bitCast(u8x16, array), @bitCast(u8x16, MASK[n])));
100+
return @bitCast(shuffle_epi8(@bitCast(array), @bitCast(MASK[n])));
101101
}
102102

103103
inline fn advance_array(_array: u128, count: *[16]u8) u128 {
@@ -156,11 +156,11 @@ fn fannkuchRedux(n: u4) [2]i32 {
156156
while (count2[n - 2] == rotate_count2) {
157157
var tmp = current2;
158158
var rev_count: i32 = 0;
159-
var first = @bitCast(u8x16, tmp)[0];
159+
var first = @as(u8x16, @bitCast(tmp))[0];
160160
if (first > 0) {
161161
while (first > 0) {
162-
const next = @bitCast(u8x16, tmp)[first];
163-
tmp = reverse_array(tmp, @truncate(u4, first));
162+
const next = @as(u8x16, @bitCast(tmp))[first];
163+
tmp = reverse_array(tmp, @as(u4, @truncate(first)));
164164
first = next;
165165
rev_count += 1;
166166
}

Diff for: ‎bench/algorithm/fasta/1.zig

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const ic = 29573;
1010
var seed: u32 = 42;
1111
fn nextRandom(max: f64) f64 {
1212
seed = (seed * ia + ic) % im;
13-
return max * @intToFloat(f64, seed) / @intToFloat(f64, im);
13+
return max * @as(f64, @floatFromInt(seed)) / @as(f64, @floatFromInt(im));
1414
}
1515

1616
const AminoAcid = struct {
@@ -28,7 +28,7 @@ fn repeatAndWrap(out: anytype, comptime sequence: []const u8, count: usize) void
2828
var idx: usize = 0;
2929
while (idx < count) {
3030
const rem = count - idx;
31-
const line_length = std.math.min(@as(usize, max_line_length), rem);
31+
const line_length = @min(@as(usize, max_line_length), rem);
3232

3333
_ = out.write(padded_sequence[off .. off + line_length]) catch unreachable;
3434
_ = out.writeByte('\n') catch unreachable;
@@ -55,7 +55,7 @@ fn generateAndWrap(out: anytype, comptime nucleotides: []const AminoAcid, count:
5555
var idx: usize = 0;
5656
while (idx < count) {
5757
const rem = count - idx;
58-
const line_length = std.math.min(@as(usize, max_line_length), rem);
58+
const line_length = @min(@as(usize, max_line_length), rem);
5959

6060
for (line[0..line_length]) |*col| {
6161
const r = nextRandom(im);

Diff for: ‎bench/algorithm/json-serde/1.zig

+6-11
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,21 @@ pub fn main() !void {
2222
const json_str = try file.readToEndAlloc(global_allocator, std.math.maxInt(u32));
2323
defer global_allocator.free(json_str);
2424
{
25-
var tokens = json.TokenStream.init(json_str);
26-
const data = try json.parse(GeoData, &tokens, .{ .allocator = global_allocator });
27-
defer json.parseFree(GeoData, data, .{ .allocator = global_allocator });
25+
const parsed = try json.parseFromSlice(GeoData, global_allocator, json_str, .{});
26+
defer parsed.deinit();
27+
const data = parsed.value;
2828
var json_str_des = std.ArrayList(u8).init(global_allocator);
2929
defer json_str_des.deinit();
3030
try json.stringify(data, .{}, json_str_des.writer());
3131
try printHash(json_str_des.items, stdout);
3232
}
3333
{
3434
var array = std.ArrayList(GeoData).init(global_allocator);
35-
defer {
36-
for (array.items) |data|
37-
json.parseFree(GeoData, data, .{ .allocator = global_allocator });
38-
array.deinit();
39-
}
4035
var i: usize = 0;
4136
while (i < n) : (i += 1) {
42-
var tokens = json.TokenStream.init(json_str);
43-
const data = try json.parse(GeoData, &tokens, .{ .allocator = global_allocator });
44-
try array.append(data);
37+
const parsed = try json.parseFromSlice(GeoData, global_allocator, json_str, .{});
38+
// defer parsed.deinit();
39+
try array.append(parsed.value);
4540
}
4641
var json_str_des = std.ArrayList(u8).init(global_allocator);
4742
defer json_str_des.deinit();

Diff for: ‎bench/algorithm/knucleotide/1.zig

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Code = struct {
1111
}
1212

1313
pub inline fn makeMask(frame: usize) u64 {
14-
return (@as(u64, 1) << @intCast(u6, (2 * frame))) - 1;
14+
return (@as(u64, 1) << @as(u6, @intCast(2 * frame))) - 1;
1515
}
1616

1717
pub inline fn push(self: *Code, c: u8, mask: u64) void {
@@ -32,7 +32,7 @@ const Code = struct {
3232
var code = self.data;
3333
var i: usize = 0;
3434
while (i < frame) : (i += 1) {
35-
const c: u8 = switch (@truncate(u8, code) & 0b11) {
35+
const c: u8 = switch (@as(u8, @truncate(code)) & 0b11) {
3636
Code.encodeByte('A') => 'A',
3737
Code.encodeByte('T') => 'T',
3838
Code.encodeByte('G') => 'G',
@@ -141,13 +141,13 @@ fn printMap(self: usize, map: Map) !void {
141141
try v.append(.{ .count = count, .code = it.key_ptr.* });
142142
}
143143

144-
std.sort.sort(CountCode, v.items, {}, comptime CountCode.asc);
144+
std.mem.sort(CountCode, v.items, {}, comptime CountCode.asc);
145145
var i = v.items.len - 1;
146146
while (true) : (i -= 1) {
147147
const cc = v.items[i];
148148
try stdout.print("{!s} {d:.3}\n", .{
149149
cc.code.toString(self),
150-
@intToFloat(f32, cc.count) / @intToFloat(f32, total) * 100.0,
150+
@as(f32, @floatFromInt(cc.count)) / @as(f32, @floatFromInt(total)) * 100.0,
151151
});
152152
if (i == 0) break;
153153
}

Diff for: ‎bench/algorithm/mandelbrot/1.zig

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ const ArrayList = std.ArrayList;
33
const md5 = std.crypto.hash.Md5;
44

55
const VEC_SIZE = 8;
6-
const Vec = std.meta.Vector(VEC_SIZE, f64);
6+
const Vec = @Vector(VEC_SIZE, f64);
77

88
const global_allocator = std.heap.c_allocator;
99

1010
pub fn main() !void {
1111
const n = try get_n();
1212
const size = (n + VEC_SIZE - 1) / VEC_SIZE * VEC_SIZE;
1313
const chunk_size = size / VEC_SIZE;
14-
const inv = 2.0 / @intToFloat(f64, size);
14+
const inv = 2.0 / @as(f64, @floatFromInt(size));
1515
var xloc = ArrayList(Vec).init(global_allocator);
1616
try xloc.ensureTotalCapacityPrecise(chunk_size);
1717
var i: usize = 0;
@@ -37,7 +37,7 @@ pub fn main() !void {
3737
try pixels.ensureTotalCapacityPrecise(size * chunk_size);
3838
var y: usize = 0;
3939
while (y < size) : (y += 1) {
40-
const ci = @intToFloat(f64, y) * inv - 1.0;
40+
const ci = @as(f64, @floatFromInt(y)) * inv - 1.0;
4141
var x: usize = 0;
4242
while (x < chunk_size) : (x += 1) {
4343
const r = mbrot8(xloc.items[x], ci);
@@ -87,14 +87,14 @@ fn mbrot8(cr: Vec, civ: f64) u8 {
8787
while (i < VEC_SIZE) : (i += 1) {
8888
if (absz[i] <= 4.0) {
8989
const lhs: u8 = 0x80;
90-
accu |= (lhs >> @intCast(u3, i));
90+
accu |= (lhs >> @as(u3, @intCast(i)));
9191
}
9292
}
9393
return accu;
9494
}
9595

9696
fn init_xloc(i: usize, inv: f64) f64 {
97-
return @intToFloat(f64, i) * inv - 1.5;
97+
return @as(f64, @floatFromInt(i)) * inv - 1.5;
9898
}
9999

100100
fn get_n() !usize {

Diff for: ‎bench/algorithm/merkletrees/1.zig

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const global_allocator = std.heap.c_allocator;
99
pub fn main() !void {
1010
const stdout = std.io.getStdOut().writer();
1111
const n = try get_n();
12-
const max_depth = math.max(MIN_DEPTH + 2, n);
12+
const max_depth = @max(MIN_DEPTH + 2, n);
1313
{
1414
const stretch_depth = max_depth + 1;
1515
const stretch_tree = Node.make(stretch_depth, global_allocator).?;
@@ -22,7 +22,7 @@ pub fn main() !void {
2222

2323
var depth: usize = MIN_DEPTH;
2424
while (depth <= max_depth) : (depth += 2) {
25-
const iterations = @intCast(usize, 1) << @intCast(u6, max_depth - depth + MIN_DEPTH);
25+
const iterations = @as(usize, 1) << @as(u6, @intCast(max_depth - depth + MIN_DEPTH));
2626
var sum: i64 = 0;
2727
var i: usize = 0;
2828
while (i < iterations) : (i += 1) {

0 commit comments

Comments
 (0)