From ae5d439fa11fc92c71d12ab7ad53c5148b1b9923 Mon Sep 17 00:00:00 2001 From: spop Date: Fri, 20 Aug 2010 23:49:53 +0000 Subject: [PATCH] Also handle ARRAY_REFs in instantiate_scev_r. 2010-08-20 Sebastian Pop * tree-scalar-evolution.c (instantiate_array_ref): New. (instantiate_scev_r): Also handle ARRAY_REFs. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@163431 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.graphite | 5 +++++ gcc/tree-scalar-evolution.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite index 4d902a01a83..19665869bdd 100644 --- a/gcc/ChangeLog.graphite +++ b/gcc/ChangeLog.graphite @@ -1,5 +1,10 @@ 2010-08-20 Sebastian Pop + * tree-scalar-evolution.c (instantiate_array_ref): New. + (instantiate_scev_r): Also handle ARRAY_REFs. + +2010-08-20 Sebastian Pop + * tree-scalar-evolution.c (chrec_contains_symbols_defined_in_loop): Do not check for VAR_DECL, PARM_DECL, FUNCTION_DECL, LABEL_DECL, RESULT_DECL, and FIELD_DECL. Return false for an diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c index 24e19e0aa9d..671494caa9c 100644 --- a/gcc/tree-scalar-evolution.c +++ b/gcc/tree-scalar-evolution.c @@ -2319,6 +2319,41 @@ instantiate_scev_binary (basic_block instantiate_below, /* Analyze all the parameters of the chrec, between INSTANTIATE_BELOW and EVOLUTION_LOOP, that were left under a symbolic form. + "CHREC" is an array reference to be instantiated. + + CACHE is the cache of already instantiated values. + + FOLD_CONVERSIONS should be set to true when the conversions that + may wrap in signed/pointer type are folded, as long as the value of + the chrec is preserved. + + SIZE_EXPR is used for computing the size of the expression to be + instantiated, and to stop if it exceeds some limit. */ + +static tree +instantiate_array_ref (basic_block instantiate_below, + struct loop *evolution_loop, tree chrec, + bool fold_conversions, htab_t cache, int size_expr) +{ + tree res; + tree index = TREE_OPERAND (chrec, 1); + tree op1 = instantiate_scev_r (instantiate_below, evolution_loop, index, + fold_conversions, cache, size_expr); + + if (op1 == chrec_dont_know) + return chrec_dont_know; + + if (chrec && op1 == index) + return chrec; + + res = unshare_expr (chrec); + TREE_OPERAND (res, 1) = op1; + return res; +} + +/* Analyze all the parameters of the chrec, between INSTANTIATE_BELOW + and EVOLUTION_LOOP, that were left under a symbolic form. + "CHREC" that stands for a convert expression "(TYPE) OP" is to be instantiated. @@ -2595,6 +2630,10 @@ instantiate_scev_r (basic_block instantiate_below, case SCEV_KNOWN: return chrec_known; + case ARRAY_REF: + return instantiate_array_ref (instantiate_below, evolution_loop, chrec, + fold_conversions, cache, size_expr); + default: break; } -- 2.11.4.GIT