diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-21 15:21:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-21 15:21:48 +0100 |
commit | 7ac86da31078b5058e5e99582c287d1bbadae5f9 (patch) | |
tree | 26be4f8681525c56d2dbc7d8422fe1fc199056ba | |
parent | a1ddcf0b3462946ec25ff93e8a0c196c4e59e64f (diff) | |
parent | 9bfed00b240b8f3847bbda007147e96e67556314 (diff) |
Merge pull request #30705 from vespa-engine/toregge/llvm-18-has-code-gen-opt-level-enum-class
llvm 18 has CodeGenOptLevel enum class.
-rw-r--r-- | eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp index ca95d822be7..416c0a0827c 100644 --- a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp +++ b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp @@ -25,6 +25,12 @@ #include <vespa/vespalib/util/malloc_mmap_guard.h> #include <limits> +#if LLVM_VERSION_MAJOR < 18 +using CodeGenOptLevel = llvm::CodeGenOpt::Level; +#else +using llvm::CodeGenOptLevel; +#endif + double vespalib_eval_ldexp(double a, double b) { return std::ldexp(a, b); } double vespalib_eval_min(double a, double b) { return std::min(a, b); } double vespalib_eval_max(double a, double b) { return std::max(a, b); } @@ -718,7 +724,7 @@ LLVMWrapper::compile(llvm::raw_ostream * dumpStream) _module->print(*dumpStream, nullptr); } // Set relocation model to silence valgrind on CentOS 8 / aarch64 - _engine.reset(llvm::EngineBuilder(std::move(_module)).setOptLevel(llvm::CodeGenOpt::Aggressive).setRelocationModel(llvm::Reloc::Static).create()); + _engine.reset(llvm::EngineBuilder(std::move(_module)).setOptLevel(CodeGenOptLevel::Aggressive).setRelocationModel(llvm::Reloc::Static).create()); assert(_engine && "llvm jit not available for your platform"); MallocMmapGuard largeAllocsAsMMap(1_Mi); |