Linaro GCC

Merge lp:~rsandifo/gcc-linaro/lp721531-4.5 into lp:gcc-linaro/4.5

lp721531-4.5
Merge into 4.5

Proposed by Richard Sandiford on 2011-07-04

Status:

Merged

Approved by:

Ramana Radhakrishnan on 2011-07-08

Approved revision:

no longer in the source branch.

Merged at revision:

99521

Proposed branch:

lp:~rsandifo/gcc-linaro/lp721531-4.5

Merge into:

lp:gcc-linaro/4.5

Diff against target:

183 lines (+96/-16) (has conflicts)

4 files modified

ChangeLog.linaro (+52/-0)
gcc/builtins.c (+23/-2)
gcc/fold-const.c (+6/-14)
gcc/testsuite/gcc.dg/torture/pr49169.c (+15/-0)

Text conflict in ChangeLog.linaro

To merge this branch:

bzr merge lp:~rsandifo/gcc-linaro/lp721531-4.5

Related bugs:

Bug #721531: [armel] gcc computes wrong address for main() at build time	Medium	Fix Released
Bug #721631: [gm45] GPU lockup 9a66a985 (EIR: 0x00000010 ESR: 0x00000010 PGTBL_ER: 0x00000001 IPEHR: 0x01000000)	Undecided	New

Link a bug report

Reviewer	Review Type	Date Requested	Status
Linaro Toolchain Developers		2011-07-04	Pending
Review via email: mp+66765@code.launchpad.net

This proposal supersedes a proposal from 2011-06-29.

Description of the change

This version includes some branch-local changes to account
for differences in the handling of PR 35705. In mainline,
get_pointer_and_residue reuses get_object_alignment,
but that improvement isn't in 4.6 and earlier. This backport
just reuses get_object_alignment for the simple and safe*
case of DECLs.

