areusch commented on code in PR #12140: URL: https://github.com/apache/tvm/pull/12140#discussion_r928473224
########## src/target/llvm/llvm_scope.cc: ########## @@ -0,0 +1,368 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#ifdef TVM_LLVM_VERSION + +#include "llvm_scope.h" + +#include <dmlc/base.h> +#include <llvm/ADT/ArrayRef.h> +#include <llvm/ADT/StringRef.h> +#if TVM_LLVM_VERSION >= 150 +#include <llvm/IR/FMF.h> +#else +#include <llvm/IR/Operator.h> +#endif +#include <llvm/IR/LLVMContext.h> +#include <llvm/IR/Metadata.h> +#include <llvm/IR/Module.h> +#include <llvm/IRReader/IRReader.h> +#if TVM_LLVM_VERSION >= 140 +#include <llvm/MC/TargetRegistry.h> +#else +#include <llvm/Support/TargetRegistry.h> +#endif +#include <llvm/Support/CodeGen.h> +#include <llvm/Support/ErrorOr.h> +#include <llvm/Support/Host.h> +#include <llvm/Support/MemoryBuffer.h> +#include <llvm/Support/SourceMgr.h> +#include <llvm/Support/TargetSelect.h> +#include <llvm/Support/raw_ostream.h> +#include <llvm/Target/TargetMachine.h> +#include <llvm/Target/TargetOptions.h> +#include <tvm/runtime/container/array.h> +#include <tvm/runtime/container/map.h> +#include <tvm/runtime/container/optional.h> +#include <tvm/runtime/container/string.h> +#include <tvm/runtime/logging.h> +#include <tvm/runtime/object.h> +#include <tvm/target/target.h> + +#include <atomic> +#include <sstream> +#include <string> +#include <system_error> + +namespace tvm { +namespace codegen { + +namespace { +namespace defaults { +static const std::string cpu = "generic"; // NOLINT(runtime/string) +static const llvm::CodeGenOpt::Level opt_level = llvm::CodeGenOpt::Aggressive; +} // namespace defaults +} // namespace + +namespace { +bool InitializeLLVM() { + static std::atomic_flag initialized = ATOMIC_FLAG_INIT; Review Comment: why do we need the atomic here? i don't think we typically support multithreaded operation ########## src/target/llvm/llvm_scope.cc: ########## @@ -0,0 +1,368 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#ifdef TVM_LLVM_VERSION + +#include "llvm_scope.h" + +#include <dmlc/base.h> +#include <llvm/ADT/ArrayRef.h> +#include <llvm/ADT/StringRef.h> +#if TVM_LLVM_VERSION >= 150 +#include <llvm/IR/FMF.h> +#else +#include <llvm/IR/Operator.h> +#endif +#include <llvm/IR/LLVMContext.h> +#include <llvm/IR/Metadata.h> +#include <llvm/IR/Module.h> +#include <llvm/IRReader/IRReader.h> +#if TVM_LLVM_VERSION >= 140 +#include <llvm/MC/TargetRegistry.h> +#else +#include <llvm/Support/TargetRegistry.h> +#endif +#include <llvm/Support/CodeGen.h> +#include <llvm/Support/ErrorOr.h> +#include <llvm/Support/Host.h> +#include <llvm/Support/MemoryBuffer.h> +#include <llvm/Support/SourceMgr.h> +#include <llvm/Support/TargetSelect.h> +#include <llvm/Support/raw_ostream.h> +#include <llvm/Target/TargetMachine.h> +#include <llvm/Target/TargetOptions.h> +#include <tvm/runtime/container/array.h> +#include <tvm/runtime/container/map.h> +#include <tvm/runtime/container/optional.h> +#include <tvm/runtime/container/string.h> +#include <tvm/runtime/logging.h> +#include <tvm/runtime/object.h> +#include <tvm/target/target.h> + +#include <atomic> +#include <sstream> +#include <string> +#include <system_error> + +namespace tvm { +namespace codegen { + +namespace { +namespace defaults { +static const std::string cpu = "generic"; // NOLINT(runtime/string) Review Comment: why'd you need the NOLINT? ########## src/target/llvm/llvm_scope.h: ########## @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#ifndef TVM_TARGET_LLVM_LLVM_SCOPE_H_ +#define TVM_TARGET_LLVM_LLVM_SCOPE_H_ + +#ifdef TVM_LLVM_VERSION + +#include <llvm/ADT/ArrayRef.h> +#if TVM_LLVM_VERSION >= 150 +#include <llvm/IR/FMF.h> +#else +#include <llvm/IR/Operator.h> +#endif +#include <llvm/Support/CodeGen.h> +#include <llvm/Target/TargetOptions.h> +#include <tvm/ir/expr.h> +#include <tvm/runtime/container/array.h> +#include <tvm/runtime/container/optional.h> +#include <tvm/runtime/container/string.h> +#include <tvm/target/target.h> + +#include <memory> +#include <string> +#include <utility> +#include <vector> + +namespace llvm { +class LLVMContext; +class MemoryBuffer; +class Module; +class TargetMachine; +} // namespace llvm + +namespace tvm { +namespace codegen { + +class LLVMTarget; Review Comment: can you add some comments to describe these classes? also it'd be great to explain a little bit of the design rationale here so that folks making changes here understand to preserve the consolidation of flags. ########## src/target/llvm/codegen_llvm.cc: ########## @@ -121,38 +121,37 @@ std::unique_ptr<CodeGenLLVM> CodeGenLLVM::Create(llvm::TargetMachine* tm) { } } -void CodeGenLLVM::Init(const std::string& module_name, llvm::TargetMachine* tm, - llvm::LLVMContext* ctx, bool system_lib, bool dynamic_lookup, - bool target_c_runtime) { - InitializeLLVM(); - ctx_ = ctx; - builder_.reset(new IRBuilder(*ctx_)); - module_.reset(new llvm::Module(module_name, *ctx_)); - md_builder_.reset(new llvm::MDBuilder(*ctx_)); +void CodeGenLLVM::Init(const std::string& module_name, LLVMTarget* llvm_target, bool system_lib, + bool dynamic_lookup, bool target_c_runtime) { + llvm_target_ = llvm_target; + llvm::LLVMContext* ctx = llvm_target_->GetContext(); + builder_.reset(new IRBuilder(*ctx)); + module_.reset(new llvm::Module(module_name, *ctx)); + md_builder_.reset(new llvm::MDBuilder(*ctx)); // types - t_void_ = llvm::Type::getVoidTy(*ctx_); - t_void_p_ = llvm::Type::getInt8Ty(*ctx_)->getPointerTo(GetGlobalAddressSpace()); - t_int_ = llvm::Type::getInt32Ty(*ctx_); - t_char_ = llvm::Type::getInt8Ty(*ctx_); - t_int8_ = llvm::Type::getInt8Ty(*ctx_); - t_int16_ = llvm::Type::getInt16Ty(*ctx_); - t_int32_ = llvm::Type::getInt32Ty(*ctx_); - t_int64_ = llvm::Type::getInt64Ty(*ctx_); - t_float64_ = llvm::Type::getDoubleTy(*ctx_); + t_void_ = llvm::Type::getVoidTy(*ctx); + t_void_p_ = llvm::Type::getInt8Ty(*ctx)->getPointerTo(GetGlobalAddressSpace()); + t_int_ = llvm::Type::getInt32Ty(*ctx); + t_char_ = llvm::Type::getInt8Ty(*ctx); + t_int8_ = llvm::Type::getInt8Ty(*ctx); + t_int16_ = llvm::Type::getInt16Ty(*ctx); + t_int32_ = llvm::Type::getInt32Ty(*ctx); + t_int64_ = llvm::Type::getInt64Ty(*ctx); + t_float64_ = llvm::Type::getDoubleTy(*ctx); // meta data md_very_likely_branch_ = md_builder_->createBranchWeights(1 << 20, 1); md_tbaa_root_ = md_builder_->createTBAARoot("tvm-tbaa"); md_tbaa_alias_set_ = md_builder_->createTBAANode("tvm-alias", md_tbaa_root_); - this->InitTarget(tm); + InitTarget(); } void CodeGenLLVM::SetFastMathFlag(llvm::FastMathFlags fmf) { builder_->setFastMathFlags(fmf); } Review Comment: shall we change this to SetFastMathFlags? -- 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]
