Skip to content

Commit 691a478

Browse files
ddunbarddunbar
committed
Simplify JIT target selection.
 - Instead of requiring targets to define a JIT quality match function, we just have them specify if they support a JIT. - Target selection for the JIT just gets the host triple and looks for the best target which matches the triple and has a JIT. llvm-svn: 77060
1 parent 3c2da2b commit 691a478

File tree

17 files changed

+58
-156
lines changed

17 files changed

+58
-156
lines changed

‎llvm/include/llvm/Target/TargetRegistry.h

+10-11
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,15 @@ namespace llvm {
6868
/// of a module.
6969
ModuleMatchQualityFnTy ModuleMatchQualityFn;
7070

71-
/// JITMatchQualityFn - The target function for rating the match quality
72-
/// with the host.
73-
JITMatchQualityFnTy JITMatchQualityFn;
74-
7571
/// Name - The target name.
7672
const char *Name;
7773

7874
/// ShortDesc - A short description of the target.
7975
const char *ShortDesc;
8076

77+
/// HasJIT - Whether this target supports the JIT.
78+
bool HasJIT;
79+
8180
/// TargetMachineCtorFn - Construction function for this target's
8281
/// TargetMachine, if registered.
8382
TargetMachineCtorTy TargetMachineCtorFn;
@@ -100,9 +99,7 @@ namespace llvm {
10099
/// getShortDescription - Get a short description of the target.
101100
const char *getShortDescription() const { return ShortDesc; }
102101

103-
/// getJITMatchQuality - Get the quality of this targets match for use as a
104-
/// JIT.
105-
unsigned getJITMatchQuality() const { return JITMatchQualityFn(); }
102+
bool hasJIT() const { return HasJIT; }
106103

107104
/// hasTargetMachine - Check if this target supports code generation.
108105
bool hasTargetMachine() const { return TargetMachineCtorFn != 0; }
@@ -224,14 +221,14 @@ namespace llvm {
224221
/// this target.
225222
/// @param MQualityFn - The module match quality computation function for
226223
/// this target.
227-
/// @param JITMatchQualityFn - The JIT match quality computation function
228-
/// for this target.
224+
/// @param HasJIT - Whether the target supports JIT code
225+
/// generation.
229226
static void RegisterTarget(Target &T,
230227
const char *Name,
231228
const char *ShortDesc,
232229
Target::TripleMatchQualityFnTy TQualityFn,
233230
Target::ModuleMatchQualityFnTy MQualityFn,
234-
Target::JITMatchQualityFnTy JITQualityFn);
231+
bool HasJIT = false);
235232

236233
/// RegisterTargetMachine - Register a TargetMachine implementation for the
237234
/// given target.
@@ -292,6 +289,8 @@ namespace llvm {
292289
///
293290
/// namespace {
294291
/// struct FooInfo {
292+
/// static const bool HasJIT = ...;
293+
///
295294
/// static unsigned getJITMatchQuality() { ... }
296295
/// static unsigned getTripleMatchQuality(const std::string &) { ... }
297296
/// static unsigned getModuleMatchQuality(const Module &) { ... }
@@ -307,7 +306,7 @@ namespace llvm {
307306
TargetRegistry::RegisterTarget(T, Name, Desc,
308307
&TargetInfoImpl::getTripleMatchQuality,
309308
&TargetInfoImpl::getModuleMatchQuality,
310-
&TargetInfoImpl::getJITMatchQuality);
309+
TargetInfoImpl::HasJIT);
311310
}
312311
};
313312

‎llvm/lib/ExecutionEngine/JIT/TargetSelect.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ TargetMachine *JIT::selectTarget(ModuleProvider *MP, std::string *ErrorStr) {
6565
return 0;
6666
}
6767

68-
if (TheTarget->getJITMatchQuality() == 0) {
68+
if (!TheTarget->hasJIT()) {
6969
cerr << "WARNING: This target JIT is not designed for the host you are"
7070
<< " running. If bad things happen, please choose a different "
7171
<< "-march switch.\n";

‎llvm/lib/Support/TargetRegistry.cpp

+20-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//===----------------------------------------------------------------------===//
99

1010
#include "llvm/Target/TargetRegistry.h"
11+
#include "llvm/System/Host.h"
1112
#include <cassert>
1213
using namespace llvm;
1314

@@ -77,9 +78,18 @@ TargetRegistry::getClosestStaticTargetForModule(const Module &M,
7778
}
7879
}
7980

81+
// FIXME: This is a hack to ignore super weak matches like msil, etc. and look
82+
// by host instead. They will be found again via the triple.
83+
if (Best && BestQuality == 1)
84+
Best = EquallyBest = 0;
85+
86+
// If that failed, try looking up the host triple.
87+
if (!Best)
88+
Best = getClosestStaticTargetForTriple(sys::getHostTriple(), Error);
89+
8090
if (!Best) {
8191
Error = "No available targets are compatible with this module";
82-
return 0;
92+
return Best;
8393
}
8494

8595
// Otherwise, take the best target, but make sure we don't have two equally
@@ -95,6 +105,8 @@ TargetRegistry::getClosestStaticTargetForModule(const Module &M,
95105

96106
const Target *
97107
TargetRegistry::getClosestTargetForJIT(std::string &Error) {
108+
std::string Triple = sys::getHostTriple();
109+
98110
// Provide special warning when no targets are initialized.
99111
if (begin() == end()) {
100112
Error = "No JIT is available for this host (no targets are registered)";
@@ -104,7 +116,10 @@ TargetRegistry::getClosestTargetForJIT(std::string &Error) {
104116
const Target *Best = 0, *EquallyBest = 0;
105117
unsigned BestQuality = 0;
106118
for (iterator it = begin(), ie = end(); it != ie; ++it) {
107-
if (unsigned Qual = it->JITMatchQualityFn()) {
119+
if (!it->hasJIT())
120+
continue;
121+
122+
if (unsigned Qual = it->TripleMatchQualityFn(Triple)) {
108123
if (!Best || Qual > BestQuality) {
109124
Best = &*it;
110125
EquallyBest = 0;
@@ -128,8 +143,8 @@ void TargetRegistry::RegisterTarget(Target &T,
128143
const char *ShortDesc,
129144
Target::TripleMatchQualityFnTy TQualityFn,
130145
Target::ModuleMatchQualityFnTy MQualityFn,
131-
Target::JITMatchQualityFnTy JITQualityFn) {
132-
assert(Name && ShortDesc && TQualityFn && MQualityFn && JITQualityFn &&
146+
bool HasJIT) {
147+
assert(Name && ShortDesc && TQualityFn && MQualityFn &&
133148
"Missing required target information!");
134149

135150
// Check if this target has already been initialized, we allow this as a
@@ -145,6 +160,6 @@ void TargetRegistry::RegisterTarget(Target &T,
145160
T.ShortDesc = ShortDesc;
146161
T.TripleMatchQualityFn = TQualityFn;
147162
T.ModuleMatchQualityFn = MQualityFn;
148-
T.JITMatchQualityFn = JITQualityFn;
163+
T.HasJIT = HasJIT;
149164
}
150165

‎llvm/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp

+4-18
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ using namespace llvm;
1414

1515
Target llvm::TheARMTarget;
1616

17-
static unsigned ARM_JITMatchQuality() {
18-
#if defined(__arm__)
19-
return 10;
20-
#endif
21-
return 0;
22-
}
23-
2417
static unsigned ARM_TripleMatchQuality(const std::string &TT) {
2518
// Match arm-foo-bar, as well as things like armv5blah-*
2619
if (TT.size() >= 4 &&
@@ -45,18 +38,11 @@ static unsigned ARM_ModuleMatchQuality(const Module &M) {
4538
M.getPointerSize() != Module::AnyPointerSize)
4639
return 0; // Match for some other target
4740

48-
return ARM_JITMatchQuality()/2;
41+
return 0;
4942
}
5043

5144
Target llvm::TheThumbTarget;
5245

53-
static unsigned Thumb_JITMatchQuality() {
54-
#if defined(__thumb__)
55-
return 10;
56-
#endif
57-
return 0;
58-
}
59-
6046
static unsigned Thumb_TripleMatchQuality(const std::string &TT) {
6147
// Match thumb-foo-bar, as well as things like thumbv5blah-*
6248
if (TT.size() >= 6 &&
@@ -81,19 +67,19 @@ static unsigned Thumb_ModuleMatchQuality(const Module &M) {
8167
M.getPointerSize() != Module::AnyPointerSize)
8268
return 0; // Match for some other target
8369

84-
return Thumb_JITMatchQuality()/2;
70+
return 0;
8571
}
8672

8773
extern "C" void LLVMInitializeARMTargetInfo() {
8874
TargetRegistry::RegisterTarget(TheARMTarget, "arm",
8975
"ARM",
9076
&ARM_TripleMatchQuality,
9177
&ARM_ModuleMatchQuality,
92-
&ARM_JITMatchQuality);
78+
/*HasJIT=*/true);
9379

9480
TargetRegistry::RegisterTarget(TheThumbTarget, "thumb",
9581
"Thumb",
9682
&Thumb_TripleMatchQuality,
9783
&Thumb_ModuleMatchQuality,
98-
&Thumb_JITMatchQuality);
84+
/*HasJIT=*/true);
9985
}

‎llvm/lib/Target/Alpha/TargetInfo/AlphaTargetInfo.cpp

+2-10
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,6 @@ using namespace llvm;
1414

1515
llvm::Target llvm::TheAlphaTarget;
1616

17-
static unsigned Alpha_JITMatchQuality() {
18-
#ifdef __alpha
19-
return 10;
20-
#else
21-
return 0;
22-
#endif
23-
}
24-
2517
static unsigned Alpha_TripleMatchQuality(const std::string &TT) {
2618
// We strongly match "alpha*".
2719
if (TT.size() >= 5 && TT[0] == 'a' && TT[1] == 'l' && TT[2] == 'p' &&
@@ -46,13 +38,13 @@ static unsigned Alpha_ModuleMatchQuality(const Module &M) {
4638
M.getPointerSize() != Module::AnyPointerSize)
4739
return 0; // Match for some other target
4840

49-
return Alpha_JITMatchQuality()/2;
41+
return 0;
5042
}
5143

5244
extern "C" void LLVMInitializeAlphaTargetInfo() {
5345
TargetRegistry::RegisterTarget(TheAlphaTarget, "alpha",
5446
"Alpha [experimental]",
5547
&Alpha_TripleMatchQuality,
5648
&Alpha_ModuleMatchQuality,
57-
&Alpha_JITMatchQuality);
49+
/*HasJIT=*/true);
5850
}

‎llvm/lib/Target/CBackend/TargetInfo/CBackendTargetInfo.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ using namespace llvm;
1414

1515
Target llvm::TheCBackendTarget;
1616

17-
static unsigned CBackend_JITMatchQuality() {
18-
return 0;
19-
}
20-
2117
static unsigned CBackend_TripleMatchQuality(const std::string &TT) {
2218
// This class always works, but must be requested explicitly on
2319
// llc command line.
@@ -34,6 +30,5 @@ extern "C" void LLVMInitializeCBackendTargetInfo() {
3430
TargetRegistry::RegisterTarget(TheCBackendTarget, "c",
3531
"C backend",
3632
&CBackend_TripleMatchQuality,
37-
&CBackend_ModuleMatchQuality,
38-
&CBackend_JITMatchQuality);
33+
&CBackend_ModuleMatchQuality);
3934
}

‎llvm/lib/Target/CellSPU/TargetInfo/CellSPUTargetInfo.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ using namespace llvm;
1414

1515
Target llvm::TheCellSPUTarget;
1616

17-
static unsigned CellSPU_JITMatchQuality() {
18-
return 0;
19-
}
20-
2117
static unsigned CellSPU_TripleMatchQuality(const std::string &TT) {
2218
// We strongly match "spu-*" or "cellspu-*".
2319
if ((TT.size() == 3 && std::string(TT.begin(), TT.begin()+3) == "spu") ||
@@ -44,6 +40,5 @@ extern "C" void LLVMInitializeCellSPUTargetInfo() {
4440
TargetRegistry::RegisterTarget(TheCellSPUTarget, "cellspu",
4541
"STI CBEA Cell SPU [experimental]",
4642
&CellSPU_TripleMatchQuality,
47-
&CellSPU_ModuleMatchQuality,
48-
&CellSPU_JITMatchQuality);
43+
&CellSPU_ModuleMatchQuality);
4944
}

‎llvm/lib/Target/CppBackend/TargetInfo/CppBackendTargetInfo.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ using namespace llvm;
1414

1515
Target llvm::TheCppBackendTarget;
1616

17-
static unsigned CppBackend_JITMatchQuality() {
18-
return 0;
19-
}
20-
2117
static unsigned CppBackend_TripleMatchQuality(const std::string &TT) {
2218
// This class always works, but shouldn't be the default in most cases.
2319
return 1;
@@ -32,6 +28,5 @@ extern "C" void LLVMInitializeCppBackendTargetInfo() {
3228
TargetRegistry::RegisterTarget(TheCppBackendTarget, "cpp",
3329
"C++ backend",
3430
&CppBackend_TripleMatchQuality,
35-
&CppBackend_ModuleMatchQuality,
36-
&CppBackend_JITMatchQuality);
31+
&CppBackend_ModuleMatchQuality);
3732
}

‎llvm/lib/Target/MSIL/TargetInfo/MSILTargetInfo.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ using namespace llvm;
1414

1515
Target llvm::TheMSILTarget;
1616

17-
static unsigned MSIL_JITMatchQuality() {
18-
return 0;
19-
}
20-
2117
static unsigned MSIL_TripleMatchQuality(const std::string &TT) {
2218
// This class always works, but shouldn't be the default in most cases.
2319
return 1;
@@ -32,6 +28,5 @@ extern "C" void LLVMInitializeMSILTargetInfo() {
3228
TargetRegistry::RegisterTarget(TheMSILTarget, "msil",
3329
"MSIL backend",
3430
&MSIL_TripleMatchQuality,
35-
&MSIL_ModuleMatchQuality,
36-
&MSIL_JITMatchQuality);
31+
&MSIL_ModuleMatchQuality);
3732
}

‎llvm/lib/Target/MSP430/TargetInfo/MSP430TargetInfo.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ using namespace llvm;
1414

1515
Target llvm::TheMSP430Target;
1616

17-
static unsigned MSP430_JITMatchQuality() {
18-
return 0;
19-
}
20-
2117
static unsigned MSP430_TripleMatchQuality(const std::string &TT) {
2218
// We strongly match msp430
2319
if (TT.size() >= 6 && TT[0] == 'm' && TT[1] == 's' && TT[2] == 'p' &&
@@ -42,6 +38,5 @@ extern "C" void LLVMInitializeMSP430TargetInfo() {
4238
TargetRegistry::RegisterTarget(TheMSP430Target, "msp430",
4339
"MSP430 [experimental]",
4440
&MSP430_TripleMatchQuality,
45-
&MSP430_ModuleMatchQuality,
46-
&MSP430_JITMatchQuality);
41+
&MSP430_ModuleMatchQuality);
4742
}

‎llvm/lib/Target/Mips/TargetInfo/MipsTargetInfo.cpp

+2-12
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ using namespace llvm;
1414

1515
Target llvm::TheMipsTarget;
1616

17-
static unsigned Mips_JITMatchQuality() {
18-
return 0;
19-
}
20-
2117
static unsigned Mips_TripleMatchQuality(const std::string &TT) {
2218
// We strongly match "mips*-*".
2319
if (TT.size() >= 5 && std::string(TT.begin(), TT.begin()+5) == "mips-")
@@ -43,10 +39,6 @@ static unsigned Mips_ModuleMatchQuality(const Module &M) {
4339

4440
Target llvm::TheMipselTarget;
4541

46-
static unsigned Mipsel_JITMatchQuality() {
47-
return 0;
48-
}
49-
5042
static unsigned Mipsel_TripleMatchQuality(const std::string &TT) {
5143
// We strongly match "mips*el-*".
5244
if (TT.size() >= 7 && std::string(TT.begin(), TT.begin()+7) == "mipsel-")
@@ -77,12 +69,10 @@ extern "C" void LLVMInitializeMipsTargetInfo() {
7769
TargetRegistry::RegisterTarget(TheMipsTarget, "mips",
7870
"Mips",
7971
&Mips_TripleMatchQuality,
80-
&Mips_ModuleMatchQuality,
81-
&Mips_JITMatchQuality);
72+
&Mips_ModuleMatchQuality);
8273

8374
TargetRegistry::RegisterTarget(TheMipselTarget, "mipsel",
8475
"Mipsel",
8576
&Mipsel_TripleMatchQuality,
86-
&Mipsel_ModuleMatchQuality,
87-
&Mipsel_JITMatchQuality);
77+
&Mipsel_ModuleMatchQuality);
8878
}

0 commit comments

Comments
 (0)