From 5f5cf6029852d703e850c5c16b386284d048dd91 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Thu, 16 Feb 2023 11:35:18 -0800 Subject: [PATCH] [Pipeline] Remove -enable-npm-O3-nontrivial-unswitch flag This was added to help debugging performance issues, no longer needed. Reviewed By: asbirlea Differential Revision: https://reviews.llvm.org/D98675 --- llvm/lib/Passes/PassBuilderPipelines.cpp | 7 +------ llvm/test/Transforms/SimpleLoopUnswitch/pipeline.ll | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp index c6288b4..738b021 100644 --- a/llvm/lib/Passes/PassBuilderPipelines.cpp +++ b/llvm/lib/Passes/PassBuilderPipelines.cpp @@ -165,10 +165,6 @@ static cl::opt PerformMandatoryInliningsFirst( cl::desc("Perform mandatory inlinings module-wide, before performing " "inlining")); -static cl::opt EnableO3NonTrivialUnswitching( - "enable-npm-O3-nontrivial-unswitch", cl::init(true), cl::Hidden, - cl::desc("Enable non-trivial loop unswitching for -O3")); - static cl::opt EnableEagerlyInvalidateAnalyses( "eagerly-invalidate-analyses", cl::init(true), cl::Hidden, cl::desc("Eagerly invalidate more analyses in default pipelines")); @@ -567,8 +563,7 @@ PassBuilder::buildFunctionSimplificationPipeline(OptimizationLevel Level, LPM1.addPass(LICMPass(PTO.LicmMssaOptCap, PTO.LicmMssaNoAccForPromotionCap, /*AllowSpeculation=*/true)); LPM1.addPass( - SimpleLoopUnswitchPass(/* NonTrivial */ Level == OptimizationLevel::O3 && - EnableO3NonTrivialUnswitching)); + SimpleLoopUnswitchPass(/* NonTrivial */ Level == OptimizationLevel::O3)); if (EnableLoopFlatten) LPM1.addPass(LoopFlattenPass()); diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/pipeline.ll b/llvm/test/Transforms/SimpleLoopUnswitch/pipeline.ll index 3aab25f..0c65e49 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/pipeline.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/pipeline.ll @@ -1,7 +1,6 @@ ; RUN: opt < %s -S -passes="default" | FileCheck %s -check-prefixes=TRIVIAL,CHECK ; RUN: opt < %s -S -passes="default" | FileCheck %s -check-prefixes=TRIVIAL,CHECK ; RUN: opt < %s -S -passes="default" | FileCheck %s -check-prefixes=NONTRIVIAL,CHECK -; RUN: opt < %s -S -passes="default" -enable-npm-O3-nontrivial-unswitch=0 | FileCheck %s -check-prefixes=TRIVIAL,CHECK ; RUN: opt < %s -S -passes="default" | FileCheck %s -check-prefixes=TRIVIAL,CHECK ; RUN: opt < %s -S -passes="default" | FileCheck %s -check-prefixes=TRIVIAL,CHECK -- 2.7.4