Skip to content

Commit 20328e9

Browse files
Jan Philipp Haferandrewrk
Jan Philipp Hafer
authored and
andrewrk
committed
compiler_rt: add __cmpXi2 and __ucmpXi2
- adds __cmpsi2, __cmpdi2, __cmpti2 - adds __ucmpsi2, __ucmpdi2, __ucmpti2 - use 2 if statements with 2 temporaries and a constant - tests: MIN, MIN+1, MIN/2, -1, 0, 1, MAX/2, MAX-1, MAX if applicable See #1290
1 parent 0550198 commit 20328e9

9 files changed

+521
-1
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ set(ZIG_STAGE2_SOURCES
448448
"${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/atomics.zig"
449449
"${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/bswap.zig"
450450
"${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/clear_cache.zig"
451+
"${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/cmp.zig"
451452
"${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/compareXf2.zig"
452453
"${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/count0bits.zig"
453454
"${CMAKE_SOURCE_DIR}/lib/std/special/compiler_rt/divdf3.zig"

‎lib/std/special/compiler_rt.zig

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,22 @@ comptime {
421421

422422
// missing: Integral arithmetic which returns if overflow
423423

424-
// missing: Integral comparison
424+
// Integral comparison
425425
// (a < b) => 0
426426
// (a == b) => 1
427427
// (a > b) => 2
428+
const __cmpsi2 = @import("compiler_rt/cmp.zig").__cmpsi2;
429+
@export(__cmpsi2, .{ .name = "__cmpsi2", .linkage = linkage });
430+
const __cmpdi2 = @import("compiler_rt/cmp.zig").__cmpdi2;
431+
@export(__cmpdi2, .{ .name = "__cmpdi2", .linkage = linkage });
432+
const __cmpti2 = @import("compiler_rt/cmp.zig").__cmpti2;
433+
@export(__cmpti2, .{ .name = "__cmpti2", .linkage = linkage });
434+
const __ucmpsi2 = @import("compiler_rt/cmp.zig").__ucmpsi2;
435+
@export(__ucmpsi2, .{ .name = "__ucmpsi2", .linkage = linkage });
436+
const __ucmpdi2 = @import("compiler_rt/cmp.zig").__ucmpdi2;
437+
@export(__ucmpdi2, .{ .name = "__ucmpdi2", .linkage = linkage });
438+
const __ucmpti2 = @import("compiler_rt/cmp.zig").__ucmpti2;
439+
@export(__ucmpti2, .{ .name = "__ucmpti2", .linkage = linkage });
428440

429441
// missing: Floating point raised to integer power
430442

‎lib/std/special/compiler_rt/cmp.zig

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
const std = @import("std");
2+
const builtin = @import("builtin");
3+
4+
// cmp - signed compare
5+
// - cmpXi2_generic for unoptimized little and big endian
6+
7+
// ucmp - unsigned compare
8+
// - ucmpXi2_generic for unoptimized little and big endian
9+
10+
// a < b => 0
11+
// a == b => 1
12+
// a > b => 2
13+
14+
fn XcmpXi2_generic(comptime T: type) fn (a: T, b: T) callconv(.C) i32 {
15+
return struct {
16+
fn f(a: T, b: T) callconv(.C) i32 {
17+
@setRuntimeSafety(builtin.is_test);
18+
var cmp1: i32 = 0;
19+
var cmp2: i32 = 0;
20+
if (a > b)
21+
cmp1 = 1;
22+
if (a < b)
23+
cmp2 = 1;
24+
return cmp1 - cmp2 + 1;
25+
}
26+
}.f;
27+
}
28+
29+
pub const __cmpsi2 = XcmpXi2_generic(i32);
30+
pub const __cmpdi2 = XcmpXi2_generic(i64);
31+
pub const __cmpti2 = XcmpXi2_generic(i128);
32+
33+
pub const __ucmpsi2 = XcmpXi2_generic(u32);
34+
pub const __ucmpdi2 = XcmpXi2_generic(u64);
35+
pub const __ucmpti2 = XcmpXi2_generic(u128);
36+
37+
test {
38+
_ = @import("cmpsi2_test.zig");
39+
_ = @import("cmpdi2_test.zig");
40+
_ = @import("cmpti2_test.zig");
41+
42+
_ = @import("ucmpsi2_test.zig");
43+
_ = @import("ucmpdi2_test.zig");
44+
_ = @import("ucmpti2_test.zig");
45+
}

‎lib/std/special/compiler_rt/cmpdi2_test.zig

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
const cmp = @import("cmp.zig");
2+
const testing = @import("std").testing;
3+
4+
fn test__cmpdi2(a: i64, b: i64, expected: i64) !void {
5+
var result = cmp.__cmpdi2(a, b);
6+
try testing.expectEqual(expected, result);
7+
}
8+
9+
test "cmpdi2" {
10+
// minInt == -9223372036854775808
11+
// maxInt == 9223372036854775807
12+
// minInt/2 == -4611686018427387904
13+
// maxInt/2 == 4611686018427387903
14+
// 1. equality minInt, minInt+1, minInt/2, 0, maxInt/2, maxInt-1, maxInt
15+
try test__cmpdi2(-9223372036854775808, -9223372036854775808, 1);
16+
try test__cmpdi2(-9223372036854775807, -9223372036854775807, 1);
17+
try test__cmpdi2(-4611686018427387904, -4611686018427387904, 1);
18+
try test__cmpdi2(-1, -1, 1);
19+
try test__cmpdi2(0, 0, 1);
20+
try test__cmpdi2(1, 1, 1);
21+
try test__cmpdi2(4611686018427387903, 4611686018427387903, 1);
22+
try test__cmpdi2(9223372036854775806, 9223372036854775806, 1);
23+
try test__cmpdi2(9223372036854775807, 9223372036854775807, 1);
24+
// 2. cmp minInt, { minInt + 1, minInt/2, -1, 0, 1, maxInt/2, maxInt-1, maxInt}
25+
try test__cmpdi2(-9223372036854775808, -9223372036854775807, 0);
26+
try test__cmpdi2(-9223372036854775808, -4611686018427387904, 0);
27+
try test__cmpdi2(-9223372036854775808, -1, 0);
28+
try test__cmpdi2(-9223372036854775808, 0, 0);
29+
try test__cmpdi2(-9223372036854775808, 1, 0);
30+
try test__cmpdi2(-9223372036854775808, 4611686018427387903, 0);
31+
try test__cmpdi2(-9223372036854775808, 9223372036854775806, 0);
32+
try test__cmpdi2(-9223372036854775808, 9223372036854775807, 0);
33+
// 3. cmp minInt+1, {minInt, minInt/2, -1,0,1, maxInt/2, maxInt-1, maxInt}
34+
try test__cmpdi2(-9223372036854775807, -9223372036854775808, 2);
35+
try test__cmpdi2(-9223372036854775807, -4611686018427387904, 0);
36+
try test__cmpdi2(-9223372036854775807, -1, 0);
37+
try test__cmpdi2(-9223372036854775807, 0, 0);
38+
try test__cmpdi2(-9223372036854775807, 1, 0);
39+
try test__cmpdi2(-9223372036854775807, 4611686018427387903, 0);
40+
try test__cmpdi2(-9223372036854775807, 9223372036854775806, 0);
41+
try test__cmpdi2(-9223372036854775807, 9223372036854775807, 0);
42+
// 4. cmp minInt/2, {minInt, minInt + 1, -1,0,1, maxInt/2, maxInt-1, maxInt}
43+
try test__cmpdi2(-4611686018427387904, -9223372036854775808, 2);
44+
try test__cmpdi2(-4611686018427387904, -9223372036854775807, 2);
45+
try test__cmpdi2(-4611686018427387904, -1, 0);
46+
try test__cmpdi2(-4611686018427387904, 0, 0);
47+
try test__cmpdi2(-4611686018427387904, 1, 0);
48+
try test__cmpdi2(-4611686018427387904, 4611686018427387903, 0);
49+
try test__cmpdi2(-4611686018427387904, 9223372036854775806, 0);
50+
try test__cmpdi2(-4611686018427387904, 9223372036854775807, 0);
51+
// 5. cmp -1, {minInt, minInt + 1, minInt/2, 0,1, maxInt/2, maxInt-1, maxInt}
52+
try test__cmpdi2(-1, -9223372036854775808, 2);
53+
try test__cmpdi2(-1, -9223372036854775807, 2);
54+
try test__cmpdi2(-1, -4611686018427387904, 2);
55+
try test__cmpdi2(-1, 0, 0);
56+
try test__cmpdi2(-1, 1, 0);
57+
try test__cmpdi2(-1, 4611686018427387903, 0);
58+
try test__cmpdi2(-1, 9223372036854775806, 0);
59+
try test__cmpdi2(-1, 9223372036854775807, 0);
60+
// 6. cmp 0, {minInt, minInt + 1, minInt/2, -1, 1, maxInt/2, maxInt-1, maxInt}
61+
try test__cmpdi2(0, -9223372036854775808, 2);
62+
try test__cmpdi2(0, -9223372036854775807, 2);
63+
try test__cmpdi2(0, -4611686018427387904, 2);
64+
try test__cmpdi2(0, -1, 2);
65+
try test__cmpdi2(0, 1, 0);
66+
try test__cmpdi2(0, 4611686018427387903, 0);
67+
try test__cmpdi2(0, 9223372036854775806, 0);
68+
try test__cmpdi2(0, 9223372036854775807, 0);
69+
// 7. cmp 1, {minInt, minInt + 1, minInt/2, -1,0, maxInt/2, maxInt-1, maxInt}
70+
try test__cmpdi2(1, -9223372036854775808, 2);
71+
try test__cmpdi2(1, -9223372036854775807, 2);
72+
try test__cmpdi2(1, -4611686018427387904, 2);
73+
try test__cmpdi2(1, -1, 2);
74+
try test__cmpdi2(1, 0, 2);
75+
try test__cmpdi2(1, 4611686018427387903, 0);
76+
try test__cmpdi2(1, 9223372036854775806, 0);
77+
try test__cmpdi2(1, 9223372036854775807, 0);
78+
// 8. cmp maxInt/2, {minInt, minInt + 1, minInt/2, -1,0,1, maxInt-1, maxInt}
79+
try test__cmpdi2(4611686018427387903, -9223372036854775808, 2);
80+
try test__cmpdi2(4611686018427387903, -9223372036854775807, 2);
81+
try test__cmpdi2(4611686018427387903, -4611686018427387904, 2);
82+
try test__cmpdi2(4611686018427387903, -1, 2);
83+
try test__cmpdi2(4611686018427387903, 0, 2);
84+
try test__cmpdi2(4611686018427387903, 1, 2);
85+
try test__cmpdi2(4611686018427387903, 9223372036854775806, 0);
86+
try test__cmpdi2(4611686018427387903, 9223372036854775807, 0);
87+
// 9. cmp maxInt-1, {minInt, minInt + 1, minInt/2, -1,0,1, maxInt/2, maxInt}
88+
try test__cmpdi2(9223372036854775806, -9223372036854775808, 2);
89+
try test__cmpdi2(9223372036854775806, -9223372036854775807, 2);
90+
try test__cmpdi2(9223372036854775806, -4611686018427387904, 2);
91+
try test__cmpdi2(9223372036854775806, -1, 2);
92+
try test__cmpdi2(9223372036854775806, 0, 2);
93+
try test__cmpdi2(9223372036854775806, 1, 2);
94+
try test__cmpdi2(9223372036854775806, 4611686018427387903, 2);
95+
try test__cmpdi2(9223372036854775806, 9223372036854775807, 0);
96+
// 10.cmp maxInt, {minInt, minInt + 1, minInt/2, -1,0,1, maxInt/2, maxInt-1, }
97+
try test__cmpdi2(9223372036854775807, -9223372036854775808, 2);
98+
try test__cmpdi2(9223372036854775807, -9223372036854775807, 2);
99+
try test__cmpdi2(9223372036854775807, -4611686018427387904, 2);
100+
try test__cmpdi2(9223372036854775807, -1, 2);
101+
try test__cmpdi2(9223372036854775807, 0, 2);
102+
try test__cmpdi2(9223372036854775807, 1, 2);
103+
try test__cmpdi2(9223372036854775807, 4611686018427387903, 2);
104+
try test__cmpdi2(9223372036854775807, 9223372036854775806, 2);
105+
}

‎lib/std/special/compiler_rt/cmpsi2_test.zig

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
const cmp = @import("cmp.zig");
2+
const testing = @import("std").testing;
3+
4+
fn test__cmpsi2(a: i32, b: i32, expected: i32) !void {
5+
var result = cmp.__cmpsi2(a, b);
6+
try testing.expectEqual(expected, result);
7+
}
8+
9+
test "cmpsi2" {
10+
// minInt == -2147483648
11+
// maxInt == 2147483647
12+
// minInt/2 == -1073741824
13+
// maxInt/2 == 1073741823
14+
// 1. equality minInt, minInt+1, minInt/2, -1, 0, 1, maxInt/2, maxInt-1, maxInt
15+
try test__cmpsi2(-2147483648, -2147483648, 1);
16+
try test__cmpsi2(-2147483647, -2147483647, 1);
17+
try test__cmpsi2(-1073741824, -1073741824, 1);
18+
try test__cmpsi2(-1, -1, 1);
19+
try test__cmpsi2(0, 0, 1);
20+
try test__cmpsi2(1, 1, 1);
21+
try test__cmpsi2(1073741823, 1073741823, 1);
22+
try test__cmpsi2(2147483646, 2147483646, 1);
23+
try test__cmpsi2(2147483647, 2147483647, 1);
24+
// 2. cmp minInt, { minInt + 1, minInt/2, -1,0,1, maxInt/2, maxInt-1, maxInt}
25+
try test__cmpsi2(-2147483648, -2147483647, 0);
26+
try test__cmpsi2(-2147483648, -1073741824, 0);
27+
try test__cmpsi2(-2147483648, -1, 0);
28+
try test__cmpsi2(-2147483648, 0, 0);
29+
try test__cmpsi2(-2147483648, 1, 0);
30+
try test__cmpsi2(-2147483648, 1073741823, 0);
31+
try test__cmpsi2(-2147483648, 2147483646, 0);
32+
try test__cmpsi2(-2147483648, 2147483647, 0);
33+
// 3. cmp minInt+1, {minInt, minInt/2, -1,0,1, maxInt/2, maxInt-1, maxInt}
34+
try test__cmpsi2(-2147483647, -2147483648, 2);
35+
try test__cmpsi2(-2147483647, -1073741824, 0);
36+
try test__cmpsi2(-2147483647, -1, 0);
37+
try test__cmpsi2(-2147483647, 0, 0);
38+
try test__cmpsi2(-2147483647, 1, 0);
39+
try test__cmpsi2(-2147483647, 1073741823, 0);
40+
try test__cmpsi2(-2147483647, 2147483646, 0);
41+
try test__cmpsi2(-2147483647, 2147483647, 0);
42+
// 4. cmp minInt/2, {minInt, minInt + 1, -1,0,1, maxInt/2, maxInt-1, maxInt}
43+
try test__cmpsi2(-1073741824, -2147483648, 2);
44+
try test__cmpsi2(-1073741824, -2147483647, 2);
45+
try test__cmpsi2(-1073741824, -1, 0);
46+
try test__cmpsi2(-1073741824, 0, 0);
47+
try test__cmpsi2(-1073741824, 1, 0);
48+
try test__cmpsi2(-1073741824, 1073741823, 0);
49+
try test__cmpsi2(-1073741824, 2147483646, 0);
50+
try test__cmpsi2(-1073741824, 2147483647, 0);
51+
// 5. cmp -1, {minInt, minInt + 1, minInt/2, 0,1, maxInt/2, maxInt-1, maxInt}
52+
try test__cmpsi2(-1, -2147483648, 2);
53+
try test__cmpsi2(-1, -2147483647, 2);
54+
try test__cmpsi2(-1, -1073741824, 2);
55+
try test__cmpsi2(-1, 0, 0);
56+
try test__cmpsi2(-1, 1, 0);
57+
try test__cmpsi2(-1, 1073741823, 0);
58+
try test__cmpsi2(-1, 2147483646, 0);
59+
try test__cmpsi2(-1, 2147483647, 0);
60+
// 6. cmp 0, {minInt, minInt + 1, minInt/2, -1, 1, maxInt/2, maxInt-1, maxInt}
61+
try test__cmpsi2(0, -2147483648, 2);
62+
try test__cmpsi2(0, -2147483647, 2);
63+
try test__cmpsi2(0, -1073741824, 2);
64+
try test__cmpsi2(0, -1, 2);
65+
try test__cmpsi2(0, 1, 0);
66+
try test__cmpsi2(0, 1073741823, 0);
67+
try test__cmpsi2(0, 2147483646, 0);
68+
try test__cmpsi2(0, 2147483647, 0);
69+
// 7. cmp 1, {minInt, minInt + 1, minInt/2, -1,0, maxInt/2, maxInt-1, maxInt}
70+
try test__cmpsi2(1, -2147483648, 2);
71+
try test__cmpsi2(1, -2147483647, 2);
72+
try test__cmpsi2(1, -1073741824, 2);
73+
try test__cmpsi2(1, -1, 2);
74+
try test__cmpsi2(1, 0, 2);
75+
try test__cmpsi2(1, 1073741823, 0);
76+
try test__cmpsi2(1, 2147483646, 0);
77+
try test__cmpsi2(1, 2147483647, 0);
78+
// 8. cmp maxInt/2, {minInt, minInt + 1, minInt/2, -1, 0, 1, maxInt-1, maxInt}
79+
try test__cmpsi2(1073741823, -2147483648, 2);
80+
try test__cmpsi2(1073741823, -2147483647, 2);
81+
try test__cmpsi2(1073741823, -1073741824, 2);
82+
try test__cmpsi2(1073741823, -1, 2);
83+
try test__cmpsi2(1073741823, 0, 2);
84+
try test__cmpsi2(1073741823, 1, 2);
85+
try test__cmpsi2(1073741823, 2147483646, 0);
86+
try test__cmpsi2(1073741823, 2147483647, 0);
87+
// 9. cmp maxInt-1, {minInt, minInt + 1, minInt/2, -1, 0, 1, maxInt/2, maxInt}
88+
try test__cmpsi2(2147483646, -2147483648, 2);
89+
try test__cmpsi2(2147483646, -2147483647, 2);
90+
try test__cmpsi2(2147483646, -1073741824, 2);
91+
try test__cmpsi2(2147483646, -1, 2);
92+
try test__cmpsi2(2147483646, 0, 2);
93+
try test__cmpsi2(2147483646, 1, 2);
94+
try test__cmpsi2(2147483646, 1073741823, 2);
95+
try test__cmpsi2(2147483646, 2147483647, 0);
96+
// 10.cmp maxInt, {minInt, minInt + 1, minInt/2, -1, 0, 1, maxInt/2, maxInt-1, }
97+
try test__cmpsi2(2147483647, -2147483648, 2);
98+
try test__cmpsi2(2147483647, -2147483647, 2);
99+
try test__cmpsi2(2147483647, -1073741824, 2);
100+
try test__cmpsi2(2147483647, -1, 2);
101+
try test__cmpsi2(2147483647, 0, 2);
102+
try test__cmpsi2(2147483647, 1, 2);
103+
try test__cmpsi2(2147483647, 1073741823, 2);
104+
try test__cmpsi2(2147483647, 2147483646, 2);
105+
}

0 commit comments

Comments
 (0)