From patchwork Sat Apr 26 10:57:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kugan Vivekanandarajah X-Patchwork-Id: 343072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AA3A61400DF for ; Sat, 26 Apr 2014 20:58:10 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=ooawVivZvuN1Vcg0CYcnkbwHmiOZVmFgJEhLWCCsFAH FEEa2W+FCAHmtBj8V43ozip5RgH0bU3BvZm8xHmYUzLAJM0wxLSEI6iLpf6YcMMs iI7QLyre98YID+Dp206An8GZVTvXjjqwmNfNpm0zC37OWZn6wItSwy8o5zpNXHt0 = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=H8yNcAHCh3HAmWcbTmU/giB3V4s=; b=Apxm1WijodSvDZV6A /OBwpO04qqCRJd9rIo0SB5XUEUrVEEuu/yS240G+3AYHiJMHRzdE/VJTuWjzPnwC K/QK9hmIrpmkB1mficKAMr4zkVfFbx0wzXt7II6qyQcEFzcEZ0K7chzECiFpXyyt /47CyfZE7NSOcBFZ+3U0/GUB8k= Received: (qmail 26763 invoked by alias); 26 Apr 2014 10:58:03 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 26744 invoked by uid 89); 26 Apr 2014 10:58:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pd0-f171.google.com Received: from mail-pd0-f171.google.com (HELO mail-pd0-f171.google.com) (209.85.192.171) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sat, 26 Apr 2014 10:58:01 +0000 Received: by mail-pd0-f171.google.com with SMTP id r10so4018204pdi.2 for ; Sat, 26 Apr 2014 03:57:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type; bh=CEW0pihFQ/tnSIr2s7rPnJvAIt3KCBmaEeWuql4nRaI=; b=mOetpfEbpq07FCZ1/Sv9ZAZEp7pgABJa9vtBplpmE/ctcPWNmdumrBAegFkmsjJ7NJ +a/IJnwMMAUFbn+lpNaQnQ82QgcJRxzRAe1VC9OKIicXReI55P5x+0IAN/fQnrhPWHnE pImLqEG//KMJhKD7xJCyWs1nC0ty1MhDW1O/NycED4udMBoB1JN4QSS8PMakUUyIQvA2 63mXN4KwwhUTFA7Usd/OA6F+OVTASf9dLpQ+T71axTyKxm8fUU0hckiQi4tr+BuuzlsF fD1/IX8qPSgZkne+jtnRnSm01YrD+75vvk1oI6c8JrwNjPJpUOlkMk0gmGFaea+kvce4 2jIA== X-Gm-Message-State: ALoCoQnl7YNmC3+3q745zhwidVdaZ+UbrNM1UcJkCwDAk6I/mdqeVret3WJ2QDfB+ehvh5mEtKPO X-Received: by 10.66.141.144 with SMTP id ro16mr13529613pab.131.1398509879304; Sat, 26 Apr 2014 03:57:59 -0700 (PDT) Received: from [10.1.1.2] (58-6-183-210.dyn.iinet.net.au. [58.6.183.210]) by mx.google.com with ESMTPSA id tu3sm54581639pab.1.2014.04.26.03.57.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 26 Apr 2014 03:57:57 -0700 (PDT) Message-ID: <535B9132.40703@linaro.org> Date: Sat, 26 Apr 2014 20:57:54 +1000 From: Kugan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Marcus Shawcroft , Richard Earnshaw Subject: [RFC][AARCH64] TARGET_ATOMIC_ASSIGN_EXPAND_FENV hook X-IsSubscribed: yes Attached patch implements TARGET_ATOMIC_ASSIGN_EXPAND_FENV for AARCH64. With this, atomic test-case gcc.dg/atomic/c11-atomic-exec-5.c now PASS. This implementation is based on SPARC and i386 implementations. Regression tested on qemu-aarch64 for aarch64-none-linux-gnu with no new regression. Is this OK for trunk? Thanks, Kugan gcc/ +2014-04-27 Kugan Vivekanandarajah + + * config/aarch64/aarch64.c (TARGET_ATOMIC_ASSIGN_EXPAND_FENV): New + define. + * config/aarch64/aarch64-builtins.c (arm_builtins) : Add + AARCH64_BUILTIN_LDFPSCR and AARCH64_BUILTIN_STFPSCR. + (aarch64_init_builtins) : Initialize builtins + __builtins_aarch64_stfpscr and __builtins_aarch64_ldfpscr. + (aarch64_expand_builtin) : Expand builtins __builtins_aarch64_stfpscr + and __builtins_aarch64_ldfpscr. + (aarch64_atomic_assign_expand_fenv): New function. + * config/aarch64/aarch64.md (stfpscr): New pattern. + (ldfpscr) : Likewise. + (unspecv): Add UNSPECV_LDFPSCR and UNSPECV_STFPSCR. + diff --git a/gcc/config/aarch64/aarch64-builtins.c b/gcc/config/aarch64/aarch64-builtins.c index 55cfe0a..70d3efa 100644 --- a/gcc/config/aarch64/aarch64-builtins.c +++ b/gcc/config/aarch64/aarch64-builtins.c @@ -371,6 +371,10 @@ static aarch64_simd_builtin_datum aarch64_simd_builtin_data[] = { enum aarch64_builtins { AARCH64_BUILTIN_MIN, + + AARCH64_BUILTIN_LDFPSCR, + AARCH64_BUILTIN_STFPSCR, + AARCH64_SIMD_BUILTIN_BASE, #include "aarch64-simd-builtins.def" AARCH64_SIMD_BUILTIN_MAX = AARCH64_SIMD_BUILTIN_BASE @@ -752,6 +756,18 @@ aarch64_init_simd_builtins (void) void aarch64_init_builtins (void) { + tree ftype_stfpscr + = build_function_type_list (void_type_node, unsigned_type_node, NULL); + tree ftype_ldfpscr + = build_function_type_list (unsigned_type_node, NULL); + + aarch64_builtin_decls[AARCH64_BUILTIN_LDFPSCR] + = add_builtin_function ("__builtin_aarch64_ldfscr", ftype_ldfpscr, + AARCH64_BUILTIN_LDFPSCR, BUILT_IN_MD, NULL, NULL_TREE); + aarch64_builtin_decls[AARCH64_BUILTIN_STFPSCR] + = add_builtin_function ("__builtin_aarch64_stfscr", ftype_stfpscr, + AARCH64_BUILTIN_STFPSCR, BUILT_IN_MD, NULL, NULL_TREE); + if (TARGET_SIMD) aarch64_init_simd_builtins (); } @@ -964,6 +980,31 @@ aarch64_expand_builtin (tree exp, { tree fndecl = TREE_OPERAND (CALL_EXPR_FN (exp), 0); int fcode = DECL_FUNCTION_CODE (fndecl); + int icode; + rtx pat, op0; + tree arg0; + + switch (fcode) + { + case AARCH64_BUILTIN_LDFPSCR: + case AARCH64_BUILTIN_STFPSCR: + if (fcode == AARCH64_BUILTIN_LDFPSCR) + { + icode = CODE_FOR_ldfpscr; + target = gen_reg_rtx (SImode); + pat = GEN_FCN (icode) (target); + } + else + { + target = NULL_RTX; + icode = CODE_FOR_stfpscr; + arg0 = CALL_EXPR_ARG (exp, 0); + op0 = expand_normal (arg0); + pat = GEN_FCN (icode) (op0); + } + emit_insn (pat); + return target; + } if (fcode >= AARCH64_SIMD_BUILTIN_BASE) return aarch64_simd_expand_builtin (fcode, exp, target); @@ -1196,6 +1237,70 @@ aarch64_gimple_fold_builtin (gimple_stmt_iterator *gsi) return changed; } +void +aarch64_atomic_assign_expand_fenv (tree *hold, tree *clear, tree *update) +{ + const unsigned FE_INVALID = 1; + const unsigned FE_DIVBYZERO = 2; + const unsigned FE_OVERFLOW = 4; + const unsigned FE_UNDERFLOW = 8; + const unsigned FE_INEXACT = 16; + const unsigned HOST_WIDE_INT FE_ALL_EXCEPT = (FE_INVALID | FE_DIVBYZERO + | FE_OVERFLOW | FE_UNDERFLOW + | FE_INEXACT); + const unsigned HOST_WIDE_INT FE_EXCEPT_SHIFT = 8; + + /* Genareate the equivalence of : + unsigned int fenv_var; + fenv_var = __builtin_aarch64_ldfpscr (); + + unsigned int masked_fenv; + tmp1_var = fenv_var & ~ mask; + + __builtin_aarch64_fpscr (&tmp1_var); */ + + tree fenv_var = create_tmp_var (unsigned_type_node, NULL); + tree ldfpscr = aarch64_builtin_decls[AARCH64_BUILTIN_LDFPSCR]; + tree stfpscr = aarch64_builtin_decls[AARCH64_BUILTIN_STFPSCR]; + tree mask = build_int_cst (unsigned_type_node, + ~((FE_ALL_EXCEPT << FE_EXCEPT_SHIFT) + | FE_ALL_EXCEPT)); + tree ld_fenv_stmt = build2 (MODIFY_EXPR, unsigned_type_node, + fenv_var, build_call_expr (ldfpscr, 0)); + tree masked_fenv = build2 (BIT_AND_EXPR, unsigned_type_node, fenv_var, mask); + tree hold_fnclex = build_call_expr (stfpscr, 1, masked_fenv); + *hold = build2 (COMPOUND_EXPR, void_type_node, + build2 (COMPOUND_EXPR, void_type_node, masked_fenv, + ld_fenv_stmt), hold_fnclex); + + /* Store the value of masked_fenv to clear the exceptions: + __builtin_aarch64_stfpscr (masked_fenv); */ + + *clear = build_call_expr (stfpscr, 1, masked_fenv); + + /* Generate the equivalent of : + unsigned int tmp2_var; + tmp_var = __builtin_aarch64_fpscr (); + + __builtin_aarch64_stfpscr (fenv_var); + + __atomic_feraiseexcept (tmp_var); */ + + tree tmp_var = create_tmp_var (unsigned_type_node, NULL); + tree reload_fenv_stmt = build2 (MODIFY_EXPR, unsigned_type_node, + tmp_var, build_call_expr (ldfpscr, 0)); + tree restore_fnenv = build_call_expr (stfpscr, 1, fenv_var); + tree atomic_feraiseexcept + = builtin_decl_implicit (BUILT_IN_ATOMIC_FERAISEEXCEPT); + tree update_call + = build_call_expr (atomic_feraiseexcept, 1, + fold_convert (integer_type_node, tmp_var)); + *update = build2 (COMPOUND_EXPR, void_type_node, + build2 (COMPOUND_EXPR, void_type_node, + reload_fenv_stmt, restore_fnenv), update_call); +} + + #undef AARCH64_CHECK_BUILTIN_MODE #undef AARCH64_FIND_FRINT_VARIANT #undef BUILTIN_DX diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index a3147ee..0f5ea48 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -332,6 +332,8 @@ static const char * const aarch64_condition_codes[] = "hi", "ls", "ge", "lt", "gt", "le", "al", "nv" }; +void aarch64_atomic_assign_expand_fenv (tree *hold, tree *clear, tree *update); + /* Provide a mapping from gcc register numbers to dwarf register numbers. */ unsigned aarch64_dbx_register_number (unsigned regno) @@ -8488,6 +8490,10 @@ aarch64_cannot_change_mode_class (enum machine_mode from, #define TARGET_VECTORIZE_AUTOVECTORIZE_VECTOR_SIZES \ aarch64_autovectorize_vector_sizes +#undef TARGET_ATOMIC_ASSIGN_EXPAND_FENV +#define TARGET_ATOMIC_ASSIGN_EXPAND_FENV \ + aarch64_atomic_assign_expand_fenv + /* Section anchor support. */ #undef TARGET_MIN_ANCHOR_OFFSET diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md index c86a29d..e916ff5 100644 --- a/gcc/config/aarch64/aarch64.md +++ b/gcc/config/aarch64/aarch64.md @@ -107,6 +107,8 @@ (define_c_enum "unspecv" [ UNSPECV_EH_RETURN ; Represent EH_RETURN + UNSPECV_LDFPSCR ; load floating point status and control register. + UNSPECV_STFPSCR ; store floating point status and control register. ] ) @@ -3635,6 +3637,21 @@ DONE; }) +;; Write Floating-point Status Register. +(define_insn "stfpscr" + [(unspec_volatile [(match_operand:SI 0 "register_operand" "r")] UNSPECV_STFPSCR)] + "" + "msr\\tfpsr, %0" + [(set_attr "type" "mrs")]) + +;; Read Floating-point Status Register. +(define_insn "ldfpscr" + [(set (match_operand:SI 0 "register_operand" "=r") + (unspec_volatile:SI [(const_int 0)] UNSPECV_LDFPSCR))] + "" + "mrs\\t%0, fpsr" + [(set_attr "type" "mrs")]) + ;; AdvSIMD Stuff (include "aarch64-simd.md")