Skip to content

Commit 026dc74

Browse files
committed
Update CodeGenOpt to CodeGenOptLevel
See llvm/llvm-project#66295
1 parent cfaba7a commit 026dc74

File tree

3 files changed

+23
-0
lines changed

3 files changed

+23
-0
lines changed

src/aotcompile.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,11 @@ void jl_dump_native_impl(void *native_code,
16341634
jl_ExecutionEngine->getTargetOptions(),
16351635
RelocModel,
16361636
CMModel,
1637+
#if JL_LLVM_VERSION >= 180000
1638+
CodeGenOptLevel::Aggressive // -O3 TODO: respect command -O0 flag?
1639+
#else
16371640
CodeGenOpt::Aggressive // -O3 TODO: respect command -O0 flag?
1641+
#endif
16381642
));
16391643
fixupTM(*SourceTM);
16401644
auto DL = jl_create_datalayout(*SourceTM);

src/jitlayers.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,19 @@ jl_value_t *jl_dump_method_asm_impl(jl_method_instance_t *mi, size_t world,
607607
return jl_dump_function_asm(&llvmf_dump, emit_mc, asm_variant, debuginfo, binary, false);
608608
}
609609

610+
#if JL_LLVM_VERSION >= 180000
611+
CodeGenOptLevel CodeGenOptLevelFor(int optlevel)
612+
{
613+
#ifdef DISABLE_OPT
614+
return CodeGenOptLevel::None;
615+
#else
616+
return optlevel == 0 ? CodeGenOptLevel::None :
617+
optlevel == 1 ? CodeGenOptLevel::Less :
618+
optlevel == 2 ? CodeGenOptLevel::Default :
619+
CodeGenOptLevel::Aggressive;
620+
#endif
621+
}
622+
#else
610623
CodeGenOpt::Level CodeGenOptLevelFor(int optlevel)
611624
{
612625
#ifdef DISABLE_OPT
@@ -618,6 +631,7 @@ CodeGenOpt::Level CodeGenOptLevelFor(int optlevel)
618631
CodeGenOpt::Aggressive;
619632
#endif
620633
}
634+
#endif
621635

622636
static auto countBasicBlocks(const Function &F) JL_NOTSAFEPOINT
623637
{

src/jitlayers.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "julia_internal.h"
2727
#include "platform.h"
2828
#include "llvm-codegen-shared.h"
29+
#include "llvm-version.h"
2930
#include <stack>
3031
#include <queue>
3132

@@ -642,4 +643,8 @@ void optimizeDLSyms(Module &M);
642643
// NewPM
643644
#include "passes.h"
644645

646+
#if JL_LLVM_VERSION >= 180000
647+
CodeGenOptLevel CodeGenOptLevelFor(int optlevel) JL_NOTSAFEPOINT;
648+
#else
645649
CodeGenOpt::Level CodeGenOptLevelFor(int optlevel) JL_NOTSAFEPOINT;
650+
#endif

0 commit comments

Comments
 (0)