Index: polly/trunk/lib/Transform/ScheduleOptimizer.cpp
===================================================================
--- polly/trunk/lib/Transform/ScheduleOptimizer.cpp
+++ polly/trunk/lib/Transform/ScheduleOptimizer.cpp
@@ -226,7 +226,7 @@
 static cl::opt<bool>
     PMBasedOpts("polly-pattern-matching-based-opts",
                 cl::desc("Perform optimizations based on pattern matching"),
-                cl::init(false), cl::ZeroOrMore, cl::cat(PollyCategory));
+                cl::init(true), cl::ZeroOrMore, cl::cat(PollyCategory));
 
 static cl::opt<bool> OptimizedScops(
     "polly-optimized-scops",
Index: polly/trunk/test/ScheduleOptimizer/full_partial_tile_separation.ll
===================================================================
--- polly/trunk/test/ScheduleOptimizer/full_partial_tile_separation.ll
+++ polly/trunk/test/ScheduleOptimizer/full_partial_tile_separation.ll
@@ -1,4 +1,6 @@
-; RUN: opt -S %loadPolly -polly-vectorizer=stripmine -polly-opt-isl -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt -S %loadPolly -polly-pattern-matching-based-opts=false \
+; RUN: -polly-vectorizer=stripmine -polly-opt-isl -polly-ast -analyze \
+; RUN: < %s | FileCheck %s
 ; CHECK:          // 1st level tiling - Tiles
 ; CHECK-NEXT:    #pragma known-parallel
 ; CHECK-NEXT:    for (int c0 = 0; c0 <= floord(ni - 1, 32); c0 += 1)
Index: polly/trunk/test/ScheduleOptimizer/pattern-matching-based-opts.ll
===================================================================
--- polly/trunk/test/ScheduleOptimizer/pattern-matching-based-opts.ll
+++ polly/trunk/test/ScheduleOptimizer/pattern-matching-based-opts.ll
@@ -1,4 +1,5 @@
-; RUN: opt %loadPolly -polly-opt-isl -debug < %s 2>&1| FileCheck %s
+; RUN: opt %loadPolly -polly-opt-isl -polly-pattern-matching-based-opts=false \
+; RUN: -debug < %s 2>&1| FileCheck %s
 ; RUN: opt %loadPolly -polly-opt-isl -polly-pattern-matching-based-opts=true -debug < %s 2>&1| FileCheck %s --check-prefix=PATTERN-MATCHING-OPTS
 ; REQUIRES: asserts
 ;
Index: polly/trunk/test/ScheduleOptimizer/prevectorization-without-tiling.ll
===================================================================
--- polly/trunk/test/ScheduleOptimizer/prevectorization-without-tiling.ll
+++ polly/trunk/test/ScheduleOptimizer/prevectorization-without-tiling.ll
@@ -1,4 +1,6 @@
-; RUN: opt -S %loadPolly -basicaa -polly-opt-isl -polly-tiling=false -polly-vectorizer=polly -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt -S %loadPolly -basicaa -polly-opt-isl -polly-tiling=false \
+; RUN: -polly-pattern-matching-based-opts=false -polly-vectorizer=polly \
+; RUN: -polly-ast -analyze < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 @C = common global [1536 x [1536 x float]] zeroinitializer, align 16
Index: polly/trunk/test/ScheduleOptimizer/prevectorization.ll
===================================================================
--- polly/trunk/test/ScheduleOptimizer/prevectorization.ll
+++ polly/trunk/test/ScheduleOptimizer/prevectorization.ll
@@ -1,10 +1,14 @@
-; RUN: opt -S %loadPolly -basicaa -polly-opt-isl -polly-vectorizer=polly -polly-ast -analyze < %s | FileCheck %s 
-; RUN: opt -S %loadPolly -basicaa -polly-opt-isl -polly-vectorizer=stripmine -polly-ast -analyze < %s | FileCheck %s
+; RUN: opt -S %loadPolly -basicaa -polly-opt-isl \
+; RUN: -polly-pattern-matching-based-opts=false -polly-vectorizer=polly \
+; RUN: -polly-ast -analyze < %s | FileCheck %s 
+; RUN: opt -S %loadPolly -basicaa -polly-opt-isl \
+; RUN: -polly-pattern-matching-based-opts=false -polly-vectorizer=stripmine \
+; RUN: -polly-ast -analyze < %s | FileCheck %s
 
 ; RUN: opt -S %loadPolly -basicaa -polly-opt-isl \
-; RUN:                   -polly-vectorizer=polly -polly-ast -analyze \
-; RUN:                   -polly-prevect-width=16 < %s | \
-; RUN:                   FileCheck %s -check-prefix=VEC16
+; RUN: -polly-vectorizer=polly -polly-pattern-matching-based-opts=false \
+; RUN: -polly-ast -analyze -polly-prevect-width=16 < %s | \
+; RUN: FileCheck %s -check-prefix=VEC16
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"