Skip to content

Commit 49b8fe6

Browse files
Sebastian Popsebpop
authored andcommitted
fix pr46851 and pr60340: remove unmaintained omega dependence test
Regstrapped on amd64-linux. 2015-07-18 Sebastian Pop <[email protected]> PR middle-end/46851 PR middle-end/60340 * Makefile.in: Removed omega.o. * common.opt: Remove flag fcheck-data-deps. * doc/invoke.texi: Remove documentation for fcheck-data-deps and its associated params: omega-max-vars, omega-max-geqs, omega-max-eqs, omega-max-wild-cards, omega-hash-table-size, omega-max-keys, omega-eliminate-redundant-constraints. * doc/loop.texi: Remove all the section on Omega. * graphite-blocking.c: Include missing params.h: it used to be included through tree-data-ref.h and omega.h. * graphite-isl-ast-to-gimple.c: Same. * graphite-optimize-isl.c: Same. * graphite-sese-to-poly.c: Same. * graphite.c: Same. * omega.c: Remove. * omega.h: Remove. * params.def: Removed PARAM_OMEGA_MAX_VARS, PARAM_OMEGA_MAX_GEQS, PARAM_OMEGA_MAX_EQS, PARAM_OMEGA_MAX_WILD_CARDS, PARAM_OMEGA_HASH_TABLE_SIZE, PARAM_OMEGA_MAX_KEYS, and PARAM_OMEGA_ELIMINATE_REDUNDANT_CONSTRAINTS. * passes.def: Remove pass_check_data_deps. * tree-data-ref.c (dump_affine_function): Declare DEBUG_FUNCTION. (dump_conflict_function): Same. (dump_subscript): Same. (print_direction_vector): Same. (print_dir_vectors): Same. (print_lambda_vector): Same. (print_dist_vectors): Same. (dump_data_dependence_relation): Same. (dump_data_dependence_relations): Same. (dump_dist_dir_vectors): Same. (dump_ddrs): Same. (init_omega_eq_with_af): Removed. (omega_extract_distance_vectors): Removed. (omega_setup_subscript): Removed. (init_omega_for_ddr_1): Removed. (init_omega_for_ddr): Removed. (ddr_consistent_p): Removed. (compute_affine_dependence): Do not use omega to check data dependences. (compute_data_dependences_for_bb): Removed. (analyze_all_data_dependences): Removed. (tree_check_data_deps): Removed. * tree-data-ref.h: Do not include omega.h. (compute_data_dependences_for_bb): Removed. (tree_check_data_deps): Removed. * tree-ssa-loop.c (pass_check_data_deps): Removed. (make_pass_check_data_deps): Removed. * tree-ssa-phiopt.c: Include params.h. * tree-vect-data-refs.c: Same. * tree-vect-slp.c: Same. testsuite/ * gcc.dg/tree-ssa/pr42327.c: Removed. * g++.dg/other/pr35011.C: Removed. From-SVN: r225979
1 parent ca4b5db commit 49b8fe6

23 files changed

+84
-6738
lines changed

