OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

graphite-dependences.c (graphite_legal_transform_bb): Call pbb_remove_duplicate_pdrs. 

2009-08-28  Sebastian Pop  <sebastian.pop@amd.com>

	* graphite-dependences.c (graphite_legal_transform_bb): Call
	pbb_remove_duplicate_pdrs.
	* graphite-poly.c (can_collapse_pdr): Removed.
	(pdr_find_duplicate): Removed.
	(can_collapse_pdrs): New.
	(pbb_remove_duplicate_pdrs): New.
	(new_poly_dr): Do not look for duplicates.
	* graphite-poly.h (struct poly_bb): New field pdr_duplicates_removed.
	(PBB_PDR_DUPLICATES_REMOVED): New.
	(pbb_remove_duplicate_pdrs): Declared.

From-SVN: r151192
This commit is contained in:
Sebastian Pop 2009-08-28 20:41:53 +00:00 committed by Sebastian Pop
parent 7bd2a8a7ef
commit 211694b6da
5 changed files with 62 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gcc/ChangeLog
View File

@ -1,3 +1,16 @@
2009-08-28 Sebastian Pop <sebastian.pop@amd.com>
* graphite-dependences.c (graphite_legal_transform_bb): Call
pbb_remove_duplicate_pdrs.
* graphite-poly.c (can_collapse_pdr): Removed.
(pdr_find_duplicate): Removed.
(can_collapse_pdrs): New.
(pbb_remove_duplicate_pdrs): New.
(new_poly_dr): Do not look for duplicates.
* graphite-poly.h (struct poly_bb): New field pdr_duplicates_removed.
(PBB_PDR_DUPLICATES_REMOVED): New.
(pbb_remove_duplicate_pdrs): Declared.
2009-08-28 Sebastian Pop <sebastian.pop@amd.com>
* graphite-interchange.c (pbb_interchange_profitable_p): Adjust

13
gcc/ChangeLog.graphite
View File

@ -1,3 +1,16 @@
2009-08-25 Sebastian Pop <sebastian.pop@amd.com>
* graphite-dependences.c (graphite_legal_transform_bb): Call
pbb_remove_duplicate_pdrs.
* graphite-poly.c (can_collapse_pdr): Removed.
(pdr_find_duplicate): Removed.
(can_collapse_pdrs): New.
(pbb_remove_duplicate_pdrs): New.
(new_poly_dr): Do not look for duplicates.
* graphite-poly.h (struct poly_bb): New field pdr_duplicates_removed.
(PBB_PDR_DUPLICATES_REMOVED): New.
(pbb_remove_duplicate_pdrs): Declared.
2009-08-25 Sebastian Pop <sebastian.pop@amd.com>
* graphite-interchange.c (pbb_interchange_profitable_p): Adjust

6
gcc/graphite-dependences.c
View File

@ -589,6 +589,12 @@ graphite_legal_transform_bb (poly_bb_p pbb1, poly_bb_p pbb2)
int i, j;
poly_dr_p pdr1, pdr2;
if (!PBB_PDR_DUPLICATES_REMOVED (pbb1))
pbb_remove_duplicate_pdrs (pbb1);
if (!PBB_PDR_DUPLICATES_REMOVED (pbb2))
pbb_remove_duplicate_pdrs (pbb2);
for (i = 0; VEC_iterate (poly_dr_p, PBB_DRS (pbb1), i, pdr1); i++)
for (j = 0; VEC_iterate (poly_dr_p, PBB_DRS (pbb2), j, pdr2); j++)
if (!graphite_legal_transform_dr (pbb1, pbb2, pdr1, pdr2))

64
gcc/graphite-poly.c
View File

