/* End PBXBuildStyle section */
/* Begin PBXFileReference section */
+ CF9BCD0808C74DE0001E7011 /* SubtargetFeature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SubtargetFeature.h; sourceTree = "<group>"; };
+ CF9BCD1508C75070001E7011 /* SubtargetFeature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SubtargetFeature.cpp; sourceTree = "<group>"; };
DE66EC5B08ABE86900323D32 /* AsmWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = AsmWriter.cpp; path = ../lib/VMCore/AsmWriter.cpp; sourceTree = SOURCE_ROOT; };
DE66EC5C08ABE86A00323D32 /* BasicBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = BasicBlock.cpp; path = ../lib/VMCore/BasicBlock.cpp; sourceTree = SOURCE_ROOT; };
DE66EC5D08ABE86A00323D32 /* ConstantFolding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ConstantFolding.cpp; path = ../lib/VMCore/ConstantFolding.cpp; sourceTree = SOURCE_ROOT; };
DE66EFC908ABEE5F00323D32 /* SparcV9 */,
DE66F09308ABEE6000323D32 /* X86 */,
DE66EF1008ABEE5E00323D32 /* MRegisterInfo.cpp */,
+ CF9BCD1508C75070001E7011 /* SubtargetFeature.cpp */,
DE66F08A08ABEE6000323D32 /* Target.td */,
DE66F08B08ABEE6000323D32 /* TargetData.cpp */,
DE66F08C08ABEE6000323D32 /* TargetFrameInfo.cpp */,
isa = PBXGroup;
children = (
DE66F2A008ABF03200323D32 /* MRegisterInfo.h */,
+ CF9BCD0808C74DE0001E7011 /* SubtargetFeature.h */,
DE66F2A108ABF03200323D32 /* TargetData.h */,
DE66F2A208ABF03200323D32 /* TargetFrameInfo.h */,
DE66F2A308ABF03200323D32 /* TargetInstrInfo.h */,
PRODUCT_NAME = LLVM;
};
buildToolPath = /usr/bin/make;
- buildWorkingDirectory = /llvm/obj;
+ buildWorkingDirectory = /llvm/obj/;
dependencies = (
);
name = LLVM;
struct Entry {
const char *Name;
const char *ShortDesc;
- TargetMachine *(*CtorFn)(const Module &, IntrinsicLowering*);
+ TargetMachine *(*CtorFn)(const Module &, IntrinsicLowering*,
+ const std::string &);
unsigned (*ModuleMatchQualityFn)(const Module &M);
unsigned (*JITMatchQualityFn)();
protected:
Entry(const char *N, const char *SD,
- TargetMachine *(*CF)(const Module &, IntrinsicLowering*),
+ TargetMachine *(*CF)(const Module &, IntrinsicLowering*,
+ const std::string &),
unsigned (*MMF)(const Module &M), unsigned (*JMF)());
private:
const Entry *Next; // Next entry in the linked list.
&TargetMachineImpl::getJITMatchQuality) {
}
private:
- static TargetMachine *Allocator(const Module &M, IntrinsicLowering *IL) {
- return new TargetMachineImpl(M, IL);
+ static TargetMachine *Allocator(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS) {
+ return new TargetMachineImpl(M, IL, FS);
}
};
#include "JIT.h"
#include "llvm/Module.h"
#include "llvm/ModuleProvider.h"
+#include "llvm/Target/SubtargetFeature.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetMachineRegistry.h"
#include <iostream>
static cl::opt<const TargetMachineRegistry::Entry*, false, TargetNameParser>
MArch("march", cl::desc("Architecture to generate assembly for:"));
+static cl::opt<std::string>
+MCPU("mcpu",
+ cl::desc("Target a specific cpu type"),
+ cl::value_desc("cpu-name"),
+ cl::init(""));
+
+static cl::list<std::string>
+MAttrs("mattr",
+ cl::CommaSeparated,
+ cl::desc("Target specific attributes:"),
+ cl::value_desc("attributes"));
+
/// create - Create an return a new JIT compiler if there is one available
/// for the current target. Otherwise, return null.
///
<< "-march switch.\n";
}
+ // Package up features to be passed to target/subtarget
+ std::string FeaturesStr;
+ if (MCPU.size() || MAttrs.size()) {
+ SubtargetFeatures Features;
+ Features.setCPU(MCPU);
+ for (unsigned i = 0; i != MAttrs.size(); ++i)
+ Features.AddFeature(MAttrs[i]);
+ FeaturesStr = Features.getString();
+ }
+
// Allocate a target...
- TargetMachine *Target = MArch->CtorFn(*MP->getModule(), IL);
+ TargetMachine *Target = MArch->CtorFn(*MP->getModule(), IL, FeaturesStr);
assert(Target && "Could not allocate target machine!");
// If the target supports JIT code generation, return a new JIT now.
#endif
}
-AlphaTargetMachine::AlphaTargetMachine( const Module &M, IntrinsicLowering *IL)
+AlphaTargetMachine::AlphaTargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS)
: TargetMachine("alpha", IL, true),
FrameInfo(TargetFrameInfo::StackGrowsDown, 16, 0),
JITInfo(*this)
AlphaJITInfo JITInfo;
public:
- AlphaTargetMachine(const Module &M, IntrinsicLowering *IL);
+ AlphaTargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS);
virtual const AlphaInstrInfo *getInstrInfo() const { return &InstrInfo; }
virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; }
class IntrinsicLowering;
struct CTargetMachine : public TargetMachine {
- CTargetMachine(const Module &M, IntrinsicLowering *IL) :
+ CTargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS) :
TargetMachine("CBackend", IL, M) {}
// This is the only thing that actually does anything here.
/// IA64TargetMachine ctor - Create an LP64 architecture model
///
-IA64TargetMachine::IA64TargetMachine(const Module &M, IntrinsicLowering *IL)
+IA64TargetMachine::IA64TargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS)
: TargetMachine("IA64", IL, true),
FrameInfo(TargetFrameInfo::StackGrowsDown, 16, 0) { // FIXME? check this stuff
}
TargetFrameInfo FrameInfo;
//IA64JITInfo JITInfo;
public:
- IA64TargetMachine(const Module &M, IntrinsicLowering *IL);
+ IA64TargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS);
virtual const IA64InstrInfo *getInstrInfo() const { return &InstrInfo; }
virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; }
#include "PowerPC.h"
#include "llvm/Module.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Target/SubtargetFeature.h"
+
using namespace llvm;
PPCTargetEnum llvm::PPCTarget = TargetDefault;
cl::desc("Enable optimizations for GP cpus"));
}
+enum PowerPCFeature {
+ PowerPCFeature64Bit = 1 << 0,
+ PowerPCFeatureAltivec = 1 << 1,
+ PowerPCFeatureFSqrt = 1 << 2,
+ PowerPCFeatureGPUL = 1 << 3,
+};
+
+/// Sorted (by key) array of values for CPU subtype.
+static const SubtargetFeatureKV PowerPCSubTypeKV[] = {
+ { "601" , 0 },
+ { "602" , 0 },
+ { "603" , 0 },
+ { "603e" , 0 },
+ { "603ev" , 0 },
+ { "604" , 0 },
+ { "604e" , 0 },
+ { "620" , 0 },
+ { "7400" , PowerPCFeatureAltivec },
+ { "7450" , PowerPCFeatureAltivec },
+ { "750" , 0 },
+ { "970" , PowerPCFeature64Bit | PowerPCFeatureAltivec |
+ PowerPCFeatureFSqrt | PowerPCFeatureGPUL },
+ { "g3" , 0 },
+ { "g4" , PowerPCFeatureAltivec },
+ { "g4+" , PowerPCFeatureAltivec },
+ { "g5" , PowerPCFeature64Bit | PowerPCFeatureAltivec |
+ PowerPCFeatureFSqrt | PowerPCFeatureGPUL },
+ { "generic", 0 }
+};
+/// Length of PowerPCSubTypeKV.
+static const unsigned PowerPCSubTypeKVSize = sizeof(PowerPCSubTypeKV)
+ / sizeof(SubtargetFeatureKV);
+
+/// Sorted (by key) array of values for CPU features.
+static SubtargetFeatureKV PowerPCFeatureKV[] = {
+ { "64bit" , PowerPCFeature64Bit },
+ { "altivec", PowerPCFeatureAltivec },
+ { "fsqrt" , PowerPCFeatureFSqrt },
+ { "gpul" , PowerPCFeatureGPUL }
+ };
+/// Length of PowerPCFeatureKV.
+static const unsigned PowerPCFeatureKVSize = sizeof(PowerPCFeatureKV)
+ / sizeof(SubtargetFeatureKV);
+
+
#if defined(__APPLE__)
#include <mach/mach.h>
#include <mach/mach_host.h>
#include <mach/host_info.h>
#include <mach/machine.h>
-static boolean_t IsGP() {
+/// GetCurrentPowerPCFeatures - Returns the current CPUs features.
+static const char *GetCurrentPowerPCCPU() {
host_basic_info_data_t hostInfo;
mach_msg_type_number_t infoCount;
infoCount = HOST_BASIC_INFO_COUNT;
host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)&hostInfo,
&infoCount);
+
+ if (hostInfo.cpu_type != CPU_TYPE_POWERPC) return "generic";
+
+ switch(hostInfo.cpu_subtype) {
+ case CPU_SUBTYPE_POWERPC_601: return "601";
+ case CPU_SUBTYPE_POWERPC_602: return "602";
+ case CPU_SUBTYPE_POWERPC_603: return "603";
+ case CPU_SUBTYPE_POWERPC_603e: return "603e";
+ case CPU_SUBTYPE_POWERPC_603ev: return "603ev";
+ case CPU_SUBTYPE_POWERPC_604: return "604";
+ case CPU_SUBTYPE_POWERPC_604e: return "604e";
+ case CPU_SUBTYPE_POWERPC_620: return "620";
+ case CPU_SUBTYPE_POWERPC_750: return "750";
+ case CPU_SUBTYPE_POWERPC_7400: return "7400";
+ case CPU_SUBTYPE_POWERPC_7450: return "7450";
+ case CPU_SUBTYPE_POWERPC_970: return "970";
+ default: ;
+ }
- return ((hostInfo.cpu_type == CPU_TYPE_POWERPC) &&
- (hostInfo.cpu_subtype == CPU_SUBTYPE_POWERPC_970));
-}
+ return "generic";
+}
#endif
-PPCSubtarget::PPCSubtarget(const Module &M)
+PPCSubtarget::PPCSubtarget(const Module &M, const std::string &FS)
: StackAlignment(16), IsGigaProcessor(false), IsAIX(false), IsDarwin(false) {
- // Set the boolean corresponding to the current target triple, or the default
+ // Determine default and user specified characteristics
+ std::string CPU;
+#if defined(__APPLE__)
+ CPU = GetCurrentPowerPCCPU();
+#endif
+ uint32_t Bits =
+ SubtargetFeatures::Parse(FS, CPU,
+ PowerPCSubTypeKV, PowerPCSubTypeKVSize,
+ PowerPCFeatureKV, PowerPCFeatureKVSize);
+ IsGigaProcessor = (Bits & PowerPCFeatureGPUL) != 0;
+
+ // Set the boolean corresponding to the current target triple, or the default
// if one cannot be determined, to true.
const std::string& TT = M.getTargetTriple();
if (TT.length() > 5) {
IsDarwin = TT.find("darwin") != std::string::npos;
-#if defined(__APPLE__)
- IsGigaProcessor = IsGP();
-#endif
} else if (TT.empty()) {
#if defined(_POWER)
IsAIX = true;
#elif defined(__APPLE__)
IsDarwin = true;
- IsGigaProcessor = IsGP();
#endif
}
#include "llvm/Target/TargetSubtarget.h"
+#include <string>
+
namespace llvm {
class Module;
/// This constructor initializes the data members to match that
/// of the specified module.
///
- PPCSubtarget(const Module &M);
+ PPCSubtarget(const Module &M, const std::string &FS);
/// getStackAlignment - Returns the minimum alignment known to hold of the
/// stack frame on entry to the function and which must be maintained by every
PowerPCTargetMachine::PowerPCTargetMachine(const std::string &name,
IntrinsicLowering *IL,
const Module &M,
+ const std::string &FS,
const TargetData &TD,
const PowerPCFrameInfo &TFI)
-: TargetMachine(name, IL, TD), FrameInfo(TFI), Subtarget(M) {
+: TargetMachine(name, IL, TD), FrameInfo(TFI), Subtarget(M, FS) {
if (TargetDefault == PPCTarget) {
if (Subtarget.isAIX()) PPCTarget = TargetAIX;
if (Subtarget.isDarwin()) PPCTarget = TargetDarwin;
/// PowerPCTargetMachine ctor - Create an ILP32 architecture model
///
-PPC32TargetMachine::PPC32TargetMachine(const Module &M, IntrinsicLowering *IL)
- : PowerPCTargetMachine(PPC32ID, IL, M,
+PPC32TargetMachine::PPC32TargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS)
+ : PowerPCTargetMachine(PPC32ID, IL, M, FS,
TargetData(PPC32ID,false,4,4,4,4,4,4,2,1,1),
PowerPCFrameInfo(*this, false)), JITInfo(*this) {}
PPC32JITInfo JITInfo;
public:
- PPC32TargetMachine(const Module &M, IntrinsicLowering *IL);
+ PPC32TargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS);
virtual const PPC32InstrInfo *getInstrInfo() const { return &InstrInfo; }
virtual const MRegisterInfo *getRegisterInfo() const {
return &InstrInfo.getRegisterInfo();
PPCSubtarget Subtarget;
protected:
PowerPCTargetMachine(const std::string &name, IntrinsicLowering *IL,
- const Module &M, const TargetData &TD,
+ const Module &M, const std::string &FS,
+ const TargetData &TD,
const PowerPCFrameInfo &TFI);
public:
virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; }
/// SkeletonTargetMachine ctor - Create an ILP32 architecture model
///
SkeletonTargetMachine::SkeletonTargetMachine(const Module &M,
- IntrinsicLowering *IL)
+ IntrinsicLowering *IL,
+ const std::string &FS)
: TargetMachine("Skeleton", IL, true, 4, 4, 4, 4, 4),
FrameInfo(TargetFrameInfo::StackGrowsDown, 8, -4), JITInfo(*this) {
}
TargetFrameInfo FrameInfo;
SkeletonJITInfo JITInfo;
public:
- SkeletonTargetMachine(const Module &M, IntrinsicLowering *IL);
+ SkeletonTargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS);
virtual const SkeletonInstrInfo *getInstrInfo() const { return &InstrInfo; }
virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; }
/// SparcV8TargetMachine ctor - Create an ILP32 architecture model
///
SparcV8TargetMachine::SparcV8TargetMachine(const Module &M,
- IntrinsicLowering *IL)
+ IntrinsicLowering *IL,
+ const std::string &FS)
: TargetMachine("SparcV8", IL, false, 4, 4),
FrameInfo(TargetFrameInfo::StackGrowsDown, 8, 0), JITInfo(*this) {
}
TargetFrameInfo FrameInfo;
SparcV8JITInfo JITInfo;
public:
- SparcV8TargetMachine(const Module &M, IntrinsicLowering *IL);
+ SparcV8TargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS);
virtual const SparcV8InstrInfo *getInstrInfo() const { return &InstrInfo; }
virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; }
/// SparcV8TargetMachine ctor - Create an ILP32 architecture model
///
SparcV8TargetMachine::SparcV8TargetMachine(const Module &M,
- IntrinsicLowering *IL)
+ IntrinsicLowering *IL,
+ const std::string &FS)
: TargetMachine("SparcV8", IL, false, 4, 4),
FrameInfo(TargetFrameInfo::StackGrowsDown, 8, 0), JITInfo(*this) {
}
TargetFrameInfo FrameInfo;
SparcV8JITInfo JITInfo;
public:
- SparcV8TargetMachine(const Module &M, IntrinsicLowering *IL);
+ SparcV8TargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS);
virtual const SparcV8InstrInfo *getInstrInfo() const { return &InstrInfo; }
virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; }
SparcV9TargetMachine::SparcV9TargetMachine(const Module &M,
- IntrinsicLowering *il)
+ IntrinsicLowering *il,
+ const std::string &FS)
: TargetMachine("UltraSparcV9-Native", il, false),
schedInfo(*this),
regInfo(*this),
SparcV9FrameInfo frameInfo;
SparcV9JITInfo jitInfo;
public:
- SparcV9TargetMachine(const Module &M, IntrinsicLowering *IL);
+ SparcV9TargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS);
virtual const TargetInstrInfo *getInstrInfo() const { return &instrInfo; }
virtual const TargetSchedInfo *getSchedInfo() const { return &schedInfo; }
static TargetRegistrationListener *Listeners = 0;
TargetMachineRegistry::Entry::Entry(const char *N, const char *SD,
- TargetMachine *(*CF)(const Module &, IntrinsicLowering*),
+ TargetMachine *(*CF)(const Module &, IntrinsicLowering*,
+ const std::string &),
unsigned (*MMF)(const Module &M), unsigned (*JMF)())
: Name(N), ShortDesc(SD), CtorFn(CF), ModuleMatchQualityFn(MMF),
JITMatchQualityFn(JMF), Next(List) {
#include "llvm/Module.h"
using namespace llvm;
-X86Subtarget::X86Subtarget(const Module &M)
+X86Subtarget::X86Subtarget(const Module &M, const std::string &FS)
: TargetSubtarget(), stackAlignment(8),
indirectExternAndWeakGlobals(false), asmDarwinLinkerStubs(false),
asmLeadingUnderscore(false), asmAlignmentIsInBytes(false),
#include "llvm/Target/TargetSubtarget.h"
+#include <string>
+
namespace llvm {
class Module;
/// This constructor initializes the data members to match that
/// of the specified module.
///
- X86Subtarget(const Module &M);
+ X86Subtarget(const Module &M, const std::string &FS);
/// getStackAlignment - Returns the minimum alignment known to hold of the
/// stack frame on entry to the function and which must be maintained by every
/// X86TargetMachine ctor - Create an ILP32 architecture model
///
-X86TargetMachine::X86TargetMachine(const Module &M, IntrinsicLowering *IL)
+X86TargetMachine::X86TargetMachine(const Module &M,
+ IntrinsicLowering *IL,
+ const std::string &FS)
: TargetMachine("X86", IL, true, 4, 4, 4, 4, 4),
- Subtarget(M),
+ Subtarget(M, FS),
FrameInfo(TargetFrameInfo::StackGrowsDown,
Subtarget.getStackAlignment(), -4),
JITInfo(*this) {
TargetFrameInfo FrameInfo;
X86JITInfo JITInfo;
public:
- X86TargetMachine(const Module &M, IntrinsicLowering *IL);
+ X86TargetMachine(const Module &M, IntrinsicLowering *IL,
+ const std::string &FS);
virtual const X86InstrInfo *getInstrInfo() const { return &InstrInfo; }
virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; }
//===----------------------------------------------------------------------===//
#include "llvm/Bytecode/Reader.h"
+#include "llvm/Target/SubtargetFeature.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetMachineRegistry.h"
#include "llvm/Transforms/Scalar.h"
static cl::opt<const TargetMachineRegistry::Entry*, false, TargetNameParser>
MArch("march", cl::desc("Architecture to generate code for:"));
+static cl::opt<std::string>
+MCPU("mcpu",
+ cl::desc("Target a specific cpu type"),
+ cl::value_desc("cpu-name"),
+ cl::init(""));
+
+static cl::list<std::string>
+MAttrs("mattr",
+ cl::CommaSeparated,
+ cl::desc("Target specific attributes:"),
+ cl::value_desc("attributes"));
+
cl::opt<TargetMachine::CodeGenFileType>
FileType("filetype", cl::init(TargetMachine::AssemblyFile),
cl::desc("Choose a file type (not all types are supported by all targets):"),
}
}
- std::auto_ptr<TargetMachine> target(MArch->CtorFn(mod, 0));
+ // Package up features to be passed to target/subtarget
+ std::string FeaturesStr;
+ if (MCPU.size() || MAttrs.size()) {
+ SubtargetFeatures Features;
+ Features.setCPU(MCPU);
+ for (unsigned i = 0; i != MAttrs.size(); ++i)
+ Features.AddFeature(MAttrs[i]);
+ FeaturesStr = Features.getString();
+ }
+
+ std::auto_ptr<TargetMachine> target(MArch->CtorFn(mod, 0, FeaturesStr));
assert(target.get() && "Could not allocate target machine!");
TargetMachine &Target = *target.get();
const TargetData &TD = Target.getTargetData();
projects / oota-llvm.git / commitdiff