(PR 35705 was about optimising away checks for bit 1 (rather than bit 0)
in a HPPA function address. This patch subsumes that one.

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-06-27: Posted in a previous version of this proposal

cbuild has taken a snapshot of this branch at r99486 and queued it for build.

The snapshot is available at:
http://ex.seabright.co.nz/snapshots/gcc-linaro-4.5+bzr99486~rsandifo~lp721531-4.5.tar.xdelta3.xz

and will be built on the following builders:
a9-builder armv5-builder i686 x86_64

You can track the build queue at:
http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: gcc-linaro-4.5+bzr99486~rsandifo~lp721531-4.5
cbuild-ancestor: lp:gcc-linaro+bzr99485
cbuild-state: check

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-06-29: Posted in a previous version of this proposal

cbuild successfully built this on i686-lucid-cbuild137-scorpius-i686r1.

The build results are available at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99486~rsandifo~lp721531-4.5/logs/i686-lucid-cbuild137-scorpius-i686r1

The test suite results changed compared to the branch point lp:gcc-linaro+bzr99485:
+PASS: gcc.dg/torture/pr49169.c -O0 (test for excess errors)
+PASS: gcc.dg/torture/pr49169.c -O1 (test for excess errors)
+PASS: gcc.dg/torture/pr49169.c -O2 -flto (test for excess errors)
+PASS: gcc.dg/torture/pr49169.c -O2 -fwhopr (test for excess errors)
+PASS: gcc.dg/torture/pr49169.c -O2 (test for excess errors)
+PASS: gcc.dg/torture/pr49169.c -O3 -fomit-frame-pointer (test for excess errors)
+PASS: gcc.dg/torture/pr49169.c -O3 -g (test for excess errors)
+PASS: gcc.dg/torture/pr49169.c -Os (test for excess errors)
+PASS: gcc.dg/torture/pr49169.c scan-assembler abort
+PASS: gcc.dg/torture/pr49169.c scan-assembler abort
+PASS: gcc.dg/torture/pr49169.c scan-assembler abort
+PASS: gcc.dg/torture/pr49169.c scan-assembler abort
+PASS: gcc.dg/torture/pr49169.c scan-assembler abort
+PASS: gcc.dg/torture/pr49169.c scan-assembler abort
+PASS: gcc.dg/torture/pr49169.c scan-assembler abort
+PASS: gcc.dg/torture/pr49169.c scan-assembler abort
-PASS: g++.dg/tree-ssa/fwprop-align.C scan-tree-dump-times forwprop2 "& 1" 0
+FAIL: g++.dg/tree-ssa/fwprop-align.C scan-tree-dump-times forwprop2 "& 1" 0

The full testsuite results are at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99486~rsandifo~lp721531-4.5/logs/i686-lucid-cbuild137-scorpius-i686r1/gcc-testsuite.txt

cbuild-checked: i686-lucid-cbuild137-scorpius-i686r1

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-06-29: Posted in a previous version of this proposal

cbuild successfully built this on x86_64-natty-cbuild136-crucis-x86_64r1.

The build results are available at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99486~rsandifo~lp721531-4.5/logs/x86_64-natty-cbuild136-crucis-x86_64r1

The full testsuite results are at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99486~rsandifo~lp721531-4.5/logs/x86_64-natty-cbuild136-crucis-x86_64r1/gcc-testsuite.txt

cbuild-checked: x86_64-natty-cbuild136-crucis-x86_64r1

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-06-29: Posted in a previous version of this proposal

cbuild has taken a snapshot of this branch at r99487 and queued it for build.

The snapshot is available at:
http://ex.seabright.co.nz/snapshots/gcc-linaro-4.5+bzr99487~rsandifo~lp721531-4.5.tar.xdelta3.xz

and will be built on the following builders:
a9-builder armv5-builder i686 x86_64

You can track the build queue at:
http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: gcc-linaro-4.5+bzr99487~rsandifo~lp721531-4.5
cbuild-ancestor: lp:gcc-linaro+bzr99485
cbuild-state: check

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-06-30: Posted in a previous version of this proposal

cbuild successfully built this on i686-lucid-cbuild142-scorpius-i686r1.

The build results are available at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99487~rsandifo~lp721531-4.5/logs/i686-lucid-cbuild142-scorpius-i686r1

The test suite results changed compared to the branch point lp:gcc-linaro+bzr99485:
+UNSUPPORTED: gcc.dg/torture/pr49169.c -O0
+UNSUPPORTED: gcc.dg/torture/pr49169.c -O1
+UNSUPPORTED: gcc.dg/torture/pr49169.c -O2
+UNSUPPORTED: gcc.dg/torture/pr49169.c -O2 -flto
+UNSUPPORTED: gcc.dg/torture/pr49169.c -O2 -fwhopr
+UNSUPPORTED: gcc.dg/torture/pr49169.c -O3 -fomit-frame-pointer
+UNSUPPORTED: gcc.dg/torture/pr49169.c -O3 -g
+UNSUPPORTED: gcc.dg/torture/pr49169.c -Os

The full testsuite results are at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99487~rsandifo~lp721531-4.5/logs/i686-lucid-cbuild142-scorpius-i686r1/gcc-testsuite.txt

cbuild-checked: i686-lucid-cbuild142-scorpius-i686r1

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-06-30: Posted in a previous version of this proposal

cbuild successfully built this on x86_64-natty-cbuild144-oort1-x86_64r1.

The build results are available at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99487~rsandifo~lp721531-4.5/logs/x86_64-natty-cbuild144-oort1-x86_64r1

The full testsuite results are at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99487~rsandifo~lp721531-4.5/logs/x86_64-natty-cbuild144-oort1-x86_64r1/gcc-testsuite.txt

cbuild-checked: x86_64-natty-cbuild144-oort1-x86_64r1

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-07-04: Posted in a previous version of this proposal

cbuild successfully built this on armv7l-natty-cbuild144-ursa4-armv5r2.

The build results are available at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99487~rsandifo~lp721531-4.5/logs/armv7l-natty-cbuild144-ursa4-armv5r2

The test suite was not checked as the branch point lp:gcc-linaro+bzr99485 has nothing to compare against.

The full testsuite results are at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99487~rsandifo~lp721531-4.5/logs/armv7l-natty-cbuild144-ursa4-armv5r2/gcc-testsuite.txt

cbuild-checked: armv7l-natty-cbuild144-ursa4-armv5r2

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-07-04:

cbuild has taken a snapshot of this branch at r99488 and queued it for build.

The snapshot is available at:
http://ex.seabright.co.nz/snapshots/gcc-linaro-4.5+bzr99488~rsandifo~lp721531-4.5.tar.xdelta3.xz

and will be built on the following builders:
a9-builder armv5-builder i686 x86_64

You can track the build queue at:
http://ex.seabright.co.nz/helpers/scheduler

cbuild-snapshot: gcc-linaro-4.5+bzr99488~rsandifo~lp721531-4.5
cbuild-ancestor: lp:gcc-linaro+bzr99485
cbuild-state: check

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-07-05:

cbuild successfully built this on x86_64-natty-cbuild148-oort1-x86_64r1.

The build results are available at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99488~rsandifo~lp721531-4.5/logs/x86_64-natty-cbuild148-oort1-x86_64r1

The full testsuite results are at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99488~rsandifo~lp721531-4.5/logs/x86_64-natty-cbuild148-oort1-x86_64r1/gcc-testsuite.txt

cbuild-checked: x86_64-natty-cbuild148-oort1-x86_64r1

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-07-05:

cbuild successfully built this on armv7l-natty-cbuild148-ursa1-cortexa9r1.

The build results are available at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99488~rsandifo~lp721531-4.5/logs/armv7l-natty-cbuild148-ursa1-cortexa9r1

The full testsuite results are at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99488~rsandifo~lp721531-4.5/logs/armv7l-natty-cbuild148-ursa1-cortexa9r1/gcc-testsuite.txt

cbuild-checked: armv7l-natty-cbuild148-ursa1-cortexa9r1

Revision history for this message

Linaro Toolchain Builder (cbuild) wrote on 2011-07-05:

cbuild successfully built this on armv7l-natty-cbuild149-ursa2-armv5r2.

The build results are available at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99488~rsandifo~lp721531-4.5/logs/armv7l-natty-cbuild149-ursa2-armv5r2

The test suite was not checked as the branch point lp:gcc-linaro+bzr99485 has nothing to compare against.

The full testsuite results are at:
http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99488~rsandifo~lp721531-4.5/logs/armv7l-natty-cbuild149-ursa2-armv5r2/gcc-testsuite.txt

cbuild-checked: armv7l-natty-cbuild149-ursa2-armv5r2

Revision history for this message

Ramana Radhakrishnan (ramana) wrote on 2011-07-08:

This is OK.

Ramana

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Hector Oron

Linaro Toolchain Developers

Michael Hope

Michael K. Edwards

Richard Sandiford

 === modified file 'ChangeLog.linaro'
 --- ChangeLog.linaro	2011-07-01 11:24:39 +0000
 +++ ChangeLog.linaro	2011-07-04 10:22:21 +0000
@@ -1,3 +1,4 @@
++<<<<<<< TREE
 -07-01  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
  	Backport from mainline.
@@ -525,6 +526,57 @@
  	* function.c (prepare_shrink_wrap): New function.
  	(thread_prologue_and_epilogue_insns): Call it.
++=======
++2011-07-04  Richard Sandiford  <rdsandiford@googlemail.com>
++
++	gcc/
++	* builtins.c (get_object_alignment): Fix comment.
++	* fold-const.c (get_pointer_modulus_and_residue): Remove
++	allow_func_align.  Use get_object_alignment.
++	(fold_binary_loc): Update caller.
++
++2011-06-29  Richard Sandiford  <rdsandiford@googlemail.com>
++
++	gcc/
++	Backport from mainline:
++
++	2011-06-29  Richard Sandiford  <richard.sandiford@linaro.org>
++
++	PR tree-optimization/49545
++	* builtins.c (get_object_alignment_1): Update function comment.
++	Do not use DECL_ALIGN for functions, but test
++	TARGET_PTRMEMFUNC_VBIT_LOCATION instead.
++	* fold-const.c (get_pointer_modulus_and_residue): Don't check
++	for functions here.
++
++	gcc/testsuite/
++	Backport from mainline:
++
++	2011-06-29  Richard Sandiford  <richard.sandiford@linaro.org>
++
++	* gcc.dg/torture/pr49169.c: Restrict to ARM and MIPS targets.
++
++2011-06-27  Richard Sandiford  <richard.sandiford@linaro.org>
++
++	gcc/
++	Backport from mainline:
++
++	2011-07-27  Richard Guenther  <rguenther@suse.de>
++
++	PR tree-optimization/49169
++	* fold-const.c (get_pointer_modulus_and_residue): Don't rely on
++	the alignment of function decls.
++
++	gcc/testsuite/
++	Backport from mainline:
++
++	2011-07-27  Michael Hope  <michael.hope@linaro.org>
++		    Richard Sandiford  <richard.sandiford@linaro.org>
++
++	PR tree-optimization/49169
++	* gcc.dg/torture/pr49169.c: New test.
++
++>>>>>>> MERGE-SOURCE
 -03-03  Andrew Stubbs  <ams@codesourcery.com>
  	gcc/
 === modified file 'gcc/builtins.c'
 --- gcc/builtins.c	2011-01-06 11:02:44 +0000
 +++ gcc/builtins.c	2011-07-04 10:22:21 +0000
@@ -263,7 +263,14 @@
  /* Return the alignment in bits of EXP, an object.
     Don't return more than MAX_ALIGN no matter what, ALIGN is the inital
--   guessed alignment e.g. from type alignment.  */
++   guessed alignment e.g. from type alignment.
++
++   Note that the address (and thus the alignment) computed here is based
++   on the address to which a symbol resolves, whereas DECL_ALIGN is based
++   on the address at which an object is actually located.  These two
++   addresses are not always the same.  For example, on ARM targets,
++   the address &foo of a Thumb function foo() has the lowest bit set,
++   whereas foo() itself starts on an even address.  */
  int
  get_object_alignment (tree exp, unsigned int align, unsigned int max_align)
@@ -327,7 +334,21 @@
      exp = DECL_INITIAL (exp);
    if (DECL_P (exp)
        && TREE_CODE (exp) != LABEL_DECL)
--    align = MIN (inner, DECL_ALIGN (exp));
++    {
++      if (TREE_CODE (exp) == FUNCTION_DECL)
++	{
++	  /* Function addresses can encode extra information besides their
++	     alignment.  However, if TARGET_PTRMEMFUNC_VBIT_LOCATION
++	     allows the low bit to be used as a virtual bit, we know
++	     that the address itself must be 2-byte aligned.  */
++	  if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_pfn)
++	    align = 2 * BITS_PER_UNIT;
++	  else
++	    align = BITS_PER_UNIT;
++	}
++      else
++	align = MIN (inner, DECL_ALIGN (exp));
++    }
  #ifdef CONSTANT_ALIGNMENT
    else if (CONSTANT_CLASS_P (exp))
      align = MIN (inner, (unsigned)CONSTANT_ALIGNMENT (exp, align));
 === modified file 'gcc/fold-const.c'
 --- gcc/fold-const.c	2011-05-05 14:28:53 +0000
 +++ gcc/fold-const.c	2011-07-04 10:22:21 +0000
