RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-11-29 22:50:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rollback changes r89516: Added two SubtargetFeatures::AddFeatures methods, which accept a comma-separated string or already parsed command line parameters as input, and some code re-factoring to use these new methods.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@89893 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Viktor Kutuzov 2009-11-25 22:44:18 +00:00
parent e7c9195706
commit 308f6630a3
3 changed files with 3 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/Target/SubtargetFeature.h
View File

@ -22,7 +22,6 @@
#include <vector>
#include <cstring>
#include "llvm/ADT/Triple.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/System/DataTypes.h"
namespace llvm {
@ -94,12 +93,6 @@ public:
/// Adding Features.
void AddFeature(const std::string &String, bool IsEnabled = true);
/// Add a set of features from the comma-separated string.
void AddFeatures(const std::string &String);
/// Add a set of features from the parsed command line parameters.
void AddFeatures(const cl::list<std::string> &List);
/// Get feature bits.
uint32_t getBits(const SubtargetFeatureKV *CPUTable,
size_t CPUTableSize,

27
lib/Target/SubtargetFeature.cpp
View File

@ -110,33 +110,6 @@ void SubtargetFeatures::AddFeature(const std::string &String,
}
}
/// Add a set of features from the comma-separated string.
void SubtargetFeatures::AddFeatures(const std::string &String)
{
std::vector<std::string> _Features;
Split(_Features, String);
// Nothing is specified.
if (_Features.size() == 0)
return;
for (std::vector<std::string>::iterator it = _Features.begin(),
end = _Features.end(); it != end; ++it) {
// AddFeature will take care of feature string normalization.
AddFeature(*it);
}
}
/// Add a set of features from the parsed command line parameters.
void SubtargetFeatures::AddFeatures(const cl::list<std::string> &List)
{
for (cl::list<std::string>::const_iterator it = List.begin(),
end = List.end(); it != end; ++it) {
// AddFeature will take care of feature string normalization.
AddFeature(*it);
}
}
/// Find KV in array using binary search.
template<typename T> const T *Find(const std::string &S, const T *A, size_t L) {
// Make the lower bound element we're looking for

13
tools/lto/LTOCodeGenerator.cpp
View File

@ -304,17 +304,10 @@ bool LTOCodeGenerator::determineTarget(std::string& errMsg)
break;
}
// Prepare subtarget feature set for the given command line options.
SubtargetFeatures features;
// Set the rest of features by default.
// Note: Please keep this after all explict feature settings to make sure
// defaults will not override explicitly set options.
features.AddFeatures(
SubtargetFeatures::getDefaultSubtargetFeatures(llvm::Triple(Triple)));
// construct LTModule, hand over ownership of module and target
_target = march->createTargetMachine(Triple, features.getString());
const std::string FeatureStr =
SubtargetFeatures::getDefaultSubtargetFeatures(llvm::Triple(Triple));
_target = march->createTargetMachine(Triple, FeatureStr);
}
return false;
}