From 173327b7af38d294ff8fa7f77ed3a1c68f84a24c Mon Sep 17 00:00:00 2001
From: Diego Novillo <dnovillo@google.com>
Date: Sun, 29 Nov 2015 18:23:26 +0000
Subject: [PATCH] SamplePGO - Do not use std::to_string in diagnostics.
This fixes buildbots in systems that std::to_string is not present. It
also tidies the output of the diagnostic to render doubles a bit better
(thanks Ben Kramer for help with string streams and format).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254261 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/Transforms/IPO/SampleProfile.cpp | 29 ++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/lib/Transforms/IPO/SampleProfile.cpp b/lib/Transforms/IPO/SampleProfile.cpp
index 5cb71f71e70..2ce1fcece41 100644
--- a/lib/Transforms/IPO/SampleProfile.cpp
+++ b/lib/Transforms/IPO/SampleProfile.cpp
@@ -44,6 +44,7 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorOr.h"
+#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Transforms/IPO.h"
#include "llvm/Transforms/Utils/Cloning.h"
@@ -629,12 +630,14 @@ bool SampleProfileLoader::emitInlineHints(Function &F) {
// it globally hot.
if (SamplesPercent >= SampleProfileGlobalHotThreshold) {
F.addFnAttr(llvm::Attribute::InlineHint);
- emitOptimizationRemark(
- F.getContext(), DEBUG_TYPE, F, DebugLoc(),
- Twine("Applied inline hint to globally hot function '" + F.getName() +
- "' with " + Twine(std::to_string(SamplesPercent)) +
- "% of samples (threshold: " +
- Twine(std::to_string(SampleProfileGlobalHotThreshold)) + "%)"));
+ std::string Msg;
+ raw_string_ostream S(Msg);
+ S << "Applied inline hint to globally hot function '" << F.getName()
+ << "' with " << format("%.2f", SamplesPercent)
+ << "% of samples (threshold: "
+ << format("%.2f", SampleProfileGlobalHotThreshold.getValue()) << "%)";
+ S.flush();
+ emitOptimizationRemark(F.getContext(), DEBUG_TYPE, F, DebugLoc(), Msg);
return true;
}
@@ -642,12 +645,14 @@ bool SampleProfileLoader::emitInlineHints(Function &F) {
// it globally cold.
if (SamplesPercent <= SampleProfileGlobalColdThreshold) {
F.addFnAttr(llvm::Attribute::Cold);
- emitOptimizationRemark(
- F.getContext(), DEBUG_TYPE, F, DebugLoc(),
- Twine("Applied cold hint to globally cold function '" + F.getName() +
- "' with " + Twine(std::to_string(SamplesPercent)) +
- "% of samples (threshold: " +
- Twine(std::to_string(SampleProfileGlobalColdThreshold)) + "%)"));
+ std::string Msg;
+ raw_string_ostream S(Msg);
+ S << "Applied cold hint to globally cold function '" << F.getName()
+ << "' with " << format("%.2f", SamplesPercent)
+ << "% of samples (threshold: "
+ << format("%.2f", SampleProfileGlobalColdThreshold.getValue()) << "%)";
+ S.flush();
+ emitOptimizationRemark(F.getContext(), DEBUG_TYPE, F, DebugLoc(), Msg);
return true;
}
--
2.34.1