maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use std::bitset for SubtargetFeatures 

Previously, subtarget features were a bitfield with the underlying type being uint64_t. 
Since several targets (X86 and ARM, in particular) have hit or were very close to hitting this bound, switching the features to use a bitset.
No functional change.

The first time this was committed (r229831), it caused several buildbot failures. 
At least some of the ARM ones were due to gcc/binutils issues, and should now be fixed.

Differential Revision: http://reviews.llvm.org/D8542

llvm-svn: 233055
This commit is contained in:
Michael Kuperstein 2015-03-24 09:17:25 +00:00
parent 25122a3c57
commit 774b441b5e
33 changed files with 348 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/include/llvm/MC/MCInstPrinter.h
View File

@ -10,6 +10,7 @@
#ifndef LLVM_MC_MCINSTPRINTER_H #ifndef LLVM_MC_MCINSTPRINTER_H
#define LLVM_MC_MCINSTPRINTER_H #define LLVM_MC_MCINSTPRINTER_H
#include "llvm/MC/SubtargetFeature.h"
#include "llvm/Support/DataTypes.h" #include "llvm/Support/DataTypes.h"
#include "llvm/Support/Format.h" #include "llvm/Support/Format.h"
@ -41,7 +42,7 @@ protected:
const MCRegisterInfo &MRI; const MCRegisterInfo &MRI;
/// The current set of available features. /// The current set of available features.
uint64_t AvailableFeatures; FeatureBitset AvailableFeatures;
/// True if we are printing marked up assembly. /// True if we are printing marked up assembly.
bool UseMarkup; bool UseMarkup;
@ -58,7 +59,7 @@ public:
MCInstPrinter(const MCAsmInfo &mai, const MCInstrInfo &mii, MCInstPrinter(const MCAsmInfo &mai, const MCInstrInfo &mii,
const MCRegisterInfo &mri) const MCRegisterInfo &mri)
: CommentStream(nullptr), MAI(mai), MII(mii), MRI(mri), : CommentStream(nullptr), MAI(mai), MII(mii), MRI(mri),
AvailableFeatures(0), UseMarkup(0), PrintImmHex(0), AvailableFeatures(), UseMarkup(0), PrintImmHex(0),
PrintHexStyle(HexStyle::C) {} PrintHexStyle(HexStyle::C) {}
virtual ~MCInstPrinter(); virtual ~MCInstPrinter();
@ -78,8 +79,8 @@ public:
/// printRegName - Print the assembler register name. /// printRegName - Print the assembler register name.
virtual void printRegName(raw_ostream &OS, unsigned RegNo) const; virtual void printRegName(raw_ostream &OS, unsigned RegNo) const;
uint64_t getAvailableFeatures() const { return AvailableFeatures; } const FeatureBitset& getAvailableFeatures() const { return AvailableFeatures; }
void setAvailableFeatures(uint64_t Value) { AvailableFeatures = Value; } void setAvailableFeatures(const FeatureBitset& Value) { AvailableFeatures = Value; }
bool getUseMarkup() const { return UseMarkup; } bool getUseMarkup() const { return UseMarkup; }
void setUseMarkup(bool Value) { UseMarkup = Value; } void setUseMarkup(bool Value) { UseMarkup = Value; }

4
llvm/include/llvm/MC/MCInstrDesc.h
View File

