Skip to content

Add initial support for PGO instrumentation/use in inputgen #2

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.

Sign up for GitHub

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

Open
boomanaiden154 wants to merge 1 commit into
base: input_gen
Choose a base branch
from
Open

Add initial support for PGO instrumentation/use in inputgen #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions llvm/test/tools/input-gen/pgo.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
; RUN: mkdir -p %t
; RUN: input-gen --verify --output-dir %t --compile-input-gen-executables --input-gen-runtime %S/../../../../input-gen-runtimes/rt-input-gen.cpp --input-run-runtime %S/../../../../input-gen-runtimes/rt-run.cpp --pgo-instr-generate %s
; RUN: %t/input-gen.module.generate.a.out %t 0 1 i64
; RUN: %t/input-gen.module.run.a.out %t/input-gen.module.generate.a.out.input.i64.0.bin i64
; RUN: llvm-profdata merge default.profraw -o %t/default.profdata
; RUN: mkdir -p %t.withpgo
; RUN: input-gen --verify --output-dir %t.withpgo --compile-input-gen-executables --input-gen-runtime %S/../../../../input-gen-runtimes/rt-input-gen.cpp --input-run-runtime %S/../../../../input-gen-runtimes/rt-run.cpp --pgo-instr-use %t/default.profdata %s

define dso_local i64 @i64(ptr noundef %LL) local_unnamed_addr #0 {
entry:
%a = load i64, ptr %LL
store i64 %a, ptr %LL
ret i64 %a
}
36 changes: 33 additions & 3 deletions llvm/tools/input-gen/input-gen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ static cl::opt<bool>
ClOptimizeBeforeInstrumenting("optimize-before-instrumenting",
cl::cat(InputGenCategory));

static cl::opt<bool> ClInstrumentedPGOGenerate("pgo-instr-generate",
cl::cat(InputGenCategory));

static cl::opt<std::string> ClInstrumentedPGOUse("pgo-instr-use",
cl::cat(InputGenCategory));

constexpr char ToolName[] = "input-gen";

[[noreturn]] static void fatalError(const Twine &Message) {
Expand Down Expand Up @@ -269,8 +275,16 @@ class InputGenOrchestration {
llvm::outs() << "Writing instrumented module to file failed\n";
exit(1);
}

bool InstrumentBinaryPGO = false;
std::string PGOProfilePath = "";
if (Mode == llvm::IG_Run) {
InstrumentBinaryPGO = ClInstrumentedPGOGenerate;
PGOProfilePath = ClInstrumentedPGOUse;
}
if (ClCompileInputGenExecutables) {
if (!compileExecutable(BcFileName, ExecutableFileName, RuntimeName)) {
if (!compileExecutable(BcFileName, ExecutableFileName, RuntimeName,
InstrumentBinaryPGO, PGOProfilePath)) {
llvm::outs() << "Compiling instrumented module failed\n";
exit(1);
}
Expand Down Expand Up @@ -333,12 +347,22 @@ class InputGenOrchestration {
}

bool compileExecutable(std::string ModuleName, std::string ExecutableName,
std::string RuntimeName) {
std::string RuntimeName,
bool GenInstrumentationPGO = false,
std::string PGOProfilePath = "") {
if (ClCompileInputGenExecutables) {
outs() << "Compiling " << ExecutableName << "\n";
SmallVector<StringRef, 10> Args = {
SmallVector<StringRef, 11> Args = {
Clang, "-fopenmp", "-O2", "-ldl", "-rdynamic",
RuntimeName, ModuleName, "-o", ExecutableName};
assert(!(GenInstrumentationPGO && !PGOProfilePath.empty()) &&
"Cannot instrument and use profile at the same time.");
std::string ProfileInstrUseArg = "-fprofile-instr-use=" + PGOProfilePath;
if (GenInstrumentationPGO)
Args.push_back("-fprofile-instr-generate");
else if (!PGOProfilePath.empty()) {
Args.push_back(ProfileInstrUseArg);
}
if (ClDebug)
Args.push_back("-g");
std::string ErrMsg;
Expand Down Expand Up @@ -376,6 +400,12 @@ int main(int argc, char **argv) {
return 1;
}

if (ClInstrumentedPGOGenerate && !ClInstrumentedPGOUse.empty()) {
ExitOnErr(make_error<StringError>(
"Cannot use a PGO profile while instrumenting the program.",
errc::invalid_argument));
}

InputGenOrchestration IGO(*M);

IGO.init(argc, argv);
Expand Down