alpha: Cleaup builtins and folding

Message ID	1340833046-3749-1-git-send-email-rth@redhat.com
State	New
Headers	show Return-Path: <gcc-patches-return-321806-incoming=patchwork.ozlabs.org@gcc.gnu.org> Comment: DKIM? See http://www.dkim.org Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:From:To:Subject:Date:Message-Id:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=RrlCvrlRrEFXWKEXd238OMVvexiv2S8+g8T3hK7zAvh0hkjgKxfeNexIqhZcbv FfHqYouqI2xnM1yGCGWvaT9Ai9/18jxcp85ei4nFQ5ZtzQmU7eY/F36bUcpqxcPZ k9+54Omfa0IbZf9S4UkKcdlNu8mcjgDiga0t/yZ7lzNNE=; From: Richard Henderson <rth@redhat.com> To: gcc-patches@gcc.gnu.org Subject: [PATCH] alpha: Cleaup builtins and folding Date: Wed, 27 Jun 2012 14:37:26 -0700 Message-Id: <1340833046-3749-1-git-send-email-rth@redhat.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8720ec4..09c2d56 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,20 @@ 2012-06-27 Richard Henderson <rth@redhat.com> + * config/alpha/alpha.c (alpha_dimode_u): New. + (alpha_init_builtins): Initialize it, and use it. + (alpha_fold_builtin_cmpbge): Use alpha_dimode_u. + (alpha_fold_builtin_zapnot, alpha_fold_builtin_insxx): Likewise. + (alpha_fold_vector_minmax, alpha_fold_builtin_perr): Likewise. + (alpha_fold_builtin_pklb, alpha_fold_builtin_pkwb): Likewise. + (alpha_fold_builtin_unpkbl, alpha_fold_builtin_unpkbw): Likewise. + (alpha_fold_builtin_cttz, alpha_fold_builtin_ctlz): Likewise. + (alpha_fold_builtin_ctpop): Likewise. + (alpha_fold_builtin_umulh): Remove. + (alpha_fold_builtin): Use MULT_HIGHPART_EXPR for UMULH; fix + typo in MAX_ARGS check. + +2012-06-27 Richard Henderson <rth@redhat.com> + * tree.def (MULT_HIGHPART_EXPR): New. * cfgexpand.c (expand_debug_expr): Ignore it. * expr.c (expand_expr_real_2): Handle it. diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c index a881a9e..5617ea3 100644 --- a/gcc/config/alpha/alpha.c +++ b/gcc/config/alpha/alpha.c @@ -6461,6 +6461,7 @@ static struct alpha_builtin_def const two_arg_builtins[] = { { "__builtin_alpha_perr", ALPHA_BUILTIN_PERR, MASK_MAX, true } }; +static GTY(()) tree alpha_dimode_u; static GTY(()) tree alpha_v8qi_u; static GTY(()) tree alpha_v8qi_s; static GTY(()) tree alpha_v4hi_u; @@ -6514,25 +6515,23 @@ alpha_add_builtins (const struct alpha_builtin_def *p, size_t count, static void alpha_init_builtins (void) { - tree dimode_integer_type_node; tree ftype; - dimode_integer_type_node = lang_hooks.types.type_for_mode (DImode, 0); + alpha_dimode_u = lang_hooks.types.type_for_mode (DImode, 1); + alpha_v8qi_u = build_vector_type (unsigned_intQI_type_node, 8); + alpha_v8qi_s = build_vector_type (intQI_type_node, 8); + alpha_v4hi_u = build_vector_type (unsigned_intHI_type_node, 4); + alpha_v4hi_s = build_vector_type (intHI_type_node, 4); - ftype = build_function_type_list (dimode_integer_type_node, NULL_TREE); - alpha_add_builtins (zero_arg_builtins, ARRAY_SIZE (zero_arg_builtins), - ftype); + ftype = build_function_type_list (alpha_dimode_u, NULL_TREE); + alpha_add_builtins (zero_arg_builtins, ARRAY_SIZE (zero_arg_builtins), ftype); - ftype = build_function_type_list (dimode_integer_type_node, - dimode_integer_type_node, NULL_TREE); - alpha_add_builtins (one_arg_builtins, ARRAY_SIZE (one_arg_builtins), - ftype); + ftype = build_function_type_list (alpha_dimode_u, alpha_dimode_u, NULL_TREE); + alpha_add_builtins (one_arg_builtins, ARRAY_SIZE (one_arg_builtins), ftype); - ftype = build_function_type_list (dimode_integer_type_node, - dimode_integer_type_node, - dimode_integer_type_node, NULL_TREE); - alpha_add_builtins (two_arg_builtins, ARRAY_SIZE (two_arg_builtins), - ftype); + ftype = build_function_type_list (alpha_dimode_u, alpha_dimode_u, + alpha_dimode_u, NULL_TREE); + alpha_add_builtins (two_arg_builtins, ARRAY_SIZE (two_arg_builtins), ftype); ftype = build_function_type_list (ptr_type_node, NULL_TREE); alpha_builtin_function ("__builtin_thread_pointer", ftype, @@ -6558,11 +6557,6 @@ alpha_init_builtins (void) vms_patch_builtins (); } - - alpha_v8qi_u = build_vector_type (unsigned_intQI_type_node, 8); - alpha_v8qi_s = build_vector_type (intQI_type_node, 8); - alpha_v4hi_u = build_vector_type (unsigned_intHI_type_node, 4); - alpha_v4hi_s = build_vector_type (intHI_type_node, 4); } /* Expand an expression EXP that calls a built-in function, @@ -6675,10 +6669,10 @@ alpha_fold_builtin_cmpbge (unsigned HOST_WIDE_INT opint[], long op_const) if (c0 >= c1) val |= 1 << i; } - return build_int_cst (long_integer_type_node, val); + return build_int_cst (alpha_dimode_u, val); } else if (op_const == 2 && opint[1] == 0) - return build_int_cst (long_integer_type_node, 0xff); + return build_int_cst (alpha_dimode_u, 0xff); return NULL; } @@ -6705,14 +6699,14 @@ alpha_fold_builtin_zapnot (tree *op, unsigned HOST_WIDE_INT opint[], mask |= (unsigned HOST_WIDE_INT)0xff << (i * 8); if (op_const & 1) - return build_int_cst (long_integer_type_node, opint[0] & mask); + return build_int_cst (alpha_dimode_u, opint[0] & mask); if (op) - return fold_build2 (BIT_AND_EXPR, long_integer_type_node, op[0], - build_int_cst (long_integer_type_node, mask)); + return fold_build2 (BIT_AND_EXPR, alpha_dimode_u, op[0], + build_int_cst (alpha_dimode_u, mask)); } else if ((op_const & 1) && opint[0] == 0) - return build_int_cst (long_integer_type_node, 0); + return build_int_cst (alpha_dimode_u, 0); return NULL; } @@ -6762,7 +6756,7 @@ alpha_fold_builtin_insxx (tree op[], unsigned HOST_WIDE_INT opint[], bool is_high) { if ((op_const & 1) && opint[0] == 0) - return build_int_cst (long_integer_type_node, 0); + return build_int_cst (alpha_dimode_u, 0); if (op_const & 2) { @@ -6821,43 +6815,12 @@ alpha_fold_builtin_mskxx (tree op[], unsigned HOST_WIDE_INT opint[], } static tree -alpha_fold_builtin_umulh (unsigned HOST_WIDE_INT opint[], long op_const) -{ - switch (op_const) - { - case 3: - { - unsigned HOST_WIDE_INT l; - HOST_WIDE_INT h; - - mul_double (opint[0], 0, opint[1], 0, &l, &h); - -#if HOST_BITS_PER_WIDE_INT > 64 -# error fixme -#endif - - return build_int_cst (long_integer_type_node, h); - } - - case 1: - opint[1] = opint[0]; - /* FALLTHRU */ - case 2: - /* Note that (X*1) >> 64 == 0. */ - if (opint[1] == 0 || opint[1] == 1) - return build_int_cst (long_integer_type_node, 0); - break; - } - return NULL; -} - -static tree alpha_fold_vector_minmax (enum tree_code code, tree op[], tree vtype) { tree op0 = fold_convert (vtype, op[0]); tree op1 = fold_convert (vtype, op[1]); tree val = fold_build2 (code, vtype, op0, op1); - return fold_build1 (VIEW_CONVERT_EXPR, long_integer_type_node, val); + return fold_build1 (VIEW_CONVERT_EXPR, alpha_dimode_u, val); } static tree @@ -6879,7 +6842,7 @@ alpha_fold_builtin_perr (unsigned HOST_WIDE_INT opint[], long op_const) temp += b - a; } - return build_int_cst (long_integer_type_node, temp); + return build_int_cst (alpha_dimode_u, temp); } static tree @@ -6893,7 +6856,7 @@ alpha_fold_builtin_pklb (unsigned HOST_WIDE_INT opint[], long op_const) temp = opint[0] & 0xff; temp |= (opint[0] >> 24) & 0xff00; - return build_int_cst (long_integer_type_node, temp); + return build_int_cst (alpha_dimode_u, temp); } static tree @@ -6909,7 +6872,7 @@ alpha_fold_builtin_pkwb (unsigned HOST_WIDE_INT opint[], long op_const) temp |= (opint[0] >> 16) & 0xff0000; temp |= (opint[0] >> 24) & 0xff000000; - return build_int_cst (long_integer_type_node, temp); + return build_int_cst (alpha_dimode_u, temp); } static tree @@ -6923,7 +6886,7 @@ alpha_fold_builtin_unpkbl (unsigned HOST_WIDE_INT opint[], long op_const) temp = opint[0] & 0xff; temp |= (opint[0] & 0xff00) << 24; - return build_int_cst (long_integer_type_node, temp); + return build_int_cst (alpha_dimode_u, temp); } static tree @@ -6939,7 +6902,7 @@ alpha_fold_builtin_unpkbw (unsigned HOST_WIDE_INT opint[], long op_const) temp |= (opint[0] & 0x00ff0000) << 16; temp |= (opint[0] & 0xff000000) << 24; - return build_int_cst (long_integer_type_node, temp); + return build_int_cst (alpha_dimode_u, temp); } static tree @@ -6955,7 +6918,7 @@ alpha_fold_builtin_cttz (unsigned HOST_WIDE_INT opint[], long op_const) else temp = exact_log2 (opint[0] & -opint[0]); - return build_int_cst (long_integer_type_node, temp); + return build_int_cst (alpha_dimode_u, temp); } static tree @@ -6971,7 +6934,7 @@ alpha_fold_builtin_ctlz (unsigned HOST_WIDE_INT opint[], long op_const) else temp = 64 - floor_log2 (opint[0]) - 1; - return build_int_cst (long_integer_type_node, temp); + return build_int_cst (alpha_dimode_u, temp); } static tree @@ -6987,7 +6950,7 @@ alpha_fold_builtin_ctpop (unsigned HOST_WIDE_INT opint[], long op_const) while (op) temp++, op &= op - 1; - return build_int_cst (long_integer_type_node, temp); + return build_int_cst (alpha_dimode_u, temp); } /* Fold one of our builtin functions. */ @@ -7000,7 +6963,7 @@ alpha_fold_builtin (tree fndecl, int n_args, tree *op, long op_const = 0; int i; - if (n_args >= MAX_ARGS) + if (n_args > MAX_ARGS) return NULL; for (i = 0; i < n_args; i++) @@ -7068,7 +7031,7 @@ alpha_fold_builtin (tree fndecl, int n_args, tree *op, return alpha_fold_builtin_mskxx (op, opint, op_const, 0xff, true); case ALPHA_BUILTIN_UMULH: - return alpha_fold_builtin_umulh (opint, op_const); + return fold_build2 (MULT_HIGHPART_EXPR, alpha_dimode_u, op[0], op[1]); case ALPHA_BUILTIN_ZAP: opint[1] ^= 0xff;

alpha: Cleaup builtins and folding

Commit Message

Patch