From 683bf4db05fb5149c1f2bc3e8c508938ad6dccfa Mon Sep 17 00:00:00 2001 From: Mike Edwards Date: Tue, 11 Oct 2016 22:09:13 +0000 Subject: [PATCH] Revert - When optimizing for size, enable loop rerolling by default This reverts r283685 as it is causing test failures on Green Dragon. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@283950 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 11 +---------- test/Driver/clang_f_opts.c | 5 ----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 1e5dbb54bf..6c07b9b5de 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -5229,18 +5229,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } if (Arg *A = Args.getLastArg(options::OPT_freroll_loops, - options::OPT_fno_reroll_loops)) { + options::OPT_fno_reroll_loops)) if (A->getOption().matches(options::OPT_freroll_loops)) CmdArgs.push_back("-freroll-loops"); - } else if (Arg *A = Args.getLastArg(options::OPT_O_Group)) { - // If rerolling is not explicitly enabled or disabled, then enable when - // optimizing for size. - if (A->getOption().matches(options::OPT_O)) { - StringRef S(A->getValue()); - if (S == "s" || S == "z") - CmdArgs.push_back("-freroll-loops"); - } - } Args.AddLastArg(CmdArgs, options::OPT_fwritable_strings); Args.AddLastArg(CmdArgs, options::OPT_funroll_loops, diff --git a/test/Driver/clang_f_opts.c b/test/Driver/clang_f_opts.c index f940ed974d..2952d0e111 100644 --- a/test/Driver/clang_f_opts.c +++ b/test/Driver/clang_f_opts.c @@ -47,12 +47,7 @@ // CHECK-NO-UNROLL-LOOPS: "-fno-unroll-loops" // RUN: %clang -### -S -freroll-loops %s 2>&1 | FileCheck -check-prefix=CHECK-REROLL-LOOPS %s -// RUN: %clang -### -S -Os %s 2>&1 | FileCheck -check-prefix=CHECK-REROLL-LOOPS %s -// RUN: %clang -### -S -Oz %s 2>&1 | FileCheck -check-prefix=CHECK-REROLL-LOOPS %s // RUN: %clang -### -S -fno-reroll-loops %s 2>&1 | FileCheck -check-prefix=CHECK-NO-REROLL-LOOPS %s -// RUN: %clang -### -S -Os -fno-reroll-loops %s 2>&1 | FileCheck -check-prefix=CHECK-NO-REROLL-LOOPS %s -// RUN: %clang -### -S -Oz -fno-reroll-loops %s 2>&1 | FileCheck -check-prefix=CHECK-NO-REROLL-LOOPS %s -// RUN: %clang -### -S -O1 %s 2>&1 | FileCheck -check-prefix=CHECK-NO-REROLL-LOOPS %s // RUN: %clang -### -S -fno-reroll-loops -freroll-loops %s 2>&1 | FileCheck -check-prefix=CHECK-REROLL-LOOPS %s // RUN: %clang -### -S -freroll-loops -fno-reroll-loops %s 2>&1 | FileCheck -check-prefix=CHECK-NO-REROLL-LOOPS %s // CHECK-REROLL-LOOPS: "-freroll-loops" -- 2.40.0