niyue commented on code in PR #39098:
URL: https://github.com/apache/arrow/pull/39098#discussion_r1417015619
##########
cpp/src/gandiva/engine.cc:
##########
@@ -163,114 +237,50 @@ Status Engine::LoadFunctionIRs() {
}
/// factory method to construct the engine.
-Status Engine::Make(const std::shared_ptr<Configuration>& conf, bool cached,
- std::unique_ptr<Engine>* out) {
+Result<std::unique_ptr<Engine>> Engine::Make(
+ const std::shared_ptr<Configuration>& conf, bool cached,
+ std::optional<std::reference_wrapper<GandivaObjectCache>> object_cache) {
std::call_once(llvm_init_once_flag, InitOnce);
- auto ctx = std::make_unique<llvm::LLVMContext>();
- auto module = std::make_unique<llvm::Module>("codegen", *ctx);
-
- // Capture before moving, ExecutionEngine does not allow retrieving the
- // original Module.
- auto module_ptr = module.get();
-
- auto opt_level =
- conf->optimize() ? llvm::CodeGenOpt::Aggressive : llvm::CodeGenOpt::None;
-
- // Note that the lifetime of the error string is not captured by the
- // ExecutionEngine but only for the lifetime of the builder. Found by
- // inspecting LLVM sources.
- std::string builder_error;
-
- llvm::EngineBuilder engine_builder(std::move(module));
-
- engine_builder.setEngineKind(llvm::EngineKind::JIT)
- .setOptLevel(opt_level)
- .setErrorStr(&builder_error);
-
- if (conf->target_host_cpu()) {
- engine_builder.setMCPU(cpu_name);
- engine_builder.setMAttrs(cpu_attrs);
- }
- std::unique_ptr<llvm::ExecutionEngine> exec_engine{engine_builder.create()};
-
- if (exec_engine == nullptr) {
- return Status::CodeGenError("Could not instantiate llvm::ExecutionEngine:
",
- builder_error);
- }
+ ARROW_ASSIGN_OR_RAISE(auto jtmb, GetTargetMachineBuilder(*conf));
+ ARROW_ASSIGN_OR_RAISE(auto jit, BuildJIT(jtmb, object_cache));
+ auto maybe_tm = jtmb.createTargetMachine();
+ ARROW_ASSIGN_OR_RAISE(auto target_machine,
+ AsArrowResult(maybe_tm, "Could not create target
machine: "));
std::unique_ptr<Engine> engine{
- new Engine(conf, std::move(ctx), std::move(exec_engine), module_ptr,
cached)};
- ARROW_RETURN_NOT_OK(engine->Init());
- *out = std::move(engine);
- return Status::OK();
-}
-
-// This method was modified from its original version for a part of MLIR
-// Original source from
-//
https://github.com/llvm/llvm-project/blob/9f2ce5b915a505a5488a5cf91bb0a8efa9ddfff7/mlir/lib/ExecutionEngine/ExecutionEngine.cpp
-// The original copyright notice follows.
-
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-static void SetDataLayout(llvm::Module* module) {
- auto target_triple = llvm::sys::getDefaultTargetTriple();
- std::string error_message;
- auto target = llvm::TargetRegistry::lookupTarget(target_triple,
error_message);
- if (!target) {
- return;
- }
-
- std::string cpu(llvm::sys::getHostCPUName());
- llvm::SubtargetFeatures features;
- llvm::StringMap<bool> host_features;
-
- if (llvm::sys::getHostCPUFeatures(host_features)) {
- for (auto& f : host_features) {
- features.AddFeature(f.first(), f.second);
- }
- }
-
- std::unique_ptr<llvm::TargetMachine> machine(
- target->createTargetMachine(target_triple, cpu, features.getString(),
{}, {}));
-
- module->setDataLayout(machine->createDataLayout());
Review Comment:
Part of the logic here is moved into `GetTargetMachineBuilder` function.
The `setDataLayout` is called in line 265 within `VerifyAndLinkModule`
function.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
