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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@89516 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Target/SubtargetFeature.h b/include/llvm/Target/SubtargetFeature.h
index 38a3cc2..fb5dba1 100644
--- a/include/llvm/Target/SubtargetFeature.h
+++ b/include/llvm/Target/SubtargetFeature.h
@@ -22,6 +22,7 @@
#include <vector>
#include <cstring>
#include "llvm/ADT/Triple.h"
+#include "llvm/Support/CommandLine.h"
#include "llvm/System/DataTypes.h"
namespace llvm {
@@ -93,6 +94,12 @@
/// 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,
diff --git a/lib/Target/SubtargetFeature.cpp b/lib/Target/SubtargetFeature.cpp
index 590574e..1085668 100644
--- a/lib/Target/SubtargetFeature.cpp
+++ b/lib/Target/SubtargetFeature.cpp
@@ -110,6 +110,33 @@
}
}
+/// 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
diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index 0b9cb29..f079c2e 100644
--- a/tools/lto/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
@@ -304,10 +304,17 @@
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
- const std::string FeatureStr =
- SubtargetFeatures::getDefaultSubtargetFeatures(llvm::Triple(Triple));
- _target = march->createTargetMachine(Triple, FeatureStr);
+ _target = march->createTargetMachine(Triple, features.getString());
}
return false;
}