invoke.texi (floop-flatten): Declare obsolete.

	gcc/
	* doc/invoke.texi (floop-flatten): Declare obsolete.
	* toplev.c (process_options): Remove references to flag_loop_flatten.
	* tree-ssa-loop.c (gate_graphite_transform): Same.
	* common.opt (floop-flatten): Obsolete.
	* graphite-poly.c (apply_poly_transforms): Remove reference to
	flag_loop_flatten.
	* Makefile.in (graphite-flattening.o): Remove.
	* graphite-flattening.c: Remove.

	gcc/testsuite/
	* gcc.dg/graphite/pr50561.c: Update.

From-SVN: r184820

gcc/ChangeLog

+2012-03-02  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* doc/invoke.texi (floop-flatten): Remove.
+	* toplev.c (process_options): Remove references to flag_loop_flatten.
+	* tree-ssa-loop.c (gate_graphite_transform): Same.
+	* common.opt (floop-flatten): Obsolete.
+	* graphite-poly.c (apply_poly_transforms): Remove reference to
+	flag_loop_flatten.
+	* Makefile.in (graphite-flattening.o): Remove.
+	* graphite-flattening.c: Remove.
+
 2012-03-02  Uros Bizjak  <ubizjak@gmail.com>
 
 	* compare-elim.c (find_comparisons_in_bb): Eliminate only compares

gcc/Makefile.in

@@ -1241,7 +1241,6 @@ OBJS = \
 	graphite-clast-to-gimple.o \
 	graphite-cloog-util.o \
 	graphite-dependences.o \
-	graphite-flattening.o \
 	graphite-interchange.o \
 	graphite-poly.o \
 	graphite-ppl.o \
@@ -2619,9 +2618,6 @@ graphite-dependences.o : graphite-dependences.c $(CONFIG_H) $(SYSTEM_H) \
    coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
    sese.h graphite-ppl.h graphite-poly.h graphite-dependences.h \
    graphite-cloog-util.h
-graphite-flattening.o : graphite-flattening.c $(CONFIG_H) $(SYSTEM_H)	\
-   coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
-   sese.h graphite-ppl.h graphite-poly.h
 graphite-interchange.o : graphite-interchange.c $(CONFIG_H) $(SYSTEM_H) \
    coretypes.h $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \
    sese.h graphite-ppl.h graphite-poly.h

gcc/common.opt

@@ -1198,8 +1198,8 @@ Common Report Var(flag_tm)
 Enable support for GNU transactional memory
 
 floop-flatten
-Common Report Var(flag_loop_flatten) Optimization
-Enable Loop Flattening transformation
+Common Ignore
+Does nothing. Preserved for backward compatibility.
 
 fstrict-volatile-bitfields
 Common Report Var(flag_strict_volatile_bitfields) Init(-1)

gcc/doc/invoke.texi

@@ -371,7 +371,7 @@ Objective-C and Objective-C++ Dialects}.
 -fira-loop-pressure -fno-ira-share-save-slots @gol
 -fno-ira-share-spill-slots -fira-verbose=@var{n} @gol
 -fivopts -fkeep-inline-functions -fkeep-static-consts @gol
--floop-block -floop-flatten -floop-interchange -floop-strip-mine @gol
+-floop-block -floop-interchange -floop-strip-mine @gol
 -floop-parallelize-all -flto -flto-compression-level @gol
 -flto-partition=@var{alg} -flto-report -fmerge-all-constants @gol
 -fmerge-constants -fmodulo-sched -fmodulo-sched-allow-regmoves @gol
@@ -7287,16 +7287,6 @@ GIMPLE -> GRAPHITE -> GIMPLE transformation.  Some minimal optimizations
 are also performed by the code generator CLooG, like index splitting and
 dead code elimination in loops.
 
-@item -floop-flatten
-@opindex floop-flatten
-Removes the loop nesting structure: transforms the loop nest into a
-single loop.  This transformation can be useful as an enablement
-transform for vectorization and parallelization.  This feature
-is experimental.
-To use this code transformation, GCC has to be configured
-with @option{--with-ppl} and @option{--with-cloog} to enable the
-Graphite loop transformation infrastructure.
-
 @item -floop-parallelize-all
 @opindex floop-parallelize-all
 Use the Graphite data dependence analysis to identify loops that can

gcc/graphite-poly.c

@@ -771,9 +771,6 @@ apply_poly_transforms (scop_p scop)
 	transform_done |= scop_do_interchange (scop);
     }
 
-  if (flag_loop_flatten)
-    transform_done |= flatten_all_loops (scop);
-
   /* This feature is only enabled in the Graphite branch.  */
   if (0)
     {

gcc/testsuite/ChangeLog

+2012-03-02  Maxim Kuvyrkov  <maxim@codesourcery.com>
+
+	* gcc.dg/graphite/pr50561.c: Update.
+
 2012-03-02  Peter Bergner  <bergner@vnet.ibm.com>
 
 	* gcc.target/powerpc/pr52457.c: New test.

gcc/testsuite/gcc.dg/graphite/pr50561.c

 /* { dg-do compile } */
-/* { dg-options "-O2 -floop-flatten -floop-strip-mine" } */
+/* { dg-options "-O2 -floop-strip-mine" } */
 
 void f (unsigned *s)
 {

gcc/toplev.c

@@ -1315,12 +1315,11 @@ process_options (void)
   if (flag_graphite
       || flag_graphite_identity
       || flag_loop_block
-      || flag_loop_flatten
       || flag_loop_interchange
       || flag_loop_strip_mine
       || flag_loop_parallelize_all)
     sorry ("Graphite loop optimizations cannot be used (-fgraphite, "
-	   "-fgraphite-identity, -floop-block, -floop-flatten, "
+	   "-fgraphite-identity, -floop-block, "
 	   "-floop-interchange, -floop-strip-mine, -floop-parallelize-all, "
 	   "and -ftree-loop-linear)");
 #endif

gcc/tree-ssa-loop.c

@@ -266,8 +266,7 @@ gate_graphite_transforms (void)
       || flag_loop_interchange
       || flag_loop_strip_mine
       || flag_graphite_identity
-      || flag_loop_parallelize_all
-      || flag_loop_flatten)
+      || flag_loop_parallelize_all)
     flag_graphite = 1;
 
   return flag_graphite != 0;