Merge lp:~eres/gcc-linaro/SMS_fixes_for_unfreed_memory into lp:gcc-linaro/4.5

Proposed by Revital Eres
Status: Merged
Approved by: Ulrich Weigand
Approved revision: no longer in the source branch.
Merged at revision: 99514
Proposed branch: lp:~eres/gcc-linaro/SMS_fixes_for_unfreed_memory
Merge into: lp:gcc-linaro/4.5
Diff against target: 39 lines (+9/-1)
3 files modified
ChangeLog.linaro (+8/-0)
gcc/ddg.c (+1/-0)
gcc/modulo-sched.c (+0/-1)
To merge this branch: bzr merge lp:~eres/gcc-linaro/SMS_fixes_for_unfreed_memory
Reviewer Review Type Date Requested Status
Ulrich Weigand (community) Approve
Review via email: mp+60949@code.launchpad.net

Description of the change

Two fixes for unfreed memory in SMS; backport from trunk:
Free sccs field
http://gcc.gnu.org/ml/gcc-patches/2011-04/msg01205.html (approved in trunk)
Avoid unfreed memory when SMS fails
http://gcc.gnu.org/ml/gcc-patches/2011-04/msg01204.html (approved in trunk)

To post a comment you must log in.
Revision history for this message
Linaro Toolchain Builder (cbuild) wrote :

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

The snapshot is available at:
 http://ex.seabright.co.nz/snapshots/gcc-linaro-4.5+bzr99512~eres~SMS_fixes_for_unfreed_memory.tar.xdelta3.xz

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

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

cbuild-snapshot: gcc-linaro-4.5+bzr99512~eres~SMS_fixes_for_unfreed_memory
cbuild-ancestor: lp:gcc-linaro+bzr99511
cbuild-state: check

Revision history for this message
Linaro Toolchain Builder (cbuild) wrote :

cbuild successfully built this on armv7l-maverick-cbuild114-ursa4-cortexa9r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99512~eres~SMS_fixes_for_unfreed_memory/logs/armv7l-maverick-cbuild114-ursa4-cortexa9r1

The test suite results changed compared to the branch point lp:gcc-linaro+bzr99511:
 -PASS: gfortran.dg/allocatable_function_1.f90 -O0 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O0 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O1 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O1 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O2 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O2 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-loops scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-loops scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -g scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -g scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -Os scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -Os scan-tree-dump-times original "free" 10

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99512~eres~SMS_fixes_for_unfreed_memory/logs/armv7l-maverick-cbuild114-ursa4-cortexa9r1/gcc-testsuite.txt

cbuild-checked: armv7l-maverick-cbuild114-ursa4-cortexa9r1

Revision history for this message
Linaro Toolchain Builder (cbuild) wrote :

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

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99512~eres~SMS_fixes_for_unfreed_memory/logs/i686-lucid-cbuild114-scorpius-i686r1

The test suite results changed compared to the branch point lp:gcc-linaro+bzr99511:
 -PASS: gfortran.dg/allocatable_function_1.f90 -O0 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O0 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O1 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O1 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O2 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O2 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-loops scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-loops scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -g scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -g scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -Os scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -Os scan-tree-dump-times original "free" 10

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99512~eres~SMS_fixes_for_unfreed_memory/logs/i686-lucid-cbuild114-scorpius-i686r1/gcc-testsuite.txt

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

Revision history for this message
Linaro Toolchain Builder (cbuild) wrote :

cbuild successfully built this on x86_64-maverick-cbuild114-crucis-x86_64r1.

The build results are available at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99512~eres~SMS_fixes_for_unfreed_memory/logs/x86_64-maverick-cbuild114-crucis-x86_64r1

The test suite results changed compared to the branch point lp:gcc-linaro+bzr99511:
 -PASS: gfortran.dg/allocatable_function_1.f90 -O0 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O0 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O1 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O1 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O2 scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O2 scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-loops scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer -funroll-loops scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -fomit-frame-pointer scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -O3 -g scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -O3 -g scan-tree-dump-times original "free" 10
 -PASS: gfortran.dg/allocatable_function_1.f90 -Os scan-tree-dump-times original "free" 10
 +FAIL: gfortran.dg/allocatable_function_1.f90 -Os scan-tree-dump-times original "free" 10

The full testsuite results are at:
 http://ex.seabright.co.nz/build/gcc-linaro-4.5+bzr99512~eres~SMS_fixes_for_unfreed_memory/logs/x86_64-maverick-cbuild114-crucis-x86_64r1/gcc-testsuite.txt

cbuild-checked: x86_64-maverick-cbuild114-crucis-x86_64r1

Revision history for this message
Ulrich Weigand (uweigand) wrote :

Please have a look at the failing allocatable_function_1.f90 test case; it may be the test needs to be updated since it checks for occurrences of the word "free" ...

review: Needs Fixing
Revision history for this message
Ulrich Weigand (uweigand) wrote :

The test case fails only due to occurrence of the string "free" in the directory path name where the test is run; see the discussion in the 4.6 merge branch for this patch.

Given this, the patch is OK for 4.5 as well.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog.linaro'
2--- ChangeLog.linaro 2011-05-13 10:19:09 +0000
3+++ ChangeLog.linaro 2011-05-13 16:44:39 +0000
4@@ -1,3 +1,11 @@
5+2011-05-13 Revital Eres <revital.eres@linaro.org>
6+
7+ gcc/
8+ * ddg.c (free_ddg_all_sccs): Free sccs field in struct
9+ ddg_all_sccs.
10+ * modulo-sched.c (sms_schedule): Avoid unfreed memory when
11+ SMS fails.
12+
13 2011-05-13 Revital Eres <revital.eres@linaro.org>
14
15 gcc/
16
17=== modified file 'gcc/ddg.c'
18--- gcc/ddg.c 2011-05-11 08:00:14 +0000
19+++ gcc/ddg.c 2011-05-13 16:44:39 +0000
20@@ -978,6 +978,7 @@
21 for (i = 0; i < all_sccs->num_sccs; i++)
22 free_scc (all_sccs->sccs[i]);
23
24+ free (all_sccs->sccs);
25 free (all_sccs);
26 }
27
28
29=== modified file 'gcc/modulo-sched.c'
30--- gcc/modulo-sched.c 2011-05-11 08:00:14 +0000
31+++ gcc/modulo-sched.c 2011-05-13 16:44:39 +0000
32@@ -1216,7 +1216,6 @@
33 fprintf (dump_file, HOST_WIDEST_INT_PRINT_DEC, trip_count);
34 fprintf (dump_file, ")\n");
35 }
36- continue;
37 }
38 else
39 {

Subscribers

People subscribed via source and target branches