authorgravatar for tristan.ross@midstall.comTristan Ross <tristan.ross@midstall.com> 2024-02-18 21:12:10-08:00
committergravatar for tristan.ross@midstall.comTristan Ross <tristan.ross@midstall.com> 2024-03-11 07:09:10-07:00
logaab84a3decd784a275c0bb694c7717d3c73ae4b1
tree9afc9d9929e1e1f127262cf4d169d321706ff1be
parent9d70d614ae33133f3786ec056b8660476ff49f53
signaturelock-open Commit is signed but in an unrecognized format.

std.builtin: make float mode fields lowercase

6 files changed, 44 insertions(+), 44 deletions(-)

doc/langref.html.in+1-1
......@@ -1453,7 +1453,7 @@ export fn foo_strict(x: f64) f64 {
14531453}
14541454
14551455export fn foo_optimized(x: f64) f64 {
1456 @setFloatMode(.Optimized);
1456 @setFloatMode(.optimized);
14571457 return x + big - big;
14581458}
14591459 {#code_end#}
lib/std/builtin.zig+2-2
......@@ -471,8 +471,8 @@ pub const Type = union(enum) {
471471/// This data structure is used by the Zig language code generation and
472472/// therefore must be kept in sync with the compiler implementation.
473473pub const FloatMode = enum {
474 Strict,
475 Optimized,
474 strict,
475 optimized,
476476};
477477
478478/// This data structure is used by the Zig language code generation and
lib/std/zig/AstGen.zig+1-1
......@@ -8587,7 +8587,7 @@ fn numberLiteral(gz: *GenZir, ri: ResultInfo, node: Ast.Node.Index, source_node:
85878587 .positive => unsigned_float_number,
85888588 };
85898589 // If the value fits into a f64 without losing any precision, store it that way.
8590 @setFloatMode(.Strict);
8590 @setFloatMode(.strict);
85918591 const smaller_float: f64 = @floatCast(float_number);
85928592 const bigger_again: f128 = smaller_float;
85938593 if (bigger_again == float_number) {
src/Sema.zig+38-38
......@@ -357,7 +357,7 @@ pub const Block = struct {
357357 want_safety: ?bool = null,
358358
359359 /// What mode to generate float operations in, set by @setFloatMode
360 float_mode: std.builtin.FloatMode = .Strict,
360 float_mode: std.builtin.FloatMode = .strict,
361361
362362 c_import_buf: ?*std.ArrayList(u8) = null,
363363
......@@ -686,7 +686,7 @@ pub const Block = struct {
686686 const sema = block.sema;
687687 const mod = sema.mod;
688688 return block.addInst(.{
689 .tag = if (block.float_mode == .Optimized) .cmp_vector_optimized else .cmp_vector,
689 .tag = if (block.float_mode == .optimized) .cmp_vector_optimized else .cmp_vector,
690690 .data = .{ .ty_pl = .{
691691 .ty = Air.internedToRef((try mod.vectorType(.{
692692 .len = sema.typeOf(lhs).vectorLen(mod),
......@@ -1020,10 +1020,10 @@ fn analyzeBodyInner(
10201020 .field_call => try sema.zirCall(block, inst, .field),
10211021 .cmp_lt => try sema.zirCmp(block, inst, .lt),
10221022 .cmp_lte => try sema.zirCmp(block, inst, .lte),
1023 .cmp_eq => try sema.zirCmpEq(block, inst, .eq, Air.Inst.Tag.fromCmpOp(.eq, block.float_mode == .Optimized)),
1023 .cmp_eq => try sema.zirCmpEq(block, inst, .eq, Air.Inst.Tag.fromCmpOp(.eq, block.float_mode == .optimized)),
10241024 .cmp_gte => try sema.zirCmp(block, inst, .gte),
10251025 .cmp_gt => try sema.zirCmp(block, inst, .gt),
1026 .cmp_neq => try sema.zirCmpEq(block, inst, .neq, Air.Inst.Tag.fromCmpOp(.neq, block.float_mode == .Optimized)),
1026 .cmp_neq => try sema.zirCmpEq(block, inst, .neq, Air.Inst.Tag.fromCmpOp(.neq, block.float_mode == .optimized)),
10271027 .decl_ref => try sema.zirDeclRef(block, inst),
10281028 .decl_val => try sema.zirDeclVal(block, inst),
10291029 .load => try sema.zirLoad(block, inst),
......@@ -10264,7 +10264,7 @@ fn intCast(
1026410264 const ok = if (is_vector) ok: {
1026510265 const is_in_range = try block.addCmpVector(diff_unsigned, dest_range, .lte);
1026610266 const all_in_range = try block.addInst(.{
10267 .tag = if (block.float_mode == .Optimized) .reduce_optimized else .reduce,
10267 .tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
1026810268 .data = .{ .reduce = .{
1026910269 .operand = is_in_range,
1027010270 .operation = .And,
......@@ -10281,7 +10281,7 @@ fn intCast(
1028110281 const ok = if (is_vector) ok: {
1028210282 const is_in_range = try block.addCmpVector(diff, dest_max, .lte);
1028310283 const all_in_range = try block.addInst(.{
10284 .tag = if (block.float_mode == .Optimized) .reduce_optimized else .reduce,
10284 .tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
1028510285 .data = .{ .reduce = .{
1028610286 .operand = is_in_range,
1028710287 .operation = .And,
......@@ -10303,7 +10303,7 @@ fn intCast(
1030310303 const zero_inst = Air.internedToRef(zero_val.toIntern());
1030410304 const is_in_range = try block.addCmpVector(operand, zero_inst, .gte);
1030510305 const all_in_range = try block.addInst(.{
10306 .tag = if (block.float_mode == .Optimized) .reduce_optimized else .reduce,
10306 .tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
1030710307 .data = .{ .reduce = .{
1030810308 .operand = is_in_range,
1030910309 .operation = .And,
......@@ -12530,7 +12530,7 @@ fn analyzeSwitchRuntimeBlock(
1253012530 cases_extra.appendSliceAssumeCapacity(@ptrCast(case_block.instructions.items));
1253112531 } else {
1253212532 for (items) |item| {
12533 const cmp_ok = try case_block.addBinOp(if (case_block.float_mode == .Optimized) .cmp_eq_optimized else .cmp_eq, operand, item);
12533 const cmp_ok = try case_block.addBinOp(if (case_block.float_mode == .optimized) .cmp_eq_optimized else .cmp_eq, operand, item);
1253412534 if (any_ok != .none) {
1253512535 any_ok = try case_block.addBinOp(.bool_or, any_ok, cmp_ok);
1253612536 } else {
......@@ -12549,12 +12549,12 @@ fn analyzeSwitchRuntimeBlock(
1254912549
1255012550 // operand >= first and operand <= last
1255112551 const range_first_ok = try case_block.addBinOp(
12552 if (case_block.float_mode == .Optimized) .cmp_gte_optimized else .cmp_gte,
12552 if (case_block.float_mode == .optimized) .cmp_gte_optimized else .cmp_gte,
1255312553 operand,
1255412554 item_first,
1255512555 );
1255612556 const range_last_ok = try case_block.addBinOp(
12557 if (case_block.float_mode == .Optimized) .cmp_lte_optimized else .cmp_lte,
12557 if (case_block.float_mode == .optimized) .cmp_lte_optimized else .cmp_lte,
1255812558 operand,
1255912559 item_last,
1256012560 );
......@@ -13904,7 +13904,7 @@ fn zirShl(
1390413904 const ov_bit = try sema.tupleFieldValByIndex(block, src, op_ov, 1, op_ov_tuple_ty);
1390513905 const any_ov_bit = if (lhs_ty.zigTypeTag(mod) == .Vector)
1390613906 try block.addInst(.{
13907 .tag = if (block.float_mode == .Optimized) .reduce_optimized else .reduce,
13907 .tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
1390813908 .data = .{ .reduce = .{
1390913909 .operand = ov_bit,
1391013910 .operation = .Or,
......@@ -14044,7 +14044,7 @@ fn zirShr(
1404414044 const ok = if (rhs_ty.zigTypeTag(mod) == .Vector) ok: {
1404514045 const eql = try block.addCmpVector(lhs, back, .eq);
1404614046 break :ok try block.addInst(.{
14047 .tag = if (block.float_mode == .Optimized) .reduce_optimized else .reduce,
14047 .tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
1404814048 .data = .{ .reduce = .{
1404914049 .operand = eql,
1405014050 .operation = .And,
......@@ -14811,7 +14811,7 @@ fn zirNegate(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.
1481114811 return Air.internedToRef((try rhs_val.floatNeg(rhs_ty, sema.arena, mod)).toIntern());
1481214812 }
1481314813 try sema.requireRuntimeBlock(block, src, null);
14814 return block.addUnOp(if (block.float_mode == .Optimized) .neg_optimized else .neg, rhs);
14814 return block.addUnOp(if (block.float_mode == .optimized) .neg_optimized else .neg, rhs);
1481514815 }
1481614816
1481714817 const lhs = Air.internedToRef((try sema.splat(rhs_ty, try mod.intValue(rhs_scalar_ty, 0))).toIntern());
......@@ -15018,8 +15018,8 @@ fn zirDiv(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Ins
1501815018 }
1501915019 break :blk Air.Inst.Tag.div_trunc;
1502015020 } else switch (block.float_mode) {
15021 .Optimized => Air.Inst.Tag.div_float_optimized,
15022 .Strict => Air.Inst.Tag.div_float,
15021 .optimized => Air.Inst.Tag.div_float_optimized,
15022 .strict => Air.Inst.Tag.div_float,
1502315023 };
1502415024 return block.addBinOp(air_tag, casted_lhs, casted_rhs);
1502515025}
......@@ -15142,8 +15142,8 @@ fn zirDivExact(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
1514215142 const eql = try block.addCmpVector(result, floored, .eq);
1514315143 break :ok try block.addInst(.{
1514415144 .tag = switch (block.float_mode) {
15145 .Strict => .reduce,
15146 .Optimized => .reduce_optimized,
15145 .strict => .reduce,
15146 .optimized => .reduce_optimized,
1514715147 },
1514815148 .data = .{ .reduce = .{
1514915149 .operand = eql,
......@@ -15152,8 +15152,8 @@ fn zirDivExact(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
1515215152 });
1515315153 } else {
1515415154 const is_in_range = try block.addBinOp(switch (block.float_mode) {
15155 .Strict => .cmp_eq,
15156 .Optimized => .cmp_eq_optimized,
15155 .strict => .cmp_eq,
15156 .optimized => .cmp_eq_optimized,
1515715157 }, result, floored);
1515815158 break :ok is_in_range;
1515915159 }
......@@ -15503,7 +15503,7 @@ fn addDivByZeroSafety(
1550315503 is_int: bool,
1550415504) CompileError!void {
1550515505 // Strict IEEE floats have well-defined division by zero.
15506 if (!is_int and block.float_mode == .Strict) return;
15506 if (!is_int and block.float_mode == .strict) return;
1550715507
1550815508 // If rhs was comptime-known to be zero a compile error would have been
1550915509 // emitted above.
......@@ -15535,8 +15535,8 @@ fn addDivByZeroSafety(
1553515535fn airTag(block: *Block, is_int: bool, normal: Air.Inst.Tag, optimized: Air.Inst.Tag) Air.Inst.Tag {
1553615536 if (is_int) return normal;
1553715537 return switch (block.float_mode) {
15538 .Strict => normal,
15539 .Optimized => optimized,
15538 .strict => normal,
15539 .optimized => optimized,
1554015540 };
1554115541}
1554215542
......@@ -16228,7 +16228,7 @@ fn analyzeArithmetic(
1622816228 return casted_lhs;
1622916229 }
1623016230 }
16231 const air_tag: Air.Inst.Tag = if (block.float_mode == .Optimized) .add_optimized else .add;
16231 const air_tag: Air.Inst.Tag = if (block.float_mode == .optimized) .add_optimized else .add;
1623216232 if (maybe_lhs_val) |lhs_val| {
1623316233 if (lhs_val.isUndef(mod)) {
1623416234 if (is_int) {
......@@ -16330,7 +16330,7 @@ fn analyzeArithmetic(
1633016330 return casted_lhs;
1633116331 }
1633216332 }
16333 const air_tag: Air.Inst.Tag = if (block.float_mode == .Optimized) .sub_optimized else .sub;
16333 const air_tag: Air.Inst.Tag = if (block.float_mode == .optimized) .sub_optimized else .sub;
1633416334 if (maybe_lhs_val) |lhs_val| {
1633516335 if (lhs_val.isUndef(mod)) {
1633616336 if (is_int) {
......@@ -16448,7 +16448,7 @@ fn analyzeArithmetic(
1644816448 }
1644916449 }
1645016450 }
16451 const air_tag: Air.Inst.Tag = if (block.float_mode == .Optimized) .mul_optimized else .mul;
16451 const air_tag: Air.Inst.Tag = if (block.float_mode == .optimized) .mul_optimized else .mul;
1645216452 if (maybe_rhs_val) |rhs_val| {
1645316453 if (rhs_val.isUndef(mod)) {
1645416454 if (is_int) {
......@@ -16625,7 +16625,7 @@ fn analyzeArithmetic(
1662516625 const ov_bit = try sema.tupleFieldValByIndex(block, src, op_ov, 1, op_ov_tuple_ty);
1662616626 const any_ov_bit = if (resolved_type.zigTypeTag(mod) == .Vector)
1662716627 try block.addInst(.{
16628 .tag = if (block.float_mode == .Optimized) .reduce_optimized else .reduce,
16628 .tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
1662916629 .data = .{ .reduce = .{
1663016630 .operand = ov_bit,
1663116631 .operation = .Or,
......@@ -17168,7 +17168,7 @@ fn cmpSelf(
1716817168 if (resolved_type.zigTypeTag(mod) == .Vector) {
1716917169 return block.addCmpVector(casted_lhs, casted_rhs, op);
1717017170 }
17171 const tag = Air.Inst.Tag.fromCmpOp(op, block.float_mode == .Optimized);
17171 const tag = Air.Inst.Tag.fromCmpOp(op, block.float_mode == .optimized);
1717217172 return block.addBinOp(tag, casted_lhs, casted_rhs);
1717317173}
1717417174
......@@ -22226,7 +22226,7 @@ fn zirIntFromFloat(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileErro
2222622226 if (dest_scalar_ty.intInfo(mod).bits == 0) {
2222722227 if (!is_vector) {
2222822228 if (block.wantSafety()) {
22229 const ok = try block.addBinOp(if (block.float_mode == .Optimized) .cmp_eq_optimized else .cmp_eq, operand, Air.internedToRef((try mod.floatValue(operand_ty, 0.0)).toIntern()));
22229 const ok = try block.addBinOp(if (block.float_mode == .optimized) .cmp_eq_optimized else .cmp_eq, operand, Air.internedToRef((try mod.floatValue(operand_ty, 0.0)).toIntern()));
2223022230 try sema.addSafetyCheck(block, src, ok, .integer_part_out_of_bounds);
2223122231 }
2223222232 return Air.internedToRef((try mod.intValue(dest_ty, 0)).toIntern());
......@@ -22236,7 +22236,7 @@ fn zirIntFromFloat(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileErro
2223622236 for (0..len) |i| {
2223722237 const idx_ref = try mod.intRef(Type.usize, i);
2223822238 const elem_ref = try block.addBinOp(.array_elem_val, operand, idx_ref);
22239 const ok = try block.addBinOp(if (block.float_mode == .Optimized) .cmp_eq_optimized else .cmp_eq, elem_ref, Air.internedToRef((try mod.floatValue(operand_scalar_ty, 0.0)).toIntern()));
22239 const ok = try block.addBinOp(if (block.float_mode == .optimized) .cmp_eq_optimized else .cmp_eq, elem_ref, Air.internedToRef((try mod.floatValue(operand_scalar_ty, 0.0)).toIntern()));
2224022240 try sema.addSafetyCheck(block, src, ok, .integer_part_out_of_bounds);
2224122241 }
2224222242 }
......@@ -22246,12 +22246,12 @@ fn zirIntFromFloat(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileErro
2224622246 } }));
2224722247 }
2224822248 if (!is_vector) {
22249 const result = try block.addTyOp(if (block.float_mode == .Optimized) .int_from_float_optimized else .int_from_float, dest_ty, operand);
22249 const result = try block.addTyOp(if (block.float_mode == .optimized) .int_from_float_optimized else .int_from_float, dest_ty, operand);
2225022250 if (block.wantSafety()) {
2225122251 const back = try block.addTyOp(.float_from_int, operand_ty, result);
2225222252 const diff = try block.addBinOp(.sub, operand, back);
22253 const ok_pos = try block.addBinOp(if (block.float_mode == .Optimized) .cmp_lt_optimized else .cmp_lt, diff, Air.internedToRef((try mod.floatValue(operand_ty, 1.0)).toIntern()));
22254 const ok_neg = try block.addBinOp(if (block.float_mode == .Optimized) .cmp_gt_optimized else .cmp_gt, diff, Air.internedToRef((try mod.floatValue(operand_ty, -1.0)).toIntern()));
22253 const ok_pos = try block.addBinOp(if (block.float_mode == .optimized) .cmp_lt_optimized else .cmp_lt, diff, Air.internedToRef((try mod.floatValue(operand_ty, 1.0)).toIntern()));
22254 const ok_neg = try block.addBinOp(if (block.float_mode == .optimized) .cmp_gt_optimized else .cmp_gt, diff, Air.internedToRef((try mod.floatValue(operand_ty, -1.0)).toIntern()));
2225522255 const ok = try block.addBinOp(.bool_and, ok_pos, ok_neg);
2225622256 try sema.addSafetyCheck(block, src, ok, .integer_part_out_of_bounds);
2225722257 }
......@@ -22262,12 +22262,12 @@ fn zirIntFromFloat(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileErro
2226222262 for (new_elems, 0..) |*new_elem, i| {
2226322263 const idx_ref = try mod.intRef(Type.usize, i);
2226422264 const old_elem = try block.addBinOp(.array_elem_val, operand, idx_ref);
22265 const result = try block.addTyOp(if (block.float_mode == .Optimized) .int_from_float_optimized else .int_from_float, dest_scalar_ty, old_elem);
22265 const result = try block.addTyOp(if (block.float_mode == .optimized) .int_from_float_optimized else .int_from_float, dest_scalar_ty, old_elem);
2226622266 if (block.wantSafety()) {
2226722267 const back = try block.addTyOp(.float_from_int, operand_scalar_ty, result);
2226822268 const diff = try block.addBinOp(.sub, old_elem, back);
22269 const ok_pos = try block.addBinOp(if (block.float_mode == .Optimized) .cmp_lt_optimized else .cmp_lt, diff, Air.internedToRef((try mod.floatValue(operand_scalar_ty, 1.0)).toIntern()));
22270 const ok_neg = try block.addBinOp(if (block.float_mode == .Optimized) .cmp_gt_optimized else .cmp_gt, diff, Air.internedToRef((try mod.floatValue(operand_scalar_ty, -1.0)).toIntern()));
22269 const ok_pos = try block.addBinOp(if (block.float_mode == .optimized) .cmp_lt_optimized else .cmp_lt, diff, Air.internedToRef((try mod.floatValue(operand_scalar_ty, 1.0)).toIntern()));
22270 const ok_neg = try block.addBinOp(if (block.float_mode == .optimized) .cmp_gt_optimized else .cmp_gt, diff, Air.internedToRef((try mod.floatValue(operand_scalar_ty, -1.0)).toIntern()));
2227122271 const ok = try block.addBinOp(.bool_and, ok_pos, ok_neg);
2227222272 try sema.addSafetyCheck(block, src, ok, .integer_part_out_of_bounds);
2227322273 }
......@@ -24042,7 +24042,7 @@ fn zirReduce(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.
2404224042
2404324043 try sema.requireRuntimeBlock(block, inst_data.src(), operand_src);
2404424044 return block.addInst(.{
24045 .tag = if (block.float_mode == .Optimized) .reduce_optimized else .reduce,
24045 .tag = if (block.float_mode == .optimized) .reduce_optimized else .reduce,
2404624046 .data = .{ .reduce = .{
2404724047 .operand = operand,
2404824048 .operation = operation,
......@@ -33506,7 +33506,7 @@ fn cmpNumeric(
3350633506 };
3350733507 const casted_lhs = try sema.coerce(block, dest_ty, lhs, lhs_src);
3350833508 const casted_rhs = try sema.coerce(block, dest_ty, rhs, rhs_src);
33509 return block.addBinOp(Air.Inst.Tag.fromCmpOp(op, block.float_mode == .Optimized), casted_lhs, casted_rhs);
33509 return block.addBinOp(Air.Inst.Tag.fromCmpOp(op, block.float_mode == .optimized), casted_lhs, casted_rhs);
3351033510 }
3351133511 // For mixed unsigned integer sizes, implicit cast both operands to the larger integer.
3351233512 // For mixed signed and unsigned integers, implicit cast both operands to a signed
......@@ -33651,7 +33651,7 @@ fn cmpNumeric(
3365133651 const casted_lhs = try sema.coerce(block, dest_ty, lhs, lhs_src);
3365233652 const casted_rhs = try sema.coerce(block, dest_ty, rhs, rhs_src);
3365333653
33654 return block.addBinOp(Air.Inst.Tag.fromCmpOp(op, block.float_mode == .Optimized), casted_lhs, casted_rhs);
33654 return block.addBinOp(Air.Inst.Tag.fromCmpOp(op, block.float_mode == .optimized), casted_lhs, casted_rhs);
3365533655}
3365633656
3365733657/// Asserts that LHS value is an int or comptime int and not undefined, and
test/behavior/builtin_functions_returning_void_or_noreturn.zig+1-1
......@@ -25,6 +25,6 @@ test {
2525 try testing.expectEqual({}, @setAlignStack(16));
2626 try testing.expectEqual({}, @setCold(true));
2727 try testing.expectEqual({}, @setEvalBranchQuota(0));
28 try testing.expectEqual({}, @setFloatMode(.Optimized));
28 try testing.expectEqual({}, @setFloatMode(.optimized));
2929 try testing.expectEqual({}, @setRuntimeSafety(true));
3030}
test/behavior/floatop.zig+1-1
......@@ -1511,7 +1511,7 @@ test "eval @setFloatMode at compile-time" {
15111511}
15121512
15131513fn fnWithFloatMode() f32 {
1514 @setFloatMode(std.builtin.FloatMode.Strict);
1514 @setFloatMode(std.builtin.FloatMode.strict);
15151515 return 1234.0;
15161516}
15171517