@ -261,51 +261,45 @@ apply_poly_transforms (scop_p scop)
return transform_done;
}
/* Returns true when PDR in the same PBB and is a duplicate of the
data reference described by ACCESSES, TYPE, and NB_SUBSCRIPTS. */
/* Returns true when it PDR1 is a duplicate of PDR2: same PBB, and
their ACCESSES, TYPE, and NB_SUBSCRIPTS are the same. */
static inline bool
can_collapse_pdr (poly_dr_p pdr, poly_bb_p pbb,
ppl_Pointset_Powerset_C_Polyhedron_t accesses,
enum poly_dr_type type, graphite_dim_t nb_subscripts)
can_collapse_pdrs (poly_dr_p pdr1, poly_dr_p pdr2)
{
bool res = false;
ppl_Pointset_Powerset_C_Polyhedron_t af, diff;
bool res;
ppl_Pointset_Powerset_C_Polyhedron_t af1, af2, diff;
if (PDR_PBB (pdr) != pbb
|| PDR_NB_SUBSCRIPTS (pdr) != nb_subscripts
|| PDR_TYPE (pdr) != type)
if (PDR_PBB (pdr1) != PDR_PBB (pdr2)
|| PDR_NB_SUBSCRIPTS (pdr1) != PDR_NB_SUBSCRIPTS (pdr2)
|| PDR_TYPE (pdr1) != PDR_TYPE (pdr2))
return false;
af1 = PDR_ACCESSES (pdr1);
af2 = PDR_ACCESSES (pdr2);
ppl_new_Pointset_Powerset_C_Polyhedron_from_Pointset_Powerset_C_Polyhedron
(&diff, accesses);
af = PDR_ACCESSES (pdr);
ppl_Pointset_Powerset_C_Polyhedron_difference_assign (diff, af);
if (ppl_Pointset_Powerset_C_Polyhedron_is_empty (diff))
res = true;
(&diff, af1);
ppl_Pointset_Powerset_C_Polyhedron_difference_assign (diff, af2);
res = ppl_Pointset_Powerset_C_Polyhedron_is_empty (diff);
ppl_delete_Pointset_Powerset_C_Polyhedron (diff);
return res;
}
/* Returns a duplicate of the data reference described by ACCESSES,
TYPE, and NB_SUBSCRIPTS in the vector PBB_DRS (PBB). If there is
no duplicate, returns NULL. */
/* Removes duplicated data references in PBB. */
static inline poly_dr_p
pdr_find_duplicate (poly_bb_p pbb,
ppl_Pointset_Powerset_C_Polyhedron_t accesses,
enum poly_dr_type type, graphite_dim_t nb_subscripts)
void
pbb_remove_duplicate_pdrs (poly_bb_p pbb)
{
int i;
poly_dr_p pdr;
int i, j;
poly_dr_p pdr1, pdr2;
unsigned n = VEC_length (poly_dr_p, PBB_DRS (pbb));
VEC (poly_dr_p, heap) *collapsed = VEC_alloc (poly_dr_p, heap, n);
for (i = 0; VEC_iterate (poly_dr_p, PBB_DRS (pbb), i, pdr); i++)
if (can_collapse_pdr (pdr, pbb, accesses, type, nb_subscripts))
return pdr;
return NULL;
for (i = 0; VEC_iterate (poly_dr_p, PBB_DRS (pbb), i, pdr1); i++)
for (j = 0; VEC_iterate (poly_dr_p, collapsed, j, pdr2); j++)
if (!can_collapse_pdrs (pdr1, pdr2))
VEC_quick_push (poly_dr_p, collapsed, pdr1);
}
/* Create a new polyhedral data reference and add it to PBB. It is
@ -318,16 +312,8 @@ new_poly_dr (poly_bb_p pbb,
enum poly_dr_type type, void *cdr, graphite_dim_t nb_subscripts)
{
static int id = 0;
poly_dr_p pdr;
poly_dr_p same = pdr_find_duplicate (pbb, accesses, type, nb_subscripts);
poly_dr_p pdr = XNEW (struct poly_dr);
if (same)
{
PDR_NB_REFS (same) += 1;
return;
}
pdr = XNEW (struct poly_dr);
PDR_ID (pdr) = id++;
PDR_NB_REFS (pdr) = 1;
PDR_PBB (pdr) = pbb;

5
gcc/graphite-poly.h
View File

@ -298,6 +298,9 @@ struct poly_bb
/* A copy of the transformed scattering. */
poly_scattering_p saved;
/* True when the PDR duplicates have already been removed. */
bool pdr_duplicates_removed;
};
#define PBB_BLACK_BOX(PBB) ((gimple_bb_p) PBB->black_box)
@ -311,6 +314,7 @@ struct poly_bb
#define PBB_SAVED(PBB) (PBB->saved)
#define PBB_NB_LOCAL_VARIABLES(PBB) (PBB->transformed->nb_local_variables)
#define PBB_NB_SCATTERING_TRANSFORM(PBB) (PBB->transformed->nb_scattering)
#define PBB_PDR_DUPLICATES_REMOVED(PBB) (PBB->pdr_duplicates_removed)
extern void new_poly_bb (scop_p, void *);
extern void free_poly_bb (poly_bb_p);
@ -336,6 +340,7 @@ extern bool scop_do_interchange (scop_p);
extern bool scop_do_strip_mine (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_remove_duplicate_pdrs (poly_bb_p);
/* The index of the PBB. */