Skip to content

Commit

Permalink
forceEval() -> doNotOptimizeAway()
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedisct1
jedisct1 committed Aug 26, 2020
1 parent 0bd53dd commit ad18078
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 41 deletions.
10 changes: 5 additions & 5 deletions lib/std/crypto/benchmark.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub fn benchmarkHash(comptime Hash: anytype, comptime bytes: comptime_int) !u64
while (offset < bytes) : (offset += block.len) {
h.update(block[0..]);
}
mem.forceEval(&h);
mem.doNotOptimizeAway(&h);
const end = timer.read();

const elapsed_s = @intToFloat(f64, end - start) / time.ns_per_s;
Expand Down Expand Up @@ -82,7 +82,7 @@ pub fn benchmarkMac(comptime Mac: anytype, comptime bytes: comptime_int) !u64 {
const start = timer.lap();
while (offset < bytes) : (offset += in.len) {
Mac.create(mac[0..], in[0..], key[0..]);
mem.forceEval(&mac);
mem.doNotOptimizeAway(&mac);
}
const end = timer.read();

Expand All @@ -109,7 +109,7 @@ pub fn benchmarkKeyExchange(comptime DhKeyExchange: anytype, comptime exchange_c
var i: usize = 0;
while (i < exchange_count) : (i += 1) {
_ = DhKeyExchange.create(out[0..], out[0..], in[0..]);
mem.forceEval(&out);
mem.doNotOptimizeAway(&out);
}
}
const end = timer.read();
Expand All @@ -134,7 +134,7 @@ pub fn benchmarkSignature(comptime Signature: anytype, comptime signatures_count
var i: usize = 0;
while (i < signatures_count) : (i += 1) {
const s = try Signature.sign(&msg, key_pair, null);
mem.forceEval(&s);
mem.doNotOptimizeAway(&s);
}
}
const end = timer.read();
Expand Down Expand Up @@ -170,7 +170,7 @@ pub fn benchmarkAead(comptime Aead: anytype, comptime bytes: comptime_int) !u64
Aead.encrypt(in[0..], tag[0..], in[0..], &[_]u8{}, nonce, key);
Aead.decrypt(in[0..], in[0..], tag, &[_]u8{}, nonce, key) catch unreachable;
}
mem.forceEval(&in);
mem.doNotOptimizeAway(&in);
const end = timer.read();

const elapsed_s = @intToFloat(f64, end - start) / time.ns_per_s;
Expand Down
4 changes: 2 additions & 2 deletions lib/std/math.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ pub fn approxEq(comptime T: type, x: T, y: T, epsilon: T) bool {
return fabs(x - y) < epsilon;
}

