From e0da098961503072a0f819179263dbf06ccb7146 Mon Sep 17 00:00:00 2001 From: tnfchris Date: Fri, 17 Nov 2017 10:47:52 +0000 Subject: [PATCH] 2017-11-17 Tamar Christina * expr.c (copy_blkmode_to_reg): Fix bitsize for targets with fast unaligned access. * doc/sourcebuild.texi (word_mode_no_slow_unalign): New. gcc/testsuite/ 2017-11-17 Tamar Christina * gcc.dg/struct-simple.c: New. * lib/target-supports.exp (check_effective_target_word_mode_no_slow_unalign): New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@254862 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++ gcc/doc/sourcebuild.texi | 4 +++ gcc/expr.c | 4 ++- gcc/testsuite/ChangeLog | 6 ++++ gcc/testsuite/gcc.dg/struct-simple.c | 52 +++++++++++++++++++++++++++++++++++ gcc/testsuite/lib/target-supports.exp | 25 +++++++++++++++++ 6 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/struct-simple.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e371bf761cc..b37fd6f12de 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-11-17 Tamar Christina + + * expr.c (copy_blkmode_to_reg): Fix bitsize for targets + with fast unaligned access. + * doc/sourcebuild.texi (word_mode_no_slow_unalign): New. + 2017-11-17 Thomas Preud'homme * config/arm/arm.c (cmse_nonsecure_entry_clear_before_return): Allocate diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index d5a90e518d6..d1a3ec03431 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -2240,8 +2240,12 @@ Target supports @code{wchar_t} that is compatible with @code{char32_t}. @item comdat_group Target uses comdat groups. + +@item word_mode_no_slow_unalign +Target does not have slow unaligned access when doing word size accesses. @end table + @subsubsection Local to tests in @code{gcc.target/i386} @table @code diff --git a/gcc/expr.c b/gcc/expr.c index 76684c11cc3..c93d9f6754c 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -2772,7 +2772,9 @@ copy_blkmode_to_reg (machine_mode mode_in, tree src) n_regs = (bytes + UNITS_PER_WORD - 1) / UNITS_PER_WORD; dst_words = XALLOCAVEC (rtx, n_regs); - bitsize = MIN (TYPE_ALIGN (TREE_TYPE (src)), BITS_PER_WORD); + bitsize = BITS_PER_WORD; + if (targetm.slow_unaligned_access (word_mode, TYPE_ALIGN (TREE_TYPE (src)))) + bitsize = MIN (TYPE_ALIGN (TREE_TYPE (src)), BITS_PER_WORD); /* Copy the structure BITSIZE bits at a time. */ for (bitpos = 0, xbitpos = padding_correction; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 652ddc876b6..c3dc5f92ce9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2017-11-17 Tamar Christina + + * gcc.dg/struct-simple.c: New. + * lib/target-supports.exp + (check_effective_target_word_mode_no_slow_unalign): New. + 2017-11-17 Thomas Preud'homme * gcc.target/arm/cmse/cmse-14.c: Change logic to match branch diff --git a/gcc/testsuite/gcc.dg/struct-simple.c b/gcc/testsuite/gcc.dg/struct-simple.c new file mode 100644 index 00000000000..17b956022e4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/struct-simple.c @@ -0,0 +1,52 @@ +/* { dg-do-run } */ +/* { dg-require-effective-target word_mode_no_slow_unalign } */ +/* { dg-additional-options "-fdump-rtl-final" } */ + +/* Copyright 1996, 1999, 2007 Free Software Foundation, Inc. + + This program 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 of the License, or + (at your option) any later version. + + This program 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 + . + + Please email any bugs, comments, and/or additions to this file to: + bug-gdb@prep.ai.mit.edu */ + +#include + +struct struct3 { char a, b, c; }; +struct struct3 foo3 = { 'A', 'B', 'C'}, L3; + +struct struct3 fun3() +{ + return foo3; +} + +#ifdef PROTOTYPES +void Fun3(struct struct3 foo3) +#else +void Fun3(foo3) + struct struct3 foo3; +#endif +{ + L3 = foo3; +} + +int main() +{ + struct struct3 x = fun3(); + + printf("a:%c, b:%c, c:%c\n", x.a, x.b, x.c); +} + +/* { dg-final { scan-rtl-dump-not {zero_extract:.+\[\s*foo3\s*\]} "final" } } */ + diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 881f849a388..d80da690088 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -6222,6 +6222,31 @@ proc check_effective_target_unaligned_stack { } { return $et_unaligned_stack_saved } +# Return 1 if the target plus current options does not have +# slow unaligned access when using word size accesses. +# +# This won't change for different subtargets so cache the result. + +proc check_effective_target_word_mode_no_slow_unalign { } { + global et_word_mode_no_slow_unalign_saved + global et_index + + if [info exists et_word_mode_no_slow_unalign_saved($et_index)] { + verbose "check_effective_target_word_mode_no_slow_unalign: \ + using cached result" 2 + } else { + set et_word_mode_no_slow_unalign_saved($et_index) 0 + if { [is-effective-target non_strict_align] + && !([istarget arm*-*-*]) + } { + set et_word_mode_no_slow_unalign_saved($et_index) 1 + } + } + verbose "check_effective_target_word_mode_no_slow_unalign:\ + returning $et_word_mode_no_slow_unalign_saved($et_index)" 2 + return $et_word_mode_no_slow_unalign_saved($et_index) +} + # Return 1 if the target plus current options does not support a vector # alignment mechanism, 0 otherwise. # -- 2.11.4.GIT