From ec410bf1f9ce28ba2fd567b4306c13dd5b6c8765 Mon Sep 17 00:00:00 2001 From: hainque Date: Fri, 27 Aug 2010 10:48:32 +0000 Subject: [PATCH] * dse.c (group_info.base_mem, get_group_info): Use BLKmode to cover all the possible offsets from this base. (scan_reads_nospill): Pass base_mem's mode to canon_true_dependence. testsuite/ * gnat.dg/dse_step.ads, dse_step.adb, test_dse_step.adb: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163582 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/dse.c | 9 +++++---- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gnat.dg/dse_step.adb | 18 ++++++++++++++++++ gcc/testsuite/gnat.dg/dse_step.ads | 19 +++++++++++++++++++ gcc/testsuite/gnat.dg/test_dse_step.adb | 14 ++++++++++++++ 6 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gnat.dg/dse_step.adb create mode 100644 gcc/testsuite/gnat.dg/dse_step.ads create mode 100644 gcc/testsuite/gnat.dg/test_dse_step.adb diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 36097607bf9..edd3c4c79a7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-08-27 Olivier Hainque + Eric Botcazou + + * dse.c (group_info.base_mem, get_group_info): Use BLKmode to + cover all the possible offsets from this base. + (scan_reads_nospill): Pass base_mem's mode to canon_true_dependence. + 2010-08-26 Jakub Jelinek PR tree-optimization/44485 diff --git a/gcc/dse.c b/gcc/dse.c index 5dd7bd68bb6..1debafc385a 100644 --- a/gcc/dse.c +++ b/gcc/dse.c @@ -473,8 +473,9 @@ struct group_info hard_frame_pointer. */ bool frame_related; - /* A mem wrapped around the base pointer for the group in order to - do read dependency. */ + /* A mem wrapped around the base pointer for the group in order to do + read dependency. It must be given BLKmode in order to encompass all + the possible offsets from the base. */ rtx base_mem; /* Canonized version of base_mem's address. */ @@ -705,7 +706,7 @@ get_group_info (rtx base) *slot = gi = (group_info_t) pool_alloc (rtx_group_info_pool); gi->rtx_base = base; gi->id = rtx_group_next_id++; - gi->base_mem = gen_rtx_MEM (QImode, base); + gi->base_mem = gen_rtx_MEM (BLKmode, base); gi->canon_base_addr = canon_rtx (base); gi->store1_n = BITMAP_ALLOC (NULL); gi->store1_p = BITMAP_ALLOC (NULL); @@ -3118,7 +3119,7 @@ scan_reads_nospill (insn_info_t insn_info, bitmap gen, bitmap kill) base. */ if ((read_info->group_id < 0) && canon_true_dependence (group->base_mem, - QImode, + GET_MODE (group->base_mem), group->canon_base_addr, read_info->mem, NULL_RTX, rtx_varies_p)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5da1f904b1a..ebf60390f69 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2010-08-27 Olivier Hainque + + * gnat.dg/dse_step.ads, dse_step.adb, test_dse_step.adb: New test. + 2010-08-26 Daniel Kraft PR fortran/38936 diff --git a/gcc/testsuite/gnat.dg/dse_step.adb b/gcc/testsuite/gnat.dg/dse_step.adb new file mode 100644 index 00000000000..040bcb7d2d5 --- /dev/null +++ b/gcc/testsuite/gnat.dg/dse_step.adb @@ -0,0 +1,18 @@ +package body Dse_Step is + + procedure Do_Step (This : in out Counter) is + begin + This.Value := This.Value + This.Step; + end; + + procedure Step_From (Start : in My_Counter) is + Lc : My_Counter := Start; + begin + while Nsteps > 0 loop + Do_Step (Lc); + Nsteps := Nsteps - 1; + end loop; + Mv := Lc.Value; + end; + +end; diff --git a/gcc/testsuite/gnat.dg/dse_step.ads b/gcc/testsuite/gnat.dg/dse_step.ads new file mode 100644 index 00000000000..8cf0c74ea37 --- /dev/null +++ b/gcc/testsuite/gnat.dg/dse_step.ads @@ -0,0 +1,19 @@ +package Dse_Step is + + type Counter is record + Value : Natural; + Step : Natural; + end record; + pragma Suppress_Initialization (Counter); + + procedure Do_Step (This : in out Counter); + pragma Inline (Do_Step); + + type My_Counter is new Counter; + pragma Suppress_Initialization (My_Counter); + + procedure Step_From (Start : in My_Counter); + + Nsteps : Natural := 12; + Mv : Natural; +end; diff --git a/gcc/testsuite/gnat.dg/test_dse_step.adb b/gcc/testsuite/gnat.dg/test_dse_step.adb new file mode 100644 index 00000000000..77652b4c34f --- /dev/null +++ b/gcc/testsuite/gnat.dg/test_dse_step.adb @@ -0,0 +1,14 @@ +-- { dg-do compile } +-- { dg-options "-O1 -gnatp -gnatn" } + +with Dse_Step; use Dse_Step; + +procedure Test_Dse_Step is + Start : My_Counter := (Value => 0, Step => 1); + Steps : Natural := Nsteps; +begin + Step_From (Start); + if Mv /= Steps then + raise Program_Error; + end if; +end; -- 2.11.4.GIT