From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 352053856DD2; Thu, 11 Aug 2022 19:18:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 352053856DD2 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] compile: Move and rename `SimpleIntrinsics` -> `BuiltinsContext` X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 8749b66879f3ef78182d7712e5da981cc55f747a X-Git-Newrev: 45095d73f1ca5bb8a4954fdbf62af8351bbc52e1 Message-Id: <20220811191846.352053856DD2@sourceware.org> Date: Thu, 11 Aug 2022 19:18:46 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Aug 2022 19:18:46 -0000 https://gcc.gnu.org/g:45095d73f1ca5bb8a4954fdbf62af8351bbc52e1 commit 45095d73f1ca5bb8a4954fdbf62af8351bbc52e1 Author: Arthur Cohen Date: Mon Aug 8 10:09:42 2022 +0200 compile: Move and rename `SimpleIntrinsics` -> `BuiltinsContext` This will allow us to use the class for more than just math builtins Diff: --- gcc/rust/backend/rust-builtins.h | 181 +++++++++++++++++++++++++++++ gcc/rust/backend/rust-compile-intrinsic.cc | 157 +------------------------ gcc/rust/backend/rust-compile-intrinsic.h | 1 + 3 files changed, 185 insertions(+), 154 deletions(-) diff --git a/gcc/rust/backend/rust-builtins.h b/gcc/rust/backend/rust-builtins.h new file mode 100644 index 00000000000..13c16d15723 --- /dev/null +++ b/gcc/rust/backend/rust-builtins.h @@ -0,0 +1,181 @@ +// This file is part of GCC. + +// GCC is free software; you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation; either version 3, or (at your option) any later +// version. + +// GCC is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. + +// You should have received a copy of the GNU General Public License +// along with GCC; see the file COPYING3. If not see +// . + +#ifndef RUST_BUILTINS_H +#define RUST_BUILTINS_H + +#include "rust-system.h" +#include "tree.h" +#include "langhooks.h" + +namespace Rust { +namespace Compile { + +// https://github.com/rust-lang/rust/blob/master/library/core/src/intrinsics.rs +// https://github.com/rust-lang/rust/blob/master/compiler/rustc_codegen_llvm/src/intrinsic.rs +// https://github.com/Rust-GCC/gccrs/issues/658 +// +// let llvm_name = match name { +// sym::sqrtf32 => "llvm.sqrt.f32", +// sym::sqrtf64 => "llvm.sqrt.f64", +// sym::powif32 => "llvm.powi.f32", +// sym::powif64 => "llvm.powi.f64", +// sym::sinf32 => "llvm.sin.f32", +// sym::sinf64 => "llvm.sin.f64", +// sym::cosf32 => "llvm.cos.f32", +// sym::cosf64 => "llvm.cos.f64", +// sym::powf32 => "llvm.pow.f32", +// sym::powf64 => "llvm.pow.f64", +// sym::expf32 => "llvm.exp.f32", +// sym::expf64 => "llvm.exp.f64", +// sym::exp2f32 => "llvm.exp2.f32", +// sym::exp2f64 => "llvm.exp2.f64", +// sym::logf32 => "llvm.log.f32", +// sym::logf64 => "llvm.log.f64", +// sym::log10f32 => "llvm.log10.f32", +// sym::log10f64 => "llvm.log10.f64", +// sym::log2f32 => "llvm.log2.f32", +// sym::log2f64 => "llvm.log2.f64", +// sym::fmaf32 => "llvm.fma.f32", +// sym::fmaf64 => "llvm.fma.f64", +// sym::fabsf32 => "llvm.fabs.f32", +// sym::fabsf64 => "llvm.fabs.f64", +// sym::minnumf32 => "llvm.minnum.f32", +// sym::minnumf64 => "llvm.minnum.f64", +// sym::maxnumf32 => "llvm.maxnum.f32", +// sym::maxnumf64 => "llvm.maxnum.f64", +// sym::copysignf32 => "llvm.copysign.f32", +// sym::copysignf64 => "llvm.copysign.f64", +// sym::floorf32 => "llvm.floor.f32", +// sym::floorf64 => "llvm.floor.f64", +// sym::ceilf32 => "llvm.ceil.f32", +// sym::ceilf64 => "llvm.ceil.f64", +// sym::truncf32 => "llvm.trunc.f32", +// sym::truncf64 => "llvm.trunc.f64", +// sym::rintf32 => "llvm.rint.f32", +// sym::rintf64 => "llvm.rint.f64", +// sym::nearbyintf32 => "llvm.nearbyint.f32", +// sym::nearbyintf64 => "llvm.nearbyint.f64", +// sym::roundf32 => "llvm.round.f32", +// sym::roundf64 => "llvm.round.f64", +// _ => return None, +// }; +// Some(cx.get_intrinsic(&llvm_name)) +class BuiltinsContext +{ +public: + static BuiltinsContext &get () + { + static BuiltinsContext instance; + return instance; + } + + bool lookup_simple_builtin (const std::string &name, tree *builtin) + { + auto it = rust_intrinsic_to_gcc_builtin.find (name); + if (it == rust_intrinsic_to_gcc_builtin.end ()) + return false; + + return lookup_gcc_builtin (it->second, builtin); + } + +private: + static const int builtin_const = 1 << 0; + static const int builtin_noreturn = 1 << 1; + static const int builtin_novops = 1 << 2; + + BuiltinsContext () { setup (); } + + void setup () + { + tree math_function_type_f32 + = build_function_type_list (float_type_node, float_type_node, NULL_TREE); + + define_builtin ("sinf32", BUILT_IN_SINF, "__builtin_sinf", "sinf", + math_function_type_f32, builtin_const); + + define_builtin ("sqrtf32", BUILT_IN_SQRTF, "__builtin_sqrtf", "sqrtf", + math_function_type_f32, builtin_const); + + define_builtin ("unreachable", BUILT_IN_UNREACHABLE, + "__builtin_unreachable", NULL, + build_function_type (void_type_node, void_list_node), + builtin_const | builtin_noreturn); + + define_builtin ("abort", BUILT_IN_ABORT, "__builtin_abort", "abort", + build_function_type (void_type_node, void_list_node), + builtin_const | builtin_noreturn); + + define_builtin ("breakpoint", BUILT_IN_TRAP, "__builtin_trap", "breakpoint", + build_function_type (void_type_node, void_list_node), + builtin_const | builtin_noreturn); + } + + // Define a builtin function. BCODE is the builtin function code + // defined by builtins.def. NAME is the name of the builtin function. + // LIBNAME is the name of the corresponding library function, and is + // NULL if there isn't one. FNTYPE is the type of the function. + // CONST_P is true if the function has the const attribute. + // NORETURN_P is true if the function has the noreturn attribute. + void define_builtin (const std::string rust_name, built_in_function bcode, + const char *name, const char *libname, tree fntype, + int flags) + { + tree decl = add_builtin_function (name, fntype, bcode, BUILT_IN_NORMAL, + libname, NULL_TREE); + if ((flags & builtin_const) != 0) + TREE_READONLY (decl) = 1; + if ((flags & builtin_noreturn) != 0) + TREE_THIS_VOLATILE (decl) = 1; + if ((flags & builtin_novops) != 0) + DECL_IS_NOVOPS (decl) = 1; + set_builtin_decl (bcode, decl, true); + this->builtin_functions_[name] = decl; + if (libname != NULL) + { + decl = add_builtin_function (libname, fntype, bcode, BUILT_IN_NORMAL, + NULL, NULL_TREE); + if ((flags & builtin_const) != 0) + TREE_READONLY (decl) = 1; + if ((flags & builtin_noreturn) != 0) + TREE_THIS_VOLATILE (decl) = 1; + if ((flags & builtin_novops) != 0) + DECL_IS_NOVOPS (decl) = 1; + this->builtin_functions_[libname] = decl; + } + + rust_intrinsic_to_gcc_builtin[rust_name] = name; + } + + bool lookup_gcc_builtin (const std::string &name, tree *builtin) + { + auto it = builtin_functions_.find (name); + if (it == builtin_functions_.end ()) + return false; + + *builtin = it->second; + return true; + } + + // A mapping of the GCC built-ins exposed to GCC Rust. + std::map builtin_functions_; + std::map rust_intrinsic_to_gcc_builtin; +}; + +} // namespace Compile +} // namespace Rust + +#endif // RUST_BUILTINS_H diff --git a/gcc/rust/backend/rust-compile-intrinsic.cc b/gcc/rust/backend/rust-compile-intrinsic.cc index 88d7923a50f..ebf1ed61f55 100644 --- a/gcc/rust/backend/rust-compile-intrinsic.cc +++ b/gcc/rust/backend/rust-compile-intrinsic.cc @@ -20,6 +20,7 @@ #include "rust-compile-context.h" #include "rust-compile-type.h" #include "rust-compile-fnparam.h" +#include "rust-builtins.h" #include "rust-diagnostics.h" #include "rust-location.h" #include "rust-tree.h" @@ -28,157 +29,6 @@ namespace Rust { namespace Compile { -// https://github.com/rust-lang/rust/blob/master/library/core/src/intrinsics.rs -// https://github.com/rust-lang/rust/blob/master/compiler/rustc_codegen_llvm/src/intrinsic.rs -// https://github.com/Rust-GCC/gccrs/issues/658 -// -// let llvm_name = match name { -// sym::sqrtf32 => "llvm.sqrt.f32", -// sym::sqrtf64 => "llvm.sqrt.f64", -// sym::powif32 => "llvm.powi.f32", -// sym::powif64 => "llvm.powi.f64", -// sym::sinf32 => "llvm.sin.f32", -// sym::sinf64 => "llvm.sin.f64", -// sym::cosf32 => "llvm.cos.f32", -// sym::cosf64 => "llvm.cos.f64", -// sym::powf32 => "llvm.pow.f32", -// sym::powf64 => "llvm.pow.f64", -// sym::expf32 => "llvm.exp.f32", -// sym::expf64 => "llvm.exp.f64", -// sym::exp2f32 => "llvm.exp2.f32", -// sym::exp2f64 => "llvm.exp2.f64", -// sym::logf32 => "llvm.log.f32", -// sym::logf64 => "llvm.log.f64", -// sym::log10f32 => "llvm.log10.f32", -// sym::log10f64 => "llvm.log10.f64", -// sym::log2f32 => "llvm.log2.f32", -// sym::log2f64 => "llvm.log2.f64", -// sym::fmaf32 => "llvm.fma.f32", -// sym::fmaf64 => "llvm.fma.f64", -// sym::fabsf32 => "llvm.fabs.f32", -// sym::fabsf64 => "llvm.fabs.f64", -// sym::minnumf32 => "llvm.minnum.f32", -// sym::minnumf64 => "llvm.minnum.f64", -// sym::maxnumf32 => "llvm.maxnum.f32", -// sym::maxnumf64 => "llvm.maxnum.f64", -// sym::copysignf32 => "llvm.copysign.f32", -// sym::copysignf64 => "llvm.copysign.f64", -// sym::floorf32 => "llvm.floor.f32", -// sym::floorf64 => "llvm.floor.f64", -// sym::ceilf32 => "llvm.ceil.f32", -// sym::ceilf64 => "llvm.ceil.f64", -// sym::truncf32 => "llvm.trunc.f32", -// sym::truncf64 => "llvm.trunc.f64", -// sym::rintf32 => "llvm.rint.f32", -// sym::rintf64 => "llvm.rint.f64", -// sym::nearbyintf32 => "llvm.nearbyint.f32", -// sym::nearbyintf64 => "llvm.nearbyint.f64", -// sym::roundf32 => "llvm.round.f32", -// sym::roundf64 => "llvm.round.f64", -// _ => return None, -// }; -// Some(cx.get_intrinsic(&llvm_name)) -class SimpleIntrinsics -{ -public: - static SimpleIntrinsics &get () - { - static SimpleIntrinsics instance; - return instance; - } - - bool lookup_simple_builtin (const std::string &name, tree *builtin) - { - auto it = rust_intrinsic_to_gcc_builtin.find (name); - if (it == rust_intrinsic_to_gcc_builtin.end ()) - return false; - - return lookup_gcc_builtin (it->second, builtin); - } - -private: - static const int builtin_const = 1 << 0; - static const int builtin_noreturn = 1 << 1; - static const int builtin_novops = 1 << 2; - - SimpleIntrinsics () { setup (); } - - void setup () - { - tree math_function_type_f32 - = build_function_type_list (float_type_node, float_type_node, NULL_TREE); - - define_builtin ("sinf32", BUILT_IN_SINF, "__builtin_sinf", "sinf", - math_function_type_f32, builtin_const); - - define_builtin ("sqrtf32", BUILT_IN_SQRTF, "__builtin_sqrtf", "sqrtf", - math_function_type_f32, builtin_const); - - define_builtin ("unreachable", BUILT_IN_UNREACHABLE, - "__builtin_unreachable", NULL, - build_function_type (void_type_node, void_list_node), - builtin_const | builtin_noreturn); - - define_builtin ("abort", BUILT_IN_ABORT, "__builtin_abort", "abort", - build_function_type (void_type_node, void_list_node), - builtin_const | builtin_noreturn); - - define_builtin ("breakpoint", BUILT_IN_TRAP, "__builtin_trap", "breakpoint", - build_function_type (void_type_node, void_list_node), - builtin_const | builtin_noreturn); - } - - // Define a builtin function. BCODE is the builtin function code - // defined by builtins.def. NAME is the name of the builtin function. - // LIBNAME is the name of the corresponding library function, and is - // NULL if there isn't one. FNTYPE is the type of the function. - // CONST_P is true if the function has the const attribute. - // NORETURN_P is true if the function has the noreturn attribute. - void define_builtin (const std::string rust_name, built_in_function bcode, - const char *name, const char *libname, tree fntype, - int flags) - { - tree decl = add_builtin_function (name, fntype, bcode, BUILT_IN_NORMAL, - libname, NULL_TREE); - if ((flags & builtin_const) != 0) - TREE_READONLY (decl) = 1; - if ((flags & builtin_noreturn) != 0) - TREE_THIS_VOLATILE (decl) = 1; - if ((flags & builtin_novops) != 0) - DECL_IS_NOVOPS (decl) = 1; - set_builtin_decl (bcode, decl, true); - this->builtin_functions_[name] = decl; - if (libname != NULL) - { - decl = add_builtin_function (libname, fntype, bcode, BUILT_IN_NORMAL, - NULL, NULL_TREE); - if ((flags & builtin_const) != 0) - TREE_READONLY (decl) = 1; - if ((flags & builtin_noreturn) != 0) - TREE_THIS_VOLATILE (decl) = 1; - if ((flags & builtin_novops) != 0) - DECL_IS_NOVOPS (decl) = 1; - this->builtin_functions_[libname] = decl; - } - - rust_intrinsic_to_gcc_builtin[rust_name] = name; - } - - bool lookup_gcc_builtin (const std::string &name, tree *builtin) - { - auto it = builtin_functions_.find (name); - if (it == builtin_functions_.end ()) - return false; - - *builtin = it->second; - return true; - } - - // A mapping of the GCC built-ins exposed to GCC Rust. - std::map builtin_functions_; - std::map rust_intrinsic_to_gcc_builtin; -}; - static tree offset_intrinsic_handler (Context *ctx, TyTy::BaseType *fntype); static tree @@ -214,9 +64,8 @@ Intrinsics::compile (TyTy::FnType *fntype) rust_assert (fntype->get_abi () == ABI::INTRINSIC); tree builtin = error_mark_node; - SimpleIntrinsics &simple_intrinsics = SimpleIntrinsics::get (); - if (simple_intrinsics.lookup_simple_builtin (fntype->get_identifier (), - &builtin)) + BuiltinsContext &builtin_ctx = BuiltinsContext::get (); + if (builtin_ctx.lookup_simple_builtin (fntype->get_identifier (), &builtin)) return builtin; // is it an generic builtin? diff --git a/gcc/rust/backend/rust-compile-intrinsic.h b/gcc/rust/backend/rust-compile-intrinsic.h index 2d44baa037c..dceb0864fd4 100644 --- a/gcc/rust/backend/rust-compile-intrinsic.h +++ b/gcc/rust/backend/rust-compile-intrinsic.h @@ -18,6 +18,7 @@ #define RUST_COMPILE_INTRINSIC #include "rust-compile-context.h" +#include "langhooks.h" namespace Rust { namespace Compile {