From b14b1726f59b58f21bf9ca2ee1c464628c0acfb6 Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Wed, 22 Jul 2020 20:57:25 -0700 Subject: [PATCH] Reland D84057 [PGO][PGSO] Remove a temporary flag used for gradual rollout. The revert was a misfire. Remove the temporary flag PGSOIRPassOrTestOnly and the guard code which was used for the staged rollout. This is a cleanup (NFC) as it's now false by default. Differential Revision: https://reviews.llvm.org/D84057 --- include/llvm/Transforms/Utils/SizeOpts.h | 11 ----------- lib/Transforms/Utils/SizeOpts.cpp | 5 ----- 2 files changed, 16 deletions(-) diff --git a/include/llvm/Transforms/Utils/SizeOpts.h b/include/llvm/Transforms/Utils/SizeOpts.h index 08d963475f2..3c1173b747d 100644 --- a/include/llvm/Transforms/Utils/SizeOpts.h +++ b/include/llvm/Transforms/Utils/SizeOpts.h @@ -19,7 +19,6 @@ extern llvm::cl::opt EnablePGSO; extern llvm::cl::opt PGSOLargeWorkingSetSizeOnly; -extern llvm::cl::opt PGSOIRPassOrTestOnly; extern llvm::cl::opt PGSOColdCodeOnly; extern llvm::cl::opt PGSOColdCodeOnlyForInstrPGO; extern llvm::cl::opt PGSOColdCodeOnlyForSamplePGO; @@ -60,11 +59,6 @@ bool shouldFuncOptimizeForSizeImpl(const FuncT *F, ProfileSummaryInfo *PSI, return true; if (!EnablePGSO) return false; - // Temporarily enable size optimizations only for the IR pass or test query - // sites for gradual commit/rollout. This is to be removed later. - if (PGSOIRPassOrTestOnly && !(QueryType == PGSOQueryType::IRPass || - QueryType == PGSOQueryType::Test)) - return false; if (isPGSOColdCodeOnly(PSI)) return AdapterT::isFunctionColdInCallGraph(F, PSI, *BFI); if (PSI->hasSampleProfile()) @@ -85,11 +79,6 @@ bool shouldOptimizeForSizeImpl(BlockTOrBlockFreq BBOrBlockFreq, ProfileSummaryIn return true; if (!EnablePGSO) return false; - // Temporarily enable size optimizations only for the IR pass or test query - // sites for gradual commit/rollout. This is to be removed later. - if (PGSOIRPassOrTestOnly && !(QueryType == PGSOQueryType::IRPass || - QueryType == PGSOQueryType::Test)) - return false; if (isPGSOColdCodeOnly(PSI)) return AdapterT::isColdBlock(BBOrBlockFreq, PSI, BFI); if (PSI->hasSampleProfile()) diff --git a/lib/Transforms/Utils/SizeOpts.cpp b/lib/Transforms/Utils/SizeOpts.cpp index e257c5a015f..beeb60698f0 100644 --- a/lib/Transforms/Utils/SizeOpts.cpp +++ b/lib/Transforms/Utils/SizeOpts.cpp @@ -43,11 +43,6 @@ cl::opt PGSOColdCodeOnlyForPartialSamplePGO( cl::desc("Apply the profile guided size optimizations only " "to cold code under partial-profile sample PGO.")); -cl::opt PGSOIRPassOrTestOnly( - "pgso-ir-pass-or-test-only", cl::Hidden, cl::init(false), - cl::desc("Apply the profile guided size optimizations only" - "to the IR passes or tests.")); - cl::opt ForcePGSO( "force-pgso", cl::Hidden, cl::init(false), cl::desc("Force the (profiled-guided) size optimizations. "));