@@ -10030,15 +10030,10 @@
 <= N < M as is common.  In general, the precise value of P is unknown.
     M is chosen as large as possible such that constant N can be determined.
--   Returns M and sets *RESIDUE to N.
--
--   If ALLOW_FUNC_ALIGN is true, do take functions' DECL_ALIGN_UNIT into
--   account.  This is not always possible due to PR 35705.
-- */
++   Returns M and sets *RESIDUE to N.  */
  static unsigned HOST_WIDE_INT
--get_pointer_modulus_and_residue (tree expr, unsigned HOST_WIDE_INT *residue,
--				 bool allow_func_align)
++get_pointer_modulus_and_residue (tree expr, unsigned HOST_WIDE_INT *residue)
+ {
    enum tree_code code;
@@ -10068,9 +10063,8 @@
+ 	    }
+ 	}
--      if (DECL_P (expr)
--	  && (allow_func_align || TREE_CODE (expr) != FUNCTION_DECL))
--	return DECL_ALIGN_UNIT (expr);
++      if (DECL_P (expr))
++	return get_object_alignment (expr, BITS_PER_UNIT, ~0U) / BITS_PER_UNIT;
+     }
    else if (code == POINTER_PLUS_EXPR)
+     {
@@ -10080,8 +10074,7 @@
        op0 = TREE_OPERAND (expr, 0);
        STRIP_NOPS (op0);
--      modulus = get_pointer_modulus_and_residue (op0, residue,
--						 allow_func_align);
++      modulus = get_pointer_modulus_and_residue (op0, residue);
        op1 = TREE_OPERAND (expr, 1);
        STRIP_NOPS (op1);
@@ -11801,8 +11794,7 @@
  	  unsigned HOST_WIDE_INT modulus, residue;
  	  unsigned HOST_WIDE_INT low = TREE_INT_CST_LOW (arg1);
--	  modulus = get_pointer_modulus_and_residue (arg0, &residue,
--						     integer_onep (arg1));
++	  modulus = get_pointer_modulus_and_residue (arg0, &residue);
  	  /* This works because modulus is a power of 2.  If this weren't the
  	     case, we'd have to replace it by its greatest power-of-2
 === added file 'gcc/testsuite/gcc.dg/torture/pr49169.c'
 --- gcc/testsuite/gcc.dg/torture/pr49169.c	1970-01-01 00:00:00 +0000
 +++ gcc/testsuite/gcc.dg/torture/pr49169.c	2011-07-04 10:22:21 +0000
@@ -0,0 +1,15 @@
++/* { dg-do compile { target { arm*-*-* || mips*-*-* } } } */
++
++#include <stdlib.h>
++#include <stdint.h>
++
++int
++main (void)
++{
++  void *p = main;
++  if ((intptr_t) p & 1)
++    abort ();
++  return 0;
++}
++
++/* { dg-final { scan-assembler "abort" } } */

Linaro GCC

Merge lp:~rsandifo/gcc-linaro/lp721531-4.5 into lp:gcc-linaro/4.5

Commit message

Description of the change

Preview Diff

Subscribers