@ -150,7 +150,7 @@ public:
const uint16_t *ImplicitUses; // Registers implicitly read by this instr const uint16_t *ImplicitUses; // Registers implicitly read by this instr
const uint16_t *ImplicitDefs; // Registers implicitly defined by this instr const uint16_t *ImplicitDefs; // Registers implicitly defined by this instr
const MCOperandInfo *OpInfo; // 'NumOperands' entries about operands const MCOperandInfo *OpInfo; // 'NumOperands' entries about operands
uint64_t DeprecatedFeatureMask;// Feature bits that this is deprecated on, if any FeatureBitset DeprecatedFeatureMask; // Feature bits that this is deprecated on, if any
// A complex method to determine is a certain is deprecated or not, and return // A complex method to determine is a certain is deprecated or not, and return
// the reason for deprecation. // the reason for deprecation.
bool (*ComplexDeprecationInfo)(MCInst &, MCSubtargetInfo &, std::string &); bool (*ComplexDeprecationInfo)(MCInst &, MCSubtargetInfo &, std::string &);
@ -173,7 +173,7 @@ public:
std::string &Info) const { std::string &Info) const {
if (ComplexDeprecationInfo) if (ComplexDeprecationInfo)
return ComplexDeprecationInfo(MI, STI, Info); return ComplexDeprecationInfo(MI, STI, Info);
if ((DeprecatedFeatureMask & STI.getFeatureBits()) != 0) { if ((STI.getFeatureBits() & DeprecatedFeatureMask).any()) {
// FIXME: it would be nice to include the subtarget feature here. // FIXME: it would be nice to include the subtarget feature here.
Info = "deprecated"; Info = "deprecated";
return true; return true;

16
llvm/include/llvm/MC/MCSubtargetInfo.h
View File

@ -42,7 +42,7 @@ class MCSubtargetInfo {
const InstrStage *Stages; // Instruction itinerary stages const InstrStage *Stages; // Instruction itinerary stages
const unsigned *OperandCycles; // Itinerary operand cycles const unsigned *OperandCycles; // Itinerary operand cycles
const unsigned *ForwardingPaths; // Forwarding paths const unsigned *ForwardingPaths; // Forwarding paths
uint64_t FeatureBits; // Feature bits for current CPU + FS FeatureBitset FeatureBits; // Feature bits for current CPU + FS
public: public:
void InitMCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS, void InitMCSubtargetInfo(StringRef TT, StringRef CPU, StringRef FS,
@ -67,13 +67,13 @@ public:
/// getFeatureBits - Return the feature bits. /// getFeatureBits - Return the feature bits.
/// ///
uint64_t getFeatureBits() const { const FeatureBitset& getFeatureBits() const {
return FeatureBits; return FeatureBits;
} }
/// setFeatureBits - Set the feature bits. /// setFeatureBits - Set the feature bits.
/// ///
void setFeatureBits(uint64_t FeatureBits_) { FeatureBits = FeatureBits_; } void setFeatureBits(FeatureBitset& FeatureBits_) { FeatureBits = FeatureBits_; }
/// InitMCProcessorInfo - Set or change the CPU (optionally supplemented with /// InitMCProcessorInfo - Set or change the CPU (optionally supplemented with
/// feature string). Recompute feature bits and scheduling model. /// feature string). Recompute feature bits and scheduling model.
@ -84,11 +84,15 @@ public:
/// ToggleFeature - Toggle a feature and returns the re-computed feature /// ToggleFeature - Toggle a feature and returns the re-computed feature
/// bits. This version does not change the implied bits. /// bits. This version does not change the implied bits.
uint64_t ToggleFeature(uint64_t FB); FeatureBitset ToggleFeature(uint64_t FB);
/// ToggleFeature - Toggle a feature and returns the re-computed feature /// ToggleFeature - Toggle a feature and returns the re-computed feature
/// bits. This version will also change all implied bits. /// bits. This version does not change the implied bits.
uint64_t ToggleFeature(StringRef FS); FeatureBitset ToggleFeature(const FeatureBitset& FB);
/// ToggleFeature - Toggle a set of features and returns the re-computed
/// feature bits. This version will also change all implied bits.
FeatureBitset ToggleFeature(StringRef FS);
/// getSchedModelForCPU - Get the machine model of a CPU. /// getSchedModelForCPU - Get the machine model of a CPU.
/// ///

26
llvm/include/llvm/MC/SubtargetFeature.h
View File

@ -21,11 +21,29 @@
#include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Triple.h" #include "llvm/ADT/Triple.h"
#include "llvm/Support/DataTypes.h" #include "llvm/Support/DataTypes.h"
#include <bitset>
namespace llvm { namespace llvm {
class raw_ostream; class raw_ostream;
class StringRef; class StringRef;
// A container class for subtarget features.
// This is convenient because std::bitset does not have a constructor
// with an initializer list of set bits.
const unsigned MAX_SUBTARGET_FEATURES = 64;
class FeatureBitset : public std::bitset<MAX_SUBTARGET_FEATURES> {
public:
// Cannot inherit constructors because it's not supported by VC++..
FeatureBitset() : bitset() {}
FeatureBitset(const bitset<MAX_SUBTARGET_FEATURES>& B) : bitset(B) {}
FeatureBitset(std::initializer_list<unsigned> Init) : bitset() {
for (auto I = Init.begin() , E = Init.end(); I != E; ++I)
set(*I);
}
};
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// ///
/// SubtargetFeatureKV - Used to provide key value pairs for feature and /// SubtargetFeatureKV - Used to provide key value pairs for feature and
@ -34,8 +52,8 @@ namespace llvm {
struct SubtargetFeatureKV { struct SubtargetFeatureKV {
const char *Key; // K-V key string const char *Key; // K-V key string
const char *Desc; // Help descriptor const char *Desc; // Help descriptor
uint64_t Value; // K-V integer value FeatureBitset Value; // K-V integer value
uint64_t Implies; // K-V bit mask FeatureBitset Implies; // K-V bit mask
// Compare routine for std::lower_bound // Compare routine for std::lower_bound
bool operator<(StringRef S) const { bool operator<(StringRef S) const {
@ -82,11 +100,11 @@ public:
/// ToggleFeature - Toggle a feature and returns the newly updated feature /// ToggleFeature - Toggle a feature and returns the newly updated feature
/// bits. /// bits.
uint64_t ToggleFeature(uint64_t Bits, StringRef String, FeatureBitset ToggleFeature(FeatureBitset Bits, StringRef String,
ArrayRef<SubtargetFeatureKV> FeatureTable); ArrayRef<SubtargetFeatureKV> FeatureTable);
/// Get feature bits of a CPU. /// Get feature bits of a CPU.
uint64_t getFeatureBits(StringRef CPU, FeatureBitset getFeatureBits(StringRef CPU,
ArrayRef<SubtargetFeatureKV> CPUTable, ArrayRef<SubtargetFeatureKV> CPUTable,
ArrayRef<SubtargetFeatureKV> FeatureTable); ArrayRef<SubtargetFeatureKV> FeatureTable);

9
llvm/lib/MC/MCSubtargetInfo.cpp
View File

@ -63,14 +63,19 @@ MCSubtargetInfo::InitMCSubtargetInfo(StringRef TT, StringRef C, StringRef FS,
/// ToggleFeature - Toggle a feature and returns the re-computed feature /// ToggleFeature - Toggle a feature and returns the re-computed feature
/// bits. This version does not change the implied bits. /// bits. This version does not change the implied bits.
uint64_t MCSubtargetInfo::ToggleFeature(uint64_t FB) { FeatureBitset MCSubtargetInfo::ToggleFeature(uint64_t FB) {
FeatureBits.flip(FB);
return FeatureBits;
}
FeatureBitset MCSubtargetInfo::ToggleFeature(const FeatureBitset &FB) {
FeatureBits ^= FB; FeatureBits ^= FB;
return FeatureBits; return FeatureBits;
} }
/// ToggleFeature - Toggle a feature and returns the re-computed feature /// ToggleFeature - Toggle a feature and returns the re-computed feature
/// bits. This version will also change all implied bits. /// bits. This version will also change all implied bits.
uint64_t MCSubtargetInfo::ToggleFeature(StringRef FS) { FeatureBitset MCSubtargetInfo::ToggleFeature(StringRef FS) {
SubtargetFeatures Features; SubtargetFeatures Features;
FeatureBits = Features.ToggleFeature(FeatureBits, FS, ProcFeatures); FeatureBits = Features.ToggleFeature(FeatureBits, FS, ProcFeatures);
return FeatureBits; return FeatureBits;

23
llvm/lib/MC/SubtargetFeature.cpp
View File

@ -150,12 +150,12 @@ std::string SubtargetFeatures::getString() const {
/// feature, set it. /// feature, set it.
/// ///
static static
void SetImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry, void SetImpliedBits(FeatureBitset &Bits, const SubtargetFeatureKV *FeatureEntry,
ArrayRef<SubtargetFeatureKV> FeatureTable) { ArrayRef<SubtargetFeatureKV> FeatureTable) {
for (auto &FE : FeatureTable) { for (auto &FE : FeatureTable) {
if (FeatureEntry->Value == FE.Value) continue; if (FeatureEntry->Value == FE.Value) continue;
if (FeatureEntry->Implies & FE.Value) { if ((FeatureEntry->Implies & FE.Value).any()) {
Bits |= FE.Value; Bits |= FE.Value;
SetImpliedBits(Bits, &FE, FeatureTable); SetImpliedBits(Bits, &FE, FeatureTable);
} }
@ -166,12 +166,13 @@ void SetImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry,
/// feature, clear it. /// feature, clear it.
/// ///
static static
void ClearImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry, void ClearImpliedBits(FeatureBitset &Bits,
const SubtargetFeatureKV *FeatureEntry,
ArrayRef<SubtargetFeatureKV> FeatureTable) { ArrayRef<SubtargetFeatureKV> FeatureTable) {
for (auto &FE : FeatureTable) { for (auto &FE : FeatureTable) {
if (FeatureEntry->Value == FE.Value) continue; if (FeatureEntry->Value == FE.Value) continue;
if (FE.Implies & FeatureEntry->Value) { if ((FE.Implies & FeatureEntry->Value).any()) {
Bits &= ~FE.Value; Bits &= ~FE.Value;
ClearImpliedBits(Bits, &FE, FeatureTable); ClearImpliedBits(Bits, &FE, FeatureTable);
} }
@ -180,8 +181,8 @@ void ClearImpliedBits(uint64_t &Bits, const SubtargetFeatureKV *FeatureEntry,
/// ToggleFeature - Toggle a feature and returns the newly updated feature /// ToggleFeature - Toggle a feature and returns the newly updated feature
/// bits. /// bits.
uint64_t FeatureBitset
SubtargetFeatures::ToggleFeature(uint64_t Bits, StringRef Feature, SubtargetFeatures::ToggleFeature(FeatureBitset Bits, StringRef Feature,
ArrayRef<SubtargetFeatureKV> FeatureTable) { ArrayRef<SubtargetFeatureKV> FeatureTable) {
// Find feature in table. // Find feature in table.
@ -191,7 +192,6 @@ SubtargetFeatures::ToggleFeature(uint64_t Bits, StringRef Feature,
if (FeatureEntry) { if (FeatureEntry) {
if ((Bits & FeatureEntry->Value) == FeatureEntry->Value) { if ((Bits & FeatureEntry->Value) == FeatureEntry->Value) {
Bits &= ~FeatureEntry->Value; Bits &= ~FeatureEntry->Value;
// For each feature that implies this, clear it. // For each feature that implies this, clear it.
ClearImpliedBits(Bits, FeatureEntry, FeatureTable); ClearImpliedBits(Bits, FeatureEntry, FeatureTable);
} else { } else {
@ -212,13 +212,13 @@ SubtargetFeatures::ToggleFeature(uint64_t Bits, StringRef Feature,
/// getFeatureBits - Get feature bits a CPU. /// getFeatureBits - Get feature bits a CPU.
/// ///
uint64_t FeatureBitset
SubtargetFeatures::getFeatureBits(StringRef CPU, SubtargetFeatures::getFeatureBits(StringRef CPU,
ArrayRef<SubtargetFeatureKV> CPUTable, ArrayRef<SubtargetFeatureKV> CPUTable,
ArrayRef<SubtargetFeatureKV> FeatureTable) { ArrayRef<SubtargetFeatureKV> FeatureTable) {
if (CPUTable.empty() || FeatureTable.empty()) if (CPUTable.empty() || FeatureTable.empty())
return 0; return FeatureBitset();
#ifndef NDEBUG #ifndef NDEBUG
for (size_t i = 1, e = CPUTable.size(); i != e; ++i) { for (size_t i = 1, e = CPUTable.size(); i != e; ++i) {
@ -230,7 +230,8 @@ SubtargetFeatures::getFeatureBits(StringRef CPU,
"CPU features table is not sorted"); "CPU features table is not sorted");
} }
#endif #endif
uint64_t Bits = 0; // Resulting bits // Resulting bits
FeatureBitset Bits;
// Check if help is needed // Check if help is needed
if (CPU == "help") if (CPU == "help")
@ -247,7 +248,7 @@ SubtargetFeatures::getFeatureBits(StringRef CPU,
// Set the feature implied by this CPU feature, if any. // Set the feature implied by this CPU feature, if any.
for (auto &FE : FeatureTable) { for (auto &FE : FeatureTable) {
if (CPUEntry->Value & FE.Value) if ((CPUEntry->Value & FE.Value).any())
SetImpliedBits(Bits, &FE, FeatureTable); SetImpliedBits(Bits, &FE, FeatureTable);
} }
} else { } else {

9
llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.cpp
View File

@ -14,6 +14,7 @@
#include "llvm/ADT/APFloat.h" #include "llvm/ADT/APFloat.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include "llvm/MC/SubtargetFeature.h"
#include "llvm/Support/Regex.h" #include "llvm/Support/Regex.h"
using namespace llvm; using namespace llvm;
@ -245,7 +246,7 @@ const AArch64NamedImmMapper::Mapping AArch64SysReg::MRSMapper::MRSPairs[] = {
{"ich_elsr_el2", ICH_ELSR_EL2} {"ich_elsr_el2", ICH_ELSR_EL2}
}; };
AArch64SysReg::MRSMapper::MRSMapper(uint64_t FeatureBits) AArch64SysReg::MRSMapper::MRSMapper(const FeatureBitset &FeatureBits)
: SysRegMapper(FeatureBits) { : SysRegMapper(FeatureBits) {
InstPairs = &MRSPairs[0]; InstPairs = &MRSPairs[0];
NumInstPairs = llvm::array_lengthof(MRSPairs); NumInstPairs = llvm::array_lengthof(MRSPairs);
@ -269,7 +270,7 @@ const AArch64NamedImmMapper::Mapping AArch64SysReg::MSRMapper::MSRPairs[] = {
{"icc_sgi0r_el1", ICC_SGI0R_EL1} {"icc_sgi0r_el1", ICC_SGI0R_EL1}
}; };
AArch64SysReg::MSRMapper::MSRMapper(uint64_t FeatureBits) AArch64SysReg::MSRMapper::MSRMapper(const FeatureBitset &FeatureBits)
: SysRegMapper(FeatureBits) { : SysRegMapper(FeatureBits) {
InstPairs = &MSRPairs[0]; InstPairs = &MSRPairs[0];
NumInstPairs = llvm::array_lengthof(MSRPairs); NumInstPairs = llvm::array_lengthof(MSRPairs);
@ -773,7 +774,7 @@ AArch64SysReg::SysRegMapper::fromString(StringRef Name, bool &Valid) const {
} }
// Next search for target specific registers // Next search for target specific registers
if (FeatureBits & AArch64::ProcCyclone) { if (FeatureBits[AArch64::ProcCyclone]) {
for (unsigned i = 0; i < array_lengthof(CycloneSysRegPairs); ++i) { for (unsigned i = 0; i < array_lengthof(CycloneSysRegPairs); ++i) {
if (CycloneSysRegPairs[i].Name == NameLower) { if (CycloneSysRegPairs[i].Name == NameLower) {
Valid = true; Valid = true;
@ -823,7 +824,7 @@ AArch64SysReg::SysRegMapper::toString(uint32_t Bits) const {
} }
// Next search for target specific registers // Next search for target specific registers
if (FeatureBits & AArch64::ProcCyclone) { if (FeatureBits[AArch64::ProcCyclone]) {
for (unsigned i = 0; i < array_lengthof(CycloneSysRegPairs); ++i) { for (unsigned i = 0; i < array_lengthof(CycloneSysRegPairs); ++i) {
if (CycloneSysRegPairs[i].Value == Bits) { if (CycloneSysRegPairs[i].Value == Bits) {
return CycloneSysRegPairs[i].Name; return CycloneSysRegPairs[i].Name;

10
llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h
View File

@ -26,6 +26,8 @@
namespace llvm { namespace llvm {
class FeatureBitset;
inline static unsigned getWRegFromXReg(unsigned Reg) { inline static unsigned getWRegFromXReg(unsigned Reg) {
switch (Reg) { switch (Reg) {
case AArch64::X0: return AArch64::W0; case AArch64::X0: return AArch64::W0;
@ -1139,21 +1141,21 @@ namespace AArch64SysReg {
const AArch64NamedImmMapper::Mapping *InstPairs; const AArch64NamedImmMapper::Mapping *InstPairs;
size_t NumInstPairs; size_t NumInstPairs;
uint64_t FeatureBits; const FeatureBitset &FeatureBits;
SysRegMapper(uint64_t FeatureBits) : FeatureBits(FeatureBits) { } SysRegMapper(const FeatureBitset &FeatureBits) : FeatureBits(FeatureBits) { }
uint32_t fromString(StringRef Name, bool &Valid) const; uint32_t fromString(StringRef Name, bool &Valid) const;
std::string toString(uint32_t Bits) const; std::string toString(uint32_t Bits) const;
}; };
struct MSRMapper : SysRegMapper { struct MSRMapper : SysRegMapper {
static const AArch64NamedImmMapper::Mapping MSRPairs[]; static const AArch64NamedImmMapper::Mapping MSRPairs[];
MSRMapper(uint64_t FeatureBits); MSRMapper(const FeatureBitset &FeatureBits);
}; };
struct MRSMapper : SysRegMapper { struct MRSMapper : SysRegMapper {
static const AArch64NamedImmMapper::Mapping MRSPairs[]; static const AArch64NamedImmMapper::Mapping MRSPairs[];
MRSMapper(uint64_t FeatureBits); MRSMapper(const FeatureBitset &FeatureBits);
}; };
uint32_t ParseGenericRegister(StringRef Name, bool &Valid); uint32_t ParseGenericRegister(StringRef Name, bool &Valid);

2
llvm/lib/Target/ARM/ARMAsmPrinter.cpp
View File

@ -420,7 +420,7 @@ bool ARMAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
} }
static bool isThumb(const MCSubtargetInfo& STI) { static bool isThumb(const MCSubtargetInfo& STI) {
return (STI.getFeatureBits() & ARM::ModeThumb) != 0; return STI.getFeatureBits()[ARM::ModeThumb];
} }
void ARMAsmPrinter::emitInlineAsmEnd(const MCSubtargetInfo &StartInfo, void ARMAsmPrinter::emitInlineAsmEnd(const MCSubtargetInfo &StartInfo,

2
llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
View File

@ -4513,7 +4513,7 @@ breakPartialRegDependency(MachineBasicBlock::iterator MI,
} }
bool ARMBaseInstrInfo::hasNOP() const { bool ARMBaseInstrInfo::hasNOP() const {
return (Subtarget.getFeatureBits() & ARM::HasV6KOps) != 0; return Subtarget.getFeatureBits()[ARM::HasV6KOps];
} }
bool ARMBaseInstrInfo::isSwiftFastImmShift(const MachineInstr *MI) const { bool ARMBaseInstrInfo::isSwiftFastImmShift(const MachineInstr *MI) const {

4
llvm/lib/Target/ARM/ARMSubtarget.cpp
View File

@ -263,8 +263,8 @@ void ARMSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
} }
// NEON f32 ops are non-IEEE 754 compliant. Darwin is ok with it by default. // NEON f32 ops are non-IEEE 754 compliant. Darwin is ok with it by default.
uint64_t Bits = getFeatureBits(); const FeatureBitset &Bits = getFeatureBits();
if ((Bits & ARM::ProcA5 || Bits & ARM::ProcA8) && // Where this matters if ((Bits[ARM::ProcA5] || Bits[ARM::ProcA8]) && // Where this matters
(Options.UnsafeFPMath || isTargetDarwin())) (Options.UnsafeFPMath || isTargetDarwin()))
UseNEONForSinglePrecisionFP = true; UseNEONForSinglePrecisionFP = true;
} }

156
llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
View File

@ -244,37 +244,37 @@ class ARMAsmParser : public MCTargetAsmParser {
bool isThumb() const { bool isThumb() const {
// FIXME: Can tablegen auto-generate this? // FIXME: Can tablegen auto-generate this?
return (STI.getFeatureBits() & ARM::ModeThumb) != 0; return STI.getFeatureBits()[ARM::ModeThumb];
} }
bool isThumbOne() const { bool isThumbOne() const {
return isThumb() && (STI.getFeatureBits() & ARM::FeatureThumb2) == 0; return isThumb() && !STI.getFeatureBits()[ARM::FeatureThumb2];
} }
bool isThumbTwo() const { bool isThumbTwo() const {
return isThumb() && (STI.getFeatureBits() & ARM::FeatureThumb2); return isThumb() && STI.getFeatureBits()[ARM::FeatureThumb2];
} }
bool hasThumb() const { bool hasThumb() const {
return STI.getFeatureBits() & ARM::HasV4TOps; return STI.getFeatureBits()[ARM::HasV4TOps];
} }
bool hasV6Ops() const { bool hasV6Ops() const {
return STI.getFeatureBits() & ARM::HasV6Ops; return STI.getFeatureBits()[ARM::HasV6Ops];
} }
bool hasV6MOps() const { bool hasV6MOps() const {
return STI.getFeatureBits() & ARM::HasV6MOps; return STI.getFeatureBits()[ARM::HasV6MOps];
} }
bool hasV7Ops() const { bool hasV7Ops() const {
return STI.getFeatureBits() & ARM::HasV7Ops; return STI.getFeatureBits()[ARM::HasV7Ops];
} }
bool hasV8Ops() const { bool hasV8Ops() const {
return STI.getFeatureBits() & ARM::HasV8Ops; return STI.getFeatureBits()[ARM::HasV8Ops];
} }
bool hasARM() const { bool hasARM() const {
return !(STI.getFeatureBits() & ARM::FeatureNoARM); return !STI.getFeatureBits()[ARM::FeatureNoARM];
} }
bool hasThumb2DSP() const { bool hasThumb2DSP() const {
return STI.getFeatureBits() & ARM::FeatureDSPThumb2; return STI.getFeatureBits()[ARM::FeatureDSPThumb2];
} }
bool hasD16() const { bool hasD16() const {
return STI.getFeatureBits() & ARM::FeatureD16; return STI.getFeatureBits()[ARM::FeatureD16];
} }
void SwitchMode() { void SwitchMode() {
@ -282,7 +282,7 @@ class ARMAsmParser : public MCTargetAsmParser {
setAvailableFeatures(FB); setAvailableFeatures(FB);
} }
bool isMClass() const { bool isMClass() const {
return STI.getFeatureBits() & ARM::FeatureMClass; return STI.getFeatureBits()[ARM::FeatureMClass];
} }
/// @name Auto-generated Match Functions /// @name Auto-generated Match Functions
@ -9186,52 +9186,53 @@ bool ARMAsmParser::parseDirectiveCPU(SMLoc L) {
// tools/clang/lib/Driver/Tools.cpp // tools/clang/lib/Driver/Tools.cpp
static const struct { static const struct {
const unsigned ID; const unsigned ID;
const uint64_t Enabled; const FeatureBitset Enabled;
const uint64_t Disabled; const FeatureBitset Disabled;
} FPUs[] = { } FPUs[] = {
{/* ID */ ARM::VFP, {/* ID */ ARM::VFP,
/* Enabled */ ARM::FeatureVFP2, /* Enabled */ {ARM::FeatureVFP2},
/* Disabled */ ARM::FeatureNEON}, /* Disabled */ {ARM::FeatureNEON}},
{/* ID */ ARM::VFPV2, {/* ID */ ARM::VFPV2,
/* Enabled */ ARM::FeatureVFP2, /* Enabled */ {ARM::FeatureVFP2},
/* Disabled */ ARM::FeatureNEON}, /* Disabled */ {ARM::FeatureNEON}},
{/* ID */ ARM::VFPV3, {/* ID */ ARM::VFPV3,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3, /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3},
/* Disabled */ ARM::FeatureNEON | ARM::FeatureD16}, /* Disabled */ {ARM::FeatureNEON, ARM::FeatureD16}},
{/* ID */ ARM::VFPV3_D16, {/* ID */ ARM::VFPV3_D16,
/* Enable */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureD16, /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureD16},
/* Disabled */ ARM::FeatureNEON}, /* Disabled */ {ARM::FeatureNEON}},
{/* ID */ ARM::VFPV4, {/* ID */ ARM::VFPV4,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4, /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureVFP4},
/* Disabled */ ARM::FeatureNEON | ARM::FeatureD16}, /* Disabled */ {ARM::FeatureNEON, ARM::FeatureD16}},
{/* ID */ ARM::VFPV4_D16, {/* ID */ ARM::VFPV4_D16,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 | /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureVFP4,
ARM::FeatureD16, ARM::FeatureD16},
/* Disabled */ ARM::FeatureNEON}, /* Disabled */ {ARM::FeatureNEON}},
{/* ID */ ARM::FPV5_D16, {/* ID */ ARM::FPV5_D16,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 | /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureVFP4,
ARM::FeatureFPARMv8 | ARM::FeatureD16, ARM::FeatureFPARMv8, ARM::FeatureD16},
/* Disabled */ ARM::FeatureNEON | ARM::FeatureCrypto}, /* Disabled */ {ARM::FeatureNEON, ARM::FeatureCrypto}},
{/* ID */ ARM::FP_ARMV8, {/* ID */ ARM::FP_ARMV8,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 | /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureVFP4,
ARM::FeatureFPARMv8, ARM::FeatureFPARMv8},
/* Disabled */ ARM::FeatureNEON | ARM::FeatureCrypto | ARM::FeatureD16}, /* Disabled */ {ARM::FeatureNEON, ARM::FeatureCrypto, ARM::FeatureD16}},
{/* ID */ ARM::NEON, {/* ID */ ARM::NEON,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureNEON, /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureNEON},
/* Disabled */ ARM::FeatureD16}, /* Disabled */ {ARM::FeatureD16}},
{/* ID */ ARM::NEON_VFPV4, {/* ID */ ARM::NEON_VFPV4,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 | /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureVFP4,
ARM::FeatureNEON, ARM::FeatureNEON},
/* Disabled */ ARM::FeatureD16}, /* Disabled */ {ARM::FeatureD16}},
{/* ID */ ARM::NEON_FP_ARMV8, {/* ID */ ARM::NEON_FP_ARMV8,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 | /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureVFP4,
ARM::FeatureFPARMv8 | ARM::FeatureNEON, ARM::FeatureFPARMv8, ARM::FeatureNEON},
/* Disabled */ ARM::FeatureCrypto | ARM::FeatureD16}, /* Disabled */ {ARM::FeatureCrypto, ARM::FeatureD16}},
{/* ID */ ARM::CRYPTO_NEON_FP_ARMV8, {/* ID */ ARM::CRYPTO_NEON_FP_ARMV8,
/* Enabled */ ARM::FeatureVFP2 | ARM::FeatureVFP3 | ARM::FeatureVFP4 | /* Enabled */ {ARM::FeatureVFP2, ARM::FeatureVFP3, ARM::FeatureVFP4,
ARM::FeatureFPARMv8 | ARM::FeatureNEON | ARM::FeatureCrypto, ARM::FeatureFPARMv8, ARM::FeatureNEON,
/* Disabled */ ARM::FeatureD16}, ARM::FeatureCrypto},
{ARM::SOFTVFP, 0, 0}, /* Disabled */ {ARM::FeatureD16}},
{ARM::SOFTVFP, {}, {}},
}; };
/// parseDirectiveFPU /// parseDirectiveFPU
@ -9256,8 +9257,8 @@ bool ARMAsmParser::parseDirectiveFPU(SMLoc L) {
// Need to toggle features that should be on but are off and that // Need to toggle features that should be on but are off and that
// should off but are on. // should off but are on.
uint64_t Toggle = (Entry.Enabled & ~STI.getFeatureBits()) | FeatureBitset Toggle = (Entry.Enabled & ~STI.getFeatureBits()) |
(Entry.Disabled & STI.getFeatureBits()); (Entry.Disabled & STI.getFeatureBits());
setAvailableFeatures(ComputeAvailableFeatures(STI.ToggleFeature(Toggle))); setAvailableFeatures(ComputeAvailableFeatures(STI.ToggleFeature(Toggle)));
break; break;
} }
@ -9994,30 +9995,30 @@ extern "C" void LLVMInitializeARMAsmParser() {
static const struct { static const struct {
const char *Name; const char *Name;
const unsigned ArchCheck; const unsigned ArchCheck;
const uint64_t Features; const FeatureBitset Features;
} Extensions[] = { } Extensions[] = {
{ "crc", Feature_HasV8, ARM::FeatureCRC }, { "crc", Feature_HasV8, {ARM::FeatureCRC} },
{ "crypto", Feature_HasV8, { "crypto", Feature_HasV8,
ARM::FeatureCrypto | ARM::FeatureNEON | ARM::FeatureFPARMv8 }, {ARM::FeatureCrypto, ARM::FeatureNEON, ARM::FeatureFPARMv8} },
{ "fp", Feature_HasV8, ARM::FeatureFPARMv8 }, { "fp", Feature_HasV8, {ARM::FeatureFPARMv8} },
{ "idiv", Feature_HasV7 | Feature_IsNotMClass, { "idiv", Feature_HasV7 | Feature_IsNotMClass,
ARM::FeatureHWDiv | ARM::FeatureHWDivARM }, {ARM::FeatureHWDiv, ARM::FeatureHWDivARM} },
// FIXME: iWMMXT not supported // FIXME: iWMMXT not supported
{ "iwmmxt", Feature_None, 0 }, { "iwmmxt", Feature_None, {} },
// FIXME: iWMMXT2 not supported // FIXME: iWMMXT2 not supported
{ "iwmmxt2", Feature_None, 0 }, { "iwmmxt2", Feature_None, {} },
// FIXME: Maverick not supported // FIXME: Maverick not supported
{ "maverick", Feature_None, 0 }, { "maverick", Feature_None, {} },
{ "mp", Feature_HasV7 | Feature_IsNotMClass, ARM::FeatureMP }, { "mp", Feature_HasV7 | Feature_IsNotMClass, {ARM::FeatureMP} },
// FIXME: ARMv6-m OS Extensions feature not checked // FIXME: ARMv6-m OS Extensions feature not checked
{ "os", Feature_None, 0 }, { "os", Feature_None, {} },
// FIXME: Also available in ARMv6-K // FIXME: Also available in ARMv6-K
{ "sec", Feature_HasV7, ARM::FeatureTrustZone }, { "sec", Feature_HasV7, {ARM::FeatureTrustZone} },
{ "simd", Feature_HasV8, ARM::FeatureNEON | ARM::FeatureFPARMv8 }, { "simd", Feature_HasV8, {ARM::FeatureNEON, ARM::FeatureFPARMv8} },
// FIXME: Only available in A-class, isel not predicated // FIXME: Only available in A-class, isel not predicated
{ "virt", Feature_HasV7, ARM::FeatureVirtualization }, { "virt", Feature_HasV7, {ARM::FeatureVirtualization} },
// FIXME: xscale not supported // FIXME: xscale not supported
{ "xscale", Feature_None, 0 }, { "xscale", Feature_None, {} },
}; };
/// parseDirectiveArchExtension /// parseDirectiveArchExtension
@ -10045,7 +10046,7 @@ bool ARMAsmParser::parseDirectiveArchExtension(SMLoc L) {
if (Extension.Name != Name) if (Extension.Name != Name)
continue; continue;
if (!Extension.Features) if (Extension.Features.none())
report_fatal_error("unsupported architectural extension: " + Name); report_fatal_error("unsupported architectural extension: " + Name);
if ((getAvailableFeatures() & Extension.ArchCheck) != Extension.ArchCheck) { if ((getAvailableFeatures() & Extension.ArchCheck) != Extension.ArchCheck) {
@ -10054,9 +10055,10 @@ bool ARMAsmParser::parseDirectiveArchExtension(SMLoc L) {
return false; return false;
} }
uint64_t ToggleFeatures = EnableFeature FeatureBitset ToggleFeatures = EnableFeature
? (~STI.getFeatureBits() & Extension.Features) ? (~STI.getFeatureBits() & Extension.Features)
: ( STI.getFeatureBits() & Extension.Features); : ( STI.getFeatureBits() & Extension.Features);
uint64_t Features = uint64_t Features =
ComputeAvailableFeatures(STI.ToggleFeature(ToggleFeatures)); ComputeAvailableFeatures(STI.ToggleFeature(ToggleFeatures));
setAvailableFeatures(Features); setAvailableFeatures(Features);

71
llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
View File

@ -431,7 +431,7 @@ DecodeStatus ARMDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
raw_ostream &CS) const { raw_ostream &CS) const {
CommentStream = &CS; CommentStream = &CS;
assert(!(STI.getFeatureBits() & ARM::ModeThumb) && assert(!STI.getFeatureBits()[ARM::ModeThumb] &&
"Asked to disassemble an ARM instruction but Subtarget is in Thumb " "Asked to disassemble an ARM instruction but Subtarget is in Thumb "
"mode!"); "mode!");
@ -696,7 +696,7 @@ DecodeStatus ThumbDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
raw_ostream &CS) const { raw_ostream &CS) const {
CommentStream = &CS; CommentStream = &CS;
assert((STI.getFeatureBits() & ARM::ModeThumb) && assert(STI.getFeatureBits()[ARM::ModeThumb] &&
"Asked to disassemble in Thumb mode but Subtarget is in ARM mode!"); "Asked to disassemble in Thumb mode but Subtarget is in ARM mode!");
// We want to read exactly 2 bytes of data. // We want to read exactly 2 bytes of data.
@ -1022,9 +1022,10 @@ static const uint16_t DPRDecoderTable[] = {
static DecodeStatus DecodeDPRRegisterClass(MCInst &Inst, unsigned RegNo, static DecodeStatus DecodeDPRRegisterClass(MCInst &Inst, unsigned RegNo,
uint64_t Address, const void *Decoder) { uint64_t Address, const void *Decoder) {
uint64_t featureBits = ((const MCDisassembler*)Decoder)->getSubtargetInfo() const FeatureBitset &featureBits =
.getFeatureBits(); ((const MCDisassembler*)Decoder)->getSubtargetInfo().getFeatureBits();
bool hasD16 = featureBits & ARM::FeatureD16;
bool hasD16 = featureBits[ARM::FeatureD16];
if (RegNo > 31 || (hasD16 && RegNo > 15)) if (RegNo > 31 || (hasD16 && RegNo > 15))
return MCDisassembler::Fail; return MCDisassembler::Fail;
@ -1369,9 +1370,9 @@ static DecodeStatus DecodeCopMemInstruction(MCInst &Inst, unsigned Insn,
break; break;
} }
uint64_t featureBits = ((const MCDisassembler*)Decoder)->getSubtargetInfo() const FeatureBitset &featureBits =
.getFeatureBits(); ((const MCDisassembler*)Decoder)->getSubtargetInfo().getFeatureBits();
if ((featureBits & ARM::HasV8Ops) && (coproc != 14)) if (featureBits[ARM::HasV8Ops] && (coproc != 14))
return MCDisassembler::Fail; return MCDisassembler::Fail;
Inst.addOperand(MCOperand::CreateImm(coproc)); Inst.addOperand(MCOperand::CreateImm(coproc));
@ -3267,10 +3268,11 @@ static DecodeStatus DecodeT2LoadShift(MCInst &Inst, unsigned Insn,
unsigned Rt = fieldFromInstruction(Insn, 12, 4); unsigned Rt = fieldFromInstruction(Insn, 12, 4);
unsigned Rn = fieldFromInstruction(Insn, 16, 4); unsigned Rn = fieldFromInstruction(Insn, 16, 4);
uint64_t featureBits = ((const MCDisassembler*)Decoder)->getSubtargetInfo() const FeatureBitset &featureBits =
.getFeatureBits(); ((const MCDisassembler*)Decoder)->getSubtargetInfo().getFeatureBits();
bool hasMP = featureBits & ARM::FeatureMP;
bool hasV7Ops = featureBits & ARM::HasV7Ops; bool hasMP = featureBits[ARM::FeatureMP];
bool hasV7Ops = featureBits[ARM::HasV7Ops];
if (Rn == 15) { if (Rn == 15) {
switch (Inst.getOpcode()) { switch (Inst.getOpcode()) {
@ -3353,10 +3355,11 @@ static DecodeStatus DecodeT2LoadImm8(MCInst &Inst, unsigned Insn,
imm |= (Rn << 9); imm |= (Rn << 9);
unsigned add = fieldFromInstruction(Insn, 9, 1); unsigned add = fieldFromInstruction(Insn, 9, 1);
uint64_t featureBits = ((const MCDisassembler*)Decoder)->getSubtargetInfo() const FeatureBitset &featureBits =
.getFeatureBits(); ((const MCDisassembler*)Decoder)->getSubtargetInfo().getFeatureBits();
bool hasMP = featureBits & ARM::FeatureMP;
bool hasV7Ops = featureBits & ARM::HasV7Ops; bool hasMP = featureBits[ARM::FeatureMP];
bool hasV7Ops = featureBits[ARM::HasV7Ops];
if (Rn == 15) { if (Rn == 15) {
switch (Inst.getOpcode()) { switch (Inst.getOpcode()) {
@ -3433,10 +3436,11 @@ static DecodeStatus DecodeT2LoadImm12(MCInst &Inst, unsigned Insn,
unsigned imm = fieldFromInstruction(Insn, 0, 12); unsigned imm = fieldFromInstruction(Insn, 0, 12);
imm |= (Rn << 13); imm |= (Rn << 13);
uint64_t featureBits = ((const MCDisassembler*)Decoder)->getSubtargetInfo() const FeatureBitset &featureBits =
.getFeatureBits(); ((const MCDisassembler*)Decoder)->getSubtargetInfo().getFeatureBits();
bool hasMP = (featureBits & ARM::FeatureMP);
bool hasV7Ops = (featureBits & ARM::HasV7Ops); bool hasMP = featureBits[ARM::FeatureMP];
bool hasV7Ops = featureBits[ARM::HasV7Ops];
if (Rn == 15) { if (Rn == 15) {
switch (Inst.getOpcode()) { switch (Inst.getOpcode()) {
@ -3550,9 +3554,10 @@ static DecodeStatus DecodeT2LoadLabel(MCInst &Inst, unsigned Insn,
unsigned U = fieldFromInstruction(Insn, 23, 1); unsigned U = fieldFromInstruction(Insn, 23, 1);
int imm = fieldFromInstruction(Insn, 0, 12); int imm = fieldFromInstruction(Insn, 0, 12);
uint64_t featureBits = ((const MCDisassembler*)Decoder)->getSubtargetInfo() const FeatureBitset &featureBits =
.getFeatureBits(); ((const MCDisassembler*)Decoder)->getSubtargetInfo().getFeatureBits();
bool hasV7Ops = (featureBits & ARM::HasV7Ops);
bool hasV7Ops = featureBits[ARM::HasV7Ops];
if (Rt == 15) { if (Rt == 15) {
switch (Inst.getOpcode()) { switch (Inst.getOpcode()) {
@ -3873,9 +3878,10 @@ static DecodeStatus DecodeCoprocessor(MCInst &Inst, unsigned Val,
if (Val == 0xA || Val == 0xB) if (Val == 0xA || Val == 0xB)
return MCDisassembler::Fail; return MCDisassembler::Fail;
uint64_t featureBits = ((const MCDisassembler*)Decoder)->getSubtargetInfo() const FeatureBitset &featureBits =
.getFeatureBits(); ((const MCDisassembler*)Decoder)->getSubtargetInfo().getFeatureBits();
if ((featureBits & ARM::HasV8Ops) && !(Val == 14 || Val == 15))
if (featureBits[ARM::HasV8Ops] && !(Val == 14 || Val == 15))
return MCDisassembler::Fail; return MCDisassembler::Fail;
Inst.addOperand(MCOperand::CreateImm(Val)); Inst.addOperand(MCOperand::CreateImm(Val));
@ -4025,9 +4031,10 @@ static DecodeStatus DecodeInstSyncBarrierOption(MCInst &Inst, unsigned Val,
static DecodeStatus DecodeMSRMask(MCInst &Inst, unsigned Val, static DecodeStatus DecodeMSRMask(MCInst &Inst, unsigned Val,
uint64_t Address, const void *Decoder) { uint64_t Address, const void *Decoder) {
DecodeStatus S = MCDisassembler::Success; DecodeStatus S = MCDisassembler::Success;
uint64_t FeatureBits = ((const MCDisassembler*)Decoder)->getSubtargetInfo() const FeatureBitset &FeatureBits =
.getFeatureBits(); ((const MCDisassembler*)Decoder)->getSubtargetInfo().getFeatureBits();
if (FeatureBits & ARM::FeatureMClass) {
if (FeatureBits[ARM::FeatureMClass]) {
unsigned ValLow = Val & 0xff; unsigned ValLow = Val & 0xff;
// Validate the SYSm value first. // Validate the SYSm value first.
@ -4047,7 +4054,7 @@ static DecodeStatus DecodeMSRMask(MCInst &Inst, unsigned Val,
case 17: // basepri case 17: // basepri
case 18: // basepri_max case 18: // basepri_max
case 19: // faultmask case 19: // faultmask
if (!(FeatureBits & ARM::HasV7Ops)) if (!(FeatureBits[ARM::HasV7Ops]))
// Values basepri, basepri_max and faultmask are only valid for v7m. // Values basepri, basepri_max and faultmask are only valid for v7m.
return MCDisassembler::Fail; return MCDisassembler::Fail;
break; break;
@ -4057,7 +4064,7 @@ static DecodeStatus DecodeMSRMask(MCInst &Inst, unsigned Val,
if (Inst.getOpcode() == ARM::t2MSR_M) { if (Inst.getOpcode() == ARM::t2MSR_M) {
unsigned Mask = fieldFromInstruction(Val, 10, 2); unsigned Mask = fieldFromInstruction(Val, 10, 2);
if (!(FeatureBits & ARM::HasV7Ops)) { if (!(FeatureBits[ARM::HasV7Ops])) {
// The ARMv6-M MSR bits {11-10} can be only 0b10, other values are // The ARMv6-M MSR bits {11-10} can be only 0b10, other values are
// unpredictable. // unpredictable.
if (Mask != 2) if (Mask != 2)
@ -4071,7 +4078,7 @@ static DecodeStatus DecodeMSRMask(MCInst &Inst, unsigned Val,
// indicates the move for the GE{3:0} bits, the mask{0} bit can be set // indicates the move for the GE{3:0} bits, the mask{0} bit can be set
// only if the processor includes the DSP extension. // only if the processor includes the DSP extension.
if (Mask == 0 || (Mask != 2 && ValLow > 3) || if (Mask == 0 || (Mask != 2 && ValLow > 3) ||
(!(FeatureBits & ARM::FeatureDSPThumb2) && (Mask & 1))) (!(FeatureBits[ARM::FeatureDSPThumb2]) && (Mask & 1)))
S = MCDisassembler::SoftFail; S = MCDisassembler::SoftFail;
} }
} }

14
llvm/lib/Target/ARM/InstPrinter/ARMInstPrinter.cpp
View File

@ -90,7 +90,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O,
case 3: O << "\twfi"; break; case 3: O << "\twfi"; break;
case 4: O << "\tsev"; break; case 4: O << "\tsev"; break;
case 5: case 5:
if ((getAvailableFeatures() & ARM::HasV8Ops)) { if (getAvailableFeatures()[ARM::HasV8Ops]) {
O << "\tsevl"; O << "\tsevl";
break; break;
} // Fallthrough for non-v8 } // Fallthrough for non-v8
@ -299,7 +299,7 @@ void ARMInstPrinter::printInst(const MCInst *MI, raw_ostream &O,
if (MI->getNumOperands() == 3 && if (MI->getNumOperands() == 3 &&
MI->getOperand(0).isImm() && MI->getOperand(0).isImm() &&
MI->getOperand(0).getImm() == 0 && MI->getOperand(0).getImm() == 0 &&
(getAvailableFeatures() & ARM::FeatureVirtualization)) { getAvailableFeatures()[ARM::FeatureVirtualization]) {
O << "\teret"; O << "\teret";
printPredicateOperand(MI, 1, O); printPredicateOperand(MI, 1, O);
printAnnotation(O, Annot); printAnnotation(O, Annot);
@ -698,7 +698,7 @@ void ARMInstPrinter::printBitfieldInvMaskImmOperand(const MCInst *MI,
void ARMInstPrinter::printMemBOption(const MCInst *MI, unsigned OpNum, void ARMInstPrinter::printMemBOption(const MCInst *MI, unsigned OpNum,
raw_ostream &O) { raw_ostream &O) {
unsigned val = MI->getOperand(OpNum).getImm(); unsigned val = MI->getOperand(OpNum).getImm();
O << ARM_MB::MemBOptToString(val, (getAvailableFeatures() & ARM::HasV8Ops)); O << ARM_MB::MemBOptToString(val, getAvailableFeatures()[ARM::HasV8Ops]);
} }
void ARMInstPrinter::printInstSyncBOption(const MCInst *MI, unsigned OpNum, void ARMInstPrinter::printInstSyncBOption(const MCInst *MI, unsigned OpNum,
@ -796,14 +796,14 @@ void ARMInstPrinter::printMSRMaskOperand(const MCInst *MI, unsigned OpNum,
const MCOperand &Op = MI->getOperand(OpNum); const MCOperand &Op = MI->getOperand(OpNum);
unsigned SpecRegRBit = Op.getImm() >> 4; unsigned SpecRegRBit = Op.getImm() >> 4;
unsigned Mask = Op.getImm() & 0xf; unsigned Mask = Op.getImm() & 0xf;
uint64_t FeatureBits = getAvailableFeatures(); const FeatureBitset &FeatureBits = getAvailableFeatures();
if (FeatureBits & ARM::FeatureMClass) { if (FeatureBits[ARM::FeatureMClass]) {
unsigned SYSm = Op.getImm(); unsigned SYSm = Op.getImm();
unsigned Opcode = MI->getOpcode(); unsigned Opcode = MI->getOpcode();
// For writes, handle extended mask bits if the DSP extension is present. // For writes, handle extended mask bits if the DSP extension is present.
if (Opcode == ARM::t2MSR_M && (FeatureBits & ARM::FeatureDSPThumb2)) { if (Opcode == ARM::t2MSR_M && FeatureBits[ARM::FeatureDSPThumb2]) {
switch (SYSm) { switch (SYSm) {
case 0x400: O << "apsr_g"; return; case 0x400: O << "apsr_g"; return;
case 0xc00: O << "apsr_nzcvqg"; return; case 0xc00: O << "apsr_nzcvqg"; return;
@ -819,7 +819,7 @@ void ARMInstPrinter::printMSRMaskOperand(const MCInst *MI, unsigned OpNum,
// Handle the basic 8-bit mask. // Handle the basic 8-bit mask.
SYSm &= 0xff; SYSm &= 0xff;
if (Opcode == ARM::t2MSR_M && (FeatureBits & ARM::HasV7Ops)) { if (Opcode == ARM::t2MSR_M && FeatureBits [ARM::HasV7Ops]) {
// ARMv7-M deprecates using MSR APSR without a _<bits> qualifier as an // ARMv7-M deprecates using MSR APSR without a _<bits> qualifier as an
// alias for MSR APSR_nzcvq. // alias for MSR APSR_nzcvq.
switch (SYSm) { switch (SYSm) {

2
llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.h
View File

@ -33,7 +33,7 @@ public:
return ARM::NumTargetFixupKinds; return ARM::NumTargetFixupKinds;
} }
bool hasNOP() const { return (STI->getFeatureBits() & ARM::HasV6T2Ops) != 0; } bool hasNOP() const { return STI->getFeatureBits()[ARM::HasV6T2Ops]; }
const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override; const MCFixupKindInfo &getFixupKindInfo(MCFixupKind Kind) const override;

4
llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
View File

@ -51,10 +51,10 @@ public:
~ARMMCCodeEmitter() {} ~ARMMCCodeEmitter() {}
bool isThumb(const MCSubtargetInfo &STI) const { bool isThumb(const MCSubtargetInfo &STI) const {
return (STI.getFeatureBits() & ARM::ModeThumb) != 0; return STI.getFeatureBits()[ARM::ModeThumb];
} }
bool isThumb2(const MCSubtargetInfo &STI) const { bool isThumb2(const MCSubtargetInfo &STI) const {
return isThumb(STI) && (STI.getFeatureBits() & ARM::FeatureThumb2) != 0; return isThumb(STI) && STI.getFeatureBits()[ARM::FeatureThumb2];
} }
bool isTargetMachO(const MCSubtargetInfo &STI) const { bool isTargetMachO(const MCSubtargetInfo &STI) const {
Triple TT(STI.getTargetTriple()); Triple TT(STI.getTargetTriple());

8
llvm/lib/Target/ARM/MCTargetDesc/ARMMCTargetDesc.cpp
View File

@ -33,7 +33,7 @@ using namespace llvm;
static bool getMCRDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI, static bool getMCRDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
std::string &Info) { std::string &Info) {
if (STI.getFeatureBits() & llvm::ARM::HasV7Ops && if (STI.getFeatureBits()[llvm::ARM::HasV7Ops] &&
(MI.getOperand(0).isImm() && MI.getOperand(0).getImm() == 15) && (MI.getOperand(0).isImm() && MI.getOperand(0).getImm() == 15) &&
(MI.getOperand(1).isImm() && MI.getOperand(1).getImm() == 0) && (MI.getOperand(1).isImm() && MI.getOperand(1).getImm() == 0) &&
// Checks for the deprecated CP15ISB encoding: // Checks for the deprecated CP15ISB encoding:
@ -65,7 +65,7 @@ static bool getMCRDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
static bool getITDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI, static bool getITDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
std::string &Info) { std::string &Info) {
if (STI.getFeatureBits() & llvm::ARM::HasV8Ops && MI.getOperand(1).isImm() && if (STI.getFeatureBits()[llvm::ARM::HasV8Ops] && MI.getOperand(1).isImm() &&
MI.getOperand(1).getImm() != 8) { MI.getOperand(1).getImm() != 8) {
Info = "applying IT instruction to more than one subsequent instruction is " Info = "applying IT instruction to more than one subsequent instruction is "
"deprecated"; "deprecated";
@ -77,7 +77,7 @@ static bool getITDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
static bool getARMStoreDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI, static bool getARMStoreDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
std::string &Info) { std::string &Info) {
assert((~STI.getFeatureBits() & llvm::ARM::ModeThumb) && assert(!STI.getFeatureBits()[llvm::ARM::ModeThumb] &&
"cannot predicate thumb instructions"); "cannot predicate thumb instructions");
assert(MI.getNumOperands() >= 4 && "expected >= 4 arguments"); assert(MI.getNumOperands() >= 4 && "expected >= 4 arguments");
@ -94,7 +94,7 @@ static bool getARMStoreDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
static bool getARMLoadDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI, static bool getARMLoadDeprecationInfo(MCInst &MI, MCSubtargetInfo &STI,
std::string &Info) { std::string &Info) {
assert((~STI.getFeatureBits() & llvm::ARM::ModeThumb) && assert(!STI.getFeatureBits()[llvm::ARM::ModeThumb] &&
"cannot predicate thumb instructions"); "cannot predicate thumb instructions");
assert(MI.getNumOperands() >= 4 && "expected >= 4 arguments"); assert(MI.getNumOperands() >= 4 && "expected >= 4 arguments");

78
llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
View File

@ -72,15 +72,7 @@ public:
// The full table can be found in MipsGenSubtargetInfo.inc (MipsFeatureKV[]). // The full table can be found in MipsGenSubtargetInfo.inc (MipsFeatureKV[]).
// The reason we need this mask is explained in the selectArch function. // The reason we need this mask is explained in the selectArch function.
// FIXME: Ideally we would like TableGen to generate this information. // FIXME: Ideally we would like TableGen to generate this information.
static const uint64_t AllArchRelatedMask = static const FeatureBitset AllArchRelatedMask;
Mips::FeatureMips1 | Mips::FeatureMips2 | Mips::FeatureMips3 |
Mips::FeatureMips3_32 | Mips::FeatureMips3_32r2 | Mips::FeatureMips4 |
Mips::FeatureMips4_32 | Mips::FeatureMips4_32r2 | Mips::FeatureMips5 |
Mips::FeatureMips5_32r2 | Mips::FeatureMips32 | Mips::FeatureMips32r2 |
Mips::FeatureMips32r3 | Mips::FeatureMips32r5 | Mips::FeatureMips32r6 |
Mips::FeatureMips64 | Mips::FeatureMips64r2 | Mips::FeatureMips64r3 |
Mips::FeatureMips64r5 | Mips::FeatureMips64r6 | Mips::FeatureCnMips |
Mips::FeatureFP64Bit | Mips::FeatureGP64Bit | Mips::FeatureNaN2008;
private: private:
unsigned ATReg; unsigned ATReg;
@ -90,6 +82,17 @@ private:
}; };
} }
const FeatureBitset MipsAssemblerOptions::AllArchRelatedMask = {
Mips::FeatureMips1, Mips::FeatureMips2, Mips::FeatureMips3,
Mips::FeatureMips3_32, Mips::FeatureMips3_32r2, Mips::FeatureMips4,
Mips::FeatureMips4_32, Mips::FeatureMips4_32r2, Mips::FeatureMips5,
Mips::FeatureMips5_32r2, Mips::FeatureMips32, Mips::FeatureMips32r2,
Mips::FeatureMips32r3, Mips::FeatureMips32r5, Mips::FeatureMips32r6,
Mips::FeatureMips64, Mips::FeatureMips64r2, Mips::FeatureMips64r3,
Mips::FeatureMips64r5, Mips::FeatureMips64r6, Mips::FeatureCnMips,
Mips::FeatureFP64Bit, Mips::FeatureGP64Bit, Mips::FeatureNaN2008
};
namespace { namespace {
class MipsAsmParser : public MCTargetAsmParser { class MipsAsmParser : public MCTargetAsmParser {
MipsTargetStreamer &getTargetStreamer() { MipsTargetStreamer &getTargetStreamer() {
@ -299,7 +302,7 @@ class MipsAsmParser : public MCTargetAsmParser {
// FeatureMipsGP64 | FeatureMips1) // FeatureMipsGP64 | FeatureMips1)
// Clearing Mips3 is equivalent to clear (FeatureMips3 | FeatureMips4). // Clearing Mips3 is equivalent to clear (FeatureMips3 | FeatureMips4).
void selectArch(StringRef ArchFeature) { void selectArch(StringRef ArchFeature) {
uint64_t FeatureBits = STI.getFeatureBits(); FeatureBitset FeatureBits = STI.getFeatureBits();
FeatureBits &= ~MipsAssemblerOptions::AllArchRelatedMask; FeatureBits &= ~MipsAssemblerOptions::AllArchRelatedMask;
STI.setFeatureBits(FeatureBits); STI.setFeatureBits(FeatureBits);
setAvailableFeatures( setAvailableFeatures(
@ -308,7 +311,7 @@ class MipsAsmParser : public MCTargetAsmParser {
} }
void setFeatureBits(uint64_t Feature, StringRef FeatureString) { void setFeatureBits(uint64_t Feature, StringRef FeatureString) {
if (!(STI.getFeatureBits() & Feature)) { if (!(STI.getFeatureBits()[Feature])) {
setAvailableFeatures( setAvailableFeatures(
ComputeAvailableFeatures(STI.ToggleFeature(FeatureString))); ComputeAvailableFeatures(STI.ToggleFeature(FeatureString)));
} }
@ -316,7 +319,7 @@ class MipsAsmParser : public MCTargetAsmParser {
} }
void clearFeatureBits(uint64_t Feature, StringRef FeatureString) { void clearFeatureBits(uint64_t Feature, StringRef FeatureString) {
if (STI.getFeatureBits() & Feature) { if (STI.getFeatureBits()[Feature]) {
setAvailableFeatures( setAvailableFeatures(
ComputeAvailableFeatures(STI.ToggleFeature(FeatureString))); ComputeAvailableFeatures(STI.ToggleFeature(FeatureString)));
} }
@ -361,65 +364,66 @@ public:
/// True if all of $fcc0 - $fcc7 exist for the current ISA. /// True if all of $fcc0 - $fcc7 exist for the current ISA.
bool hasEightFccRegisters() const { return hasMips4() || hasMips32(); } bool hasEightFccRegisters() const { return hasMips4() || hasMips32(); }
bool isGP64bit() const { return STI.getFeatureBits() & Mips::FeatureGP64Bit; } bool isGP64bit() const { return STI.getFeatureBits()[Mips::FeatureGP64Bit]; }
bool isFP64bit() const { return STI.getFeatureBits() & Mips::FeatureFP64Bit; } bool isFP64bit() const { return STI.getFeatureBits()[Mips::FeatureFP64Bit]; }
const MipsABIInfo &getABI() const { return ABI; } const MipsABIInfo &getABI() const { return ABI; }
bool isABI_N32() const { return ABI.IsN32(); } bool isABI_N32() const { return ABI.IsN32(); }
bool isABI_N64() const { return ABI.IsN64(); } bool isABI_N64() const { return ABI.IsN64(); }
bool isABI_O32() const { return ABI.IsO32(); } bool isABI_O32() const { return ABI.IsO32(); }
bool isABI_FPXX() const { return STI.getFeatureBits() & Mips::FeatureFPXX; } bool isABI_FPXX() const { return STI.getFeatureBits()[Mips::FeatureFPXX]; }
bool useOddSPReg() const { bool useOddSPReg() const {
return !(STI.getFeatureBits() & Mips::FeatureNoOddSPReg); return !(STI.getFeatureBits()[Mips::FeatureNoOddSPReg]);
} }
bool inMicroMipsMode() const { bool inMicroMipsMode() const {
return STI.getFeatureBits() & Mips::FeatureMicroMips; return STI.getFeatureBits()[Mips::FeatureMicroMips];
} }
bool hasMips1() const { return STI.getFeatureBits() & Mips::FeatureMips1; } bool hasMips1() const { return STI.getFeatureBits()[Mips::FeatureMips1]; }
bool hasMips2() const { return STI.getFeatureBits() & Mips::FeatureMips2; } bool hasMips2() const { return STI.getFeatureBits()[Mips::FeatureMips2]; }
bool hasMips3() const { return STI.getFeatureBits() & Mips::FeatureMips3; } bool hasMips3() const { return STI.getFeatureBits()[Mips::FeatureMips3]; }
bool hasMips4() const { return STI.getFeatureBits() & Mips::FeatureMips4; } bool hasMips4() const { return STI.getFeatureBits()[Mips::FeatureMips4]; }
bool hasMips5() const { return STI.getFeatureBits() & Mips::FeatureMips5; } bool hasMips5() const { return STI.getFeatureBits()[Mips::FeatureMips5]; }
bool hasMips32() const { bool hasMips32() const {
return (STI.getFeatureBits() & Mips::FeatureMips32); return STI.getFeatureBits()[Mips::FeatureMips32];
} }
bool hasMips64() const { bool hasMips64() const {
return (STI.getFeatureBits() & Mips::FeatureMips64); return STI.getFeatureBits()[Mips::FeatureMips64];
} }
bool hasMips32r2() const { bool hasMips32r2() const {
return (STI.getFeatureBits() & Mips::FeatureMips32r2); return STI.getFeatureBits()[Mips::FeatureMips32r2];
} }
bool hasMips64r2() const { bool hasMips64r2() const {
return (STI.getFeatureBits() & Mips::FeatureMips64r2); return STI.getFeatureBits()[Mips::FeatureMips64r2];
} }
bool hasMips32r3() const { bool hasMips32r3() const {
return (STI.getFeatureBits() & Mips::FeatureMips32r3); return (STI.getFeatureBits()[Mips::FeatureMips32r3]);
} }
bool hasMips64r3() const { bool hasMips64r3() const {
return (STI.getFeatureBits() & Mips::FeatureMips64r3); return (STI.getFeatureBits()[Mips::FeatureMips64r3]);
} }
bool hasMips32r5() const { bool hasMips32r5() const {
return (STI.getFeatureBits() & Mips::FeatureMips32r5); return (STI.getFeatureBits()[Mips::FeatureMips32r5]);
} }
bool hasMips64r5() const { bool hasMips64r5() const {
return (STI.getFeatureBits() & Mips::FeatureMips64r5); return (STI.getFeatureBits()[Mips::FeatureMips64r5]);
} }
bool hasMips32r6() const { bool hasMips32r6() const {
return (STI.getFeatureBits() & Mips::FeatureMips32r6); return STI.getFeatureBits()[Mips::FeatureMips32r6];
} }
bool hasMips64r6() const { bool hasMips64r6() const {
return (STI.getFeatureBits() & Mips::FeatureMips64r6); return STI.getFeatureBits()[Mips::FeatureMips64r6];
} }
bool hasDSP() const { return STI.getFeatureBits()[Mips::FeatureDSP]; }
bool hasDSPR2() const { return STI.getFeatureBits()[Mips::FeatureDSPR2]; }
bool hasMSA() const { return STI.getFeatureBits()[Mips::FeatureMSA]; }
bool hasCnMips() const { bool hasCnMips() const {
return (STI.getFeatureBits() & Mips::FeatureCnMips); return (STI.getFeatureBits()[Mips::FeatureCnMips]);
} }
bool hasDSP() const { return (STI.getFeatureBits() & Mips::FeatureDSP); }
bool hasDSPR2() const { return (STI.getFeatureBits() & Mips::FeatureDSPR2); }
bool hasMSA() const { return (STI.getFeatureBits() & Mips::FeatureMSA); }
bool inMips16Mode() const { bool inMips16Mode() const {
return STI.getFeatureBits() & Mips::FeatureMips16; return STI.getFeatureBits()[Mips::FeatureMips16];
} }
// TODO: see how can we get this info. // TODO: see how can we get this info.
bool abiUsesSoftFloat() const { return false; } bool abiUsesSoftFloat() const { return false; }

10
llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp
View File

@ -36,16 +36,16 @@ class MipsDisassembler : public MCDisassembler {
public: public:
MipsDisassembler(const MCSubtargetInfo &STI, MCContext &Ctx, bool IsBigEndian) MipsDisassembler(const MCSubtargetInfo &STI, MCContext &Ctx, bool IsBigEndian)
: MCDisassembler(STI, Ctx), : MCDisassembler(STI, Ctx),
IsMicroMips(STI.getFeatureBits() & Mips::FeatureMicroMips), IsMicroMips(STI.getFeatureBits()[Mips::FeatureMicroMips]),
IsBigEndian(IsBigEndian) {} IsBigEndian(IsBigEndian) {}
bool hasMips3() const { return STI.getFeatureBits() & Mips::FeatureMips3; } bool hasMips3() const { return STI.getFeatureBits()[Mips::FeatureMips3]; }
bool hasMips32() const { return STI.getFeatureBits() & Mips::FeatureMips32; } bool hasMips32() const { return STI.getFeatureBits()[Mips::FeatureMips32]; }
bool hasMips32r6() const { bool hasMips32r6() const {
return STI.getFeatureBits() & Mips::FeatureMips32r6; return STI.getFeatureBits()[Mips::FeatureMips32r6];
} }
bool isGP64() const { return STI.getFeatureBits() & Mips::FeatureGP64Bit; } bool isGP64() const { return STI.getFeatureBits()[Mips::FeatureGP64Bit]; }
bool hasCOP3() const { bool hasCOP3() const {
// Only present in MIPS-I and MIPS-II // Only present in MIPS-I and MIPS-II

4
llvm/lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
View File

@ -112,7 +112,7 @@ static void LowerDextDins(MCInst& InstIn) {
} }
bool MipsMCCodeEmitter::isMicroMips(const MCSubtargetInfo &STI) const { bool MipsMCCodeEmitter::isMicroMips(const MCSubtargetInfo &STI) const {
return STI.getFeatureBits() & Mips::FeatureMicroMips; return STI.getFeatureBits()[Mips::FeatureMicroMips];
} }
void MipsMCCodeEmitter::EmitByte(unsigned char C, raw_ostream &OS) const { void MipsMCCodeEmitter::EmitByte(unsigned char C, raw_ostream &OS) const {
@ -175,7 +175,7 @@ EncodeInstruction(const MCInst &MI, raw_ostream &OS,
(Opcode != Mips::SLL_MM) && !Binary) (Opcode != Mips::SLL_MM) && !Binary)
llvm_unreachable("unimplemented opcode in EncodeInstruction()"); llvm_unreachable("unimplemented opcode in EncodeInstruction()");
if (STI.getFeatureBits() & Mips::FeatureMicroMips) { if (STI.getFeatureBits()[Mips::FeatureMicroMips]) {
int NewOpcode = Mips::Std2MicroMips (Opcode, Mips::Arch_micromips); int NewOpcode = Mips::Std2MicroMips (Opcode, Mips::Arch_micromips);
if (NewOpcode != -1) { if (NewOpcode != -1) {
if (Fixups.size() > N) if (Fixups.size() > N)

38
llvm/lib/Target/Mips/MCTargetDesc/MipsTargetStreamer.cpp
View File

@ -382,7 +382,7 @@ MipsTargetELFStreamer::MipsTargetELFStreamer(MCStreamer &S,
? true ? true
: false; : false;
uint64_t Features = STI.getFeatureBits(); const FeatureBitset &Features = STI.getFeatureBits();
// Set the header flags that we can in the constructor. // Set the header flags that we can in the constructor.
// FIXME: This is a fairly terrible hack. We set the rest // FIXME: This is a fairly terrible hack. We set the rest
@ -398,35 +398,35 @@ MipsTargetELFStreamer::MipsTargetELFStreamer(MCStreamer &S,
unsigned EFlags = MCA.getELFHeaderEFlags(); unsigned EFlags = MCA.getELFHeaderEFlags();
// Architecture // Architecture
if (Features & Mips::FeatureMips64r6) if (Features[Mips::FeatureMips64r6])
EFlags |= ELF::EF_MIPS_ARCH_64R6; EFlags |= ELF::EF_MIPS_ARCH_64R6;
else if (Features & Mips::FeatureMips64r2 || else if (Features[Mips::FeatureMips64r2] ||
Features & Mips::FeatureMips64r3 || Features[Mips::FeatureMips64r3] ||
Features & Mips::FeatureMips64r5) Features[Mips::FeatureMips64r5])
EFlags |= ELF::EF_MIPS_ARCH_64R2; EFlags |= ELF::EF_MIPS_ARCH_64R2;
else if (Features & Mips::FeatureMips64) else if (Features[Mips::FeatureMips64])
EFlags |= ELF::EF_MIPS_ARCH_64; EFlags |= ELF::EF_MIPS_ARCH_64;
else if (Features & Mips::FeatureMips5) else if (Features[Mips::FeatureMips5])
EFlags |= ELF::EF_MIPS_ARCH_5; EFlags |= ELF::EF_MIPS_ARCH_5;
else if (Features & Mips::FeatureMips4) else if (Features[Mips::FeatureMips4])
EFlags |= ELF::EF_MIPS_ARCH_4; EFlags |= ELF::EF_MIPS_ARCH_4;
else if (Features & Mips::FeatureMips3) else if (Features[Mips::FeatureMips3])
EFlags |= ELF::EF_MIPS_ARCH_3; EFlags |= ELF::EF_MIPS_ARCH_3;
else if (Features & Mips::FeatureMips32r6) else if (Features[Mips::FeatureMips32r6])
EFlags |= ELF::EF_MIPS_ARCH_32R6; EFlags |= ELF::EF_MIPS_ARCH_32R6;
else if (Features & Mips::FeatureMips32r2 || else if (Features[Mips::FeatureMips32r2] ||
Features & Mips::FeatureMips32r3 || Features[Mips::FeatureMips32r3] ||
Features & Mips::FeatureMips32r5) Features[Mips::FeatureMips32r5])
EFlags |= ELF::EF_MIPS_ARCH_32R2; EFlags |= ELF::EF_MIPS_ARCH_32R2;
else if (Features & Mips::FeatureMips32) else if (Features[Mips::FeatureMips32])
EFlags |= ELF::EF_MIPS_ARCH_32; EFlags |= ELF::EF_MIPS_ARCH_32;
else if (Features & Mips::FeatureMips2) else if (Features[Mips::FeatureMips2])
EFlags |= ELF::EF_MIPS_ARCH_2; EFlags |= ELF::EF_MIPS_ARCH_2;
else else
EFlags |= ELF::EF_MIPS_ARCH_1; EFlags |= ELF::EF_MIPS_ARCH_1;
// Other options. // Other options.
if (Features & Mips::FeatureNaN2008) if (Features[Mips::FeatureNaN2008])
EFlags |= ELF::EF_MIPS_NAN2008; EFlags |= ELF::EF_MIPS_NAN2008;
// -mabicalls and -mplt are not implemented but we should act as if they were // -mabicalls and -mplt are not implemented but we should act as if they were
@ -466,7 +466,7 @@ void MipsTargetELFStreamer::finish() {
DataSectionData.setAlignment(std::max(16u, DataSectionData.getAlignment())); DataSectionData.setAlignment(std::max(16u, DataSectionData.getAlignment()));
BSSSectionData.setAlignment(std::max(16u, BSSSectionData.getAlignment())); BSSSectionData.setAlignment(std::max(16u, BSSSectionData.getAlignment()));
uint64_t Features = STI.getFeatureBits(); const FeatureBitset &Features = STI.getFeatureBits();
// Update e_header flags. See the FIXME and comment above in // Update e_header flags. See the FIXME and comment above in
// the constructor for a full rundown on this. // the constructor for a full rundown on this.
@ -479,10 +479,10 @@ void MipsTargetELFStreamer::finish() {
else if (getABI().IsN32()) else if (getABI().IsN32())
EFlags |= ELF::EF_MIPS_ABI2; EFlags |= ELF::EF_MIPS_ABI2;
if (Features & Mips::FeatureGP64Bit) { if (Features[Mips::FeatureGP64Bit]) {
if (getABI().IsO32()) if (getABI().IsO32())
EFlags |= ELF::EF_MIPS_32BITMODE; /* Compatibility Mode */ EFlags |= ELF::EF_MIPS_32BITMODE; /* Compatibility Mode */
} else if (Features & Mips::FeatureMips64r2 || Features & Mips::FeatureMips64) } else if (Features[Mips::FeatureMips64r2] || Features[Mips::FeatureMips64])
EFlags |= ELF::EF_MIPS_32BITMODE; EFlags |= ELF::EF_MIPS_32BITMODE;
// If we've set the cpic eflag and we're n64, go ahead and set the pic // If we've set the cpic eflag and we're n64, go ahead and set the pic

2
llvm/lib/Target/PowerPC/Disassembler/PPCDisassembler.cpp
View File

@ -355,7 +355,7 @@ DecodeStatus PPCDisassembler::getInstruction(MCInst &MI, uint64_t &Size,
uint32_t Inst = uint32_t Inst =
(Bytes[0] << 24) | (Bytes[1] << 16) | (Bytes[2] << 8) | (Bytes[3] << 0); (Bytes[0] << 24) | (Bytes[1] << 16) | (Bytes[2] << 8) | (Bytes[3] << 0);
if ((STI.getFeatureBits() & PPC::FeatureQPX) != 0) { if (STI.getFeatureBits()[PPC::FeatureQPX]) {
DecodeStatus result = DecodeStatus result =
decodeInstruction(DecoderTableQPX32, MI, Inst, Address, this, STI); decodeInstruction(DecoderTableQPX32, MI, Inst, Address, this, STI);
if (result != MCDisassembler::Fail) if (result != MCDisassembler::Fail)

4
llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
View File

@ -99,7 +99,7 @@ void R600MCCodeEmitter::EncodeInstruction(const MCInst &MI, raw_ostream &OS,
} else if (IS_VTX(Desc)) { } else if (IS_VTX(Desc)) {
uint64_t InstWord01 = getBinaryCodeForInstr(MI, Fixups, STI); uint64_t InstWord01 = getBinaryCodeForInstr(MI, Fixups, STI);
uint32_t InstWord2 = MI.getOperand(2).getImm(); // Offset uint32_t InstWord2 = MI.getOperand(2).getImm(); // Offset
if (!(STI.getFeatureBits() & AMDGPU::FeatureCaymanISA)) { if (!(STI.getFeatureBits()[AMDGPU::FeatureCaymanISA])) {
InstWord2 |= 1 << 19; // Mega-Fetch bit InstWord2 |= 1 << 19; // Mega-Fetch bit
} }
@ -132,7 +132,7 @@ void R600MCCodeEmitter::EncodeInstruction(const MCInst &MI, raw_ostream &OS,
Emit((uint32_t) 0, OS); Emit((uint32_t) 0, OS);
} else { } else {
uint64_t Inst = getBinaryCodeForInstr(MI, Fixups, STI); uint64_t Inst = getBinaryCodeForInstr(MI, Fixups, STI);
if ((STI.getFeatureBits() & AMDGPU::FeatureR600ALUInst) && if ((STI.getFeatureBits()[AMDGPU::FeatureR600ALUInst]) &&
((Desc.TSFlags & R600_InstFlag::OP1) || ((Desc.TSFlags & R600_InstFlag::OP1) ||
Desc.TSFlags & R600_InstFlag::OP2)) { Desc.TSFlags & R600_InstFlag::OP2)) {
uint64_t ISAOpCode = Inst & (0x3FFULL << 39); uint64_t ISAOpCode = Inst & (0x3FFULL << 39);

2
llvm/lib/Target/Sparc/InstPrinter/SparcInstPrinter.cpp
View File

@ -35,7 +35,7 @@ namespace Sparc {
#include "SparcGenAsmWriter.inc" #include "SparcGenAsmWriter.inc"
bool SparcInstPrinter::isV9() const { bool SparcInstPrinter::isV9() const {
return (STI.getFeatureBits() & Sparc::FeatureV9) != 0; return (STI.getFeatureBits()[Sparc::FeatureV9]) != 0;
} }
void SparcInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const void SparcInstPrinter::printRegName(raw_ostream &OS, unsigned RegNo) const

10
llvm/lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp
View File

@ -262,13 +262,13 @@ protected:
MCContext &Ctx, int64_t *Residue); MCContext &Ctx, int64_t *Residue);
bool is64BitMode() const { bool is64BitMode() const {
return (STI.getFeatureBits() & X86::Mode64Bit) != 0; return STI.getFeatureBits()[X86::Mode64Bit];
} }
bool is32BitMode() const { bool is32BitMode() const {
return (STI.getFeatureBits() & X86::Mode32Bit) != 0; return STI.getFeatureBits()[X86::Mode32Bit];
} }
bool is16BitMode() const { bool is16BitMode() const {
return (STI.getFeatureBits() & X86::Mode16Bit) != 0; return STI.getFeatureBits()[X86::Mode16Bit];
} }
unsigned getPointerWidth() { unsigned getPointerWidth() {
@ -1073,9 +1073,9 @@ CreateX86AsmInstrumentation(const MCTargetOptions &MCOptions,
const bool hasCompilerRTSupport = T.isOSLinux(); const bool hasCompilerRTSupport = T.isOSLinux();
if (ClAsanInstrumentAssembly && hasCompilerRTSupport && if (ClAsanInstrumentAssembly && hasCompilerRTSupport &&
MCOptions.SanitizeAddress) { MCOptions.SanitizeAddress) {
if ((STI.getFeatureBits() & X86::Mode32Bit) != 0) if (STI.getFeatureBits()[X86::Mode32Bit] != 0)
return new X86AddressSanitizer32(STI); return new X86AddressSanitizer32(STI);
if ((STI.getFeatureBits() & X86::Mode64Bit) != 0) if (STI.getFeatureBits()[X86::Mode64Bit] != 0)
return new X86AddressSanitizer64(STI); return new X86AddressSanitizer64(STI);
} }
return new X86AsmInstrumentation(STI); return new X86AsmInstrumentation(STI);

25
llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
View File

@ -729,23 +729,24 @@ private:
bool is64BitMode() const { bool is64BitMode() const {
// FIXME: Can tablegen auto-generate this? // FIXME: Can tablegen auto-generate this?
return (STI.getFeatureBits() & X86::Mode64Bit) != 0; return STI.getFeatureBits()[X86::Mode64Bit];
} }
bool is32BitMode() const { bool is32BitMode() const {
// FIXME: Can tablegen auto-generate this? // FIXME: Can tablegen auto-generate this?
return (STI.getFeatureBits() & X86::Mode32Bit) != 0; return STI.getFeatureBits()[X86::Mode32Bit];
} }
bool is16BitMode() const { bool is16BitMode() const {
// FIXME: Can tablegen auto-generate this? // FIXME: Can tablegen auto-generate this?
return (STI.getFeatureBits() & X86::Mode16Bit) != 0; return STI.getFeatureBits()[X86::Mode16Bit];
} }
void SwitchMode(uint64_t mode) { void SwitchMode(unsigned mode) {
uint64_t oldMode = STI.getFeatureBits() & FeatureBitset AllModes({X86::Mode64Bit, X86::Mode32Bit, X86::Mode16Bit});
(X86::Mode64Bit | X86::Mode32Bit | X86::Mode16Bit); FeatureBitset OldMode = STI.getFeatureBits() & AllModes;
unsigned FB = ComputeAvailableFeatures(STI.ToggleFeature(oldMode | mode)); unsigned FB = ComputeAvailableFeatures(
STI.ToggleFeature(OldMode.flip(mode)));
setAvailableFeatures(FB); setAvailableFeatures(FB);
assert(mode == (STI.getFeatureBits() &
(X86::Mode64Bit | X86::Mode32Bit | X86::Mode16Bit))); assert(FeatureBitset({mode}) == (STI.getFeatureBits() & AllModes));
} }
unsigned getPointerWidth() { unsigned getPointerWidth() {
@ -1688,7 +1689,7 @@ std::unique_ptr<X86Operand> X86AsmParser::ParseIntelOperand() {
} }
// rounding mode token // rounding mode token
if (STI.getFeatureBits() & X86::FeatureAVX512 && if (STI.getFeatureBits()[X86::FeatureAVX512] &&
getLexer().is(AsmToken::LCurly)) getLexer().is(AsmToken::LCurly))
return ParseRoundingModeOp(Start, End); return ParseRoundingModeOp(Start, End);
@ -1746,7 +1747,7 @@ std::unique_ptr<X86Operand> X86AsmParser::ParseATTOperand() {
} }
case AsmToken::LCurly:{ case AsmToken::LCurly:{
SMLoc Start = Parser.getTok().getLoc(), End; SMLoc Start = Parser.getTok().getLoc(), End;
if (STI.getFeatureBits() & X86::FeatureAVX512) if (STI.getFeatureBits()[X86::FeatureAVX512])
return ParseRoundingModeOp(Start, End); return ParseRoundingModeOp(Start, End);
return ErrorOperand(Start, "unknown token in expression"); return ErrorOperand(Start, "unknown token in expression");
} }
@ -1756,7 +1757,7 @@ std::unique_ptr<X86Operand> X86AsmParser::ParseATTOperand() {
bool X86AsmParser::HandleAVX512Operand(OperandVector &Operands, bool X86AsmParser::HandleAVX512Operand(OperandVector &Operands,
const MCParsedAsmOperand &Op) { const MCParsedAsmOperand &Op) {
MCAsmParser &Parser = getParser(); MCAsmParser &Parser = getParser();
if(STI.getFeatureBits() & X86::FeatureAVX512) { if(STI.getFeatureBits()[X86::FeatureAVX512]) {
if (getLexer().is(AsmToken::LCurly)) { if (getLexer().is(AsmToken::LCurly)) {
// Eat "{" and mark the current place. // Eat "{" and mark the current place.
const SMLoc consumedToken = consumeToken(); const SMLoc consumedToken = consumeToken();

19
llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
View File

@ -80,20 +80,19 @@ X86GenericDisassembler::X86GenericDisassembler(
MCContext &Ctx, MCContext &Ctx,
std::unique_ptr<const MCInstrInfo> MII) std::unique_ptr<const MCInstrInfo> MII)
: MCDisassembler(STI, Ctx), MII(std::move(MII)) { : MCDisassembler(STI, Ctx), MII(std::move(MII)) {
switch (STI.getFeatureBits() & const FeatureBitset &FB = STI.getFeatureBits();
(X86::Mode16Bit | X86::Mode32Bit | X86::Mode64Bit)) { if (FB[X86::Mode16Bit]) {
case X86::Mode16Bit:
fMode = MODE_16BIT; fMode = MODE_16BIT;
break; return;
case X86::Mode32Bit: } else if (FB[X86::Mode32Bit]) {
fMode = MODE_32BIT; fMode = MODE_32BIT;
break; return;
case X86::Mode64Bit: } else if (FB[X86::Mode64Bit]) {
fMode = MODE_64BIT; fMode = MODE_64BIT;
break; return;
default:
llvm_unreachable("Invalid CPU mode");
} }
llvm_unreachable("Invalid CPU mode");
} }
struct Region { struct Region {

2
llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp
View File

@ -60,7 +60,7 @@ void X86ATTInstPrinter::printInst(const MCInst *MI, raw_ostream &OS,
// InstrInfo.td as soon as Requires clause is supported properly // InstrInfo.td as soon as Requires clause is supported properly
// for InstAlias. // for InstAlias.
if (MI->getOpcode() == X86::CALLpcrel32 && if (MI->getOpcode() == X86::CALLpcrel32 &&
(getAvailableFeatures() & X86::Mode64Bit) != 0) { getAvailableFeatures()[X86::Mode64Bit]) {
OS << "\tcallq\t"; OS << "\tcallq\t";
printPCRelImm(MI, 0, OS); printPCRelImm(MI, 0, OS);
} }

6
llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
View File

@ -42,15 +42,15 @@ public:
~X86MCCodeEmitter() {} ~X86MCCodeEmitter() {}
bool is64BitMode(const MCSubtargetInfo &STI) const { bool is64BitMode(const MCSubtargetInfo &STI) const {
return (STI.getFeatureBits() & X86::Mode64Bit) != 0; return STI.getFeatureBits()[X86::Mode64Bit];
} }
bool is32BitMode(const MCSubtargetInfo &STI) const { bool is32BitMode(const MCSubtargetInfo &STI) const {
return (STI.getFeatureBits() & X86::Mode32Bit) != 0; return STI.getFeatureBits()[X86::Mode32Bit];
} }
bool is16BitMode(const MCSubtargetInfo &STI) const { bool is16BitMode(const MCSubtargetInfo &STI) const {
return (STI.getFeatureBits() & X86::Mode16Bit) != 0; return STI.getFeatureBits()[X86::Mode16Bit];
} }
/// Is16BitMemOperand - Return true if the specified instruction has /// Is16BitMemOperand - Return true if the specified instruction has

12
llvm/utils/TableGen/AsmMatcherEmitter.cpp
View File

@ -2248,7 +2248,7 @@ static void emitComputeAvailableFeatures(AsmMatcherInfo &Info,
Info.AsmParser->getValueAsString("AsmParserClassName"); Info.AsmParser->getValueAsString("AsmParserClassName");
OS << "uint64_t " << Info.Target.getName() << ClassName << "::\n" OS << "uint64_t " << Info.Target.getName() << ClassName << "::\n"
<< "ComputeAvailableFeatures(uint64_t FB) const {\n"; << "ComputeAvailableFeatures(const FeatureBitset& FB) const {\n";
OS << " uint64_t Features = 0;\n"; OS << " uint64_t Features = 0;\n";
for (const auto &SF : Info.SubtargetFeatures) { for (const auto &SF : Info.SubtargetFeatures) {
const SubtargetFeatureInfo &SFI = SF.second; const SubtargetFeatureInfo &SFI = SF.second;
@ -2270,12 +2270,10 @@ static void emitComputeAvailableFeatures(AsmMatcherInfo &Info,
Cond = Cond.substr(1); Cond = Cond.substr(1);
} }
OS << "((FB & " << Info.Target.getName() << "::" << Cond << ")"; OS << "(";
if (Neg) if (Neg)
OS << " == 0"; OS << "!";
else OS << "FB[" << Info.Target.getName() << "::" << Cond << "])";
OS << " != 0";
OS << ")";
if (Comma.second.empty()) if (Comma.second.empty())
break; break;
@ -2645,7 +2643,7 @@ void AsmMatcherEmitter::run(raw_ostream &OS) {
OS << "#undef GET_ASSEMBLER_HEADER\n"; OS << "#undef GET_ASSEMBLER_HEADER\n";
OS << " // This should be included into the middle of the declaration of\n"; OS << " // This should be included into the middle of the declaration of\n";
OS << " // your subclasses implementation of MCTargetAsmParser.\n"; OS << " // your subclasses implementation of MCTargetAsmParser.\n";
OS << " uint64_t ComputeAvailableFeatures(uint64_t FeatureBits) const;\n"; OS << " uint64_t ComputeAvailableFeatures(const FeatureBitset& FB) const;\n";
OS << " void convertToMCInst(unsigned Kind, MCInst &Inst, " OS << " void convertToMCInst(unsigned Kind, MCInst &Inst, "
<< "unsigned Opcode,\n" << "unsigned Opcode,\n"
<< " const OperandVector " << " const OperandVector "

10
llvm/utils/TableGen/FixedLenDecoderEmitter.cpp
View File

@ -848,7 +848,7 @@ emitPredicateFunction(formatted_raw_ostream &OS, PredicateSet &Predicates,
// The predicate function is just a big switch statement based on the // The predicate function is just a big switch statement based on the
// input predicate index. // input predicate index.
OS.indent(Indentation) << "static bool checkDecoderPredicate(unsigned Idx, " OS.indent(Indentation) << "static bool checkDecoderPredicate(unsigned Idx, "
<< "uint64_t Bits) {\n"; << "const FeatureBitset& Bits) {\n";
Indentation += 2; Indentation += 2;
if (!Predicates.empty()) { if (!Predicates.empty()) {
OS.indent(Indentation) << "switch (Idx) {\n"; OS.indent(Indentation) << "switch (Idx) {\n";
@ -1102,10 +1102,10 @@ unsigned FilterChooser::getDecoderIndex(DecoderSet &Decoders,
static void emitSinglePredicateMatch(raw_ostream &o, StringRef str, static void emitSinglePredicateMatch(raw_ostream &o, StringRef str,
const std::string &PredicateNamespace) { const std::string &PredicateNamespace) {
if (str[0] == '!') if (str[0] == '!')
o << "!(Bits & " << PredicateNamespace << "::" o << "!Bits[" << PredicateNamespace << "::"
<< str.slice(1,str.size()) << ")"; << str.slice(1,str.size()) << "]";
else else
o << "(Bits & " << PredicateNamespace << "::" << str << ")"; o << "Bits[" << PredicateNamespace << "::" << str << "]";
} }
bool FilterChooser::emitPredicateMatch(raw_ostream &o, unsigned &Indentation, bool FilterChooser::emitPredicateMatch(raw_ostream &o, unsigned &Indentation,
@ -2010,7 +2010,7 @@ static void emitDecodeInstruction(formatted_raw_ostream &OS) {
<< " InsnType insn, uint64_t Address,\n" << " InsnType insn, uint64_t Address,\n"
<< " const void *DisAsm,\n" << " const void *DisAsm,\n"
<< " const MCSubtargetInfo &STI) {\n" << " const MCSubtargetInfo &STI) {\n"
<< " uint64_t Bits = STI.getFeatureBits();\n" << " const FeatureBitset& Bits = STI.getFeatureBits();\n"
<< "\n" << "\n"
<< " const uint8_t *Ptr = DecodeTable;\n" << " const uint8_t *Ptr = DecodeTable;\n"
<< " uint32_t CurFieldValue = 0;\n" << " uint32_t CurFieldValue = 0;\n"

8
llvm/utils/TableGen/InstrInfoEmitter.cpp
View File

@ -549,15 +549,15 @@ void InstrInfoEmitter::emitRecord(const CodeGenInstruction &Inst, unsigned Num,
CodeGenTarget &Target = CDP.getTargetInfo(); CodeGenTarget &Target = CDP.getTargetInfo();
if (Inst.HasComplexDeprecationPredicate) if (Inst.HasComplexDeprecationPredicate)
// Emit a function pointer to the complex predicate method. // Emit a function pointer to the complex predicate method.
OS << ",0" OS << ", { } "
<< ",&get" << Inst.DeprecatedReason << "DeprecationInfo"; << ",&get" << Inst.DeprecatedReason << "DeprecationInfo";
else if (!Inst.DeprecatedReason.empty()) else if (!Inst.DeprecatedReason.empty())
// Emit the Subtarget feature. // Emit the Subtarget feature.
OS << "," << Target.getInstNamespace() << "::" << Inst.DeprecatedReason OS << ", { " << Target.getInstNamespace() << "::" << Inst.DeprecatedReason
<< ",nullptr"; << "} ,nullptr";
else else
// Instruction isn't deprecated. // Instruction isn't deprecated.
OS << ",0,nullptr"; OS << ", { } ,nullptr";
OS << " }, // Inst #" << Num << " = " << Inst.TheDef->getName() << "\n"; OS << " }, // Inst #" << Num << " = " << Inst.TheDef->getName() << "\n";
} }

57
llvm/utils/TableGen/SubtargetEmitter.cpp
View File

@ -16,6 +16,7 @@
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringExtras.h"
#include "llvm/MC/MCInstrItineraries.h" #include "llvm/MC/MCInstrItineraries.h"
#include "llvm/MC/SubtargetFeature.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/Format.h" #include "llvm/Support/Format.h"
#include "llvm/TableGen/Error.h" #include "llvm/TableGen/Error.h"
@ -62,7 +63,7 @@ class SubtargetEmitter {
CodeGenSchedModels &SchedModels; CodeGenSchedModels &SchedModels;
std::string Target; std::string Target;
void Enumeration(raw_ostream &OS, const char *ClassName, bool isBits); void Enumeration(raw_ostream &OS, const char *ClassName);
unsigned FeatureKeyValues(raw_ostream &OS); unsigned FeatureKeyValues(raw_ostream &OS);
unsigned CPUKeyValues(raw_ostream &OS); unsigned CPUKeyValues(raw_ostream &OS);
void FormItineraryStageString(const std::string &Names, void FormItineraryStageString(const std::string &Names,
@ -112,8 +113,7 @@ public:
// Enumeration - Emit the specified class as an enumeration. // Enumeration - Emit the specified class as an enumeration.
// //
void SubtargetEmitter::Enumeration(raw_ostream &OS, void SubtargetEmitter::Enumeration(raw_ostream &OS,
const char *ClassName, const char *ClassName) {
bool isBits) {
// Get all records of class and sort // Get all records of class and sort
std::vector<Record*> DefList = Records.getAllDerivedDefinitions(ClassName); std::vector<Record*> DefList = Records.getAllDerivedDefinitions(ClassName);
std::sort(DefList.begin(), DefList.end(), LessRecord()); std::sort(DefList.begin(), DefList.end(), LessRecord());
@ -121,8 +121,8 @@ void SubtargetEmitter::Enumeration(raw_ostream &OS,
unsigned N = DefList.size(); unsigned N = DefList.size();
if (N == 0) if (N == 0)
return; return;
if (N > 64) { if (N > MAX_SUBTARGET_FEATURES) {
errs() << "Too many (> 64) subtarget features!\n"; errs() << "Too many subtarget features! Bump MAX_SUBTARGET_FEATURES.";
exit(1); exit(1);
} }
@ -137,21 +137,14 @@ void SubtargetEmitter::Enumeration(raw_ostream &OS,
Record *Def = DefList[i]; Record *Def = DefList[i];
// Get and emit name // Get and emit name
OS << " " << Def->getName(); OS << " " << Def->getName() << " = " << i;
// If bit flags then emit expression (1 << i)
if (isBits) OS << " = " << " 1ULL << " << i;
// Depending on 'if more in the list' emit comma
if (++i < N) OS << ","; if (++i < N) OS << ",";
OS << "\n"; OS << "\n";
} }
// Close enumeration // Close enumeration and namespace
OS << "};\n"; OS << "};\n}\n";
OS << "}\n";
} }
// //
@ -185,22 +178,24 @@ unsigned SubtargetEmitter::FeatureKeyValues(raw_ostream &OS) {
if (CommandLineName.empty()) continue; if (CommandLineName.empty()) continue;
// Emit as { "feature", "description", featureEnum, i1 | i2 | ... | in } // Emit as { "feature", "description", { featureEnum }, { i1 , i2 , ... , in } }
OS << " { " OS << " { "
<< "\"" << CommandLineName << "\", " << "\"" << CommandLineName << "\", "
<< "\"" << Desc << "\", " << "\"" << Desc << "\", "
<< Target << "::" << Name << ", "; << "{ " << Target << "::" << Name << " }, ";
const std::vector<Record*> &ImpliesList = const std::vector<Record*> &ImpliesList =
Feature->getValueAsListOfDefs("Implies"); Feature->getValueAsListOfDefs("Implies");
if (ImpliesList.empty()) { if (ImpliesList.empty()) {
OS << "0ULL"; OS << "{ }";
} else { } else {
OS << "{ ";
for (unsigned j = 0, M = ImpliesList.size(); j < M;) { for (unsigned j = 0, M = ImpliesList.size(); j < M;) {
OS << Target << "::" << ImpliesList[j]->getName(); OS << Target << "::" << ImpliesList[j]->getName();
if (++j < M) OS << " | "; if (++j < M) OS << ", ";
} }
OS << " }";
} }
OS << " }"; OS << " }";
@ -242,22 +237,24 @@ unsigned SubtargetEmitter::CPUKeyValues(raw_ostream &OS) {
const std::vector<Record*> &FeatureList = const std::vector<Record*> &FeatureList =
Processor->getValueAsListOfDefs("Features"); Processor->getValueAsListOfDefs("Features");
// Emit as { "cpu", "description", f1 | f2 | ... fn }, // Emit as { "cpu", "description", { f1 , f2 , ... fn } },
OS << " { " OS << " { "
<< "\"" << Name << "\", " << "\"" << Name << "\", "
<< "\"Select the " << Name << " processor\", "; << "\"Select the " << Name << " processor\", ";
if (FeatureList.empty()) { if (FeatureList.empty()) {
OS << "0ULL"; OS << "{ }";
} else { } else {
OS << "{ ";
for (unsigned j = 0, M = FeatureList.size(); j < M;) { for (unsigned j = 0, M = FeatureList.size(); j < M;) {
OS << Target << "::" << FeatureList[j]->getName(); OS << Target << "::" << FeatureList[j]->getName();
if (++j < M) OS << " | "; if (++j < M) OS << ", ";
} }
OS << " }";
} }
// The "0" is for the "implies" section of this data structure. // The { } is for the "implies" section of this data structure.
OS << ", 0ULL }"; OS << ", { } }";
// Depending on 'if more in the list' emit comma // Depending on 'if more in the list' emit comma
if (++i < N) OS << ","; if (++i < N) OS << ",";
@ -1385,7 +1382,7 @@ void SubtargetEmitter::ParseFeaturesFunction(raw_ostream &OS,
} }
OS << " InitMCProcessorInfo(CPU, FS);\n" OS << " InitMCProcessorInfo(CPU, FS);\n"
<< " uint64_t Bits = getFeatureBits();\n"; << " const FeatureBitset& Bits = getFeatureBits();\n";
for (unsigned i = 0; i < Features.size(); i++) { for (unsigned i = 0; i < Features.size(); i++) {
// Next record // Next record
@ -1395,12 +1392,12 @@ void SubtargetEmitter::ParseFeaturesFunction(raw_ostream &OS,
const std::string &Attribute = R->getValueAsString("Attribute"); const std::string &Attribute = R->getValueAsString("Attribute");
if (Value=="true" || Value=="false") if (Value=="true" || Value=="false")
OS << " if ((Bits & " << Target << "::" OS << " if (Bits[" << Target << "::"
<< Instance << ") != 0) " << Instance << "]) "
<< Attribute << " = " << Value << ";\n"; << Attribute << " = " << Value << ";\n";
else else
OS << " if ((Bits & " << Target << "::" OS << " if (Bits[" << Target << "::"
<< Instance << ") != 0 && " << Instance << "] && "
<< Attribute << " < " << Value << ") " << Attribute << " < " << Value << ") "
<< Attribute << " = " << Value << ";\n"; << Attribute << " = " << Value << ";\n";
} }
@ -1418,7 +1415,7 @@ void SubtargetEmitter::run(raw_ostream &OS) {
OS << "#undef GET_SUBTARGETINFO_ENUM\n"; OS << "#undef GET_SUBTARGETINFO_ENUM\n";
OS << "namespace llvm {\n"; OS << "namespace llvm {\n";
Enumeration(OS, "SubtargetFeature", true); Enumeration(OS, "SubtargetFeature");
OS << "} // End llvm namespace \n"; OS << "} // End llvm namespace \n";
OS << "#endif // GET_SUBTARGETINFO_ENUM\n\n"; OS << "#endif // GET_SUBTARGETINFO_ENUM\n\n";