From d981cc88b26a8cb13bccb517f5a7ff0c1597015d Mon Sep 17 00:00:00 2001 From: Alina Sbirlea Date: Sat, 27 Oct 2018 04:51:09 +0000 Subject: [PATCH] Revert r345170 [along with its llvm counterpart r345169] as it makes Halide builds timeout. llvm-svn: 345446 --- clang/lib/Driver/ToolChains/Hexagon.cpp | 4 ++-- clang/test/Driver/hexagon-vectorize.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Hexagon.cpp b/clang/lib/Driver/ToolChains/Hexagon.cpp index 4da63a6..8778a1a 100644 --- a/clang/lib/Driver/ToolChains/Hexagon.cpp +++ b/clang/lib/Driver/ToolChains/Hexagon.cpp @@ -516,9 +516,9 @@ void HexagonToolChain::addClangTargetOptions(const ArgList &DriverArgs, 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"); } } diff --git a/clang/test/Driver/hexagon-vectorize.c b/clang/test/Driver/hexagon-vectorize.c index 145011c..dcd6a09 100644 --- a/clang/test/Driver/hexagon-vectorize.c +++ b/clang/test/Driver/hexagon-vectorize.c @@ -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 -- 2.7.4