gcc/ChangeLog

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,58 @@
1+
2015-07-18 Sebastian Pop <[email protected]>
2+
3+
PR middle-end/46851
4+
PR middle-end/60340
5+
* Makefile.in: Removed omega.o.
6+
* common.opt: Document flag fcheck-data-deps as deprecated.
7+
* doc/invoke.texi: Remove documentation for fcheck-data-deps and
8+
its associated params: omega-max-vars, omega-max-geqs,
9+
omega-max-eqs, omega-max-wild-cards, omega-hash-table-size,
10+
omega-max-keys, omega-eliminate-redundant-constraints.
11+
* doc/loop.texi: Remove all the section on Omega.
12+
* graphite-blocking.c: Include missing params.h: it used to be
13+
included through tree-data-ref.h and omega.h.
14+
* graphite-isl-ast-to-gimple.c: Same.
15+
* graphite-optimize-isl.c: Same.
16+
* graphite-sese-to-poly.c: Same.
17+
* graphite.c: Same.
18+
* omega.c: Remove.
19+
* omega.h: Remove.
20+
* params.def: Removed PARAM_OMEGA_MAX_VARS, PARAM_OMEGA_MAX_GEQS,
21+
PARAM_OMEGA_MAX_EQS, PARAM_OMEGA_MAX_WILD_CARDS,
22+
PARAM_OMEGA_HASH_TABLE_SIZE, PARAM_OMEGA_MAX_KEYS, and
23+
PARAM_OMEGA_ELIMINATE_REDUNDANT_CONSTRAINTS.
24+
* passes.def: Remove pass_check_data_deps.
25+
* tree-data-ref.c (dump_affine_function): Declare DEBUG_FUNCTION.
26+
(dump_conflict_function): Same.
27+
(dump_subscript): Same.
28+
(print_direction_vector): Same.
29+
(print_dir_vectors): Same.
30+
(print_lambda_vector): Same.
31+
(print_dist_vectors): Same.
32+
(dump_data_dependence_relation): Same.
33+
(dump_data_dependence_relations): Same.
34+
(dump_dist_dir_vectors): Same.
35+
(dump_ddrs): Same.
36+
(init_omega_eq_with_af): Removed.
37+
(omega_extract_distance_vectors): Removed.
38+
(omega_setup_subscript): Removed.
39+
(init_omega_for_ddr_1): Removed.
40+
(init_omega_for_ddr): Removed.
41+
(ddr_consistent_p): Removed.
42+
(compute_affine_dependence): Do not use omega to check data
43+
dependences.
44+
(compute_data_dependences_for_bb): Removed.
45+
(analyze_all_data_dependences): Removed.
46+
(tree_check_data_deps): Removed.
47+
* tree-data-ref.h: Do not include omega.h.
48+
(compute_data_dependences_for_bb): Removed.
49+
(tree_check_data_deps): Removed.
50+
* tree-ssa-loop.c (pass_check_data_deps): Removed.
51+
(make_pass_check_data_deps): Removed.
52+
* tree-ssa-phiopt.c: Include params.h.
53+
* tree-vect-data-refs.c: Same.
54+
* tree-vect-slp.c: Same.
55+
156
2015-07-18 Uros Bizjak <[email protected]>
257

358
* config/i386/i386.md (pushsf splitter): Pass curr_insn to

gcc/Makefile.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,6 @@ OBJS = \
13471347
mcf.o \
13481348
mode-switching.o \
13491349
modulo-sched.o \
1350-
omega.o \
13511350
omp-low.o \
13521351
optabs.o \
13531352
options-save.o \

gcc/common.opt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ Save registers around function calls
987987

988988
fcheck-data-deps
989989
Common Report Var(flag_check_data_deps)
990-
Compare the results of several data dependence analyzers.
990+
This switch is deprecated; do not use.
991991

992992
fcheck-new
993993
Common Var(flag_check_new)

gcc/doc/invoke.texi

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ Objective-C and Objective-C++ Dialects}.
385385
-fauto-inc-dec -fbranch-probabilities @gol
386386
-fbranch-target-load-optimize -fbranch-target-load-optimize2 @gol
387387
-fbtr-bb-exclusive -fcaller-saves @gol
388-
-fcheck-data-deps -fcombine-stack-adjustments -fconserve-stack @gol
388+
-fcombine-stack-adjustments -fconserve-stack @gol
389389
-fcompare-elim -fcprop-registers -fcrossjumping @gol
390390
-fcse-follow-jumps -fcse-skip-blocks -fcx-fortran-rules @gol
391391
-fcx-limited-range @gol
@@ -8812,11 +8812,6 @@ be parallelized. Parallelize all the loops that can be analyzed to
88128812
not contain loop carried dependences without checking that it is
88138813
profitable to parallelize the loops.
88148814

8815-
@item -fcheck-data-deps
8816-
@opindex fcheck-data-deps
8817-
Compare the results of several data dependence analyzers. This option
8818-
is used for debugging the data dependence analyzers.
8819-
88208815
@item -ftree-loop-if-convert
88218816
@opindex ftree-loop-if-convert
88228817
Attempt to transform conditional jumps in the innermost loops to
@@ -10475,34 +10470,6 @@ Large expressions slow the analyzer.
1047510470
Bound on the complexity of the expressions in the scalar evolutions analyzer.
1047610471
Complex expressions slow the analyzer.
1047710472

