Revert "If -fslp-vectorize or -fno-slp-vectorize are given, honor this selection. If no flag is given, enable it for -O3."

This reverts commit r187630.

Looks like it is breaking the bots.

llvm-svn: 187633
This commit is contained in:
Rafael Espindola 2013-08-01 23:56:42 +00:00
parent 21f334372e
commit f818ef4c37
1 changed files with 3 additions and 17 deletions

View File

@ -1974,12 +1974,6 @@ static bool isOptimizationLevelFast(const ArgList &Args) {
return false;
}
static bool isOptimizationLevel3(const ArgList &Args) {
if (Arg *A = Args.getLastArg(options::OPT_O_Group))
return StringRef(A->getValue()).equals("3");
return false;
}
void Clang::ConstructJob(Compilation &C, const JobAction &JA,
const InputInfo &Output,
const InputInfoList &Inputs,
@ -3458,17 +3452,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
options::OPT_fno_vectorize, true))
CmdArgs.push_back("-vectorize-loops");
bool EnableSLP = false;
// If -fslp-vectorize or -fno-slp-vectorize are given, honor this selection.
if (Arg *A = Args.getLastArg(options::OPT_fslp_vectorize,
options::OPT_fno_slp_vectorize)) {
EnableSLP = A->getOption().matches(options::OPT_fslp_vectorize);
} else {
// Also enable SLP vectorization on O3 or OFast
EnableSLP = isOptimizationLevel3(Args) || isOptimizationLevelFast(Args);
}
if (EnableSLP)
// -fslp-vectorize is default.
if (Args.hasFlag(options::OPT_fslp_vectorize,
options::OPT_fno_slp_vectorize, true))
CmdArgs.push_back("-vectorize-slp");
// -fno-slp-vectorize-aggressive is default.