summaryrefslogtreecommitdiff
path: root/compiler/main
diff options
context:
space:
mode:
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>2013-02-05 17:53:50 +1100
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>2013-02-05 17:53:50 +1100
commit874bb7e34b114669a1b3b45f06e70a3a7a1100bb (patch)
tree52887d19fec67e7f414e76e1189a1b12d610e633 /compiler/main
parent5389b2a8e28e2fe306c67b4c348c769c9661478e (diff)
downloadhaskell-874bb7e34b114669a1b3b45f06e70a3a7a1100bb.tar.gz
Remove '-favoid-vect' and add '-fvectorisation-avoidance'
* By default '-fvectorisation-avoidance' is enabled at all optimisation levels (but it only matters in combination with '-fvectorise'). * The new vectoriser always uses vectorisation avoidance, but with '-fno-vectorisation-avoidance' it restricts it to simple scalar applications (and dictionary computations)
Diffstat (limited to 'compiler/main')
-rw-r--r--compiler/main/DynFlags.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 787f067182..7b1688750b 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -231,7 +231,6 @@ data DynFlag
| Opt_D_dump_splices
| Opt_D_dump_BCOs
| Opt_D_dump_vect
- | Opt_D_dump_avoid_vect
| Opt_D_dump_ticked
| Opt_D_dump_rtti
| Opt_D_source_stats
@@ -272,7 +271,7 @@ data DynFlag
| Opt_DictsCheap
| Opt_EnableRewriteRules -- Apply rewrite rules during simplification
| Opt_Vectorise
- | Opt_AvoidVect
+ | Opt_VectorisationAvoidance
| Opt_RegsGraph -- do graph coloring register allocation
| Opt_RegsIterative -- do iterative coalescing graph coloring register allocation
| Opt_PedanticBottoms -- Be picky about how we treat bottom
@@ -1761,7 +1760,6 @@ dynamic_flags = [
, Flag "ddump-hi" (setDumpFlag Opt_D_dump_hi)
, Flag "ddump-minimal-imports" (setDumpFlag Opt_D_dump_minimal_imports)
, Flag "ddump-vect" (setDumpFlag Opt_D_dump_vect)
- , Flag "ddump-avoid-vect" (setDumpFlag Opt_D_dump_avoid_vect)
, Flag "ddump-hpc" (setDumpFlag Opt_D_dump_ticked) -- back compat
, Flag "ddump-ticked" (setDumpFlag Opt_D_dump_ticked)
, Flag "ddump-mod-cycles" (setDumpFlag Opt_D_dump_mod_cycles)
@@ -2033,7 +2031,7 @@ fFlags = [
( "run-cpsz", Opt_RunCPSZ, nop ),
( "new-codegen", Opt_TryNewCodeGen, nop ),
( "vectorise", Opt_Vectorise, nop ),
- ( "avoid-vect", Opt_AvoidVect, nop ),
+ ( "vectorisation-avoidance", Opt_VectorisationAvoidance, nop ),
( "regs-graph", Opt_RegsGraph, nop ),
( "regs-iterative", Opt_RegsIterative, nop ),
( "llvm-tbaa", Opt_LlvmTBAA, nop), -- hidden flag
@@ -2327,6 +2325,7 @@ optLevelFlags
-- we want to make sure that the bindings for data
-- constructors are eta-expanded. This is probably
-- a good thing anyway, but it seems fragile.
+ , ([0,1,2], Opt_VectorisationAvoidance)
]
-- -----------------------------------------------------------------------------