Make the Hexagon ISelDAGToDAG pass set the subtarget dynamically

on each runOnMachineFunction invocation.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@232874 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2015-03-21 03:12:59 +00:00
parent a1ea57a185
commit 4ced9d418d
2 changed files with 19 additions and 12 deletions

View File

@ -28,10 +28,10 @@ def ArchV5: SubtargetFeature<"v5", "HexagonArchVersion", "V5", "Hexagon V5">;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Hexagon Instruction Predicate Definitions. // Hexagon Instruction Predicate Definitions.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
def HasV5T : Predicate<"HST.hasV5TOps()">; def HasV5T : Predicate<"HST->hasV5TOps()">;
def NoV5T : Predicate<"!HST.hasV5TOps()">; def NoV5T : Predicate<"!HST->hasV5TOps()">;
def UseMEMOP : Predicate<"HST.useMemOps()">; def UseMEMOP : Predicate<"HST->useMemOps()">;
def IEEERndNearV5T : Predicate<"HST.modeIEEERndNear()">; def IEEERndNearV5T : Predicate<"HST->modeIEEERndNear()">;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Classes used for relation maps. // Classes used for relation maps.

View File

@ -46,14 +46,21 @@ namespace llvm {
namespace { namespace {
class HexagonDAGToDAGISel : public SelectionDAGISel { class HexagonDAGToDAGISel : public SelectionDAGISel {
const HexagonTargetMachine& HTM; const HexagonTargetMachine& HTM;
const HexagonSubtarget &HST; const HexagonSubtarget *HST;
public: public:
explicit HexagonDAGToDAGISel(HexagonTargetMachine &tm, explicit HexagonDAGToDAGISel(HexagonTargetMachine &tm,
CodeGenOpt::Level OptLevel) CodeGenOpt::Level OptLevel)
: SelectionDAGISel(tm, OptLevel), HTM(tm), : SelectionDAGISel(tm, OptLevel), HTM(tm) {
HST(tm.getSubtarget<HexagonSubtarget>()) {
initializeHexagonDAGToDAGISelPass(*PassRegistry::getPassRegistry()); initializeHexagonDAGToDAGISelPass(*PassRegistry::getPassRegistry());
} }
bool runOnMachineFunction(MachineFunction &MF) override {
// Reset the subtarget each time through.
HST = &MF.getSubtarget<HexagonSubtarget>();
SelectionDAGISel::runOnMachineFunction(MF);
return true;
}
virtual void PreprocessISelDAG() override; virtual void PreprocessISelDAG() override;
SDNode *Select(SDNode *N) override; SDNode *Select(SDNode *N) override;
@ -246,7 +253,7 @@ SDNode *HexagonDAGToDAGISel::SelectIndexedLoadSignExtend64(LoadSDNode *LD,
SDNode *OffsetNode = Offset.getNode(); SDNode *OffsetNode = Offset.getNode();
int32_t Val = cast<ConstantSDNode>(OffsetNode)->getSExtValue(); int32_t Val = cast<ConstantSDNode>(OffsetNode)->getSExtValue();
const HexagonInstrInfo &TII = *HST.getInstrInfo(); const HexagonInstrInfo &TII = *HST->getInstrInfo();
if (TII.isValidAutoIncImm(LoadedVT, Val)) { if (TII.isValidAutoIncImm(LoadedVT, Val)) {
SDValue TargetConst = CurDAG->getTargetConstant(Val, MVT::i32); SDValue TargetConst = CurDAG->getTargetConstant(Val, MVT::i32);
SDNode *Result_1 = CurDAG->getMachineNode(Opcode, dl, MVT::i32, MVT::i32, SDNode *Result_1 = CurDAG->getMachineNode(Opcode, dl, MVT::i32, MVT::i32,
@ -300,7 +307,7 @@ SDNode *HexagonDAGToDAGISel::SelectIndexedLoadZeroExtend64(LoadSDNode *LD,
SDNode *OffsetNode = Offset.getNode(); SDNode *OffsetNode = Offset.getNode();
int32_t Val = cast<ConstantSDNode>(OffsetNode)->getSExtValue(); int32_t Val = cast<ConstantSDNode>(OffsetNode)->getSExtValue();
const HexagonInstrInfo &TII = *HST.getInstrInfo(); const HexagonInstrInfo &TII = *HST->getInstrInfo();
if (TII.isValidAutoIncImm(LoadedVT, Val)) { if (TII.isValidAutoIncImm(LoadedVT, Val)) {
SDValue TargetConstVal = CurDAG->getTargetConstant(Val, MVT::i32); SDValue TargetConstVal = CurDAG->getTargetConstant(Val, MVT::i32);
SDValue TargetConst0 = CurDAG->getTargetConstant(0, MVT::i32); SDValue TargetConst0 = CurDAG->getTargetConstant(0, MVT::i32);
@ -368,7 +375,7 @@ SDNode *HexagonDAGToDAGISel::SelectIndexedLoad(LoadSDNode *LD, SDLoc dl) {
bool IsZeroExt = (ExtType == ISD::ZEXTLOAD || ExtType == ISD::EXTLOAD); bool IsZeroExt = (ExtType == ISD::ZEXTLOAD || ExtType == ISD::EXTLOAD);
// Figure out the opcode. // Figure out the opcode.
const HexagonInstrInfo &TII = *HST.getInstrInfo(); const HexagonInstrInfo &TII = *HST->getInstrInfo();
if (LoadedVT == MVT::i64) { if (LoadedVT == MVT::i64) {
if (TII.isValidAutoIncImm(LoadedVT, Val)) if (TII.isValidAutoIncImm(LoadedVT, Val))
Opcode = Hexagon::L2_loadrd_pi; Opcode = Hexagon::L2_loadrd_pi;
@ -475,7 +482,7 @@ SDNode *HexagonDAGToDAGISel::SelectIndexedStore(StoreSDNode *ST, SDLoc dl) {
// Offset value must be within representable range // Offset value must be within representable range
// and must have correct alignment properties. // and must have correct alignment properties.
const HexagonInstrInfo &TII = *HST.getInstrInfo(); const HexagonInstrInfo &TII = *HST->getInstrInfo();
if (TII.isValidAutoIncImm(StoredVT, Val)) { if (TII.isValidAutoIncImm(StoredVT, Val)) {
unsigned Opcode = 0; unsigned Opcode = 0;
@ -1087,7 +1094,7 @@ SDNode *HexagonDAGToDAGISel::SelectBitOp(SDNode *N) {
// We handly only fabs and fneg for V5. // We handly only fabs and fneg for V5.
unsigned Opc = N->getOpcode(); unsigned Opc = N->getOpcode();
if ((Opc == ISD::FABS || Opc == ISD::FNEG) && !HST.hasV5TOps()) if ((Opc == ISD::FABS || Opc == ISD::FNEG) && !HST->hasV5TOps())
return SelectCode(N); return SelectCode(N);
int64_t Val = 0; int64_t Val = 0;