[llvm] r326975 - Revert "[LTO] Support filtering by hotness threshold"
Bob Haarman via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 7 17:13:10 PST 2018
Author: inglorion
Date: Wed Mar 7 17:13:10 2018
New Revision: 326975
URL: http://llvm.org/viewvc/llvm-project?rev=326975&view=rev
Log:
Revert "[LTO] Support filtering by hotness threshold"
This reverts commit 1f3bd185c53beb6aa68446974b7e80837abd6ef0 (r326107)
because it fails
ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll.
Modified:
llvm/trunk/include/llvm/LTO/Config.h
llvm/trunk/include/llvm/LTO/LTO.h
llvm/trunk/lib/LTO/LTO.cpp
llvm/trunk/lib/LTO/LTOBackend.cpp
llvm/trunk/lib/LTO/LTOCodeGenerator.cpp
llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp
llvm/trunk/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll
llvm/trunk/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll
Modified: llvm/trunk/include/llvm/LTO/Config.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LTO/Config.h?rev=326975&r1=326974&r2=326975&view=diff
==============================================================================
--- llvm/trunk/include/llvm/LTO/Config.h (original)
+++ llvm/trunk/include/llvm/LTO/Config.h Wed Mar 7 17:13:10 2018
@@ -79,10 +79,6 @@ struct Config {
/// Whether to emit optimization remarks with hotness informations.
bool RemarksWithHotness = false;
- /// The minimum hotness value a diagnostic needs in order to be included in
- /// optimization diagnostics.
- unsigned RemarksHotnessThreshold = 0;
-
/// Whether to emit the pass manager debuggging informations.
bool DebugPassManager = false;
Modified: llvm/trunk/include/llvm/LTO/LTO.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LTO/LTO.h?rev=326975&r1=326974&r2=326975&view=diff
==============================================================================
--- llvm/trunk/include/llvm/LTO/LTO.h (original)
+++ llvm/trunk/include/llvm/LTO/LTO.h Wed Mar 7 17:13:10 2018
@@ -73,9 +73,7 @@ std::string getThinLTOOutputFile(const s
/// Setup optimization remarks.
Expected<std::unique_ptr<ToolOutputFile>>
setupOptimizationRemarks(LLVMContext &Context, StringRef LTORemarksFilename,
- bool LTOPassRemarksWithHotness,
- unsigned LTOPassRemarksHotnessThreshold,
- int Count = -1);
+ bool LTOPassRemarksWithHotness, int Count = -1);
class LTO;
struct SymbolResolution;
Modified: llvm/trunk/lib/LTO/LTO.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/LTO.cpp?rev=326975&r1=326974&r2=326975&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/LTO.cpp (original)
+++ llvm/trunk/lib/LTO/LTO.cpp Wed Mar 7 17:13:10 2018
@@ -1202,10 +1202,10 @@ Error LTO::runThinLTO(AddStreamFn AddStr
return BackendProc->wait();
}
-Expected<std::unique_ptr<ToolOutputFile>> lto::setupOptimizationRemarks(
- LLVMContext &Context, StringRef LTORemarksFilename,
- bool LTOPassRemarksWithHotness, unsigned LTOPassRemarksHotnessThreshold,
- int Count) {
+Expected<std::unique_ptr<ToolOutputFile>>
+lto::setupOptimizationRemarks(LLVMContext &Context,
+ StringRef LTORemarksFilename,
+ bool LTOPassRemarksWithHotness, int Count) {
if (LTORemarksFilename.empty())
return nullptr;
@@ -1222,8 +1222,6 @@ Expected<std::unique_ptr<ToolOutputFile>
llvm::make_unique<yaml::Output>(DiagnosticFile->os()));
if (LTOPassRemarksWithHotness)
Context.setDiagnosticsHotnessRequested(true);
- if (LTOPassRemarksHotnessThreshold)
- Context.setDiagnosticsHotnessThreshold(LTOPassRemarksHotnessThreshold);
DiagnosticFile->keep();
return std::move(DiagnosticFile);
}
Modified: llvm/trunk/lib/LTO/LTOBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/LTOBackend.cpp?rev=326975&r1=326974&r2=326975&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/LTOBackend.cpp (original)
+++ llvm/trunk/lib/LTO/LTOBackend.cpp Wed Mar 7 17:13:10 2018
@@ -376,8 +376,7 @@ Error lto::backend(Config &C, AddStreamF
// Setup optimization remarks.
auto DiagFileOrErr = lto::setupOptimizationRemarks(
- Mod->getContext(), C.RemarksFilename, C.RemarksWithHotness,
- C.RemarksHotnessThreshold);
+ Mod->getContext(), C.RemarksFilename, C.RemarksWithHotness);
if (!DiagFileOrErr)
return DiagFileOrErr.takeError();
auto DiagnosticOutputFile = std::move(*DiagFileOrErr);
Modified: llvm/trunk/lib/LTO/LTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/LTOCodeGenerator.cpp?rev=326975&r1=326974&r2=326975&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/LTOCodeGenerator.cpp (original)
+++ llvm/trunk/lib/LTO/LTOCodeGenerator.cpp Wed Mar 7 17:13:10 2018
@@ -89,12 +89,6 @@ cl::opt<bool> LTOPassRemarksWithHotness(
"lto-pass-remarks-with-hotness",
cl::desc("With PGO, include profile count in optimization remarks"),
cl::Hidden);
-
-cl::opt<unsigned> LTOPassRemarksHotnessThreshold(
- "lto-pass-remarks-hotness-threshold",
- cl::desc("Minimum profile count required for an optimization remark to be "
- "output"),
- cl::Hidden);
}
LTOCodeGenerator::LTOCodeGenerator(LLVMContext &Context)
@@ -511,8 +505,7 @@ bool LTOCodeGenerator::optimize(bool Dis
return false;
auto DiagFileOrErr = lto::setupOptimizationRemarks(
- Context, LTORemarksFilename, LTOPassRemarksWithHotness,
- LTOPassRemarksHotnessThreshold);
+ Context, LTORemarksFilename, LTOPassRemarksWithHotness);
if (!DiagFileOrErr) {
errs() << "Error: " << toString(DiagFileOrErr.takeError()) << "\n";
report_fatal_error("Can't get an output file for the remarks");
Modified: llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp?rev=326975&r1=326974&r2=326975&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp (original)
+++ llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp Wed Mar 7 17:13:10 2018
@@ -63,7 +63,6 @@ namespace llvm {
extern cl::opt<bool> LTODiscardValueNames;
extern cl::opt<std::string> LTORemarksFilename;
extern cl::opt<bool> LTOPassRemarksWithHotness;
-extern cl::opt<unsigned> LTOPassRemarksHotnessThreshold;
}
namespace {
@@ -999,8 +998,7 @@ void ThinLTOCodeGenerator::run() {
Context.setDiscardValueNames(LTODiscardValueNames);
Context.enableDebugTypeODRUniquing();
auto DiagFileOrErr = lto::setupOptimizationRemarks(
- Context, LTORemarksFilename, LTOPassRemarksWithHotness,
- LTOPassRemarksHotnessThreshold, count);
+ Context, LTORemarksFilename, LTOPassRemarksWithHotness, count);
if (!DiagFileOrErr) {
errs() << "Error: " << toString(DiagFileOrErr.takeError()) << "\n";
report_fatal_error("ThinLTO: Can't get an output file for the "
Modified: llvm/trunk/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll?rev=326975&r1=326974&r2=326975&view=diff
==============================================================================
--- llvm/trunk/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll (original)
+++ llvm/trunk/test/LTO/X86/diagnostic-handler-remarks-with-hotness.ll Wed Mar 7 17:13:10 2018
@@ -8,18 +8,6 @@
; RUN: -exported-symbol _main -o %t.o %t.bc
; RUN: cat %t.yaml | FileCheck -check-prefix=YAML %s
-; RUN: llvm-lto -lto-pass-remarks-output=%t.yaml \
-; RUN: -lto-pass-remarks-with-hotness \
-; RUN: -lto-pass-remarks-hotness-threshold=400 \
-; RUN: -exported-symbol _main -o %t.o %t.bc
-; RUN: cat %t.yaml | FileCheck -allow-empty -check-prefix=YAML_TH_HIGH %s
-
-; RUN: llvm-lto -lto-pass-remarks-output=%t.yaml \
-; RUN: -lto-pass-remarks-with-hotness \
-; RUN: -lto-pass-remarks-hotness-threshold=200 \
-; RUN: -exported-symbol _main -o %t.o %t.bc
-; RUN: cat %t.yaml | FileCheck -allow-empty -check-prefix=YAML %s
-
; YAML: --- !Passed
; YAML-NEXT: Pass: inline
; YAML-NEXT: Name: Inlined
@@ -36,9 +24,6 @@
; YAML-NEXT: - String: ')'
; YAML-NEXT: ...
-; YAML_TH_HIGH-NOT: Name: Inlined
-
-
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-darwin"
Modified: llvm/trunk/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll?rev=326975&r1=326974&r2=326975&view=diff
==============================================================================
--- llvm/trunk/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll (original)
+++ llvm/trunk/test/ThinLTO/X86/diagnostic-handler-remarks-with-hotness.ll Wed Mar 7 17:13:10 2018
@@ -5,7 +5,7 @@
; with -lto-pass-remarks-with-hotness.
; RUN: llvm-lto -thinlto-action=run \
-; RUN: -lto-pass-remarks-output=%t-no-th.yaml \
+; RUN: -lto-pass-remarks-output=%t.yaml \
; RUN: -lto-pass-remarks-with-hotness \
; RUN: -exported-symbol _func2 \
; RUN: -exported-symbol _main %t1.bc %t2.bc 2>&1 | \
@@ -13,25 +13,9 @@
; CHECK-NOT: remark:
; CHECK-NOT: llvm-lto:
-; RUN: llvm-lto -thinlto-action=run \
-; RUN: -lto-pass-remarks-output=%t-low-th.yaml \
-; RUN: -lto-pass-remarks-with-hotness \
-; RUN: -lto-pass-remarks-hotness-threshold=20 \
-; RUN: -exported-symbol _func2 \
-; RUN: -exported-symbol _main %t1.bc %t2.bc 2>&1 | \
-
-; RUN: llvm-lto -thinlto-action=run \
-; RUN: -lto-pass-remarks-output=%t-high-th.yaml \
-; RUN: -lto-pass-remarks-with-hotness \
-; RUN: -lto-pass-remarks-hotness-threshold=100 \
-; RUN: -exported-symbol _func2 \
-; RUN: -exported-symbol _main %t1.bc %t2.bc 2>&1 | \
-
; Verify that bar is imported and inlined into foo
-; RUN: cat %t-no-th.yaml.thin.0.yaml | FileCheck %s -check-prefix=YAML1
-; RUN: cat %t-low-th.yaml.thin.0.yaml | FileCheck %s -check-prefix=YAML1
-; RUN: cat %t-high-th.yaml.thin.0.yaml | FileCheck %s -allow-empty -check-prefix=YAML1_TH_HIGH
+; RUN: cat %t.yaml.thin.0.yaml | FileCheck %s -check-prefix=YAML1
; YAML1: --- !Passed
; YAML1-NEXT: Pass: inline
; YAML1-NEXT: Name: Inlined
@@ -48,13 +32,9 @@
; YAML1-NEXT: - String: ')'
; YAML1-NEXT: ...
-; YAML1_TH_HIGH-NOT: Name: Inlined
-
; Verify that bar is imported and inlined into foo
-; RUN: cat %t-no-th.yaml.thin.1.yaml | FileCheck %s -check-prefix=YAML2
-; RUN: cat %t-low-th.yaml.thin.1.yaml | FileCheck %s -allow-empty -check-prefix=YAML2_TH_HIGH
-; RUN: cat %t-high-th.yaml.thin.1.yaml | FileCheck %s -allow-empty -check-prefix=YAML2_TH_HIGH
+; RUN: cat %t.yaml.thin.1.yaml | FileCheck %s -check-prefix=YAML2
; YAML2: --- !Passed
; YAML2-NEXT: Pass: inline
; YAML2-NEXT: Name: Inlined
@@ -70,7 +50,6 @@
; YAML2-NEXT: - String: ')'
; YAML2-NEXT: ...
-; YAML2_TH_HIGH-NOT: Name: Inlined
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.11.0"
More information about the llvm-commits
mailing list