-
Notifications
You must be signed in to change notification settings - Fork 13.6k
[ctx_prof] Extend WorkloadImportsManager
to use the contextual profile
#98682
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3ffabdf
[ctx_prof] Extend `WorkloadImportsManager` to use the contextual profile
mtrofin 8e10550
Removed spurious include of BitstreamWriter, as well as (oportunistic…
mtrofin b6479f0
reuse the `ContainedGUIDs` container.
mtrofin 157d38c
llvm_dbgs
mtrofin bfc7245
Merge branch 'main' into thinlto
mtrofin ef3da26
Merge branch 'main' into thinlto
mtrofin 7cab592
added test
mtrofin e5f9ec4
fixes
mtrofin bb58e0f
Merge branch 'main' into thinlto
mtrofin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,6 @@ | |
#include "llvm/ADT/StringRef.h" | ||
#include "llvm/Bitcode/BitcodeReader.h" | ||
#include "llvm/IR/AutoUpgrade.h" | ||
#include "llvm/IR/Constants.h" | ||
#include "llvm/IR/Function.h" | ||
#include "llvm/IR/GlobalAlias.h" | ||
#include "llvm/IR/GlobalObject.h" | ||
|
@@ -30,6 +29,7 @@ | |
#include "llvm/IR/ModuleSummaryIndex.h" | ||
#include "llvm/IRReader/IRReader.h" | ||
#include "llvm/Linker/IRMover.h" | ||
#include "llvm/ProfileData/PGOCtxProfReader.h" | ||
#include "llvm/Support/Casting.h" | ||
#include "llvm/Support/CommandLine.h" | ||
#include "llvm/Support/Debug.h" | ||
|
@@ -185,6 +185,10 @@ static cl::opt<bool> ImportAssumeUniqueLocal( | |
"user specify the full module path."), | ||
cl::Hidden); | ||
|
||
static cl::opt<std::string> | ||
ContextualProfile("thinlto-pgo-ctx-prof", | ||
cl::desc("Path to a contextual profile."), cl::Hidden); | ||
|
||
namespace llvm { | ||
extern cl::opt<bool> EnableMemProfContextDisambiguation; | ||
} | ||
|
@@ -604,13 +608,7 @@ class WorkloadImportsManager : public ModuleImportsManager { | |
LLVM_DEBUG(dbgs() << "[Workload] Done\n"); | ||
} | ||
|
||
public: | ||
WorkloadImportsManager( | ||
function_ref<bool(GlobalValue::GUID, const GlobalValueSummary *)> | ||
IsPrevailing, | ||
const ModuleSummaryIndex &Index, | ||
DenseMap<StringRef, FunctionImporter::ExportSetTy> *ExportLists) | ||
: ModuleImportsManager(IsPrevailing, Index, ExportLists) { | ||
void loadFromJson() { | ||
// Since the workload def uses names, we need a quick lookup | ||
// name->ValueInfo. | ||
StringMap<ValueInfo> NameToValueInfo; | ||
|
@@ -680,15 +678,81 @@ class WorkloadImportsManager : public ModuleImportsManager { | |
} | ||
Set.insert(ElemIt->second); | ||
} | ||
LLVM_DEBUG({ | ||
} | ||
} | ||
|
||
void loadFromCtxProf() { | ||
std::error_code EC; | ||
auto BufferOrErr = MemoryBuffer::getFileOrSTDIN(ContextualProfile); | ||
if (std::error_code EC = BufferOrErr.getError()) { | ||
report_fatal_error("Failed to open contextual profile file"); | ||
return; | ||
} | ||
auto Buffer = std::move(BufferOrErr.get()); | ||
|
||
PGOCtxProfileReader Reader(Buffer->getBuffer()); | ||
auto Ctx = Reader.loadContexts(); | ||
if (!Ctx) { | ||
report_fatal_error("Failed to parse contextual profiles"); | ||
return; | ||
} | ||
const auto &CtxMap = *Ctx; | ||
DenseSet<GlobalValue::GUID> ContainedGUIDs; | ||
for (const auto &[RootGuid, Root] : CtxMap) { | ||
// Avoid ContainedGUIDs to get in/out of scope. Reuse its memory for | ||
// subsequent roots, but clear its contents. | ||
ContainedGUIDs.clear(); | ||
|
||
auto RootVI = Index.getValueInfo(RootGuid); | ||
if (!RootVI) { | ||
LLVM_DEBUG(dbgs() << "[Workload] Root " << RootGuid | ||
<< " not found in this linkage unit.\n"); | ||
continue; | ||
} | ||
if (RootVI.getSummaryList().size() != 1) { | ||
LLVM_DEBUG(dbgs() << "[Workload] Root " << RootGuid | ||
<< " should have exactly one summary, but has " | ||
<< RootVI.getSummaryList().size() << ". Skipping.\n"); | ||
continue; | ||
} | ||
StringRef RootDefiningModule = | ||
RootVI.getSummaryList().front()->modulePath(); | ||
LLVM_DEBUG(dbgs() << "[Workload] Root defining module for " << RootGuid | ||
<< " is : " << RootDefiningModule << "\n"); | ||
auto &Set = Workloads[RootDefiningModule]; | ||
Root.getContainedGuids(ContainedGUIDs); | ||
for (auto Guid : ContainedGUIDs) | ||
if (auto VI = Index.getValueInfo(Guid)) | ||
Set.insert(VI); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The json case has some debug printing of the eventual Set contents - needed here too? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved in a common place. |
||
} | ||
} | ||
|
||
public: | ||
WorkloadImportsManager( | ||
function_ref<bool(GlobalValue::GUID, const GlobalValueSummary *)> | ||
IsPrevailing, | ||
const ModuleSummaryIndex &Index, | ||
DenseMap<StringRef, FunctionImporter::ExportSetTy> *ExportLists) | ||
: ModuleImportsManager(IsPrevailing, Index, ExportLists) { | ||
if (ContextualProfile.empty() == WorkloadDefinitions.empty()) { | ||
report_fatal_error( | ||
"Pass only one of: -thinlto-pgo-ctx-prof or -thinlto-workload-def"); | ||
return; | ||
} | ||
if (!ContextualProfile.empty()) | ||
loadFromCtxProf(); | ||
else | ||
loadFromJson(); | ||
LLVM_DEBUG({ | ||
for (const auto &[Root, Set] : Workloads) { | ||
dbgs() << "[Workload] Root: " << Root << " we have " << Set.size() | ||
<< " distinct callees.\n"; | ||
for (const auto &VI : Set) { | ||
dbgs() << "[Workload] Root: " << Root | ||
<< " Would include: " << VI.getGUID() << "\n"; | ||
} | ||
}); | ||
} | ||
} | ||
}); | ||
} | ||
}; | ||
|
||
|
@@ -697,7 +761,7 @@ std::unique_ptr<ModuleImportsManager> ModuleImportsManager::create( | |
IsPrevailing, | ||
const ModuleSummaryIndex &Index, | ||
DenseMap<StringRef, FunctionImporter::ExportSetTy> *ExportLists) { | ||
if (WorkloadDefinitions.empty()) { | ||
if (WorkloadDefinitions.empty() && ContextualProfile.empty()) { | ||
LLVM_DEBUG(dbgs() << "[Workload] Using the regular imports manager.\n"); | ||
return std::unique_ptr<ModuleImportsManager>( | ||
new ModuleImportsManager(IsPrevailing, Index, ExportLists)); | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
; Test workload based importing via -thinlto-pgo-ctx-prof | ||
; Use external linkage symbols so we don't depend on module paths which are | ||
; used when computing the GUIDs of internal linkage symbols. | ||
; The functionality is shared with what workload.ll tests, so here we only care | ||
; about testing the ctx profile is loaded and handled correctly. | ||
; | ||
; Set up | ||
; RUN: rm -rf %t | ||
; RUN: mkdir -p %t | ||
; RUN: split-file %s %t | ||
; | ||
; RUN: opt -module-summary %t/m1.ll -o %t/m1.bc | ||
; RUN: opt -module-summary %t/m2.ll -o %t/m2.bc | ||
; RUN: llvm-dis %t/m1.bc -o - | FileCheck %s --check-prefix=GUIDS-1 | ||
; RUN: llvm-dis %t/m2.bc -o - | FileCheck %s --check-prefix=GUIDS-2 | ||
; | ||
; GUIDS-1: name: "m1_f1" | ||
; GUIDS-1-SAME: guid = 6019442868614718803 | ||
; GUIDS-2: name: "m2_f1" | ||
; GUIDS-2-SAME: guid = 15593096274670919754 | ||
; | ||
; RUN: rm -rf %t_baseline | ||
; RUN: rm -rf %t_exp | ||
; RUN: mkdir -p %t_baseline | ||
; RUN: mkdir -p %t_exp | ||
; | ||
; Normal run. m1 shouldn't get m2_f1 because it's not referenced from there, and | ||
; m1_f1 shouldn't go to m2. | ||
; | ||
; RUN: llvm-lto2 run %t/m1.bc %t/m2.bc \ | ||
; RUN: -o %t_baseline/result.o -save-temps \ | ||
; RUN: -r %t/m1.bc,m1_f1,plx \ | ||
; RUN: -r %t/m2.bc,m2_f1,plx | ||
; RUN: llvm-dis %t_baseline/result.o.1.3.import.bc -o - | FileCheck %s --check-prefix=NOPROF-1 | ||
; RUN: llvm-dis %t_baseline/result.o.2.3.import.bc -o - | FileCheck %s --check-prefix=NOPROF-2 | ||
; | ||
; NOPROF-1-NOT: m2_f1() | ||
; NOPROF-2-NOT: m1_f1() | ||
; | ||
; The run with workload definitions - same other options. | ||
; | ||
; RUN: echo '[ \ | ||
; RUN: {"Guid": 6019442868614718803, "Counters": [1], "Callsites": [[{"Guid": 15593096274670919754, "Counters": [1]}]]}, \ | ||
; RUN: {"Guid": 15593096274670919754, "Counters": [1], "Callsites": [[{"Guid": 6019442868614718803, "Counters": [1]}]]} \ | ||
; RUN: ]' > %t_exp/ctxprof.json | ||
; RUN: llvm-ctxprof-util fromJSON --input %t_exp/ctxprof.json --output %t_exp/ctxprof.bitstream | ||
; RUN: llvm-lto2 run %t/m1.bc %t/m2.bc \ | ||
; RUN: -o %t_exp/result.o -save-temps \ | ||
; RUN: -thinlto-pgo-ctx-prof=%t_exp/ctxprof.bitstream \ | ||
; RUN: -r %t/m1.bc,m1_f1,plx \ | ||
; RUN: -r %t/m2.bc,m2_f1,plx | ||
; RUN: llvm-dis %t_exp/result.o.1.3.import.bc -o - | FileCheck %s --check-prefix=FIRST | ||
; RUN: llvm-dis %t_exp/result.o.2.3.import.bc -o - | FileCheck %s --check-prefix=SECOND | ||
; | ||
; | ||
; FIRST: m2_f1() | ||
; SECOND: m1_f1() | ||
; | ||
;--- m1.ll | ||
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" | ||
target triple = "x86_64-pc-linux-gnu" | ||
|
||
define dso_local void @m1_f1() { | ||
ret void | ||
} | ||
|
||
;--- m2.ll | ||
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" | ||
target triple = "x86_64-pc-linux-gnu" | ||
|
||
define dso_local void @m2_f1() { | ||
ret void | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a test to exercise this handling?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't currently have a textual representation of the contextual profile, and the import manager is internal to this file, meaning we can't write a unittest. I'd do either, though, if the new functionality was more involved, but it's really just taking data from the ctx profile reader - which is tested - and filling a set with it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant a lit test. I think it would be good to add (reading the binary format like I am assuming the ctx profile reader tests do?), otherwise this is untested functionality.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right - need to figure out where to place it, because it would need to be a test that runs a program to generate a profile. Meaning it needs compiler-rt.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done.