From 6383714bffb05a34a5320a757e08dd73bf9a2b0c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 19:56:46 +0100 Subject: Remove old procedure ABI code --- src/llvm_backend.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/llvm_backend.cpp') diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 0d27b9c6f..3e7d858ed 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -2545,8 +2545,6 @@ lbProcedure *lb_create_procedure(lbModule *m, Entity *entity) { Type *pt = base_type(entity->type); GB_ASSERT(pt->kind == Type_Proc); - set_procedure_abi_types(entity->type); - p->type = entity->type; p->type_expr = decl->type_expr; p->body = pl->body; @@ -2845,6 +2843,14 @@ lbValue lb_value_param(lbProcedure *p, Entity *e, Type *abi_type, i32 index, lbP return res; } +Type *struct_type_from_systemv_distribute_struct_fields(Type *abi_type) { + GB_ASSERT(is_type_tuple(abi_type)); + Type *final_type = alloc_type_struct(); + final_type->Struct.fields = abi_type->Tuple.variables; + return final_type; +} + + lbValue lb_add_param(lbProcedure *p, Entity *e, Ast *expr, Type *abi_type, i32 index) { lbParamPasskind kind = lbParamPass_Value; lbValue v = lb_value_param(p, e, abi_type, index, &kind); @@ -3476,9 +3482,6 @@ void lb_build_nested_proc(lbProcedure *p, AstProcLit *pd, Entity *e) { name_len = gb_snprintf(name_text, name_len, "%.*s.%.*s-%d", LIT(p->name), LIT(pd_name), guid); String name = make_string(cast(u8 *)name_text, name_len-1); - set_procedure_abi_types(e->type); - - e->Procedure.link_name = name; lbProcedure *nested_proc = lb_create_procedure(p->module, e); @@ -3613,7 +3616,6 @@ void lb_build_constant_value_decl(lbProcedure *p, AstValueDecl *vd) { return; } - set_procedure_abi_types(e->type); e->Procedure.link_name = name; lbProcedure *nested_proc = lb_create_procedure(p->module, e); @@ -8201,8 +8203,6 @@ lbValue lb_emit_call(lbProcedure *p, lbValue value, Array const &args, LLVMBuildUnreachable(p->builder); }); - set_procedure_abi_types(pt); - bool is_c_vararg = pt->Proc.c_vararg; isize param_count = pt->Proc.param_count; if (is_c_vararg) { @@ -9584,7 +9584,6 @@ lbValue lb_build_call_expr(lbProcedure *p, Ast *expr) { Type *proc_type_ = base_type(value.type); GB_ASSERT(proc_type_->kind == Type_Proc); TypeProc *pt = &proc_type_->Proc; - set_procedure_abi_types(proc_type_); if (is_call_expr_field_value(ce)) { auto args = array_make(permanent_allocator(), pt->param_count); @@ -10765,8 +10764,6 @@ lbValue lb_generate_anonymous_proc_lit(lbModule *m, String const &prefix_name, A String name = make_string((u8 *)name_text, name_len-1); Type *type = type_of_expr(expr); - set_procedure_abi_types(type); - Token token = {}; token.pos = ast_token(expr).pos; -- cgit v1.2.3 From 72aa0e6e3891c034863476751b2aefda781de5b2 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 20:22:26 +0100 Subject: Replace many `foreign` llvm calls with intrinsics --- core/math/bits/bits.odin | 160 +++++-------------------------------- core/runtime/core.odin | 17 ++-- core/runtime/core_builtin.odin | 17 ++-- core/runtime/internal.odin | 45 +++-------- core/runtime/internal_linux.odin | 10 +-- core/runtime/internal_windows.odin | 10 +-- core/runtime/udivmod128.odin | 32 +------- core/time/time.odin | 8 +- src/check_builtin.cpp | 1 + src/checker_builtin_procs.hpp | 2 + src/llvm_backend.cpp | 22 +++++ src/llvm_backend.hpp | 1 + 12 files changed, 78 insertions(+), 247 deletions(-) (limited to 'src/llvm_backend.cpp') diff --git a/core/math/bits/bits.odin b/core/math/bits/bits.odin index 2ab1de6e7..303a94c1d 100644 --- a/core/math/bits/bits.odin +++ b/core/math/bits/bits.odin @@ -1,5 +1,6 @@ package math_bits +import "intrinsics" import "core:runtime" U8_MIN :: 0; @@ -22,32 +23,10 @@ I16_MAX :: 1 << 15 - 1; I32_MAX :: 1 << 31 - 1; I64_MAX :: 1 << 63 - 1; -@(default_calling_convention="none") -foreign { - @(link_name="llvm.ctpop.i8") count_ones8 :: proc(i: u8) -> u8 --- - @(link_name="llvm.ctpop.i16") count_ones16 :: proc(i: u16) -> u16 --- - @(link_name="llvm.ctpop.i32") count_ones32 :: proc(i: u32) -> u32 --- - @(link_name="llvm.ctpop.i64") count_ones64 :: proc(i: u64) -> u64 --- - @(link_name="llvm.cttz.i8") trailing_zeros8 :: proc(i: u8, is_zero_undef := false) -> u8 --- - @(link_name="llvm.cttz.i16") trailing_zeros16 :: proc(i: u16, is_zero_undef := false) -> u16 --- - @(link_name="llvm.cttz.i32") trailing_zeros32 :: proc(i: u32, is_zero_undef := false) -> u32 --- - @(link_name="llvm.cttz.i64") trailing_zeros64 :: proc(i: u64, is_zero_undef := false) -> u64 --- - - @(link_name="llvm.bitreverse.i8") reverse_bits8 :: proc(i: u8) -> u8 --- - @(link_name="llvm.bitreverse.i16") reverse_bits16 :: proc(i: u16) -> u16 --- - @(link_name="llvm.bitreverse.i32") reverse_bits32 :: proc(i: u32) -> u32 --- - @(link_name="llvm.bitreverse.i64") reverse_bits64 :: proc(i: u64) -> u64 --- -} - - -trailing_zeros_uint :: proc(i: uint) -> uint { - when size_of(uint) == size_of(u64) { - return uint(trailing_zeros64(u64(i))); - } else { - return uint(trailing_zeros32(u32(i))); - } -} +count_ones :: intrinsics.count_ones; +trailing_zeros :: intrinsics.trailing_zeros; +reverse_bits :: intrinsics.reverse_bits; leading_zeros_u8 :: proc(i: u8) -> int { @@ -117,10 +96,17 @@ byte_swap :: proc{ byte_swap_int, }; -count_zeros8 :: proc(i: u8) -> u8 { return 8 - count_ones8(i); } -count_zeros16 :: proc(i: u16) -> u16 { return 16 - count_ones16(i); } -count_zeros32 :: proc(i: u32) -> u32 { return 32 - count_ones32(i); } -count_zeros64 :: proc(i: u64) -> u64 { return 64 - count_ones64(i); } +count_zeros8 :: proc(i: u8) -> u8 { return 8 - count_ones(i); } +count_zeros16 :: proc(i: u16) -> u16 { return 16 - count_ones(i); } +count_zeros32 :: proc(i: u32) -> u32 { return 32 - count_ones(i); } +count_zeros64 :: proc(i: u64) -> u64 { return 64 - count_ones(i); } + +count_zeros :: proc{ + count_zeros8, + count_zeros16, + count_zeros32, + count_zeros64, +}; rotate_left8 :: proc(x: u8, k: int) -> u8 { @@ -176,120 +162,10 @@ to_le_u64 :: proc(i: u64) -> u64 { when ODIN_ENDIAN == "little" { return i; } to_le_uint :: proc(i: uint) -> uint { when ODIN_ENDIAN == "little" { return i; } else { return byte_swap(i); } } -@(default_calling_convention="none") -foreign { - @(link_name="llvm.uadd.with.overflow.i8") overflowing_add_u8 :: proc(lhs, rhs: u8) -> (u8, bool) --- - @(link_name="llvm.sadd.with.overflow.i8") overflowing_add_i8 :: proc(lhs, rhs: i8) -> (i8, bool) --- - @(link_name="llvm.uadd.with.overflow.i16") overflowing_add_u16 :: proc(lhs, rhs: u16) -> (u16, bool) --- - @(link_name="llvm.sadd.with.overflow.i16") overflowing_add_i16 :: proc(lhs, rhs: i16) -> (i16, bool) --- - @(link_name="llvm.uadd.with.overflow.i32") overflowing_add_u32 :: proc(lhs, rhs: u32) -> (u32, bool) --- - @(link_name="llvm.sadd.with.overflow.i32") overflowing_add_i32 :: proc(lhs, rhs: i32) -> (i32, bool) --- - @(link_name="llvm.uadd.with.overflow.i64") overflowing_add_u64 :: proc(lhs, rhs: u64) -> (u64, bool) --- - @(link_name="llvm.sadd.with.overflow.i64") overflowing_add_i64 :: proc(lhs, rhs: i64) -> (i64, bool) --- -} - -overflowing_add_uint :: proc(lhs, rhs: uint) -> (uint, bool) { - when size_of(uint) == size_of(u32) { - x, ok := overflowing_add_u32(u32(lhs), u32(rhs)); - return uint(x), ok; - } else { - x, ok := overflowing_add_u64(u64(lhs), u64(rhs)); - return uint(x), ok; - } -} -overflowing_add_int :: proc(lhs, rhs: int) -> (int, bool) { - when size_of(int) == size_of(i32) { - x, ok := overflowing_add_i32(i32(lhs), i32(rhs)); - return int(x), ok; - } else { - x, ok := overflowing_add_i64(i64(lhs), i64(rhs)); - return int(x), ok; - } -} - -overflowing_add :: proc{ - overflowing_add_u8, overflowing_add_i8, - overflowing_add_u16, overflowing_add_i16, - overflowing_add_u32, overflowing_add_i32, - overflowing_add_u64, overflowing_add_i64, - overflowing_add_uint, overflowing_add_int, -}; -@(default_calling_convention="none") -foreign { - @(link_name="llvm.usub.with.overflow.i8") overflowing_sub_u8 :: proc(lhs, rhs: u8) -> (u8, bool) --- - @(link_name="llvm.ssub.with.overflow.i8") overflowing_sub_i8 :: proc(lhs, rhs: i8) -> (i8, bool) --- - @(link_name="llvm.usub.with.overflow.i16") overflowing_sub_u16 :: proc(lhs, rhs: u16) -> (u16, bool) --- - @(link_name="llvm.ssub.with.overflow.i16") overflowing_sub_i16 :: proc(lhs, rhs: i16) -> (i16, bool) --- - @(link_name="llvm.usub.with.overflow.i32") overflowing_sub_u32 :: proc(lhs, rhs: u32) -> (u32, bool) --- - @(link_name="llvm.ssub.with.overflow.i32") overflowing_sub_i32 :: proc(lhs, rhs: i32) -> (i32, bool) --- - @(link_name="llvm.usub.with.overflow.i64") overflowing_sub_u64 :: proc(lhs, rhs: u64) -> (u64, bool) --- - @(link_name="llvm.ssub.with.overflow.i64") overflowing_sub_i64 :: proc(lhs, rhs: i64) -> (i64, bool) --- -} -overflowing_sub_uint :: proc(lhs, rhs: uint) -> (uint, bool) { - when size_of(uint) == size_of(u32) { - x, ok := overflowing_sub_u32(u32(lhs), u32(rhs)); - return uint(x), ok; - } else { - x, ok := overflowing_sub_u64(u64(lhs), u64(rhs)); - return uint(x), ok; - } -} -overflowing_sub_int :: proc(lhs, rhs: int) -> (int, bool) { - when size_of(int) == size_of(i32) { - x, ok := overflowing_sub_i32(i32(lhs), i32(rhs)); - return int(x), ok; - } else { - x, ok := overflowing_sub_i64(i64(lhs), i64(rhs)); - return int(x), ok; - } -} - -overflowing_sub :: proc{ - overflowing_sub_u8, overflowing_sub_i8, - overflowing_sub_u16, overflowing_sub_i16, - overflowing_sub_u32, overflowing_sub_i32, - overflowing_sub_u64, overflowing_sub_i64, - overflowing_sub_uint, overflowing_sub_int, -}; - -@(default_calling_convention="none") -foreign { - @(link_name="llvm.umul.with.overflow.i8") overflowing_mul_u8 :: proc(lhs, rhs: u8) -> (u8, bool) --- - @(link_name="llvm.smul.with.overflow.i8") overflowing_mul_i8 :: proc(lhs, rhs: i8) -> (i8, bool) --- - @(link_name="llvm.umul.with.overflow.i16") overflowing_mul_u16 :: proc(lhs, rhs: u16) -> (u16, bool) --- - @(link_name="llvm.smul.with.overflow.i16") overflowing_mul_i16 :: proc(lhs, rhs: i16) -> (i16, bool) --- - @(link_name="llvm.umul.with.overflow.i32") overflowing_mul_u32 :: proc(lhs, rhs: u32) -> (u32, bool) --- - @(link_name="llvm.smul.with.overflow.i32") overflowing_mul_i32 :: proc(lhs, rhs: i32) -> (i32, bool) --- - @(link_name="llvm.umul.with.overflow.i64") overflowing_mul_u64 :: proc(lhs, rhs: u64) -> (u64, bool) --- - @(link_name="llvm.smul.with.overflow.i64") overflowing_mul_i64 :: proc(lhs, rhs: i64) -> (i64, bool) --- -} -overflowing_mul_uint :: proc(lhs, rhs: uint) -> (uint, bool) { - when size_of(uint) == size_of(u32) { - x, ok := overflowing_mul_u32(u32(lhs), u32(rhs)); - return uint(x), ok; - } else { - x, ok := overflowing_mul_u64(u64(lhs), u64(rhs)); - return uint(x), ok; - } -} -overflowing_mul_int :: proc(lhs, rhs: int) -> (int, bool) { - when size_of(int) == size_of(i32) { - x, ok := overflowing_mul_i32(i32(lhs), i32(rhs)); - return int(x), ok; - } else { - x, ok := overflowing_mul_i64(i64(lhs), i64(rhs)); - return int(x), ok; - } -} - -overflowing_mul :: proc{ - overflowing_mul_u8, overflowing_mul_i8, - overflowing_mul_u16, overflowing_mul_i16, - overflowing_mul_u32, overflowing_mul_i32, - overflowing_mul_u64, overflowing_mul_i64, - overflowing_mul_uint, overflowing_mul_int, -}; +overflowing_add :: intrinsics.overflow_add; +overflowing_sub :: intrinsics.overflow_sub; +overflowing_mul :: intrinsics.overflow_mul; len_u8 :: proc(x: u8) -> int { diff --git a/core/runtime/core.odin b/core/runtime/core.odin index 78d43b65a..0033aad9a 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -20,6 +20,8 @@ // package runtime +import "intrinsics" + // NOTE(bill): This must match the compiler's Calling_Convention :: enum u8 { Invalid = 0, @@ -430,17 +432,9 @@ typeid_base_without_enum :: typeid_core; -@(default_calling_convention = "none") -foreign { - @(link_name="llvm.debugtrap") - debug_trap :: proc() ---; - - @(link_name="llvm.trap") - trap :: proc() -> ! ---; - - @(link_name="llvm.readcyclecounter") - read_cycle_counter :: proc() -> u64 ---; -} +debug_trap :: intrinsics.debug_trap; +trap :: intrinsics.trap; +read_cycle_counter :: intrinsics.read_cycle_counter; @@ -488,7 +482,6 @@ __init_context :: proc "contextless" (c: ^Context) { c.logger.data = nil; } - default_assertion_failure_proc :: proc(prefix, message: string, loc: Source_Code_Location) { print_caller_location(loc); print_string(" "); diff --git a/core/runtime/core_builtin.odin b/core/runtime/core_builtin.odin index 6656c16a0..237ad0670 100644 --- a/core/runtime/core_builtin.odin +++ b/core/runtime/core_builtin.odin @@ -1,5 +1,7 @@ package runtime +import "intrinsics" + @builtin Maybe :: union(T: typeid) #maybe {T}; @@ -539,20 +541,15 @@ excl_bit_set :: proc(s: ^$S/bit_set[$E; $U], other: S) { @builtin card :: proc(s: $S/bit_set[$E; $U]) -> int { when size_of(S) == 1 { - foreign { @(link_name="llvm.ctpop.i8") count_ones :: proc(i: u8) -> u8 --- } - return int(count_ones(transmute(u8)s)); + return int(intrinsics.count_ones(transmute(u8)s)); } else when size_of(S) == 2 { - foreign { @(link_name="llvm.ctpop.i16") count_ones :: proc(i: u16) -> u16 --- } - return int(count_ones(transmute(u16)s)); + return int(intrinsics.count_ones(transmute(u16)s)); } else when size_of(S) == 4 { - foreign { @(link_name="llvm.ctpop.i32") count_ones :: proc(i: u32) -> u32 --- } - return int(count_ones(transmute(u32)s)); + return int(intrinsics.count_ones(transmute(u32)s)); } else when size_of(S) == 8 { - foreign { @(link_name="llvm.ctpop.i64") count_ones :: proc(i: u64) -> u64 --- } - return int(count_ones(transmute(u64)s)); + return int(intrinsics.count_ones(transmute(u64)s)); } else when size_of(S) == 16 { - foreign { @(link_name="llvm.ctpop.i128") count_ones :: proc(i: u128) -> u128 --- } - return int(count_ones(transmute(u128)s)); + return int(intrinsics.count_ones(transmute(u128)s)); } else { #panic("Unhandled card bit_set size"); } diff --git a/core/runtime/internal.odin b/core/runtime/internal.odin index e2f8c7287..0e128567a 100644 --- a/core/runtime/internal.odin +++ b/core/runtime/internal.odin @@ -415,59 +415,32 @@ foreign { @(link_name="llvm.sqrt.f64") _sqrt_f64 :: proc(x: f64) -> f64 --- } abs_f16 :: #force_inline proc "contextless" (x: f16) -> f16 { - foreign { - @(link_name="llvm.fabs.f16") _abs :: proc "none" (x: f16) -> f16 --- - } - return _abs(x); + return -x if x < 0 else x; } abs_f32 :: #force_inline proc "contextless" (x: f32) -> f32 { - foreign { - @(link_name="llvm.fabs.f32") _abs :: proc "none" (x: f32) -> f32 --- - } - return _abs(x); + return -x if x < 0 else x; } abs_f64 :: #force_inline proc "contextless" (x: f64) -> f64 { - foreign { - @(link_name="llvm.fabs.f64") _abs :: proc "none" (x: f64) -> f64 --- - } - return _abs(x); + return -x if x < 0 else x; } min_f16 :: proc(a, b: f16) -> f16 { - foreign { - @(link_name="llvm.minnum.f16") _min :: proc "none" (a, b: f16) -> f16 --- - } - return _min(a, b); + return a if a < b else b; } min_f32 :: proc(a, b: f32) -> f32 { - foreign { - @(link_name="llvm.minnum.f32") _min :: proc "none" (a, b: f32) -> f32 --- - } - return _min(a, b); + return a if a < b else b; } min_f64 :: proc(a, b: f64) -> f64 { - foreign { - @(link_name="llvm.minnum.f64") _min :: proc "none" (a, b: f64) -> f64 --- - } - return _min(a, b); + return a if a < b else b; } max_f16 :: proc(a, b: f16) -> f16 { - foreign { - @(link_name="llvm.maxnum.f16") _max :: proc "none" (a, b: f16) -> f16 --- - } - return _max(a, b); + return a if a > b else b; } max_f32 :: proc(a, b: f32) -> f32 { - foreign { - @(link_name="llvm.maxnum.f32") _max :: proc "none" (a, b: f32) -> f32 --- - } - return _max(a, b); + return a if a > b else b; } max_f64 :: proc(a, b: f64) -> f64 { - foreign { - @(link_name="llvm.maxnum.f64") _max :: proc "none" (a, b: f64) -> f64 --- - } - return _max(a, b); + return a if a > b else b; } abs_complex32 :: #force_inline proc "contextless" (x: complex32) -> f16 { diff --git a/core/runtime/internal_linux.odin b/core/runtime/internal_linux.odin index aecd7f601..1e1a25bb8 100644 --- a/core/runtime/internal_linux.odin +++ b/core/runtime/internal_linux.odin @@ -1,5 +1,7 @@ package runtime +import "intrinsics" + @(link_name="__umodti3") umodti3 :: proc "c" (a, b: u128) -> u128 { r: u128 = ---; @@ -86,12 +88,6 @@ fixdfti :: proc(a: u64) -> i128 { } -@(default_calling_convention = "none") -foreign { - @(link_name="llvm.ctlz.i128") _clz_i128 :: proc(x: i128, is_zero_undef := false) -> i128 --- -} - - @(link_name="__floattidf") floattidf :: proc(a: i128) -> f64 { DBL_MANT_DIG :: 53; @@ -102,7 +98,7 @@ floattidf :: proc(a: i128) -> f64 { N :: size_of(i128) * 8; s := a >> (N-1); a = (a ~ s) - s; - sd: = N - _clz_i128(a); // number of significant digits + sd: = N - intrinsics.leading_zeros(a); // number of significant digits e := u32(sd - 1); // exponent if sd > DBL_MANT_DIG { switch sd { diff --git a/core/runtime/internal_windows.odin b/core/runtime/internal_windows.odin index 79a4bcdcb..8f50baf7f 100644 --- a/core/runtime/internal_windows.odin +++ b/core/runtime/internal_windows.odin @@ -1,5 +1,7 @@ package runtime +import "intrinsics" + @(link_name="__umodti3") umodti3 :: proc "c" (a, b: u128) -> u128 { r: u128 = ---; @@ -86,12 +88,6 @@ fixdfti :: proc(a: u64) -> i128 { } -@(default_calling_convention = "none") -foreign { - @(link_name="llvm.ctlz.i128") _clz_i128 :: proc(x: i128, is_zero_undef := false) -> i128 --- -} - - @(link_name="__floattidf") floattidf :: proc(a: i128) -> f64 { DBL_MANT_DIG :: 53; @@ -102,7 +98,7 @@ floattidf :: proc(a: i128) -> f64 { N :: size_of(i128) * 8; s := a >> (N-1); a = (a ~ s) - s; - sd: = N - _clz_i128(a); // number of significant digits + sd: = N - intrinsics.leading_zeros((a); // number of significant digits e := u32(sd - 1); // exponent if sd > DBL_MANT_DIG { switch sd { diff --git a/core/runtime/udivmod128.odin b/core/runtime/udivmod128.odin index 3486dffc2..c0ba6b9a3 100644 --- a/core/runtime/udivmod128.odin +++ b/core/runtime/udivmod128.odin @@ -1,35 +1,11 @@ package runtime -@(default_calling_convention="none") -foreign { - @(link_name="llvm.cttz.i8") _ctz_u8 :: proc(i: u8, is_zero_undef := false) -> u8 --- - @(link_name="llvm.cttz.i16") _ctz_u16 :: proc(i: u16, is_zero_undef := false) -> u16 --- - @(link_name="llvm.cttz.i32") _ctz_u32 :: proc(i: u32, is_zero_undef := false) -> u32 --- - @(link_name="llvm.cttz.i64") _ctz_u64 :: proc(i: u64, is_zero_undef := false) -> u64 --- -} -_ctz :: proc{ - _ctz_u8, - _ctz_u16, - _ctz_u32, - _ctz_u64, -}; - -@(default_calling_convention="none") -foreign { - @(link_name="llvm.ctlz.i8") _clz_u8 :: proc(i: u8, is_zero_undef := false) -> u8 --- - @(link_name="llvm.ctlz.i16") _clz_u16 :: proc(i: u16, is_zero_undef := false) -> u16 --- - @(link_name="llvm.ctlz.i32") _clz_u32 :: proc(i: u32, is_zero_undef := false) -> u32 --- - @(link_name="llvm.ctlz.i64") _clz_u64 :: proc(i: u64, is_zero_undef := false) -> u64 --- -} -_clz :: proc{ - _clz_u8, - _clz_u16, - _clz_u32, - _clz_u64, -}; - +import "intrinsics" udivmod128 :: proc "c" (a, b: u128, rem: ^u128) -> u128 { + _ctz :: intrinsics.trailing_zeros; + _clz :: intrinsics.leading_zeros; + n := transmute([2]u64)a; d := transmute([2]u64)b; q, r: [2]u64 = ---, ---; diff --git a/core/time/time.odin b/core/time/time.odin index eb35ac0d9..00d7e529a 100644 --- a/core/time/time.odin +++ b/core/time/time.odin @@ -1,5 +1,7 @@ package time +import "intrinsics" + Duration :: distinct i64; Nanosecond :: Duration(1); @@ -137,11 +139,7 @@ clock :: proc(t: Time) -> (hour, min, sec: int) { read_cycle_counter :: proc() -> u64 { - foreign _ { - @(link_name="llvm.readcyclecounter") - llvm_readcyclecounter :: proc "none" () -> u64 --- - } - return llvm_readcyclecounter(); + return u64(intrinsics.read_cycle_counter()); } diff --git a/src/check_builtin.cpp b/src/check_builtin.cpp index 94e8dcee6..95e1f78cb 100644 --- a/src/check_builtin.cpp +++ b/src/check_builtin.cpp @@ -1924,6 +1924,7 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 case BuiltinProc_count_ones: case BuiltinProc_trailing_zeros: + case BuiltinProc_leading_zeros: case BuiltinProc_reverse_bits: { Operand x = {}; diff --git a/src/checker_builtin_procs.hpp b/src/checker_builtin_procs.hpp index b9794da8a..4079d743b 100644 --- a/src/checker_builtin_procs.hpp +++ b/src/checker_builtin_procs.hpp @@ -47,6 +47,7 @@ enum BuiltinProcId { BuiltinProc_count_ones, BuiltinProc_trailing_zeros, + BuiltinProc_leading_zeros, BuiltinProc_reverse_bits, BuiltinProc_byte_swap, @@ -265,6 +266,7 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = { {STR_LIT("count_ones"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("trailing_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("leading_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("reverse_bits"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("byte_swap"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index 3e7d858ed..cefe740f0 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -9108,6 +9108,8 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, case BuiltinProc_trailing_zeros: return lb_emit_trailing_zeros(p, lb_build_expr(p, ce->args[0]), tv.type); + case BuiltinProc_leading_zeros: + return lb_emit_leading_zeros(p, lb_build_expr(p, ce->args[0]), tv.type); case BuiltinProc_count_ones: return lb_emit_count_ones(p, lb_build_expr(p, ce->args[0]), tv.type); @@ -9989,6 +9991,26 @@ lbValue lb_emit_trailing_zeros(lbProcedure *p, lbValue x, Type *type) { return res; } +lbValue lb_emit_leading_zeros(lbProcedure *p, lbValue x, Type *type) { + x = lb_emit_conv(p, x, type); + + char const *name = "llvm.ctlz"; + LLVMTypeRef types[1] = {lb_type(p->module, type)}; + unsigned id = LLVMLookupIntrinsicID(name, gb_strlen(name)); + GB_ASSERT_MSG(id != 0, "Unable to find %s.%s", name, LLVMPrintTypeToString(types[0])); + LLVMValueRef ip = LLVMGetIntrinsicDeclaration(p->module->mod, id, types, gb_count_of(types)); + + LLVMValueRef args[2] = {}; + args[0] = x.value; + args[1] = LLVMConstNull(LLVMInt1TypeInContext(p->module->ctx)); + + lbValue res = {}; + res.value = LLVMBuildCall(p->builder, ip, args, gb_count_of(args), ""); + res.type = type; + return res; +} + + lbValue lb_emit_reverse_bits(lbProcedure *p, lbValue x, Type *type) { x = lb_emit_conv(p, x, type); diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp index c2202131a..a7faa83b2 100644 --- a/src/llvm_backend.hpp +++ b/src/llvm_backend.hpp @@ -396,6 +396,7 @@ LLVMMetadataRef lb_debug_type(lbModule *m, Type *type); lbValue lb_emit_count_ones(lbProcedure *p, lbValue x, Type *type); lbValue lb_emit_trailing_zeros(lbProcedure *p, lbValue x, Type *type); +lbValue lb_emit_leading_zeros(lbProcedure *p, lbValue x, Type *type); lbValue lb_emit_reverse_bits(lbProcedure *p, lbValue x, Type *type); lbValue lb_emit_bit_set_card(lbProcedure *p, lbValue x); -- cgit v1.2.3 From 7086b49ae6755292232d9175d12bd76d93290b9c Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 20:26:11 +0100 Subject: Rename intrinsics to count_trailing_zeros and count_leading_zeros --- core/math/bits/bits.odin | 33 ++++++--------------------------- core/runtime/internal_linux.odin | 2 +- core/runtime/internal_windows.odin | 2 +- core/runtime/udivmod128.odin | 4 ++-- src/check_builtin.cpp | 4 ++-- src/checker_builtin_procs.hpp | 14 +++++++------- src/llvm_backend.cpp | 12 ++++++------ src/llvm_backend.hpp | 4 ++-- 8 files changed, 27 insertions(+), 48 deletions(-) (limited to 'src/llvm_backend.cpp') diff --git a/core/math/bits/bits.odin b/core/math/bits/bits.odin index 303a94c1d..653cddacd 100644 --- a/core/math/bits/bits.odin +++ b/core/math/bits/bits.odin @@ -25,23 +25,14 @@ I64_MAX :: 1 << 63 - 1; count_ones :: intrinsics.count_ones; -trailing_zeros :: intrinsics.trailing_zeros; +trailing_zeros :: intrinsics.count_trailing_zeros; +leading_zeros :: intrinsics.count_leading_zeros; +count_trailing_zeros :: intrinsics.count_trailing_zeros; +count_leading_zeros :: intrinsics.count_leading_zeros; reverse_bits :: intrinsics.reverse_bits; +byte_swap :: intrinsics.byte_swap; -leading_zeros_u8 :: proc(i: u8) -> int { - return 8*size_of(i) - len_u8(i); -} -leading_zeros_u16 :: proc(i: u16) -> int { - return 8*size_of(i) - len_u16(i); -} -leading_zeros_u32 :: proc(i: u32) -> int { - return 8*size_of(i) - len_u32(i); -} -leading_zeros_u64 :: proc(i: u64) -> int { - return 8*size_of(i) - len_u64(i); -} - byte_swap_u16 :: proc(x: u16) -> u16 { return runtime.bswap_16(x); @@ -83,18 +74,6 @@ byte_swap_int :: proc(i: int) -> int { } } -byte_swap :: proc{ - byte_swap_u16, - byte_swap_u32, - byte_swap_u64, - byte_swap_u128, - byte_swap_i16, - byte_swap_i32, - byte_swap_i64, - byte_swap_i128, - byte_swap_uint, - byte_swap_int, -}; count_zeros8 :: proc(i: u8) -> u8 { return 8 - count_ones(i); } count_zeros16 :: proc(i: u16) -> u16 { return 16 - count_ones(i); } @@ -324,7 +303,7 @@ div_u64 :: proc(hi, lo, y: u64) -> (quo, rem: u64) { panic("overflow error"); } - s := uint(leading_zeros_u64(y)); + s := uint(count_leading_zeros(y)); y <<= s; yn1 := y >> 32; diff --git a/core/runtime/internal_linux.odin b/core/runtime/internal_linux.odin index 1e1a25bb8..19b52a42a 100644 --- a/core/runtime/internal_linux.odin +++ b/core/runtime/internal_linux.odin @@ -98,7 +98,7 @@ floattidf :: proc(a: i128) -> f64 { N :: size_of(i128) * 8; s := a >> (N-1); a = (a ~ s) - s; - sd: = N - intrinsics.leading_zeros(a); // number of significant digits + sd: = N - intrinsics.count_leading_zeros(a); // number of significant digits e := u32(sd - 1); // exponent if sd > DBL_MANT_DIG { switch sd { diff --git a/core/runtime/internal_windows.odin b/core/runtime/internal_windows.odin index 8f50baf7f..d7f00d155 100644 --- a/core/runtime/internal_windows.odin +++ b/core/runtime/internal_windows.odin @@ -98,7 +98,7 @@ floattidf :: proc(a: i128) -> f64 { N :: size_of(i128) * 8; s := a >> (N-1); a = (a ~ s) - s; - sd: = N - intrinsics.leading_zeros((a); // number of significant digits + sd: = N - intrinsics.count_leading_zeros(a); // number of significant digits e := u32(sd - 1); // exponent if sd > DBL_MANT_DIG { switch sd { diff --git a/core/runtime/udivmod128.odin b/core/runtime/udivmod128.odin index c0ba6b9a3..e4b7380d3 100644 --- a/core/runtime/udivmod128.odin +++ b/core/runtime/udivmod128.odin @@ -3,8 +3,8 @@ package runtime import "intrinsics" udivmod128 :: proc "c" (a, b: u128, rem: ^u128) -> u128 { - _ctz :: intrinsics.trailing_zeros; - _clz :: intrinsics.leading_zeros; + _ctz :: intrinsics.count_trailing_zeros; + _clz :: intrinsics.count_leading_zeros; n := transmute([2]u64)a; d := transmute([2]u64)b; diff --git a/src/check_builtin.cpp b/src/check_builtin.cpp index 95e1f78cb..d3dbb3120 100644 --- a/src/check_builtin.cpp +++ b/src/check_builtin.cpp @@ -1923,8 +1923,8 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 break; case BuiltinProc_count_ones: - case BuiltinProc_trailing_zeros: - case BuiltinProc_leading_zeros: + case BuiltinProc_count_trailing_zeros: + case BuiltinProc_count_leading_zeros: case BuiltinProc_reverse_bits: { Operand x = {}; diff --git a/src/checker_builtin_procs.hpp b/src/checker_builtin_procs.hpp index 4079d743b..7282e9895 100644 --- a/src/checker_builtin_procs.hpp +++ b/src/checker_builtin_procs.hpp @@ -46,8 +46,8 @@ enum BuiltinProcId { BuiltinProc_read_cycle_counter, BuiltinProc_count_ones, - BuiltinProc_trailing_zeros, - BuiltinProc_leading_zeros, + BuiltinProc_count_trailing_zeros, + BuiltinProc_count_leading_zeros, BuiltinProc_reverse_bits, BuiltinProc_byte_swap, @@ -264,11 +264,11 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = { {STR_LIT("debug_trap"), 0, false, Expr_Stmt, BuiltinProcPkg_intrinsics, /*diverging*/false}, {STR_LIT("read_cycle_counter"), 0, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("count_ones"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("trailing_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("leading_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("reverse_bits"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, - {STR_LIT("byte_swap"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("count_ones"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("count_trailing_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("count_leading_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("reverse_bits"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("byte_swap"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("overflow_add"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("overflow_sub"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics}, diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index cefe740f0..c6f1c3693 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -9106,10 +9106,10 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, return res; } - case BuiltinProc_trailing_zeros: - return lb_emit_trailing_zeros(p, lb_build_expr(p, ce->args[0]), tv.type); - case BuiltinProc_leading_zeros: - return lb_emit_leading_zeros(p, lb_build_expr(p, ce->args[0]), tv.type); + case BuiltinProc_count_trailing_zeros: + return lb_emit_count_trailing_zeros(p, lb_build_expr(p, ce->args[0]), tv.type); + case BuiltinProc_count_leading_zeros: + return lb_emit_count_leading_zeros(p, lb_build_expr(p, ce->args[0]), tv.type); case BuiltinProc_count_ones: return lb_emit_count_ones(p, lb_build_expr(p, ce->args[0]), tv.type); @@ -9972,7 +9972,7 @@ lbValue lb_emit_count_ones(lbProcedure *p, lbValue x, Type *type) { } -lbValue lb_emit_trailing_zeros(lbProcedure *p, lbValue x, Type *type) { +lbValue lb_emit_count_trailing_zeros(lbProcedure *p, lbValue x, Type *type) { x = lb_emit_conv(p, x, type); char const *name = "llvm.cttz"; @@ -9991,7 +9991,7 @@ lbValue lb_emit_trailing_zeros(lbProcedure *p, lbValue x, Type *type) { return res; } -lbValue lb_emit_leading_zeros(lbProcedure *p, lbValue x, Type *type) { +lbValue lb_emit_count_leading_zeros(lbProcedure *p, lbValue x, Type *type) { x = lb_emit_conv(p, x, type); char const *name = "llvm.ctlz"; diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp index a7faa83b2..b25d94abb 100644 --- a/src/llvm_backend.hpp +++ b/src/llvm_backend.hpp @@ -395,8 +395,8 @@ lbValue lb_emit_conv(lbProcedure *p, lbValue value, Type *t); LLVMMetadataRef lb_debug_type(lbModule *m, Type *type); lbValue lb_emit_count_ones(lbProcedure *p, lbValue x, Type *type); -lbValue lb_emit_trailing_zeros(lbProcedure *p, lbValue x, Type *type); -lbValue lb_emit_leading_zeros(lbProcedure *p, lbValue x, Type *type); +lbValue lb_emit_count_trailing_zeros(lbProcedure *p, lbValue x, Type *type); +lbValue lb_emit_count_leading_zeros(lbProcedure *p, lbValue x, Type *type); lbValue lb_emit_reverse_bits(lbProcedure *p, lbValue x, Type *type); lbValue lb_emit_bit_set_card(lbProcedure *p, lbValue x); -- cgit v1.2.3 From 2691c394e071f63a72a0f425e1ed2415e14515f5 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 25 Apr 2021 20:50:25 +0100 Subject: Add `intrinsics.count_zeros` --- core/math/bits/bits.odin | 73 ++++++------------------------------------- src/check_builtin.cpp | 1 + src/checker_builtin_procs.hpp | 2 ++ src/llvm_backend.cpp | 10 ++++++ src/llvm_backend.hpp | 1 + 5 files changed, 23 insertions(+), 64 deletions(-) (limited to 'src/llvm_backend.cpp') diff --git a/core/math/bits/bits.odin b/core/math/bits/bits.odin index 653cddacd..dbd7cc002 100644 --- a/core/math/bits/bits.odin +++ b/core/math/bits/bits.odin @@ -24,68 +24,18 @@ I32_MAX :: 1 << 31 - 1; I64_MAX :: 1 << 63 - 1; -count_ones :: intrinsics.count_ones; -trailing_zeros :: intrinsics.count_trailing_zeros; -leading_zeros :: intrinsics.count_leading_zeros; +count_ones :: intrinsics.count_ones; +count_zeros :: intrinsics.count_zeros; +trailing_zeros :: intrinsics.count_trailing_zeros; +leading_zeros :: intrinsics.count_leading_zeros; count_trailing_zeros :: intrinsics.count_trailing_zeros; count_leading_zeros :: intrinsics.count_leading_zeros; -reverse_bits :: intrinsics.reverse_bits; -byte_swap :: intrinsics.byte_swap; +reverse_bits :: intrinsics.reverse_bits; +byte_swap :: intrinsics.byte_swap; - - -byte_swap_u16 :: proc(x: u16) -> u16 { - return runtime.bswap_16(x); -} -byte_swap_u32 :: proc(x: u32) -> u32 { - return runtime.bswap_32(x); -} -byte_swap_u64 :: proc(x: u64) -> u64 { - return runtime.bswap_64(x); -} -byte_swap_i16 :: proc(x: i16) -> i16 { - return i16(runtime.bswap_16(u16(x))); -} -byte_swap_i32 :: proc(x: i32) -> i32 { - return i32(runtime.bswap_32(u32(x))); -} -byte_swap_i64 :: proc(x: i64) -> i64 { - return i64(runtime.bswap_64(u64(x))); -} -byte_swap_u128 :: proc(x: u128) -> u128 { - return runtime.bswap_128(x); -} -byte_swap_i128 :: proc(x: i128) -> i128 { - return i128(runtime.bswap_128(u128(x))); -} - -byte_swap_uint :: proc(i: uint) -> uint { - when size_of(uint) == size_of(u32) { - return uint(byte_swap_u32(u32(i))); - } else { - return uint(byte_swap_u64(u64(i))); - } -} -byte_swap_int :: proc(i: int) -> int { - when size_of(int) == size_of(i32) { - return int(byte_swap_i32(i32(i))); - } else { - return int(byte_swap_i64(i64(i))); - } -} - - -count_zeros8 :: proc(i: u8) -> u8 { return 8 - count_ones(i); } -count_zeros16 :: proc(i: u16) -> u16 { return 16 - count_ones(i); } -count_zeros32 :: proc(i: u32) -> u32 { return 32 - count_ones(i); } -count_zeros64 :: proc(i: u64) -> u64 { return 64 - count_ones(i); } - -count_zeros :: proc{ - count_zeros8, - count_zeros16, - count_zeros32, - count_zeros64, -}; +overflowing_add :: intrinsics.overflow_add; +overflowing_sub :: intrinsics.overflow_sub; +overflowing_mul :: intrinsics.overflow_mul; rotate_left8 :: proc(x: u8, k: int) -> u8 { @@ -142,11 +92,6 @@ to_le_uint :: proc(i: uint) -> uint { when ODIN_ENDIAN == "little" { return i; } -overflowing_add :: intrinsics.overflow_add; -overflowing_sub :: intrinsics.overflow_sub; -overflowing_mul :: intrinsics.overflow_mul; - - len_u8 :: proc(x: u8) -> int { return int(len_u8_table[x]); } diff --git a/src/check_builtin.cpp b/src/check_builtin.cpp index d3dbb3120..00963487f 100644 --- a/src/check_builtin.cpp +++ b/src/check_builtin.cpp @@ -1923,6 +1923,7 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 break; case BuiltinProc_count_ones: + case BuiltinProc_count_zeros: case BuiltinProc_count_trailing_zeros: case BuiltinProc_count_leading_zeros: case BuiltinProc_reverse_bits: diff --git a/src/checker_builtin_procs.hpp b/src/checker_builtin_procs.hpp index 7282e9895..98ef5180b 100644 --- a/src/checker_builtin_procs.hpp +++ b/src/checker_builtin_procs.hpp @@ -46,6 +46,7 @@ enum BuiltinProcId { BuiltinProc_read_cycle_counter, BuiltinProc_count_ones, + BuiltinProc_count_zeros, BuiltinProc_count_trailing_zeros, BuiltinProc_count_leading_zeros, BuiltinProc_reverse_bits, @@ -265,6 +266,7 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = { {STR_LIT("read_cycle_counter"), 0, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("count_ones"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, + {STR_LIT("count_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("count_trailing_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("count_leading_zeros"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, {STR_LIT("reverse_bits"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics}, diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp index c6f1c3693..c52c9269e 100644 --- a/src/llvm_backend.cpp +++ b/src/llvm_backend.cpp @@ -9113,6 +9113,8 @@ lbValue lb_build_builtin_proc(lbProcedure *p, Ast *expr, TypeAndValue const &tv, case BuiltinProc_count_ones: return lb_emit_count_ones(p, lb_build_expr(p, ce->args[0]), tv.type); + case BuiltinProc_count_zeros: + return lb_emit_count_zeros(p, lb_build_expr(p, ce->args[0]), tv.type); case BuiltinProc_reverse_bits: return lb_emit_reverse_bits(p, lb_build_expr(p, ce->args[0]), tv.type); @@ -9971,6 +9973,14 @@ lbValue lb_emit_count_ones(lbProcedure *p, lbValue x, Type *type) { return res; } +lbValue lb_emit_count_zeros(lbProcedure *p, lbValue x, Type *type) { + i64 sz = 8*type_size_of(type); + lbValue size = lb_const_int(p->module, type, cast(u64)sz); + lbValue count = lb_emit_count_ones(p, x, type); + return lb_emit_arith(p, Token_Sub, size, count, type); +} + + lbValue lb_emit_count_trailing_zeros(lbProcedure *p, lbValue x, Type *type) { x = lb_emit_conv(p, x, type); diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp index b25d94abb..e8811a91e 100644 --- a/src/llvm_backend.hpp +++ b/src/llvm_backend.hpp @@ -395,6 +395,7 @@ lbValue lb_emit_conv(lbProcedure *p, lbValue value, Type *t); LLVMMetadataRef lb_debug_type(lbModule *m, Type *type); lbValue lb_emit_count_ones(lbProcedure *p, lbValue x, Type *type); +lbValue lb_emit_count_zeros(lbProcedure *p, lbValue x, Type *type); lbValue lb_emit_count_trailing_zeros(lbProcedure *p, lbValue x, Type *type); lbValue lb_emit_count_leading_zeros(lbProcedure *p, lbValue x, Type *type); lbValue lb_emit_reverse_bits(lbProcedure *p, lbValue x, Type *type); -- cgit v1.2.3