2010-04-12 Andreas Simbuerger <simbuerg@fim.uni-passau.de>
* graphite-blocking.c
(pbb_strip_mine_profitable_p): Replace Value with mpz_t.
* graphite-clast-to-gimple.c
(clast_to_gcc_expression): Same.
(precision_for_value): Same.
(precision_for_interval): Same.
(gcc_type_for_interval): Same.
(graphite_create_new_guard): Same.
(compute_bounds_for_level): Same.
(graphite_create_new_loop_guard): Same.
* graphite-interchange.c
(build_linearized_memory_access): Same.
(pdr_stride_in_loop): Same.
(memory_strides_in_loop_1): Same.
(memory_strides_in_loop): Same.
(extend_scattering): Same.
(psct_scattering_dim_for_loop_depth): Same.
(pbb_number_of_iterations): Same.
* graphite-poly.h
(debug_iteration_domains): Same.
* graphite-ppl.c
(new_Cloog_Domain_from_ppl_Pointset_Powerset): Same.
(ppl_set_inhomogeneous_gmp): Same.
(ppl_strip_loop): Same.
(ppl_lexico_compare_linear_expressions): Same.
(ppl_read_polyhedron_matrix): Same.
(ppl_max_for_le_pointset): Same.
* graphite-ppl.h
(ppl_read_polyhedron_matrix): Same.
(tree_int_to_gmp): Same.
(gmp_cst_to_tree): Same.
(ppl_set_inhomogeneous): Same.
(ppl_set_inhomogeneous_tree): Same.
(ppl_set_coef): Same.
(ppl_set_coef_tree): Same.
* graphite-sese-to-poly.c
(build_pbb_scattering_polyhedrons): Same.
(build_scop_scattering): Same.
(scan_tree_for_params_right_scev): Same.
(scan_tree_for_params): Same.
(find_params_in_bb): Same.
(find_scop_parameters): Same.
(add_upper_bounds_from_estimated_nit): Same.
(build_loop_iteration_domains): Same.
(add_condition_to_domain): Same.
(pdr_add_memory_accesses): Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159133
138bc75d-0d04-0410-961f-
82ee72b054a4
+2010-04-12 Andreas Simbuerger <simbuerg@fim.uni-passau.de>
+
+ * graphite-blocking.c
+ (pbb_strip_mine_profitable_p): Replace Value with mpz_t.
+ * graphite-clast-to-gimple.c
+ (clast_to_gcc_expression): Same.
+ (precision_for_value): Same.
+ (precision_for_interval): Same.
+ (gcc_type_for_interval): Same.
+ (graphite_create_new_guard): Same.
+ (compute_bounds_for_level): Same.
+ (graphite_create_new_loop_guard): Same.
+ * graphite-interchange.c
+ (build_linearized_memory_access): Same.
+ (pdr_stride_in_loop): Same.
+ (memory_strides_in_loop_1): Same.
+ (memory_strides_in_loop): Same.
+ (extend_scattering): Same.
+ (psct_scattering_dim_for_loop_depth): Same.
+ (pbb_number_of_iterations): Same.
+ * graphite-poly.h
+ (debug_iteration_domains): Same.
+ * graphite-ppl.c
+ (new_Cloog_Domain_from_ppl_Pointset_Powerset): Same.
+ (ppl_set_inhomogeneous_gmp): Same.
+ (ppl_strip_loop): Same.
+ (ppl_lexico_compare_linear_expressions): Same.
+ (ppl_read_polyhedron_matrix): Same.
+ (ppl_max_for_le_pointset): Same.
+ * graphite-ppl.h
+ (ppl_read_polyhedron_matrix): Same.
+ (tree_int_to_gmp): Same.
+ (gmp_cst_to_tree): Same.
+ (ppl_set_inhomogeneous): Same.
+ (ppl_set_inhomogeneous_tree): Same.
+ (ppl_set_coef): Same.
+ (ppl_set_coef_tree): Same.
+ * graphite-sese-to-poly.c
+ (build_pbb_scattering_polyhedrons): Same.
+ (build_scop_scattering): Same.
+ (scan_tree_for_params_right_scev): Same.
+ (scan_tree_for_params): Same.
+ (find_params_in_bb): Same.
+ (find_scop_parameters): Same.
+ (add_upper_bounds_from_estimated_nit): Same.
+ (build_loop_iteration_domains): Same.
+ (add_condition_to_domain): Same.
+ (pdr_add_memory_accesses): Same.
+
2010-04-11 Andreas Simbuerger <simbuerg@fim.uni-passau.de>
* graphite-blocking.c (pbb_strip_mine_profitable_p): Resolve
graphite_dim_t depth,
int stride)
{
- Value niter, strip_stride;
+ mpz_t niter, strip_stride;
bool res;
mpz_init (strip_stride);
/* Return the precision needed to represent the value VAL. */
static int
-precision_for_value (Value val)
+precision_for_value (mpz_t val)
{
- Value x, y, two;
+ mpz_t x, y, two;
int precision;
value_init (x);
UP. */
static int
-precision_for_interval (Value low, Value up)
+precision_for_interval (mpz_t low, mpz_t up)
{
- Value diff;
+ mpz_t diff;
int precision;
gcc_assert (value_le (low, up));
otherwise return NULL_TREE. */
static tree
-gcc_type_for_interval (Value low, Value up, tree old_type)
+gcc_type_for_interval (mpz_t low, mpz_t up, tree old_type)
{
bool unsigned_p = true;
int precision, prec_up, prec_int;
otherwise return NULL_TREE. */
static tree
-gcc_type_for_value (Value val)
+gcc_type_for_value (mpz_t val)
{
return gcc_type_for_interval (val, val, NULL_TREE);
}
the iteration domain, and G the context parameters. */
static void
-compute_bounds_for_level (poly_bb_p pbb, int level, Value low, Value up)
+compute_bounds_for_level (poly_bb_p pbb, int level, mpz_t low, mpz_t up)
{
ppl_Pointset_Powerset_C_Polyhedron_t ps;
ppl_Linear_Expression_t le;
static tree
compute_type_for_level_1 (poly_bb_p pbb, int level, tree old_type)
{
- Value low, up;
+ mpz_t low, up;
tree type;
value_init (low);
2^{32|64}, and the condition lb <= ub is true, even if we do not want this.
However lb < ub + 1 is false, as expected. */
tree one;
- Value gmp_one;
+ mpz_t gmp_one;
mpz_init (gmp_one);
mpz_set_si (gmp_one, 1);
ppl_dimension_type i;
ppl_dimension_type first = pdr_subscript_dim (pdr, 0);
ppl_dimension_type last = pdr_subscript_dim (pdr, PDR_NB_SUBSCRIPTS (pdr));
- Value size, sub_size;
+ mpz_t size, sub_size;
graphite_dim_t dim = offset + pdr_dim (pdr);
ppl_new_Linear_Expression_with_dimension (&res, dim);
the loop at DEPTH. */
static void
-pdr_stride_in_loop (Value stride, graphite_dim_t depth, poly_dr_p pdr)
+pdr_stride_in_loop (mpz_t stride, graphite_dim_t depth, poly_dr_p pdr)
{
ppl_dimension_type time_depth;
ppl_Linear_Expression_t le, lma;
accessed in LOOP at DEPTH. */
static void
-memory_strides_in_loop_1 (lst_p loop, graphite_dim_t depth, Value strides)
+memory_strides_in_loop_1 (lst_p loop, graphite_dim_t depth, mpz_t strides)
{
int i, j;
lst_p l;
poly_dr_p pdr;
- Value s, n;
+ mpz_t s, n;
mpz_init (s);
mpz_init (n);
accessed in LOOP at DEPTH. */
static void
-memory_strides_in_loop (lst_p loop, graphite_dim_t depth, Value strides)
+memory_strides_in_loop (lst_p loop, graphite_dim_t depth, mpz_t strides)
{
if (mpz_cmp_si (loop->memory_strides, -1) == 0)
{
static bool
lst_interchange_profitable_p (lst_p loop1, lst_p loop2)
{
- Value d1, d2;
+ mpz_t d1, d2;
bool res;
gcc_assert (loop1 && loop2
ppl_dimension_type nb_old_dims, nb_new_dims;
int nb_added_dims, i;
ppl_Coefficient_t coef;
- Value one;
+ mpz_t one;
nb_added_dims = max_scattering - pbb_nb_scattering_transform (pbb);
mpz_init (one);
ppl_dimension_type iter = psct_iterator_dim (pbb, loop_depth);
ppl_Linear_Expression_t expr;
ppl_Coefficient_t coef;
- Value val;
+ mpz_t val;
graphite_dim_t i;
mpz_init (val);
void
pbb_number_of_iterations (poly_bb_p pbb,
graphite_dim_t loop_depth,
- Value niter)
+ mpz_t niter)
{
ppl_Linear_Expression_t le;
ppl_dimension_type dim;
void
pbb_number_of_iterations_at_time (poly_bb_p pbb,
graphite_dim_t time_depth,
- Value niter)
+ mpz_t niter)
{
ppl_Pointset_Powerset_C_Polyhedron_t ext_domain, sctr;
ppl_Linear_Expression_t le;
extern bool scop_do_interchange (scop_p);
extern bool scop_do_strip_mine (scop_p);
extern bool scop_do_block (scop_p);
-extern void pbb_number_of_iterations (poly_bb_p, graphite_dim_t, Value);
-extern void pbb_number_of_iterations_at_time (poly_bb_p, graphite_dim_t, Value);
+extern void pbb_number_of_iterations (poly_bb_p, graphite_dim_t, mpz_t);
+extern void pbb_number_of_iterations_at_time (poly_bb_p, graphite_dim_t, mpz_t);
extern void pbb_remove_duplicate_pdrs (poly_bb_p);
/* Return the number of write data references in PBB. */
lst_p loop_father;
/* The sum of all the memory strides for an LST loop. */
- Value memory_strides;
+ mpz_t memory_strides;
/* Loop nodes contain a sequence SEQ of LST nodes, statements
contain a pointer to their polyhedral representation PBB. */
/* Set the inhomogeneous term of E to X. */
void
-ppl_set_inhomogeneous_gmp (ppl_Linear_Expression_t e, Value x)
+ppl_set_inhomogeneous_gmp (ppl_Linear_Expression_t e, mpz_t x)
{
- Value v0, v1;
+ mpz_t v0, v1;
ppl_Coefficient_t c;
mpz_init (v0);
/* Set E[I] to X. */
void
-ppl_set_coef_gmp (ppl_Linear_Expression_t e, ppl_dimension_type i, Value x)
+ppl_set_coef_gmp (ppl_Linear_Expression_t e, ppl_dimension_type i, mpz_t x)
{
- Value v0, v1;
+ mpz_t v0, v1;
ppl_Coefficient_t c;
mpz_init (v0);
ppl_dimension_type dim;
ppl_Polyhedron_t res;
ppl_Coefficient_t c;
- Value val;
+ mpz_t val;
mpz_init (val);
ppl_new_Coefficient (&c);
ppl_dimension_type i;
ppl_Coefficient_t c;
int res;
- Value va, vb;
+ mpz_t va, vb;
ppl_Linear_Expression_space_dimension (a, &length1);
ppl_Linear_Expression_space_dimension (b, &length2);
void
ppl_max_for_le_pointset (ppl_Pointset_Powerset_C_Polyhedron_t ps,
- ppl_Linear_Expression_t le, Value res)
+ ppl_Linear_Expression_t le, mpz_t res)
{
ppl_Coefficient_t num, denom;
- Value dv, nv;
+ mpz_t dv, nv;
int maximum, err;
mpz_init (nv);
void
ppl_min_for_le_pointset (ppl_Pointset_Powerset_C_Polyhedron_t ps,
- ppl_Linear_Expression_t le, Value res)
+ ppl_Linear_Expression_t le, mpz_t res)
{
ppl_Coefficient_t num, denom;
- Value dv, nv;
+ mpz_t dv, nv;
int minimum, err;
mpz_init (nv);
ppl_Linear_Expression_t expr;
ppl_Constraint_t cstr;
ppl_Coefficient_t coef;
- Value v, v_op, v_c;
+ mpz_t v, v_op, v_c;
mpz_init (v);
mpz_init (v_op);
void ppl_insert_dimensions (ppl_Polyhedron_t, int, int);
void ppl_insert_dimensions_pointset (ppl_Pointset_Powerset_C_Polyhedron_t, int,
int);
-void ppl_set_inhomogeneous_gmp (ppl_Linear_Expression_t, Value);
-void ppl_set_coef_gmp (ppl_Linear_Expression_t, ppl_dimension_type, Value);
+void ppl_set_inhomogeneous_gmp (ppl_Linear_Expression_t, mpz_t);
+void ppl_set_coef_gmp (ppl_Linear_Expression_t, ppl_dimension_type, mpz_t);
void ppl_max_for_le_pointset (ppl_Pointset_Powerset_C_Polyhedron_t,
- ppl_Linear_Expression_t, Value);
+ ppl_Linear_Expression_t, mpz_t);
void ppl_min_for_le_pointset (ppl_Pointset_Powerset_C_Polyhedron_t,
- ppl_Linear_Expression_t, Value);
+ ppl_Linear_Expression_t, mpz_t);
ppl_Constraint_t ppl_build_relation (int, int, int, int,
enum ppl_enum_Constraint_Type);
/* Assigns to RES the value of the INTEGER_CST T. */
static inline void
-tree_int_to_gmp (tree t, Value res)
+tree_int_to_gmp (tree t, mpz_t res)
{
double_int di = tree_to_double_int (t);
mpz_set_double_int (res, di, TYPE_UNSIGNED (TREE_TYPE (t)));
/* Converts a GMP constant VAL to a tree and returns it. */
static inline tree
-gmp_cst_to_tree (tree type, Value val)
+gmp_cst_to_tree (tree type, mpz_t val)
{
tree t = type ? type : integer_type_node;
- Value tmp;
+ mpz_t tmp;
double_int di;
mpz_init (tmp);
static inline void
ppl_set_inhomogeneous (ppl_Linear_Expression_t e, int x)
{
- Value v;
+ mpz_t v;
mpz_init (v);
mpz_set_si (v, x);
ppl_set_inhomogeneous_gmp (e, v);
static inline void
ppl_set_inhomogeneous_tree (ppl_Linear_Expression_t e, tree x)
{
- Value v;
+ mpz_t v;
mpz_init (v);
tree_int_to_gmp (x, v);
ppl_set_inhomogeneous_gmp (e, v);
static inline void
ppl_set_coef (ppl_Linear_Expression_t e, ppl_dimension_type i, int x)
{
- Value v;
+ mpz_t v;
mpz_init (v);
mpz_set_si (v, x);
ppl_set_coef_gmp (e, i, v);
static inline void
ppl_set_coef_tree (ppl_Linear_Expression_t e, ppl_dimension_type i, tree x)
{
- Value v;
+ mpz_t v;
mpz_init (v);
tree_int_to_gmp (x, v);
ppl_set_coef_gmp (e, i, v);
/* Sets RES to the max of V1 and V2. */
static inline void
-value_max (Value res, Value v1, Value v2)
+value_max (mpz_t res, mpz_t v1, mpz_t v2)
{
if (mpz_cmp (v1, v2) < 0)
mpz_set (res, v2);
int nb_params = scop_nb_params (scop);
ppl_Coefficient_t c;
ppl_dimension_type dim = scattering_dimensions + nb_iterators + nb_params;
- Value v;
+ mpz_t v;
gcc_assert (scattering_dimensions >= used_scattering_dimensions);
gimple_bb_p previous_gbb = NULL;
ppl_Linear_Expression_t static_schedule;
ppl_Coefficient_t c;
- Value v;
+ mpz_t v;
mpz_init (v);
ppl_new_Coefficient (&c);
static void
add_value_to_dim (ppl_dimension_type d, ppl_Linear_Expression_t expr,
- Value k)
+ mpz_t k)
{
- Value val;
+ mpz_t val;
ppl_Coefficient_t coef;
ppl_new_Coefficient (&coef);
{
loop_p loop = get_loop (var);
ppl_dimension_type l = sese_loop_depth (s, loop) - 1;
- Value val;
+ mpz_t val;
/* Scalar evolutions should happen in the sese region. */
gcc_assert (sese_loop_depth (s, loop) > 0);
linear expression EXPR. K is the multiplier of the constant. */
static void
-scan_tree_for_params_int (tree cst, ppl_Linear_Expression_t expr, Value k)
+scan_tree_for_params_int (tree cst, ppl_Linear_Expression_t expr, mpz_t k)
{
- Value val;
+ mpz_t val;
ppl_Coefficient_t coef;
int v = int_cst_value (cst);
static void
scan_tree_for_params (sese s, tree e, ppl_Linear_Expression_t c,
- Value k)
+ mpz_t k)
{
if (e == chrec_dont_know)
return;
{
if (c)
{
- Value val;
+ mpz_t val;
gcc_assert (host_integerp (TREE_OPERAND (e, 1), 0));
mpz_init (val);
mpz_set_si (val, int_cst_value (TREE_OPERAND (e, 1)));
{
if (c)
{
- Value val;
+ mpz_t val;
gcc_assert (host_integerp (TREE_OPERAND (e, 0), 0));
mpz_init (val);
mpz_set_si (val, int_cst_value (TREE_OPERAND (e, 0)));
if (c)
{
ppl_Coefficient_t coef;
- Value minus_one;
+ mpz_t minus_one;
ppl_subtract_Linear_Expression_from_Linear_Expression (c,
tmp_expr);
data_reference_p dr;
gimple stmt;
loop_p loop = GBB_BB (gbb)->loop_father;
- Value one;
+ mpz_t one;
mpz_init (one);
mpz_set_si (one, 1);
unsigned i;
sese region = SCOP_REGION (scop);
struct loop *loop;
- Value one;
+ mpz_t one;
mpz_init (one);
mpz_set_si (one, 1);
ppl_dimension_type dim,
ppl_Linear_Expression_t ub_expr)
{
- Value val;
+ mpz_t val;
ppl_Linear_Expression_t nb_iters_le;
ppl_Polyhedron_t pol;
ppl_Coefficient_t coef;
}
else if (!chrec_contains_undetermined (nb_iters))
{
- Value one;
+ mpz_t one;
ppl_Constraint_t ub;
ppl_Linear_Expression_t ub_expr;
double_int nit;
static ppl_Linear_Expression_t
create_linear_expr_from_tree (poly_bb_p pbb, tree t)
{
- Value one;
+ mpz_t one;
ppl_Linear_Expression_t res;
ppl_dimension_type dim;
sese region = SCOP_REGION (PBB_SCOP (pbb));
add_condition_to_domain (ppl_Pointset_Powerset_C_Polyhedron_t ps, gimple stmt,
poly_bb_p pbb, enum tree_code code)
{
- Value v;
+ mpz_t v;
ppl_Coefficient_t c;
ppl_Linear_Expression_t left, right;
ppl_Constraint_t cstr;
poly_bb_p pbb)
{
int i, nb_subscripts = DR_NUM_DIMENSIONS (dr);
- Value v;
+ mpz_t v;
scop_p scop = PBB_SCOP (pbb);
sese region = SCOP_REGION (scop);
OSDN Git Service
