@@ -1,5 +1,28 @@
2016-12-05 Andre Vieira <andre.simoesdiasvieira@arm.com>
+ * config/arm/arm-builtins.c (arm_unsigned_binop_qualifiers): New.
+ (UBINOP_QUALIFIERS): New.
+ (si_UP): Define.
+ (acle_builtin_data): New. Change comment.
+ (arm_builtins): Remove ARM_BUILTIN_CRC32B, ARM_BUILTIN_CRC32H,
+ ARM_BUILTIN_CRC32W, ARM_BUILTIN_CRC32CB, ARM_BUILTIN_CRC32CH,
+ ARM_BUILTIN_CRC32CW. Add ARM_BUILTIN_ACLE_BASE and include
+ arm_acle_builtins.def.
+ (ARM_BUILTIN_ACLE_PATTERN_START): Define.
+ (arm_init_acle_builtins): New.
+ (CRC32_BUILTIN): Remove.
+ (bdesc_2arg): Remove entries for crc32b, crc32h, crc32w,
+ crc32cb, crc32ch and crc32cw.
+ (arm_init_crc32_builtins): Remove.
+ (arm_init_builtins): Use arm_init_acle_builtins rather
+ than arm_init_crc32_builtins.
+ (arm_expand_acle_builtin): New.
+ (arm_expand_builtin): Use 'arm_expand_acle_builtin'.
+ (si_UP): New define.
+ * config/arm/arm_acle_builtins.def: New.
+
+2016-12-05 Andre Vieira <andre.simoesdiasvieira@arm.com>
+
* config/arm/arm-builtins.c (neon_builtin_datum): Rename to ...
(arm_builtin_datum): ... this.
(arm_init_neon_builtin): Rename to ...
@@ -156,6 +156,13 @@ arm_load1_lane_qualifiers[SIMD_MAX_BUILTIN_ARGS]
qualifier_none, qualifier_struct_load_store_lane_index };
#define LOAD1LANE_QUALIFIERS (arm_load1_lane_qualifiers)
+/* unsigned T (unsigned T, unsigned T, unsigned T). */
+static enum arm_type_qualifiers
+arm_unsigned_binop_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+ = { qualifier_unsigned, qualifier_unsigned, qualifier_unsigned,
+ qualifier_unsigned };
+#define UBINOP_QUALIFIERS (arm_unsigned_binop_qualifiers)
+
/* The first argument (return type) of a store should be void type,
which we represent with qualifier_void. Their first operand will be
a DImode pointer to the location to store to, so we must use
@@ -190,6 +197,7 @@ arm_storestruct_lane_qualifiers[SIMD_MAX_BUILTIN_ARGS]
#define ti_UP TImode
#define ei_UP EImode
#define oi_UP OImode
+#define si_UP SImode
#define UP(X) X##_UP
@@ -239,12 +247,13 @@ typedef struct {
VAR11 (T, N, A, B, C, D, E, F, G, H, I, J, K) \
VAR1 (T, N, L)
-/* The builtin data can be found in arm_neon_builtins.def.
+/* The builtin data can be found in arm_neon_builtins.def and
+ arm_acle_builtins.def.
The mode entries in the following table correspond to the "key" type of the
instruction variant, i.e. equivalent to that which would be specified after
the assembler mnemonic, which usually refers to the last vector operand.
The modes listed per instruction should be the same as those defined for
- that instruction's pattern in neon.md. */
+ that instruction's pattern, for instance in neon.md. */
static arm_builtin_datum neon_builtin_data[] =
{
@@ -253,6 +262,15 @@ static arm_builtin_datum neon_builtin_data[] =
#undef CF
#undef VAR1
+#define VAR1(T, N, A) \
+ {#N, UP (A), CODE_FOR_##N, 0, T##_QUALIFIERS},
+
+static arm_builtin_datum acle_builtin_data[] =
+{
+#include "arm_acle_builtins.def"
+};
+
+#undef VAR1
#define VAR1(T, N, X) \
ARM_BUILTIN_NEON_##N##X,
@@ -505,13 +523,6 @@ enum arm_builtins
ARM_BUILTIN_WMERGE,
- ARM_BUILTIN_CRC32B,
- ARM_BUILTIN_CRC32H,
- ARM_BUILTIN_CRC32W,
- ARM_BUILTIN_CRC32CB,
- ARM_BUILTIN_CRC32CH,
- ARM_BUILTIN_CRC32CW,
-
ARM_BUILTIN_GET_FPSCR,
ARM_BUILTIN_SET_FPSCR,
@@ -541,12 +552,23 @@ enum arm_builtins
#include "arm_neon_builtins.def"
+#undef VAR1
+#define VAR1(T, N, X) \
+ ARM_BUILTIN_##N,
+
+ ARM_BUILTIN_ACLE_BASE,
+
+#include "arm_acle_builtins.def"
+
ARM_BUILTIN_MAX
};
#define ARM_BUILTIN_NEON_PATTERN_START \
(ARM_BUILTIN_NEON_BASE + 1)
+#define ARM_BUILTIN_ACLE_PATTERN_START \
+ (ARM_BUILTIN_ACLE_BASE + 1)
+
#undef CF
#undef VAR1
#undef VAR2
@@ -994,7 +1016,7 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d,
gcc_assert (ftype != NULL);
if (print_type_signature_p
- && IN_RANGE (fcode, ARM_BUILTIN_NEON_BASE, ARM_BUILTIN_MAX - 1))
+ && IN_RANGE (fcode, ARM_BUILTIN_NEON_BASE, ARM_BUILTIN_ACLE_BASE - 1))
snprintf (namebuf, sizeof (namebuf), "%s_%s_%s",
prefix, d->name, type_signature);
else
@@ -1006,6 +1028,23 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d,
arm_builtin_decls[fcode] = fndecl;
}
+/* Set up ACLE builtins, even builtins for instructions that are not
+ in the current target ISA to allow the user to compile particular modules
+ with different target specific options that differ from the command line
+ options. Such builtins will be rejected in arm_expand_builtin. */
+
+static void
+arm_init_acle_builtins (void)
+{
+ unsigned int i, fcode = ARM_BUILTIN_ACLE_PATTERN_START;
+
+ for (i = 0; i < ARRAY_SIZE (acle_builtin_data); i++, fcode++)
+ {
+ arm_builtin_datum *d = &acle_builtin_data[i];
+ arm_init_builtin (fcode, d, "__builtin_arm");
+ }
+}
+
/* Set up all the NEON builtins, even builtins for instructions that are not
in the current target ISA to allow the user to compile particular modules
with different target specific options that differ from the command line
@@ -1267,18 +1306,6 @@ static const struct builtin_description bdesc_2arg[] =
FP_BUILTIN (set_fpscr, SET_FPSCR)
#undef FP_BUILTIN
-#define CRC32_BUILTIN(L, U) \
- {ARM_FSET_EMPTY, CODE_FOR_##L, "__builtin_arm_"#L, \
- ARM_BUILTIN_##U, UNKNOWN, 0},
- CRC32_BUILTIN (crc32b, CRC32B)
- CRC32_BUILTIN (crc32h, CRC32H)
- CRC32_BUILTIN (crc32w, CRC32W)
- CRC32_BUILTIN (crc32cb, CRC32CB)
- CRC32_BUILTIN (crc32ch, CRC32CH)
- CRC32_BUILTIN (crc32cw, CRC32CW)
-#undef CRC32_BUILTIN
-
-
#define CRYPTO_BUILTIN(L, U) \
{ARM_FSET_EMPTY, CODE_FOR_crypto_##L, "__builtin_arm_crypto_"#L, \
ARM_BUILTIN_CRYPTO_##U, UNKNOWN, 0},
@@ -1735,42 +1762,6 @@ arm_init_fp16_builtins (void)
"__fp16");
}
-static void
-arm_init_crc32_builtins ()
-{
- tree si_ftype_si_qi
- = build_function_type_list (unsigned_intSI_type_node,
- unsigned_intSI_type_node,
- unsigned_intQI_type_node, NULL_TREE);
- tree si_ftype_si_hi
- = build_function_type_list (unsigned_intSI_type_node,
- unsigned_intSI_type_node,
- unsigned_intHI_type_node, NULL_TREE);
- tree si_ftype_si_si
- = build_function_type_list (unsigned_intSI_type_node,
- unsigned_intSI_type_node,
- unsigned_intSI_type_node, NULL_TREE);
-
- arm_builtin_decls[ARM_BUILTIN_CRC32B]
- = add_builtin_function ("__builtin_arm_crc32b", si_ftype_si_qi,
- ARM_BUILTIN_CRC32B, BUILT_IN_MD, NULL, NULL_TREE);
- arm_builtin_decls[ARM_BUILTIN_CRC32H]
- = add_builtin_function ("__builtin_arm_crc32h", si_ftype_si_hi,
- ARM_BUILTIN_CRC32H, BUILT_IN_MD, NULL, NULL_TREE);
- arm_builtin_decls[ARM_BUILTIN_CRC32W]
- = add_builtin_function ("__builtin_arm_crc32w", si_ftype_si_si,
- ARM_BUILTIN_CRC32W, BUILT_IN_MD, NULL, NULL_TREE);
- arm_builtin_decls[ARM_BUILTIN_CRC32CB]
- = add_builtin_function ("__builtin_arm_crc32cb", si_ftype_si_qi,
- ARM_BUILTIN_CRC32CB, BUILT_IN_MD, NULL, NULL_TREE);
- arm_builtin_decls[ARM_BUILTIN_CRC32CH]
- = add_builtin_function ("__builtin_arm_crc32ch", si_ftype_si_hi,
- ARM_BUILTIN_CRC32CH, BUILT_IN_MD, NULL, NULL_TREE);
- arm_builtin_decls[ARM_BUILTIN_CRC32CW]
- = add_builtin_function ("__builtin_arm_crc32cw", si_ftype_si_si,
- ARM_BUILTIN_CRC32CW, BUILT_IN_MD, NULL, NULL_TREE);
-}
-
void
arm_init_builtins (void)
{
@@ -1788,8 +1779,7 @@ arm_init_builtins (void)
arm_init_crypto_builtins ();
}
- if (TARGET_CRC32)
- arm_init_crc32_builtins ();
+ arm_init_acle_builtins ();
if (TARGET_VFP && TARGET_HARD_FLOAT)
{
@@ -2071,6 +2061,7 @@ arm_expand_builtin_args (rtx target, machine_mode map_mode, int fcode,
machine_mode mode[SIMD_MAX_BUILTIN_ARGS];
tree formals;
int argc = 0;
+ rtx_insn * insn;
if (have_retval
&& (!target
@@ -2234,7 +2225,17 @@ constant_arg:
if (!pat)
return 0;
+ /* Check whether our current target implements the pattern chosen for this
+ builtin and error out if not. */
+ start_sequence ();
emit_insn (pat);
+ insn = get_insns ();
+ end_sequence ();
+
+ if (recog_memoized (insn) < 0)
+ error ("this builtin is not supported for this target");
+ else
+ emit_insn (insn);
return target;
}
@@ -2255,7 +2256,7 @@ arm_expand_builtin_1 (int fcode, tree exp, rtx target,
int k;
bool neon = false;
- if (IN_RANGE (fcode, ARM_BUILTIN_NEON_BASE, ARM_BUILTIN_MAX - 1))
+ if (IN_RANGE (fcode, ARM_BUILTIN_NEON_BASE, ARM_BUILTIN_ACLE_BASE - 1))
neon = true;
is_void = !!(d->qualifiers[0] & qualifier_void);
@@ -2312,6 +2313,20 @@ arm_expand_builtin_1 (int fcode, tree exp, rtx target,
&args[1]);
}
+/* Expand an ACLE builtin, i.e. those registered only if their respective
+ target constraints are met. This check happens within
+ arm_expand_builtin_args. */
+
+static rtx
+arm_expand_acle_builtin (int fcode, tree exp, rtx target)
+{
+
+ arm_builtin_datum *d
+ = &acle_builtin_data[fcode - ARM_BUILTIN_ACLE_PATTERN_START];
+
+ return arm_expand_builtin_1 (fcode, exp, target, d);
+}
+
/* Expand a Neon builtin, i.e. those registered only if TARGET_NEON holds.
Most of these are "special" because they don't have symbolic
constants defined per-instruction or per instruction-variant. Instead, the
@@ -2385,6 +2400,9 @@ arm_expand_builtin (tree exp,
int mask;
int imm;
+ if (fcode >= ARM_BUILTIN_ACLE_BASE)
+ return arm_expand_acle_builtin (fcode, exp, target);
+
if (fcode >= ARM_BUILTIN_NEON_BASE)
return arm_expand_neon_builtin (fcode, exp, target);
new file mode 100644
@@ -0,0 +1,26 @@
+/* ACLE builtin definitions for ARM.
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ Contributed by ARM Ltd.
+
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+VAR1 (UBINOP, crc32b, si)
+VAR1 (UBINOP, crc32h, si)
+VAR1 (UBINOP, crc32w, si)
+VAR1 (UBINOP, crc32cb, si)
+VAR1 (UBINOP, crc32ch, si)
+VAR1 (UBINOP, crc32cw, si)