mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #120995 - durin42:llvm-19-pgo-coldfuncopt, r=cuviper

Browse source 
PassWrapper: adapt for llvm/llvm-project@93cdd1b5cf

Should be no functional change.

`@rustbot` label: +llvm-main
This commit is contained in:
Matthias Krüger 2024-02-13 06:27:41 +01:00 • committed by GitHub
commit 70ea26d349
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View file

@ -43,6 +43,9 @@
#include "llvm/Transforms/Instrumentation.h" #include "llvm/Transforms/Instrumentation.h"
#include "llvm/Transforms/Instrumentation/AddressSanitizer.h" #include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
#include "llvm/Support/TimeProfiler.h" #include "llvm/Support/TimeProfiler.h"
#if LLVM_VERSION_GE(19, 0)
#include "llvm/Support/PGOOptions.h"
#endif
#include "llvm/Transforms/Instrumentation/GCOVProfiler.h" #include "llvm/Transforms/Instrumentation/GCOVProfiler.h"
#include "llvm/Transforms/Instrumentation/InstrProfiling.h" #include "llvm/Transforms/Instrumentation/InstrProfiling.h"
#include "llvm/Transforms/Instrumentation/ThreadSanitizer.h" #include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
@ -749,6 +752,9 @@ LLVMRustOptimize(
FS, FS,
#endif #endif
PGOOptions::IRInstr, PGOOptions::NoCSAction, PGOOptions::IRInstr, PGOOptions::NoCSAction,
#if LLVM_VERSION_GE(19, 0)
PGOOptions::ColdFuncOpt::Default,
#endif
DebugInfoForProfiling); DebugInfoForProfiling);
} else if (PGOUsePath) { } else if (PGOUsePath) {
assert(!PGOSampleUsePath); assert(!PGOSampleUsePath);
@ -758,6 +764,9 @@ LLVMRustOptimize(
FS, FS,
#endif #endif
PGOOptions::IRUse, PGOOptions::NoCSAction, PGOOptions::IRUse, PGOOptions::NoCSAction,
#if LLVM_VERSION_GE(19, 0)
PGOOptions::ColdFuncOpt::Default,
#endif
DebugInfoForProfiling); DebugInfoForProfiling);
} else if (PGOSampleUsePath) { } else if (PGOSampleUsePath) {
PGOOpt = PGOOptions(PGOSampleUsePath, "", "", PGOOpt = PGOOptions(PGOSampleUsePath, "", "",
@ -766,6 +775,9 @@ LLVMRustOptimize(
FS, FS,
#endif #endif
PGOOptions::SampleUse, PGOOptions::NoCSAction, PGOOptions::SampleUse, PGOOptions::NoCSAction,
#if LLVM_VERSION_GE(19, 0)
PGOOptions::ColdFuncOpt::Default,
#endif
DebugInfoForProfiling); DebugInfoForProfiling);
} else if (DebugInfoForProfiling) { } else if (DebugInfoForProfiling) {
PGOOpt = PGOOptions("", "", "", PGOOpt = PGOOptions("", "", "",
@ -774,6 +786,9 @@ LLVMRustOptimize(
FS, FS,
#endif #endif
PGOOptions::NoAction, PGOOptions::NoCSAction, PGOOptions::NoAction, PGOOptions::NoCSAction,
#if LLVM_VERSION_GE(19, 0)
PGOOptions::ColdFuncOpt::Default,
#endif
DebugInfoForProfiling); DebugInfoForProfiling);
} }