summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-07-15 09:53:37 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-07-15 09:53:37 +0000
commit776fe8db5f09cf55ae7aab2dbf546e01034f4352 (patch)
tree405a1de5d13b8daea4eb76531bda7cdb69c604da /llvm/lib
parent39d2781b04bdf03cb1d3945a8ff4b080975006fc (diff)
downloadbcm5719-llvm-776fe8db5f09cf55ae7aab2dbf546e01034f4352.tar.gz
bcm5719-llvm-776fe8db5f09cf55ae7aab2dbf546e01034f4352.zip
Reimplement TargetMachineRegistry in terms of TargetRegistry.
- This is a temporary hack to aid in incremental refactoring, for now we allocate a new TargetMachineRegistryEntry on every getClosest... call. - No intended functionality change, other than the leaked memory. llvm-svn: 75766
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/TargetMachineRegistry.cpp55
1 files changed, 14 insertions, 41 deletions
diff --git a/llvm/lib/Target/TargetMachineRegistry.cpp b/llvm/lib/Target/TargetMachineRegistry.cpp
index c1a4777c631..4d4652604f0 100644
--- a/llvm/lib/Target/TargetMachineRegistry.cpp
+++ b/llvm/lib/Target/TargetMachineRegistry.cpp
@@ -24,27 +24,14 @@ using namespace llvm;
const TargetMachineRegistry::entry *
TargetMachineRegistry::getClosestStaticTargetForModule(const Module &M,
std::string &Error) {
- std::vector<std::pair<unsigned, const entry *> > UsableTargets;
- for (Registry<TargetMachine>::iterator I = begin(), E = end(); I != E; ++I)
- if (unsigned Qual = I->ModuleMatchQualityFn(M))
- UsableTargets.push_back(std::make_pair(Qual, &*I));
-
- if (UsableTargets.empty()) {
- Error = "No available targets are compatible with this module";
- return 0;
- } else if (UsableTargets.size() == 1)
- return UsableTargets.back().second;
-
- // Otherwise, take the best target, but make sure we don't have two equally
- // good best targets.
- std::sort(UsableTargets.begin(), UsableTargets.end());
- if (UsableTargets.back().first ==UsableTargets[UsableTargets.size()-2].first){
- Error = "Cannot choose between targets \"" +
- std::string(UsableTargets.back().second->Name) + "\" and \"" +
- std::string(UsableTargets[UsableTargets.size()-2].second->Name) + "\"";
+ const Target *T = TargetRegistry::getClosestStaticTargetForModule(M, Error);
+ if (!T)
return 0;
- }
- return UsableTargets.back().second;
+ // FIXME: Temporary hack, please remove.
+ return new TargetMachineRegistry::entry(T->Name, T->ShortDesc,
+ T->TargetMachineCtorFn,
+ T->ModuleMatchQualityFn,
+ T->JITMatchQualityFn);
}
/// getClosestTargetForJIT - Pick the best target that is compatible with
@@ -52,27 +39,13 @@ TargetMachineRegistry::getClosestStaticTargetForModule(const Module &M,
/// and sets the Error string to a reason.
const TargetMachineRegistry::entry *
TargetMachineRegistry::getClosestTargetForJIT(std::string &Error) {
- std::vector<std::pair<unsigned, const entry *> > UsableTargets;
- for (Registry<TargetMachine>::iterator I = begin(), E = end(); I != E; ++I)
- if (unsigned Qual = I->JITMatchQualityFn())
- UsableTargets.push_back(std::make_pair(Qual, &*I));
-
- if (UsableTargets.empty()) {
- Error = "No JIT is available for this host";
+ const Target *T = TargetRegistry::getClosestTargetForJIT(Error);
+ if (!T)
return 0;
- } else if (UsableTargets.size() == 1)
- return UsableTargets.back().second;
-
- // Otherwise, take the best target. If there is a tie, just pick one.
- unsigned MaxQual = UsableTargets.front().first;
- const entry *MaxQualTarget = UsableTargets.front().second;
-
- for (unsigned i = 1, e = UsableTargets.size(); i != e; ++i)
- if (UsableTargets[i].first > MaxQual) {
- MaxQual = UsableTargets[i].first;
- MaxQualTarget = UsableTargets[i].second;
- }
-
- return MaxQualTarget;
+ // FIXME: Temporary hack, please remove.
+ return new TargetMachineRegistry::entry(T->Name, T->ShortDesc,
+ T->TargetMachineCtorFn,
+ T->ModuleMatchQualityFn,
+ T->JITMatchQualityFn);
}
OpenPOWER on IntegriCloud