Author: Dmitry Chernenkov Date: 2024-10-31T10:55:17Z New Revision: d924a9ba03a05b417676e84f6c81aac44f907f71
URL: https://github.com/llvm/llvm-project/commit/d924a9ba03a05b417676e84f6c81aac44f907f71 DIFF: https://github.com/llvm/llvm-project/commit/d924a9ba03a05b417676e84f6c81aac44f907f71.diff LOG: Revert "[InstrPGO] Support cold function coverage instrumentation (#109837)" This reverts commit e517cfc531886bf6ed64b4e7109bb3141ac7f430. Added: Modified: clang/include/clang/Driver/Options.td clang/lib/Driver/ToolChain.cpp clang/lib/Driver/ToolChains/Clang.cpp llvm/lib/Passes/PassBuilderPipelines.cpp llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp Removed: clang/test/CodeGen/pgo-cold-function-coverage.c clang/test/Driver/fprofile-generate-cold-function-coverage.c llvm/test/Transforms/PGOProfile/instr-gen-cold-function.ll ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 2b9ee1a0e669ed..5115b3d3e09c7c 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -1786,12 +1786,6 @@ defm debug_info_for_profiling : BoolFOption<"debug-info-for-profiling", PosFlag<SetTrue, [], [ClangOption, CC1Option], "Emit extra debug info to make sample profile more accurate">, NegFlag<SetFalse>>; -def fprofile_generate_cold_function_coverage : Flag<["-"], "fprofile-generate-cold-function-coverage">, - Group<f_Group>, Visibility<[ClangOption, CLOption]>, - HelpText<"Generate instrumented code to collect coverage info for cold functions into default.profraw file (overridden by '=' form of option or LLVM_PROFILE_FILE env var)">; -def fprofile_generate_cold_function_coverage_EQ : Joined<["-"], "fprofile-generate-cold-function-coverage=">, - Group<f_Group>, Visibility<[ClangOption, CLOption]>, MetaVarName<"<directory>">, - HelpText<"Generate instrumented code to collect coverage info for cold functions into <directory>/default.profraw (overridden by LLVM_PROFILE_FILE env var)">; def fprofile_instr_generate : Flag<["-"], "fprofile-instr-generate">, Group<f_Group>, Visibility<[ClangOption, CLOption]>, HelpText<"Generate instrumented code to collect execution counts into default.profraw file (overridden by '=' form of option or LLVM_PROFILE_FILE env var)">; diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index bdf3da0c96adca..6d3ede40691093 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -899,9 +899,7 @@ bool ToolChain::needsProfileRT(const ArgList &Args) { Args.hasArg(options::OPT_fprofile_instr_generate) || Args.hasArg(options::OPT_fprofile_instr_generate_EQ) || Args.hasArg(options::OPT_fcreate_profile) || - Args.hasArg(options::OPT_forder_file_instrumentation) || - Args.hasArg(options::OPT_fprofile_generate_cold_function_coverage) || - Args.hasArg(options::OPT_fprofile_generate_cold_function_coverage_EQ); + Args.hasArg(options::OPT_forder_file_instrumentation); } bool ToolChain::needsGCovInstrumentation(const llvm::opt::ArgList &Args) { diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 4c6f508f1f24a6..04b3832327a99c 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -632,26 +632,6 @@ static void addPGOAndCoverageFlags(const ToolChain &TC, Compilation &C, } } - if (auto *ColdFuncCoverageArg = Args.getLastArg( - options::OPT_fprofile_generate_cold_function_coverage, - options::OPT_fprofile_generate_cold_function_coverage_EQ)) { - SmallString<128> Path( - ColdFuncCoverageArg->getOption().matches( - options::OPT_fprofile_generate_cold_function_coverage_EQ) - ? ColdFuncCoverageArg->getValue() - : ""); - llvm::sys::path::append(Path, "default_%m.profraw"); - // FIXME: Idealy the file path should be passed through - // `-fprofile-instrument-path=`(InstrProfileOutput), however, this field is - // shared with other profile use path(see PGOOptions), we need to refactor - // PGOOptions to make it work. - CmdArgs.push_back("-mllvm"); - CmdArgs.push_back(Args.MakeArgString( - Twine("--instrument-cold-function-only-path=") + Path)); - CmdArgs.push_back("-mllvm"); - CmdArgs.push_back("--pgo-function-entry-coverage"); - } - Arg *PGOGenArg = nullptr; if (PGOGenerateArg) { assert(!CSPGOGenerateArg); diff --git a/clang/test/CodeGen/pgo-cold-function-coverage.c b/clang/test/CodeGen/pgo-cold-function-coverage.c deleted file mode 100644 index fd1e1e7e14cda5..00000000000000 --- a/clang/test/CodeGen/pgo-cold-function-coverage.c +++ /dev/null @@ -1,19 +0,0 @@ -// Test -fprofile-generate-cold-function-coverage - -// RUN: rm -rf %t && split-file %s %t -// RUN: %clang -O2 -fprofile-generate-cold-function-coverage=/xxx/yyy/ -fprofile-sample-accurate -fprofile-sample-use=%t/pgo-cold-func.prof -S -emit-llvm -o - %t/pgo-cold-func.c | FileCheck %s - -// CHECK: @__llvm_profile_filename = {{.*}} c"/xxx/yyy/default_%m.profraw\00" - -// CHECK: store i8 0, ptr @__profc_bar, align 1 -// CHECK-NOT: @__profc_foo - -//--- pgo-cold-func.prof -foo:1:1 - 1: 1 - -//--- pgo-cold-func.c -int bar(int x) { return x;} -int foo(int x) { - return x; -} diff --git a/clang/test/Driver/fprofile-generate-cold-function-coverage.c b/clang/test/Driver/fprofile-generate-cold-function-coverage.c deleted file mode 100644 index 9b2f46423f34b1..00000000000000 --- a/clang/test/Driver/fprofile-generate-cold-function-coverage.c +++ /dev/null @@ -1,8 +0,0 @@ -// RUN: %clang -### -c -fprofile-generate-cold-function-coverage %s 2>&1 | FileCheck %s -// CHECK: "--instrument-cold-function-only-path=default_%m.profraw" -// CHECK: "--pgo-function-entry-coverage" -// CHECK-NOT: "-fprofile-instrument" -// CHECK-NOT: "-fprofile-instrument-path= - -// RUN: %clang -### -c -fprofile-generate-cold-function-coverage=dir %s 2>&1 | FileCheck %s --check-prefix=CHECK-EQ -// CHECK-EQ: "--instrument-cold-function-only-path=dir{{/|\\\\}}default_%m.profraw" diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp index c391853c8d0c2b..6478667e22b851 100644 --- a/llvm/lib/Passes/PassBuilderPipelines.cpp +++ b/llvm/lib/Passes/PassBuilderPipelines.cpp @@ -296,12 +296,7 @@ static cl::opt<bool> UseLoopVersioningLICM( "enable-loop-versioning-licm", cl::init(false), cl::Hidden, cl::desc("Enable the experimental Loop Versioning LICM pass")); -static cl::opt<std::string> InstrumentColdFuncOnlyPath( - "instrument-cold-function-only-path", cl::init(""), - cl::desc("File path for cold function only instrumentation"), cl::Hidden); - extern cl::opt<std::string> UseCtxProfile; -extern cl::opt<bool> PGOInstrumentColdFunctionOnly; namespace llvm { extern cl::opt<bool> EnableMemProfContextDisambiguation; @@ -1188,13 +1183,8 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level, const bool IsCtxProfUse = !UseCtxProfile.empty() && Phase == ThinOrFullLTOPhase::ThinLTOPreLink; - // Enable cold function coverage instrumentation if - // InstrumentColdFuncOnlyPath is provided. - const bool IsColdFuncOnlyInstrGen = PGOInstrumentColdFunctionOnly = - IsPGOPreLink && !InstrumentColdFuncOnlyPath.empty(); - if (IsPGOInstrGen || IsPGOInstrUse || IsMemprofUse || IsCtxProfGen || - IsCtxProfUse || IsColdFuncOnlyInstrGen) + IsCtxProfUse) addPreInlinerPasses(MPM, Level, Phase); // Add all the requested passes for instrumentation PGO, if requested. @@ -1216,11 +1206,6 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level, return MPM; addPostPGOLoopRotation(MPM, Level); MPM.addPass(PGOCtxProfLoweringPass()); - } else if (IsColdFuncOnlyInstrGen) { - addPGOInstrPasses( - MPM, Level, /* RunProfileGen */ true, /* IsCS */ false, - /* AtomicCounterUpdate */ false, InstrumentColdFuncOnlyPath, - /* ProfileRemappingFile */ "", IntrusiveRefCntPtr<vfs::FileSystem>()); } if (IsPGOInstrGen || IsPGOInstrUse || IsCtxProfGen) diff --git a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp index 4d8141431a0c19..bceb6135cc1f92 100644 --- a/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp +++ b/llvm/lib/Transforms/Instrumentation/PGOInstrumentation.cpp @@ -319,20 +319,6 @@ static cl::opt<unsigned> PGOFunctionCriticalEdgeThreshold( cl::desc("Do not instrument functions with the number of critical edges " " greater than this threshold.")); -static cl::opt<uint64_t> PGOColdInstrumentEntryThreshold( - "pgo-cold-instrument-entry-threshold", cl::init(0), cl::Hidden, - cl::desc("For cold function instrumentation, skip instrumenting functions " - "whose entry count is above the given value.")); - -static cl::opt<bool> PGOTreatUnknownAsCold( - "pgo-treat-unknown-as-cold", cl::init(false), cl::Hidden, - cl::desc("For cold function instrumentation, treat count unknown(e.g. " - "unprofiled) functions as cold.")); - -cl::opt<bool> PGOInstrumentColdFunctionOnly( - "pgo-instrument-cold-function-only", cl::init(false), cl::Hidden, - cl::desc("Enable cold function only instrumentation.")); - extern cl::opt<unsigned> MaxNumVTableAnnotations; namespace llvm { @@ -1911,11 +1897,6 @@ static bool skipPGOGen(const Function &F) { return true; if (F.getInstructionCount() < PGOFunctionSizeThreshold) return true; - if (PGOInstrumentColdFunctionOnly) { - if (auto EntryCount = F.getEntryCount()) - return EntryCount->getCount() > PGOColdInstrumentEntryThreshold; - return !PGOTreatUnknownAsCold; - } return false; } diff --git a/llvm/test/Transforms/PGOProfile/instr-gen-cold-function.ll b/llvm/test/Transforms/PGOProfile/instr-gen-cold-function.ll deleted file mode 100644 index ab8cf8c010812b..00000000000000 --- a/llvm/test/Transforms/PGOProfile/instr-gen-cold-function.ll +++ /dev/null @@ -1,35 +0,0 @@ -; RUN: opt < %s --passes=pgo-instr-gen -pgo-instrument-cold-function-only -pgo-function-entry-coverage -S | FileCheck --check-prefixes=COLD %s -; RUN: opt < %s --passes=pgo-instr-gen -pgo-instrument-cold-function-only -pgo-function-entry-coverage -pgo-cold-instrument-entry-threshold=1 -S | FileCheck --check-prefixes=ENTRY-COUNT %s -; RUN: opt < %s --passes=pgo-instr-gen -pgo-instrument-cold-function-only -pgo-function-entry-coverage -pgo-treat-unknown-as-cold -S | FileCheck --check-prefixes=UNKNOWN-FUNC %s - -; COLD: call void @llvm.instrprof.cover(ptr @__profn_foo, i64 [[#]], i32 1, i32 0) -; COLD-NOT: __profn_main -; COLD-NOT: __profn_bar - -; ENTRY-COUNT: call void @llvm.instrprof.cover(ptr @__profn_foo, i64 [[#]], i32 1, i32 0) -; ENTRY-COUNT: call void @llvm.instrprof.cover(ptr @__profn_main, i64 [[#]], i32 1, i32 0) - -; UNKNOWN-FUNC: call void @llvm.instrprof.cover(ptr @__profn_bar, i64 [[#]], i32 1, i32 0) -; UNKNOWN-FUNC: call void @llvm.instrprof.cover(ptr @__profn_foo, i64 [[#]], i32 1, i32 0) - - -target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128" -target triple = "x86_64-unknown-linux-gnu" - -define void @bar() { -entry: - ret void -} - -define void @foo() !prof !0 { -entry: - ret void -} - -define i32 @main() !prof !1 { -entry: - ret i32 0 -} - -!0 = !{!"function_entry_count", i64 0} -!1 = !{!"function_entry_count", i64 1} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
