Richard Guenther wrote:
> On Tue, Aug 7, 2012 at 4:56 PM, Ulrich Weigand <uweig...@de.ibm.com> wrote:
> > Would it be OK to backport this to 4.7 and possibly 4.6?
> I'll defer the decision to the target maintainers. But please double-check
> for any changes in the vectorizer parts when backporting to 4.6.
Thanks! For reference, there's the version as committed to 4.7.
Bye,
Ulrich
ChangeLog:
Backport from mainline:
2012-07-30 Ulrich Weigand <ulrich.weig...@linaro.org>
Richard Earnshaw <rearn...@arm.com>
* target.def (vector_alignment): New target hook.
* doc/tm.texi.in (TARGET_VECTOR_ALIGNMENT): Document new hook.
* doc/tm.texi: Regenerate.
* targhooks.c (default_vector_alignment): New function.
* targhooks.h (default_vector_alignment): Add prototype.
* stor-layout.c (layout_type): Use targetm.vector_alignment.
* config/arm/arm.c (arm_vector_alignment): New function.
(TARGET_VECTOR_ALIGNMENT): Define.
* tree-vect-data-refs.c (vect_update_misalignment_for_peel): Use
vector type alignment instead of size.
* tree-vect-loop-manip.c (vect_do_peeling_for_loop_bound): Use
element type size directly instead of computing it from alignment.
Fix variable naming and comment.
testsuite/ChangeLog:
Backport from mainline:
2012-07-30 Ulrich Weigand <ulrich.weig...@linaro.org>
Richard Earnshaw <rearn...@arm.com>
* lib/target-supports.exp
(check_effective_target_vect_natural_alignment): New function.
* gcc.dg/align-2.c: Only run on targets with natural alignment
of vector types.
* gcc.dg/vect/slp-25.c: Adjust tests for targets without natural
alignment of vector types.
Index: gcc/doc/tm.texi
===================================================================
*** gcc/doc/tm.texi (revision 190202)
--- gcc/doc/tm.texi (working copy)
*************** make it all fit in fewer cache lines.
*** 1105,1110 ****
--- 1105,1118 ----
If the value of this macro has a type, it should be an unsigned type.
@end defmac
+ @deftypefn {Target Hook} HOST_WIDE_INT TARGET_VECTOR_ALIGNMENT (const_tree
@var{type})
+ This hook can be used to define the alignment for a vector of type
+ @var{type}, in order to comply with a platform ABI. The default is to
+ require natural alignment for vector types. The alignment returned by
+ this hook must be a power-of-two multiple of the default alignment of
+ the vector element type.
+ @end deftypefn
+
@defmac STACK_SLOT_ALIGNMENT (@var{type}, @var{mode}, @var{basic-align})
If defined, a C expression to compute the alignment for stack slot.
@var{type} is the data type, @var{mode} is the widest mode available,
Index: gcc/doc/tm.texi.in
===================================================================
*** gcc/doc/tm.texi.in (revision 190202)
--- gcc/doc/tm.texi.in (working copy)
*************** make it all fit in fewer cache lines.
*** 1093,1098 ****
--- 1093,1100 ----
If the value of this macro has a type, it should be an unsigned type.
@end defmac
+ @hook TARGET_VECTOR_ALIGNMENT
+
@defmac STACK_SLOT_ALIGNMENT (@var{type}, @var{mode}, @var{basic-align})
If defined, a C expression to compute the alignment for stack slot.
@var{type} is the data type, @var{mode} is the widest mode available,
Index: gcc/targhooks.c
===================================================================
*** gcc/targhooks.c (revision 190202)
--- gcc/targhooks.c (working copy)
*************** tree default_mangle_decl_assembler_name
*** 939,944 ****
--- 939,951 ----
return id;
}
+ /* Default to natural alignment for vector types. */
+ HOST_WIDE_INT
+ default_vector_alignment (const_tree type)
+ {
+ return tree_low_cst (TYPE_SIZE (type), 0);
+ }
+
bool
default_builtin_vector_alignment_reachable (const_tree type, bool is_packed)
{
Index: gcc/targhooks.h
===================================================================
*** gcc/targhooks.h (revision 190202)
--- gcc/targhooks.h (working copy)
*************** extern int default_builtin_vectorization
*** 83,88 ****
--- 83,90 ----
extern tree default_builtin_reciprocal (unsigned int, bool, bool);
+ extern HOST_WIDE_INT default_vector_alignment (const_tree);
+
extern bool default_builtin_vector_alignment_reachable (const_tree, bool);
extern bool
default_builtin_support_vector_misalignment (enum machine_mode mode,
Index: gcc/target.def
===================================================================
*** gcc/target.def (revision 190202)
--- gcc/target.def (working copy)
*************** DEFHOOK
*** 1615,1620 ****
--- 1615,1630 ----
bool, (enum machine_mode mode),
hook_bool_mode_false)
+ DEFHOOK
+ (vector_alignment,
+ "This hook can be used to define the alignment for a vector of type\n\
+ @var{type}, in order to comply with a platform ABI. The default is to\n\
+ require natural alignment for vector types. The alignment returned by\n\
+ this hook must be a power-of-two multiple of the default alignment of\n\
+ the vector element type.",
+ HOST_WIDE_INT, (const_tree type),
+ default_vector_alignment)
+
/* True if we should try to use a scalar mode to represent an array,
overriding the usual MAX_FIXED_MODE limit. */
DEFHOOK
Index: gcc/tree-vect-loop-manip.c
===================================================================
*** gcc/tree-vect-loop-manip.c (revision 190202)
--- gcc/tree-vect-loop-manip.c (working copy)
*************** vect_do_peeling_for_loop_bound (loop_vec
*** 1993,1999 ****
If the misalignment of DR is known at compile time:
addr_mis = int mis = DR_MISALIGNMENT (dr);
Else, compute address misalignment in bytes:
! addr_mis = addr & (vectype_size - 1)
prolog_niters = min (LOOP_NITERS, ((VF - addr_mis/elem_size)&(VF-1))/step)
--- 1993,1999 ----
If the misalignment of DR is known at compile time:
addr_mis = int mis = DR_MISALIGNMENT (dr);
Else, compute address misalignment in bytes:
! addr_mis = addr & (vectype_align - 1)
prolog_niters = min (LOOP_NITERS, ((VF - addr_mis/elem_size)&(VF-1))/step)
*************** vect_gen_niters_for_prolog_loop (loop_ve
*** 2049,2057 ****
tree ptr_type = TREE_TYPE (start_addr);
tree size = TYPE_SIZE (ptr_type);
tree type = lang_hooks.types.type_for_size (tree_low_cst (size, 1), 1);
! tree vectype_size_minus_1 = build_int_cst (type, vectype_align - 1);
! tree elem_size_log =
! build_int_cst (type, exact_log2 (vectype_align/nelements));
tree nelements_minus_1 = build_int_cst (type, nelements - 1);
tree nelements_tree = build_int_cst (type, nelements);
tree byte_misalign;
--- 2049,2058 ----
tree ptr_type = TREE_TYPE (start_addr);
tree size = TYPE_SIZE (ptr_type);
tree type = lang_hooks.types.type_for_size (tree_low_cst (size, 1), 1);
! tree vectype_align_minus_1 = build_int_cst (type, vectype_align - 1);
! HOST_WIDE_INT elem_size =
! int_cst_value (TYPE_SIZE_UNIT (TREE_TYPE (vectype)));
! tree elem_size_log = build_int_cst (type, exact_log2 (elem_size));
tree nelements_minus_1 = build_int_cst (type, nelements - 1);
tree nelements_tree = build_int_cst (type, nelements);
tree byte_misalign;
*************** vect_gen_niters_for_prolog_loop (loop_ve
*** 2060,2069 ****
new_bb = gsi_insert_seq_on_edge_immediate (pe, new_stmts);
gcc_assert (!new_bb);
! /* Create: byte_misalign = addr & (vectype_size - 1) */
byte_misalign =
fold_build2 (BIT_AND_EXPR, type, fold_convert (type, start_addr),
! vectype_size_minus_1);
/* Create: elem_misalign = byte_misalign / element_size */
elem_misalign =
--- 2061,2070 ----
new_bb = gsi_insert_seq_on_edge_immediate (pe, new_stmts);
gcc_assert (!new_bb);
! /* Create: byte_misalign = addr & (vectype_align - 1) */
byte_misalign =
fold_build2 (BIT_AND_EXPR, type, fold_convert (type, start_addr),
! vectype_align_minus_1);
/* Create: elem_misalign = byte_misalign / element_size */
elem_misalign =
Index: gcc/testsuite/lib/target-supports.exp
===================================================================
*** gcc/testsuite/lib/target-supports.exp (revision 190202)
--- gcc/testsuite/lib/target-supports.exp (working copy)
*************** proc check_effective_target_natural_alig
*** 3370,3375 ****
--- 3370,3395 ----
return $et_natural_alignment_64_saved
}
+ # Return 1 if all vector types are naturally aligned (aligned to their
+ # type-size), 0 otherwise.
+ #
+ # This won't change for different subtargets so cache the result.
+
+ proc check_effective_target_vect_natural_alignment { } {
+ global et_vect_natural_alignment
+
+ if [info exists et_vect_natural_alignment_saved] {
+ verbose "check_effective_target_vect_natural_alignment: using cached
result" 2
+ } else {
+ set et_vect_natural_alignment_saved 1
+ if { [check_effective_target_arm_eabi] } {
+ set et_vect_natural_alignment_saved 0
+ }
+ }
+ verbose "check_effective_target_vect_natural_alignment: returning
$et_vect_natural_alignment_saved" 2
+ return $et_vect_natural_alignment_saved
+ }
+
# Return 1 if vector alignment (for types of size 32 bit or less) is
reachable, 0 otherwise.
#
# This won't change for different subtargets so cache the result.
Index: gcc/testsuite/gcc.dg/align-2.c
===================================================================
*** gcc/testsuite/gcc.dg/align-2.c (revision 190202)
--- gcc/testsuite/gcc.dg/align-2.c (working copy)
***************
*** 1,5 ****
/* PR 17962 */
! /* { dg-do compile } */
/* { dg-options "" } */
typedef float v4 __attribute__((vector_size(sizeof(float)*4)));
--- 1,5 ----
/* PR 17962 */
! /* { dg-do compile { target vect_natural_alignment } } */
/* { dg-options "" } */
typedef float v4 __attribute__((vector_size(sizeof(float)*4)));
Index: gcc/testsuite/gcc.dg/vect/slp-25.c
===================================================================
*** gcc/testsuite/gcc.dg/vect/slp-25.c (revision 190202)
--- gcc/testsuite/gcc.dg/vect/slp-25.c (working copy)
*************** int main (void)
*** 56,60 ****
/* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0
"vect" } } */
! /* { dg-final { scan-tree-dump-times "Alignment of access forced using
peeling" 2 "vect" { xfail { vect_no_align } } } } */
/* { dg-final { cleanup-tree-dump "vect" } } */
--- 56,60 ----
/* { dg-final { scan-tree-dump-times "vectorized 2 loops" 1 "vect" } } */
/* { dg-final { scan-tree-dump-times "Vectorizing an unaligned access" 0
"vect" } } */
! /* { dg-final { scan-tree-dump-times "Alignment of access forced using
peeling" 2 "vect" { xfail { vect_no_align || { ! vect_natural_alignment } } } }
} */
/* { dg-final { cleanup-tree-dump "vect" } } */
Index: gcc/stor-layout.c
===================================================================
*** gcc/stor-layout.c (revision 190202)
--- gcc/stor-layout.c (working copy)
*************** layout_type (tree type)
*** 2108,2116 ****
TYPE_SIZE (type) = int_const_binop (MULT_EXPR, TYPE_SIZE (innertype),
bitsize_int (nunits));
! /* Always naturally align vectors. This prevents ABI changes
! depending on whether or not native vector modes are supported. */
! TYPE_ALIGN (type) = tree_low_cst (TYPE_SIZE (type), 0);
break;
}
--- 2108,2124 ----
TYPE_SIZE (type) = int_const_binop (MULT_EXPR, TYPE_SIZE (innertype),
bitsize_int (nunits));
! /* For vector types, we do not default to the mode's alignment.
! Instead, query a target hook, defaulting to natural alignment.
! This prevents ABI changes depending on whether or not native
! vector modes are supported. */
! TYPE_ALIGN (type) = targetm.vector_alignment (type);
!
! /* However, if the underlying mode requires a bigger alignment than
! what the target hook provides, we cannot use the mode. For now,
! simply reject that case. */
! gcc_assert (TYPE_ALIGN (type)
! >= GET_MODE_ALIGNMENT (TYPE_MODE (type)));
break;
}
Index: gcc/tree-vect-data-refs.c
===================================================================
*** gcc/tree-vect-data-refs.c (revision 190202)
--- gcc/tree-vect-data-refs.c (working copy)
*************** vect_update_misalignment_for_peel (struc
*** 1023,1029 ****
int misal = DR_MISALIGNMENT (dr);
tree vectype = STMT_VINFO_VECTYPE (stmt_info);
misal += negative ? -npeel * dr_size : npeel * dr_size;
! misal &= GET_MODE_SIZE (TYPE_MODE (vectype)) - 1;
SET_DR_MISALIGNMENT (dr, misal);
return;
}
--- 1023,1029 ----
int misal = DR_MISALIGNMENT (dr);
tree vectype = STMT_VINFO_VECTYPE (stmt_info);
misal += negative ? -npeel * dr_size : npeel * dr_size;
! misal &= (TYPE_ALIGN (vectype) / BITS_PER_UNIT) - 1;
SET_DR_MISALIGNMENT (dr, misal);
return;
}
Index: gcc/config/arm/arm.c
===================================================================
*** gcc/config/arm/arm.c (revision 190202)
--- gcc/config/arm/arm.c (working copy)
*************** static bool arm_array_mode_supported_p (
*** 258,263 ****
--- 258,264 ----
unsigned HOST_WIDE_INT);
static enum machine_mode arm_preferred_simd_mode (enum machine_mode);
static bool arm_class_likely_spilled_p (reg_class_t);
+ static HOST_WIDE_INT arm_vector_alignment (const_tree type);
static bool arm_vector_alignment_reachable (const_tree type, bool is_packed);
static bool arm_builtin_support_vector_misalignment (enum machine_mode mode,
const_tree type,
*************** static const struct attribute_spec arm_a
*** 603,608 ****
--- 604,612 ----
#undef TARGET_CLASS_LIKELY_SPILLED_P
#define TARGET_CLASS_LIKELY_SPILLED_P arm_class_likely_spilled_p
+ #undef TARGET_VECTOR_ALIGNMENT
+ #define TARGET_VECTOR_ALIGNMENT arm_vector_alignment
+
#undef TARGET_VECTORIZE_VECTOR_ALIGNMENT_REACHABLE
#define TARGET_VECTORIZE_VECTOR_ALIGNMENT_REACHABLE \
arm_vector_alignment_reachable
*************** arm_have_conditional_execution (void)
*** 24482,24487 ****
--- 24486,24503 ----
return !TARGET_THUMB1;
}
+ /* The AAPCS sets the maximum alignment of a vector to 64 bits. */
+ static HOST_WIDE_INT
+ arm_vector_alignment (const_tree type)
+ {
+ HOST_WIDE_INT align = tree_low_cst (TYPE_SIZE (type), 0);
+
+ if (TARGET_AAPCS_BASED)
+ align = MIN (align, 64);
+
+ return align;
+ }
+
static unsigned int
arm_autovectorize_vector_sizes (void)
{
--
Dr. Ulrich Weigand
GNU Toolchain for Linux on System z and Cell BE
ulrich.weig...@de.ibm.com