pub fn forceEval(value: anytype) void {
mem.forceEval(value);
pub fn doNotOptimizeAway(value: anytype) void {
mem.doNotOptimizeAway(value);
}

pub fn raiseInvalid() void {
Expand Down
4 changes: 2 additions & 2 deletions lib/std/math/asinh.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fn asinh32(x: f32) f32 {
}
// |x| < 0x1p-12, inexact if x != 0
else {
math.forceEval(x + 0x1.0p120);
math.doNotOptimizeAway(x + 0x1.0p120);
}

return if (s != 0) -rx else rx;
Expand Down Expand Up @@ -87,7 +87,7 @@ fn asinh64(x: f64) f64 {
}
// |x| < 0x1p-12, inexact if x != 0
else {
math.forceEval(x + 0x1.0p120);
math.doNotOptimizeAway(x + 0x1.0p120);
}

return if (s != 0) -rx else rx;
Expand Down
4 changes: 2 additions & 2 deletions lib/std/math/atan.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn atan32(x_: f32) f32 {
// |x| < 2^(-12)
if (ix < 0x39800000) {
if (ix < 0x00800000) {
math.forceEval(x * x);
math.doNotOptimizeAway(x * x);
}
return x;
}
Expand Down Expand Up @@ -170,7 +170,7 @@ fn atan64(x_: f64) f64 {
// |x| < 2^(-27)
if (ix < 0x3E400000) {
if (ix < 0x00100000) {
math.forceEval(@floatCast(f32, x));
math.doNotOptimizeAway(@floatCast(f32, x));
}
return x;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/std/math/atanh.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fn atanh_32(x: f32) f32 {
if (u < 0x3F800000 - (32 << 23)) {
// underflow
if (u < (1 << 23)) {
math.forceEval(y * y);
math.doNotOptimizeAway(y * y);
}
}
// |x| < 0.5
Expand Down Expand Up @@ -74,7 +74,7 @@ fn atanh_64(x: f64) f64 {
if (e < 0x3FF - 32) {
// underflow
if (e == 0) {
math.forceEval(@floatCast(f32, y));
math.doNotOptimizeAway(@floatCast(f32, y));
}
}
// |x| < 0.5
Expand Down
8 changes: 4 additions & 4 deletions lib/std/math/ceil.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ fn ceil32(x: f32) f32 {
if (u & m == 0) {
return x;
}
math.forceEval(x + 0x1.0p120);
math.doNotOptimizeAway(x + 0x1.0p120);
if (u >> 31 == 0) {
u += m;
}
u &= ~m;
return @bitCast(f32, u);
} else {
math.forceEval(x + 0x1.0p120);
math.doNotOptimizeAway(x + 0x1.0p120);
if (u >> 31 != 0) {
return -0.0;
} else {
Expand All @@ -79,7 +79,7 @@ fn ceil64(x: f64) f64 {
}

if (e <= 0x3FF - 1) {
math.forceEval(y);
math.doNotOptimizeAway(y);
if (u >> 63 != 0) {
return -0.0;
} else {
Expand All @@ -106,7 +106,7 @@ fn ceil128(x: f128) f128 {
}

if (e <= 0x3FFF - 1) {
math.forceEval(y);
math.doNotOptimizeAway(y);
if (u >> 127 != 0) {
return -0.0;
} else {
Expand Down
8 changes: 4 additions & 4 deletions lib/std/math/exp.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fn exp32(x_: f32) f32 {
return x * 0x1.0p127;
}
if (sign != 0) {
math.forceEval(-0x1.0p-149 / x); // overflow
math.doNotOptimizeAway(-0x1.0p-149 / x); // overflow
// x <= -103.972084
if (hx >= 0x42CFF1B5) {
return 0;
Expand Down Expand Up @@ -88,7 +88,7 @@ fn exp32(x_: f32) f32 {
hi = x;
lo = 0;
} else {
math.forceEval(0x1.0p127 + x); // inexact
math.doNotOptimizeAway(0x1.0p127 + x); // inexact
return 1 + x;
}

Expand Down Expand Up @@ -139,7 +139,7 @@ fn exp64(x_: f64) f64 {
}
if (x < -708.39641853226410622) {
// underflow if x != -inf
// math.forceEval(@as(f32, -0x1.0p-149 / x));
// math.doNotOptimizeAway(@as(f32, -0x1.0p-149 / x));
if (x < -745.13321910194110842) {
return 0;
}
Expand Down Expand Up @@ -172,7 +172,7 @@ fn exp64(x_: f64) f64 {
lo = 0;
} else {
// inexact if x != 0
// math.forceEval(0x1.0p1023 + x);
// math.doNotOptimizeAway(0x1.0p1023 + x);
return 1 + x;
}

Expand Down
4 changes: 2 additions & 2 deletions lib/std/math/exp2.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ fn exp2_32(x: f32) f32 {
// x < -126
if (u >= 0x80000000) {
if (u >= 0xC3160000 or u & 0x000FFFF != 0) {
math.forceEval(-0x1.0p-149 / x);
math.doNotOptimizeAway(-0x1.0p-149 / x);
}
// x <= -150
if (u >= 0x3160000) {
Expand Down Expand Up @@ -393,7 +393,7 @@ fn exp2_64(x: f64) f64 {
if (ux >> 63 != 0) {
// underflow
if (x <= -1075 or x - 0x1.0p52 + 0x1.0p52 != x) {
math.forceEval(@floatCast(f32, -0x1.0p-149 / x));
math.doNotOptimizeAway(@floatCast(f32, -0x1.0p-149 / x));
}
if (x <= -1075) {
return 0;
Expand Down
4 changes: 2 additions & 2 deletions lib/std/math/expm1.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ fn expm1_32(x_: f32) f32 {
// |x| < 2^(-25)
else if (hx < 0x33000000) {
if (hx < 0x00800000) {
math.forceEval(x * x);
math.doNotOptimizeAway(x * x);
}
return x;
} else {
Expand Down Expand Up @@ -237,7 +237,7 @@ fn expm1_64(x_: f64) f64 {
// |x| < 2^(-54)
else if (hx < 0x3C900000) {
if (hx < 0x00100000) {
math.forceEval(@floatCast(f32, x));
math.doNotOptimizeAway(@floatCast(f32, x));
}
return x;
} else {
Expand Down
12 changes: 6 additions & 6 deletions lib/std/math/floor.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ fn floor16(x: f16) f16 {
if (u & m == 0) {
return x;
}
math.forceEval(x + 0x1.0p120);
math.doNotOptimizeAway(x + 0x1.0p120);
if (u >> 15 != 0) {
u += m;
}
return @bitCast(f16, u & ~m);
} else {
math.forceEval(x + 0x1.0p120);
math.doNotOptimizeAway(x + 0x1.0p120);
if (u >> 15 == 0) {
return 0.0;
} else {
Expand Down Expand Up @@ -84,13 +84,13 @@ fn floor32(x: f32) f32 {
if (u & m == 0) {
return x;
}
math.forceEval(x + 0x1.0p120);
math.doNotOptimizeAway(x + 0x1.0p120);
if (u >> 31 != 0) {
u += m;
}
return @bitCast(f32, u & ~m);
} else {
math.forceEval(x + 0x1.0p120);
math.doNotOptimizeAway(x + 0x1.0p120);
if (u >> 31 == 0) {
return 0.0;
} else {
Expand All @@ -115,7 +115,7 @@ fn floor64(x: f64) f64 {
}

if (e <= 0x3FF - 1) {
math.forceEval(y);
math.doNotOptimizeAway(y);
if (u >> 63 != 0) {
return -1.0;
} else {
Expand All @@ -142,7 +142,7 @@ fn floor128(x: f128) f128 {
}

if (e <= 0x3FFF - 1) {
math.forceEval(y);
math.doNotOptimizeAway(y);
if (u >> 127 != 0) {
return -1.0;
} else {
Expand Down
2 changes: 1 addition & 1 deletion lib/std/math/log1p.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ fn log1p_32(x: f32) f32 {
if ((ix << 1) < (0x33800000 << 1)) {
// underflow if subnormal
if (ix & 0x7F800000 == 0) {
math.forceEval(x * x);
math.doNotOptimizeAway(x * x);
}
return x;
}
Expand Down
6 changes: 3 additions & 3 deletions lib/std/math/round.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fn round32(x_: f32) f32 {
x = -x;
}
if (e < 0x7F - 1) {
math.forceEval(x + math.f32_toint);
math.doNotOptimizeAway(x + math.f32_toint);
return 0 * @bitCast(f32, u);
}

Expand Down Expand Up @@ -76,7 +76,7 @@ fn round64(x_: f64) f64 {
x = -x;
}
if (e < 0x3ff - 1) {
math.forceEval(x + math.f64_toint);
math.doNotOptimizeAway(x + math.f64_toint);
return 0 * @bitCast(f64, u);
}

Expand Down Expand Up @@ -109,7 +109,7 @@ fn round128(x_: f128) f128 {
x = -x;
}
if (e < 0x3FFF - 1) {
math.forceEval(x + math.f64_toint);
math.doNotOptimizeAway(x + math.f64_toint);
return 0 * @bitCast(f128, u);
}

Expand Down
4 changes: 2 additions & 2 deletions lib/std/math/tanh.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ fn tanh32(x: f32) f32 {
}
// |x| is subnormal
else {
math.forceEval(x * x);
math.doNotOptimizeAway(x * x);
t = x;
}

Expand Down Expand Up @@ -112,7 +112,7 @@ fn tanh64(x: f64) f64 {
}
// |x| is subnormal
else {
math.forceEval(@floatCast(f32, x));
math.doNotOptimizeAway(@floatCast(f32, x));
t = x;
}

Expand Down
6 changes: 3 additions & 3 deletions lib/std/math/trunc.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn trunc32(x: f32) f32 {
if (u & m == 0) {
return x;
} else {
math.forceEval(x + 0x1p120);
math.doNotOptimizeAway(x + 0x1p120);
return @bitCast(f32, u & ~m);
}
}
Expand All @@ -67,7 +67,7 @@ fn trunc64(x: f64) f64 {
if (u & m == 0) {
return x;
} else {
math.forceEval(x + 0x1p120);
math.doNotOptimizeAway(x + 0x1p120);
return @bitCast(f64, u & ~m);
}
}
Expand All @@ -88,7 +88,7 @@ fn trunc128(x: f128) f128 {
if (u & m == 0) {
return x;
} else {
math.forceEval(x + 0x1p120);
math.doNotOptimizeAway(x + 0x1p120);
return @bitCast(f128, u & ~m);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/std/mem.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2161,7 +2161,7 @@ pub fn alignForwardGeneric(comptime T: type, addr: T, alignment: T) T {
/// Force an evaluation of the expression; this tries to prevent
/// the compiler from optimizing the computation away even if the
/// result eventually gets discarded.
pub fn forceEval(val: anytype) void {
pub fn doNotOptimizeAway(val: anytype) void {
asm volatile (""
:
: [val] "rm" (val)
Expand Down

0 comments on commit ad18078

Please sign in to comment.