r345446 - Revert r345170 [along with its llvm counterpart r345169] as it makes Halide builds timeout.

[Alina Sbirlea via cfe-commits]

Author: asbirlea
Date: Fri Oct 26 21:51:09 2018
New Revision: 345446

URL: http://llvm.org/viewvc/llvm-project?rev=345446&view=rev
Log:
Revert r345170 [along with its llvm counterpart r345169] as it makes Halide builds timeout.

Modified:
    cfe/trunk/lib/Driver/ToolChains/Hexagon.cpp
    cfe/trunk/test/Driver/hexagon-vectorize.c

Modified: cfe/trunk/lib/Driver/ToolChains/Hexagon.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Hexagon.cpp?rev=345446&r1=345445&r2=345446&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/Hexagon.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Hexagon.cpp Fri Oct 26 21:51:09 2018
@@ -516,9 +516,9 @@ void HexagonToolChain::addClangTargetOpt
     CC1Args.push_back("-target-feature");
     CC1Args.push_back("+reserved-r19");
   }
-  if (!isAutoHVXEnabled(DriverArgs)) {
+  if (isAutoHVXEnabled(DriverArgs)) {
     CC1Args.push_back("-mllvm");
-    CC1Args.push_back("-hexagon-autohvx=0");
+    CC1Args.push_back("-hexagon-autohvx");
   }
 }
 

Modified: cfe/trunk/test/Driver/hexagon-vectorize.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/hexagon-vectorize.c?rev=345446&r1=345445&r2=345446&view=diff
==============================================================================
--- cfe/trunk/test/Driver/hexagon-vectorize.c (original)
+++ cfe/trunk/test/Driver/hexagon-vectorize.c Fri Oct 26 21:51:09 2018
@@ -3,7 +3,7 @@
 // RUN: %clang -target hexagon -fvectorize -fno-vectorize -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-NOVECTOR
 // RUN: %clang -target hexagon -fvectorize -### %s 2>&1 | FileCheck %s --check-prefix=CHECK-NEEDHVX
 
-// CHECK-DEFAULT: -hexagon-autohvx={{false|0}}
-// CHECK-VECTOR-NOT: -hexagon-autohvx={{false|0}}
-// CHECK-NOVECTOR: -hexagon-autohvx={{false|0}}
+// CHECK-DEFAULT-NOT: hexagon-autohvx
+// CHECK-VECTOR: "-mllvm" "-hexagon-autohvx"
+// CHECK-NOVECTOR-NOT: hexagon-autohvx
 // CHECK-NEEDHVX: warning: auto-vectorization requires HVX, use -mhvx to enable it