From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id C20CF38493CA; Tue, 21 Feb 2023 12:00:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C20CF38493CA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676980819; bh=ZqHuGoY09XRQ/78GRs1gQtHBUIcidp8NiEeXIXYfgGk=; h=From:To:Subject:Date:From; b=Es6DIoL5qdrqbOXfz+R4KenGjmBFBVAj30cR2ET9Y3ryU/KXTTs2Y6iRFtKpqSPsG DlhRatxYp+9b2DHZKplKfhPhfWeJ4X/z2+QUYcAp4TGF8umcasWEXwBR/MKw60q1QA BKyHdpJFaXaUuWm+tgGhOQdT0CrS3BiX6qcefLZQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6213] gccrs: intrinsics: Add early implementation for atomic_store_{seqcst, relaxed, release} X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/master X-Git-Oldrev: 514284ecd97f2f42948f17a244b790c26f637716 X-Git-Newrev: a7c8f7ee34334edec4b57db547de1c8b5d0ad31d Message-Id: <20230221120019.C20CF38493CA@sourceware.org> Date: Tue, 21 Feb 2023 12:00:19 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a7c8f7ee34334edec4b57db547de1c8b5d0ad31d commit r13-6213-ga7c8f7ee34334edec4b57db547de1c8b5d0ad31d Author: Arthur Cohen Date: Tue Oct 25 11:24:10 2022 +0200 gccrs: intrinsics: Add early implementation for atomic_store_{seqcst, relaxed, release} gcc/rust/ChangeLog: * backend/rust-builtins.cc (BuiltinsContext::setup_atomic_fns): New function. (BuiltinsContext::setup): Call `setup_atomic_fns`. * backend/rust-builtins.h: Declare `setup_atomic_fns`. * backend/rust-compile-intrinsic.cc (atomic_store_handler_inner): New function. (atomic_store_handler): New handler. (make_unsigned_long_tree): Add helper around making unsigned long trees. (prefetch_data_handler): Use `make_unsigned_long_tree`. (build_atomic_builtin_name): New function. gcc/testsuite/ChangeLog: * rust/compile/torture/intrinsics-4.rs: New test. * rust/compile/torture/intrinsics-5.rs: New test. * rust/execute/torture/atomic_store.rs: New test. Diff: --- gcc/rust/backend/rust-builtins.cc | 36 +++++ gcc/rust/backend/rust-builtins.h | 2 +- gcc/rust/backend/rust-compile-intrinsic.cc | 165 ++++++++++++++++++--- gcc/testsuite/rust/compile/torture/intrinsics-4.rs | 20 +++ gcc/testsuite/rust/compile/torture/intrinsics-5.rs | 35 +++++ gcc/testsuite/rust/execute/torture/atomic_store.rs | 32 ++++ 6 files changed, 268 insertions(+), 22 deletions(-) diff --git a/gcc/rust/backend/rust-builtins.cc b/gcc/rust/backend/rust-builtins.cc index d6f8cb6f495..64e06e1a240 100644 --- a/gcc/rust/backend/rust-builtins.cc +++ b/gcc/rust/backend/rust-builtins.cc @@ -68,11 +68,47 @@ BuiltinsContext::setup_math_fns () math_function_type_f32, builtin_const); } +void +BuiltinsContext::setup_atomic_fns () +{ + define_builtin ("atomic_store", BUILT_IN_ATOMIC_STORE, "__atomic_store", NULL, + build_function_type_list (void_type_node, size_type_node, + build_pointer_type (void_type_node), + const_ptr_type_node, + integer_type_node, NULL_TREE), + 0); + define_builtin ("atomic_store_n", BUILT_IN_ATOMIC_STORE_N, "__atomic_store_n", + NULL, + build_varargs_function_type_list (void_type_node, NULL_TREE), + 0); + define_builtin ("atomic_store_1", BUILT_IN_ATOMIC_STORE_1, "__atomic_store_1", + NULL, + build_varargs_function_type_list (void_type_node, NULL_TREE), + 0); + define_builtin ("atomic_store_2", BUILT_IN_ATOMIC_STORE_2, "__atomic_store_2", + NULL, + build_varargs_function_type_list (void_type_node, NULL_TREE), + 0); + define_builtin ("atomic_store_4", BUILT_IN_ATOMIC_STORE_4, "__atomic_store_4", + NULL, + build_varargs_function_type_list (void_type_node, NULL_TREE), + 0); + define_builtin ("atomic_store_8", BUILT_IN_ATOMIC_STORE_8, "__atomic_store_8", + NULL, + build_varargs_function_type_list (void_type_node, NULL_TREE), + 0); + define_builtin ("atomic_store_16", BUILT_IN_ATOMIC_STORE_16, + "__atomic_store_16", NULL, + build_varargs_function_type_list (void_type_node, NULL_TREE), + 0); +} + void BuiltinsContext::setup () { setup_math_fns (); setup_overflow_fns (); + setup_atomic_fns (); define_builtin ("unreachable", BUILT_IN_UNREACHABLE, "__builtin_unreachable", NULL, build_function_type (void_type_node, void_list_node), diff --git a/gcc/rust/backend/rust-builtins.h b/gcc/rust/backend/rust-builtins.h index e421fa43755..c2825107faf 100644 --- a/gcc/rust/backend/rust-builtins.h +++ b/gcc/rust/backend/rust-builtins.h @@ -86,8 +86,8 @@ private: BuiltinsContext (); void setup_overflow_fns (); - void setup_math_fns (); + void setup_atomic_fns (); void setup (); diff --git a/gcc/rust/backend/rust-compile-intrinsic.cc b/gcc/rust/backend/rust-compile-intrinsic.cc index 2a2091ccc25..7c592dabb38 100644 --- a/gcc/rust/backend/rust-compile-intrinsic.cc +++ b/gcc/rust/backend/rust-compile-intrinsic.cc @@ -93,6 +93,17 @@ prefetch_write_data (Context *ctx, TyTy::FnType *fntype) return prefetch_data_handler (ctx, fntype, Prefetch::Write); } +static tree +atomic_store_handler_inner (Context *ctx, TyTy::FnType *fntype, int ordering); + +static inline std::function +atomic_store_handler (int ordering) +{ + return [ordering] (Context *ctx, TyTy::FnType *fntype) { + return atomic_store_handler_inner (ctx, fntype, ordering); + }; +} + static inline tree sorry_handler (Context *ctx, TyTy::FnType *fntype) { @@ -105,18 +116,22 @@ sorry_handler (Context *ctx, TyTy::FnType *fntype) static const std::map> generic_intrinsics = { - {"offset", &offset_handler}, - {"size_of", &sizeof_handler}, - {"transmute", &transmute_handler}, - {"rotate_left", &rotate_left_handler}, - {"rotate_right", &rotate_right_handler}, - {"wrapping_add", &wrapping_add_handler}, - {"wrapping_sub", &wrapping_sub_handler}, - {"wrapping_mul", &wrapping_mul_handler}, - {"copy_nonoverlapping", ©_nonoverlapping_handler}, - {"prefetch_read_data", &prefetch_read_data}, - {"prefetch_write_data", &prefetch_write_data}, - {"atomic_load", &sorry_handler}, + {"offset", offset_handler}, + {"size_of", sizeof_handler}, + {"transmute", transmute_handler}, + {"rotate_left", rotate_left_handler}, + {"rotate_right", rotate_right_handler}, + {"wrapping_add", wrapping_add_handler}, + {"wrapping_sub", wrapping_sub_handler}, + {"wrapping_mul", wrapping_mul_handler}, + {"copy_nonoverlapping", copy_nonoverlapping_handler}, + {"prefetch_read_data", prefetch_read_data}, + {"prefetch_write_data", prefetch_write_data}, + {"atomic_load", sorry_handler}, + {"atomic_store_seqcst", atomic_store_handler (__ATOMIC_SEQ_CST)}, + {"atomic_store_release", atomic_store_handler (__ATOMIC_RELEASE)}, + {"atomic_store_relaxed", atomic_store_handler (__ATOMIC_RELAXED)}, + {"atomic_store_unordered", atomic_store_handler (__ATOMIC_RELAXED)}, }; Intrinsics::Intrinsics (Context *ctx) : ctx (ctx) {} @@ -551,6 +566,16 @@ copy_nonoverlapping_handler (Context *ctx, TyTy::FnType *fntype) return fndecl; } +static tree +make_unsigned_long_tree (Context *ctx, unsigned long value) +{ + mpz_t mpz_value; + mpz_init_set_ui (mpz_value, value); + + return ctx->get_backend ()->integer_constant_expression (integer_type_node, + mpz_value); +} + static tree prefetch_data_handler (Context *ctx, TyTy::FnType *fntype, Prefetch kind) { @@ -576,16 +601,8 @@ prefetch_data_handler (Context *ctx, TyTy::FnType *fntype, Prefetch kind) auto addr = ctx->get_backend ()->var_expression (args[0], Location ()); auto locality = ctx->get_backend ()->var_expression (args[1], Location ()); + auto rw_flag = make_unsigned_long_tree (ctx, kind == Prefetch::Write ? 1 : 0); - mpz_t zero; - mpz_t one; - mpz_init_set_ui (zero, 0); - mpz_init_set_ui (one, 1); - - auto rw_flag_value = kind == Prefetch::Write ? one : zero; - auto rw_flag - = ctx->get_backend ()->integer_constant_expression (integer_type_node, - rw_flag_value); auto prefetch_raw = NULL_TREE; auto ok = BuiltinsContext::get ().lookup_simple_builtin ("prefetch", &prefetch_raw); @@ -597,6 +614,9 @@ prefetch_data_handler (Context *ctx, TyTy::FnType *fntype, Prefetch kind) = ctx->get_backend ()->call_expression (prefetch, {addr, rw_flag, locality}, nullptr, Location ()); + TREE_READONLY (prefetch_call) = 0; + TREE_SIDE_EFFECTS (prefetch_call) = 1; + ctx->add_statement (prefetch_call); finalize_intrinsic_block (ctx, fndecl); @@ -604,5 +624,108 @@ prefetch_data_handler (Context *ctx, TyTy::FnType *fntype, Prefetch kind) return fndecl; } +static std::string +build_atomic_builtin_name (Location locus, tree operand_type) +{ + static const std::map allowed_types = { + {"i8", "1"}, {"i16", "2"}, {"i32", "4"}, {"i64", "8"}, + {"i128", "16"}, {"isize", "8"}, {"u8", "1"}, {"u16", "2"}, + {"u32", "4"}, {"u64", "8"}, {"u128", "16"}, {"usize", "8"}, + }; + + // TODO: Can we maybe get the generic version (atomic_store_n) to work... This + // would be so much better + + std::string result = "atomic_store_"; + + auto type_name = std::string (TYPE_NAME_STRING (operand_type)); + if (type_name == "usize" || type_name == "isize") + { + rust_sorry_at ( + locus, "atomics are not yet available for size types (usize, isize)"); + return ""; + } + + // FIXME: Can we have a better looking name here? + // Instead of `::::`? + // Maybe instead of giving the tree node, pass the resolved Tyty before it + // gets compiled? + // + // Or should we perform this check somwhere else in the compiler? + auto type_size_str = allowed_types.find (type_name); + if (type_size_str == allowed_types.end ()) + { + rust_error_at (locus, + "atomic intrinsics are only available for basic integer " + "types: got type %qs", + type_name.c_str ()); + return ""; + } + + result += type_size_str->second; + + return result; +} + +static tree +atomic_store_handler_inner (Context *ctx, TyTy::FnType *fntype, int ordering) +{ + rust_assert (fntype->get_params ().size () == 2); + rust_assert (fntype->get_num_substitutions () == 1); + + tree lookup = NULL_TREE; + if (check_for_cached_intrinsic (ctx, fntype, &lookup)) + return lookup; + + auto fndecl = compile_intrinsic_function (ctx, fntype); + + // Most intrinsic functions are pure but not the atomic ones + TREE_READONLY (fndecl) = 0; + TREE_SIDE_EFFECTS (fndecl) = 1; + + // setup the params + std::vector param_vars; + std::vector types; + compile_fn_params (ctx, fntype, fndecl, ¶m_vars, &types); + + auto ok = ctx->get_backend ()->function_set_parameters (fndecl, param_vars); + rust_assert (ok); + + enter_intrinsic_block (ctx, fndecl); + + auto dst = ctx->get_backend ()->var_expression (param_vars[0], Location ()); + TREE_READONLY (dst) = 0; + + auto value = ctx->get_backend ()->var_expression (param_vars[1], Location ()); + auto memorder = make_unsigned_long_tree (ctx, ordering); + + auto builtin_name + = build_atomic_builtin_name (fntype->get_locus (), TREE_TYPE (types[0])); + if (builtin_name.empty ()) + return error_mark_node; + + tree atomic_store_raw = nullptr; + BuiltinsContext::get ().lookup_simple_builtin (builtin_name, + &atomic_store_raw); + rust_assert (atomic_store_raw); + + auto atomic_store + = build_fold_addr_expr_loc (Location ().gcc_location (), atomic_store_raw); + + auto store_call + = ctx->get_backend ()->call_expression (atomic_store, + {dst, value, memorder}, nullptr, + Location ()); + + TREE_READONLY (store_call) = 0; + TREE_SIDE_EFFECTS (store_call) = 1; + + ctx->add_statement (store_call); + + finalize_intrinsic_block (ctx, fndecl); + + return fndecl; +} + } // namespace Compile } // namespace Rust diff --git a/gcc/testsuite/rust/compile/torture/intrinsics-4.rs b/gcc/testsuite/rust/compile/torture/intrinsics-4.rs new file mode 100644 index 00000000000..243d4460089 --- /dev/null +++ b/gcc/testsuite/rust/compile/torture/intrinsics-4.rs @@ -0,0 +1,20 @@ +trait Copy {} + +extern "rust-intrinsic" { + pub fn atomic_store_seqcst(dst: *mut T, val: T); + pub fn atomic_store_release(dst: *mut T, val: T); + pub fn atomic_store_relaxed(dst: *mut T, val: T); + // pub fn atomic_store_unordered(dst: *mut T, val: T); +} + +fn main() { + let mut dst = 15; + let new_value = 14; + + unsafe { + atomic_store_seqcst(&mut dst, new_value); + atomic_store_release(&mut dst, new_value); + atomic_store_relaxed(&mut dst, new_value); + // atomic_store_unordered(&mut dst, new_value); + } +} diff --git a/gcc/testsuite/rust/compile/torture/intrinsics-5.rs b/gcc/testsuite/rust/compile/torture/intrinsics-5.rs new file mode 100644 index 00000000000..e0087720cc4 --- /dev/null +++ b/gcc/testsuite/rust/compile/torture/intrinsics-5.rs @@ -0,0 +1,35 @@ +trait Copy {} + +extern "rust-intrinsic" { + pub fn atomic_store_seqcst(dst: *mut T, value: T); + // { dg-error "atomic intrinsics are only available for basic integer types: got type .intrinsics_5::VeryLargeType." "" { target *-*-* } .-1 } + // { dg-error "atomic intrinsics are only available for basic integer types: got type .bool." "" { target *-*-* } .-2 } +} + +struct VeryLargeType { + a0: i128, + a1: i128, + a2: i128, + a3: i128, +} + +impl VeryLargeType { + pub fn new(value: i128) -> VeryLargeType { + VeryLargeType { + a0: value, + a1: 0, + a2: 0, + a3: 0, + } + } +} + +fn main() { + let mut dst = VeryLargeType::new(0); + let mut b = false; + + unsafe { + atomic_store_seqcst(&mut dst, VeryLargeType::new(1)); + atomic_store_seqcst(&mut b, true); + } +} diff --git a/gcc/testsuite/rust/execute/torture/atomic_store.rs b/gcc/testsuite/rust/execute/torture/atomic_store.rs new file mode 100644 index 00000000000..9f248b4f823 --- /dev/null +++ b/gcc/testsuite/rust/execute/torture/atomic_store.rs @@ -0,0 +1,32 @@ +trait Copy {} + +extern "rust-intrinsic" { + pub fn atomic_store_seqcst(dst: *mut T, val: T); + pub fn atomic_store_release(dst: *mut T, val: T); + pub fn atomic_store_relaxed(dst: *mut T, val: T); + pub fn atomic_store_unordered(dst: *mut T, val: T); +} + +fn main() -> i32 { + let mut dst = 15; + let one; + let two; + let three; + let four; + + unsafe { + atomic_store_seqcst(&mut dst, 1); + one = dst; + + atomic_store_release(&mut dst, 2); + two = dst; + + atomic_store_relaxed(&mut dst, 3); + three = dst; + + atomic_store_unordered(&mut dst, 4); + four = dst; + } + + (four + three + two + one) - 10 +}