10478-
@item omega-max-vars
10479-
The maximum number of variables in an Omega constraint system.
10480-
The default value is 128.
10481-
10482-
@item omega-max-geqs
10483-
The maximum number of inequalities in an Omega constraint system.
10484-
The default value is 256.
10485-
10486-
@item omega-max-eqs
10487-
The maximum number of equalities in an Omega constraint system.
10488-
The default value is 128.
10489-
10490-
@item omega-max-wild-cards
10491-
The maximum number of wildcard variables that the Omega solver is
10492-
able to insert. The default value is 18.
10493-
10494-
@item omega-hash-table-size
10495-
The size of the hash table in the Omega solver. The default value is
10496-
550.
10497-
10498-
@item omega-max-keys
10499-
The maximal number of keys used by the Omega solver. The default
10500-
value is 500.
10501-
10502-
@item omega-eliminate-redundant-constraints
10503-
When set to 1, use expensive methods to eliminate all redundant
10504-
constraints. The default value is 0.
10505-
1050610473
@item vect-max-version-for-alignment-checks
1050710474
The maximum number of run-time checks that can be performed when
1050810475
doing loop versioning for alignment in the vectorizer.

gcc/doc/loop.texi

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ variable analysis and number of iterations analysis).
2525
* loop-iv:: Induction variables on RTL.
2626
* Number of iterations:: Number of iterations analysis.
2727
* Dependency analysis:: Data dependency analysis.
28-
* Omega:: A solver for linear programming problems.
2928
@end menu
3029

3130
@node Loop representation
@@ -602,33 +601,3 @@ maximum verbosity the details of a data dependence relations array,
602601
direction vectors for a data dependence relations array, and
603602
@code{dump_data_references} prints the details of the data references
604603
contained in a data reference array.
605-
606-
607-
@node Omega
608-
@section Omega a solver for linear programming problems
609-
@cindex Omega a solver for linear programming problems
610-
611-
The data dependence analysis contains several solvers triggered
612-
sequentially from the less complex ones to the more sophisticated.
613-
For ensuring the consistency of the results of these solvers, a data
614-
dependence check pass has been implemented based on two different
615-
solvers. The second method that has been integrated to GCC is based
616-
on the Omega dependence solver, written in the 1990's by William Pugh
617-
and David Wonnacott. Data dependence tests can be formulated using a
618-
subset of the Presburger arithmetics that can be translated to linear
619-
constraint systems. These linear constraint systems can then be
620-
solved using the Omega solver.
621-
622-
The Omega solver is using Fourier-Motzkin's algorithm for variable
623-
elimination: a linear constraint system containing @code{n} variables
624-
is reduced to a linear constraint system with @code{n-1} variables.
625-
The Omega solver can also be used for solving other problems that can
626-
be expressed under the form of a system of linear equalities and
627-
inequalities. The Omega solver is known to have an exponential worst
628-
case, also known under the name of ``omega nightmare'' in the
629-
literature, but in practice, the omega test is known to be efficient
630-
for the common data dependence tests.
631-
632-
The interface used by the Omega solver for describing the linear
633-
programming problems is described in @file{omega.h}, and the solver is
634-
@code{omega_solve_problem}.

gcc/graphite-blocking.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ along with GCC; see the file COPYING3. If not see
3838
#include "cfghooks.h"
3939
#include "tree.h"
4040
#include "gimple.h"
41+
#include "params.h"
4142
#include "fold-const.h"
4243
#include "gimple-iterator.h"
4344
#include "tree-ssa-loop.h"

gcc/graphite-isl-ast-to-gimple.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ extern "C" {
4444
#include "cfghooks.h"
4545
#include "tree.h"
4646
#include "gimple.h"
47+
#include "params.h"
4748
#include "fold-const.h"
4849
#include "gimple-iterator.h"
4950
#include "tree-ssa-loop.h"

gcc/graphite-optimize-isl.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ along with GCC; see the file COPYING3. If not see
4444
#include "cfgloop.h"
4545
#include "tree-data-ref.h"
4646
#include "graphite-poly.h"
47+
#include "params.h"
4748

4849
static isl_union_set *
4950
scop_get_domains (scop_p scop ATTRIBUTE_UNUSED)

gcc/graphite-sese-to-poly.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ extern "C" {
4747
#include "tree.h"
4848
#include "gimple.h"
4949
#include "ssa.h"
50+
#include "params.h"
5051
#include "fold-const.h"
5152
#include "gimple-iterator.h"
5253
#include "gimplify.h"

gcc/graphite.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ along with GCC; see the file COPYING3. If not see
5050
#include "diagnostic-core.h"
5151
#include "cfgloop.h"
5252
#include "tree-pass.h"
53+
#include "params.h"
5354

5455
#ifdef HAVE_isl
5556
#include "cfghooks.h"

0 commit comments

Comments
 (0)