Index: llvm/trunk/tools/llvm-exegesis/lib/TargetSelect.h =================================================================== --- llvm/trunk/tools/llvm-exegesis/lib/TargetSelect.h +++ llvm/trunk/tools/llvm-exegesis/lib/TargetSelect.h @@ -0,0 +1,40 @@ +//===-- TargetSelect.h ------------------------------------------*- C++ -*-===// +// +// 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 +// +//===----------------------------------------------------------------------===// +/// +/// \file +/// +/// Utilities to handle the creation of the native exegesis target. +/// +//===----------------------------------------------------------------------===// + +#ifndef LLVM_TOOLS_LLVM_EXEGESIS_TARGET_SELECT_H +#define LLVM_TOOLS_LLVM_EXEGESIS_TARGET_SELECT_H + +namespace llvm { +namespace exegesis { + +#ifdef LLVM_EXEGESIS_INITIALIZE_NATIVE_TARGET +void LLVM_EXEGESIS_INITIALIZE_NATIVE_TARGET(); +#endif + +// Initializes the native exegesis target, or returns false if there is no +// native target (either because llvm-exegesis does not support the target or +// because it's not linked in). +inline bool InitializeNativeExegesisTarget() { +#ifdef LLVM_EXEGESIS_INITIALIZE_NATIVE_TARGET + LLVM_EXEGESIS_INITIALIZE_NATIVE_TARGET(); + return true; +#else + return false; +#endif +} + +} // namespace exegesis +} // namespace llvm + +#endif // LLVM_TOOLS_LLVM_EXEGESIS_TARGET_SELECT_H Index: llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp =================================================================== --- llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp +++ llvm/trunk/tools/llvm-exegesis/llvm-exegesis.cpp @@ -18,6 +18,7 @@ #include "lib/LlvmState.h" #include "lib/PerfHelper.h" #include "lib/Target.h" +#include "lib/TargetSelect.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/Twine.h" #include "llvm/MC/MCInstBuilder.h" @@ -145,10 +146,6 @@ static ExitOnError ExitOnErr; -#ifdef LLVM_EXEGESIS_INITIALIZE_NATIVE_TARGET -void LLVM_EXEGESIS_INITIALIZE_NATIVE_TARGET(); -#endif - // Checks that only one of OpcodeNames, OpcodeIndex or SnippetsFile is provided, // and returns the opcode indices or {} if snippets should be read from // `SnippetsFile`. @@ -370,9 +367,7 @@ llvm::InitializeNativeTarget(); llvm::InitializeNativeTargetAsmPrinter(); llvm::InitializeNativeTargetAsmParser(); -#ifdef LLVM_EXEGESIS_INITIALIZE_NATIVE_TARGET - LLVM_EXEGESIS_INITIALIZE_NATIVE_TARGET(); -#endif + InitializeNativeExegesisTarget(); const LLVMState State(CpuName); const auto Opcodes = getOpcodesOrDie(State.getInstrInfo());