RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-02 18:42:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for the Any type. Minor fixes and enhancements for BasicBlock operands

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7769 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-08-12 04:56:42 +00:00
parent c12a61463a
commit 6b666e8afe
4 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
support/tools/TableGen/InstrSelectorEmitter.cpp
View File

@ -14,6 +14,7 @@
NodeType::ArgResultTypes NodeType::Translate(Record *R) { NodeType::ArgResultTypes NodeType::Translate(Record *R) {
const std::string &Name = R->getName(); const std::string &Name = R->getName();
if (Name == "DNVT_any") return Any;
if (Name == "DNVT_void") return Void; if (Name == "DNVT_void") return Void;
if (Name == "DNVT_val" ) return Val; if (Name == "DNVT_val" ) return Val;
if (Name == "DNVT_arg0") return Arg0; if (Name == "DNVT_arg0") return Arg0;
@ -204,6 +205,8 @@ TreePatternNode *Pattern::ParseTreePattern(DagInit *Dag) {
New = new TreePatternNode(DI); New = new TreePatternNode(DI);
// If it's a regclass or something else known, set the type. // If it's a regclass or something else known, set the type.
New->setType(getIntrinsicType(DI->getDef())); New->setType(getIntrinsicType(DI->getDef()));
} else if (DagInit *DI = dynamic_cast<DagInit*>(Arg)) {
New = ParseTreePattern(DI);
} else { } else {
Arg->dump(); Arg->dump();
error("Unknown leaf value for tree pattern!"); error("Unknown leaf value for tree pattern!");
@ -276,6 +279,7 @@ bool Pattern::InferTypes(TreePatternNode *N, bool &MadeChange) {
AnyUnset |= InferTypes(Child, MadeChange); AnyUnset |= InferTypes(Child, MadeChange);
switch (NT.ArgTypes[i]) { switch (NT.ArgTypes[i]) {
case NodeType::Any: break;
case NodeType::I8: case NodeType::I8:
MadeChange |= Child->updateNodeType(MVT::i1, TheRecord->getName()); MadeChange |= Child->updateNodeType(MVT::i1, TheRecord->getName());
break; break;
@ -301,6 +305,7 @@ bool Pattern::InferTypes(TreePatternNode *N, bool &MadeChange) {
// See if we can infer anything about the return type now... // See if we can infer anything about the return type now...
switch (NT.ResultType) { switch (NT.ResultType) {
case NodeType::Any: break;
case NodeType::Void: case NodeType::Void:
MadeChange |= N->updateNodeType(MVT::isVoid, TheRecord->getName()); MadeChange |= N->updateNodeType(MVT::isVoid, TheRecord->getName());
break; break;
@ -867,9 +872,10 @@ void InstrSelectorEmitter::PrintExpanderOperand(Init *Arg,
std::ostream &OS) { std::ostream &OS) {
if (DefInit *DI = dynamic_cast<DefInit*>(Arg)) { if (DefInit *DI = dynamic_cast<DefInit*>(Arg)) {
Record *Arg = DI->getDef(); Record *Arg = DI->getDef();
if (!ArgDeclNode->isLeaf()) if (!ArgDeclNode->isLeaf() && ArgDeclNode->getNumChildren() != 0)
P->error("Expected leaf node as argument!"); P->error("Expected leaf node as argument!");
Record *ArgDecl = ArgDeclNode->getValueRecord(); Record *ArgDecl = ArgDeclNode->isLeaf() ? ArgDeclNode->getValueRecord() :
ArgDeclNode->getOperator();
if (Arg->isSubClassOf("Register")) { if (Arg->isSubClassOf("Register")) {
// This is a physical register reference... make sure that the instruction // This is a physical register reference... make sure that the instruction
// requested a register! // requested a register!
@ -896,6 +902,10 @@ void InstrSelectorEmitter::PrintExpanderOperand(Init *Arg,
if (!PrintArg) P->error("Cannot define a new frameidx value!"); if (!PrintArg) P->error("Cannot define a new frameidx value!");
OS << ".addFrameIndex(" << NameVar << ")"; OS << ".addFrameIndex(" << NameVar << ")";
return; return;
} else if (Arg->getName() == "basicblock") {
if (!PrintArg) P->error("Cannot define a new basicblock value!");
OS << ".addMBB(" << NameVar << ")";
return;
} }
P->error("Unknown operand type '" + Arg->getName() + "' to expander!"); P->error("Unknown operand type '" + Arg->getName() + "' to expander!");
} else if (IntInit *II = dynamic_cast<IntInit*>(Arg)) { } else if (IntInit *II = dynamic_cast<IntInit*>(Arg)) {
@ -910,7 +920,7 @@ void InstrSelectorEmitter::PrintExpanderOperand(Init *Arg,
} else { } else {
if (ArgDeclNode->isLeaf() || ArgDeclNode->getOperator()->getName()!="imm") if (ArgDeclNode->isLeaf() || ArgDeclNode->getOperator()->getName()!="imm")
P->error("Illegal immediate int value '" + itostr(II->getValue()) + P->error("Illegal immediate int value '" + itostr(II->getValue()) +
"' operand!"); "' operand!");
OS << ".addZImm(" << II->getValue() << ")"; OS << ".addZImm(" << II->getValue() << ")";
} }
return; return;
@ -1213,7 +1223,8 @@ void InstrSelectorEmitter::run(std::ostream &OS) {
for (unsigned IN = 0, e = Insts->getSize(); IN != e; ++IN) { for (unsigned IN = 0, e = Insts->getSize(); IN != e; ++IN) {
DagInit *DIInst = dynamic_cast<DagInit*>(Insts->getElement(IN)); DagInit *DIInst = dynamic_cast<DagInit*>(Insts->getElement(IN));
if (!DIInst) P->error("Result list must contain instructions!"); if (!DIInst) P->error("Result list must contain instructions!");
Pattern *InstPat = getPattern(DIInst->getNodeType()); Record *InstRec = DIInst->getNodeType();
Pattern *InstPat = getPattern(InstRec);
if (!InstPat || InstPat->getPatternType() != Pattern::Instruction) if (!InstPat || InstPat->getPatternType() != Pattern::Instruction)
P->error("Instruction list must contain Instruction patterns!"); P->error("Instruction list must contain Instruction patterns!");
@ -1225,10 +1236,10 @@ void InstrSelectorEmitter::run(std::ostream &OS) {
// Start emission of the instruction... // Start emission of the instruction...
OS << " BuildMI(MBB, " << Target.getName() << "::" OS << " BuildMI(MBB, " << Target.getName() << "::"
<< InstPat->getRecord()->getName() << ", " << InstRec->getName() << ", "
<< DIInst->getNumArgs()-hasResult; << DIInst->getNumArgs()-hasResult;
// Emit register result if necessary.. // Emit register result if necessary..
if (Record *R = InstPat->getResult()) { if (hasResult) {
std::string ArgNameVal = std::string ArgNameVal =
getArgName(P, DIInst->getArgName(0), Operands); getArgName(P, DIInst->getArgName(0), Operands);
PrintExpanderOperand(DIInst->getArg(0), ArgNameVal, PrintExpanderOperand(DIInst->getArg(0), ArgNameVal,

2
support/tools/TableGen/InstrSelectorEmitter.h
View File

@ -20,7 +20,7 @@ class InstrSelectorEmitter;
/// ///
struct NodeType { struct NodeType {
enum ArgResultTypes { enum ArgResultTypes {
// Both argument and return types... Any, // No constraint on type
Val, // A non-void type Val, // A non-void type
Arg0, // Value matches the type of Arg0 Arg0, // Value matches the type of Arg0
Arg1, // Value matches the type of Arg1 Arg1, // Value matches the type of Arg1

23
utils/TableGen/InstrSelectorEmitter.cpp
View File

@ -14,6 +14,7 @@
NodeType::ArgResultTypes NodeType::Translate(Record *R) { NodeType::ArgResultTypes NodeType::Translate(Record *R) {
const std::string &Name = R->getName(); const std::string &Name = R->getName();
if (Name == "DNVT_any") return Any;
if (Name == "DNVT_void") return Void; if (Name == "DNVT_void") return Void;
if (Name == "DNVT_val" ) return Val; if (Name == "DNVT_val" ) return Val;
if (Name == "DNVT_arg0") return Arg0; if (Name == "DNVT_arg0") return Arg0;
@ -204,6 +205,8 @@ TreePatternNode *Pattern::ParseTreePattern(DagInit *Dag) {
New = new TreePatternNode(DI); New = new TreePatternNode(DI);
// If it's a regclass or something else known, set the type. // If it's a regclass or something else known, set the type.
New->setType(getIntrinsicType(DI->getDef())); New->setType(getIntrinsicType(DI->getDef()));
} else if (DagInit *DI = dynamic_cast<DagInit*>(Arg)) {
New = ParseTreePattern(DI);
} else { } else {
Arg->dump(); Arg->dump();
error("Unknown leaf value for tree pattern!"); error("Unknown leaf value for tree pattern!");
@ -276,6 +279,7 @@ bool Pattern::InferTypes(TreePatternNode *N, bool &MadeChange) {
AnyUnset |= InferTypes(Child, MadeChange); AnyUnset |= InferTypes(Child, MadeChange);
switch (NT.ArgTypes[i]) { switch (NT.ArgTypes[i]) {
case NodeType::Any: break;
case NodeType::I8: case NodeType::I8:
MadeChange |= Child->updateNodeType(MVT::i1, TheRecord->getName()); MadeChange |= Child->updateNodeType(MVT::i1, TheRecord->getName());
break; break;
@ -301,6 +305,7 @@ bool Pattern::InferTypes(TreePatternNode *N, bool &MadeChange) {
// See if we can infer anything about the return type now... // See if we can infer anything about the return type now...
switch (NT.ResultType) { switch (NT.ResultType) {
case NodeType::Any: break;
case NodeType::Void: case NodeType::Void:
MadeChange |= N->updateNodeType(MVT::isVoid, TheRecord->getName()); MadeChange |= N->updateNodeType(MVT::isVoid, TheRecord->getName());
break; break;
@ -867,9 +872,10 @@ void InstrSelectorEmitter::PrintExpanderOperand(Init *Arg,
std::ostream &OS) { std::ostream &OS) {
if (DefInit *DI = dynamic_cast<DefInit*>(Arg)) { if (DefInit *DI = dynamic_cast<DefInit*>(Arg)) {
Record *Arg = DI->getDef(); Record *Arg = DI->getDef();
if (!ArgDeclNode->isLeaf()) if (!ArgDeclNode->isLeaf() && ArgDeclNode->getNumChildren() != 0)
P->error("Expected leaf node as argument!"); P->error("Expected leaf node as argument!");
Record *ArgDecl = ArgDeclNode->getValueRecord(); Record *ArgDecl = ArgDeclNode->isLeaf() ? ArgDeclNode->getValueRecord() :
ArgDeclNode->getOperator();
if (Arg->isSubClassOf("Register")) { if (Arg->isSubClassOf("Register")) {
// This is a physical register reference... make sure that the instruction // This is a physical register reference... make sure that the instruction
// requested a register! // requested a register!
@ -896,6 +902,10 @@ void InstrSelectorEmitter::PrintExpanderOperand(Init *Arg,
if (!PrintArg) P->error("Cannot define a new frameidx value!"); if (!PrintArg) P->error("Cannot define a new frameidx value!");
OS << ".addFrameIndex(" << NameVar << ")"; OS << ".addFrameIndex(" << NameVar << ")";
return; return;
} else if (Arg->getName() == "basicblock") {
if (!PrintArg) P->error("Cannot define a new basicblock value!");
OS << ".addMBB(" << NameVar << ")";
return;
} }
P->error("Unknown operand type '" + Arg->getName() + "' to expander!"); P->error("Unknown operand type '" + Arg->getName() + "' to expander!");
} else if (IntInit *II = dynamic_cast<IntInit*>(Arg)) { } else if (IntInit *II = dynamic_cast<IntInit*>(Arg)) {
@ -910,7 +920,7 @@ void InstrSelectorEmitter::PrintExpanderOperand(Init *Arg,
} else { } else {
if (ArgDeclNode->isLeaf() || ArgDeclNode->getOperator()->getName()!="imm") if (ArgDeclNode->isLeaf() || ArgDeclNode->getOperator()->getName()!="imm")
P->error("Illegal immediate int value '" + itostr(II->getValue()) + P->error("Illegal immediate int value '" + itostr(II->getValue()) +
"' operand!"); "' operand!");
OS << ".addZImm(" << II->getValue() << ")"; OS << ".addZImm(" << II->getValue() << ")";
} }
return; return;
@ -1213,7 +1223,8 @@ void InstrSelectorEmitter::run(std::ostream &OS) {
for (unsigned IN = 0, e = Insts->getSize(); IN != e; ++IN) { for (unsigned IN = 0, e = Insts->getSize(); IN != e; ++IN) {
DagInit *DIInst = dynamic_cast<DagInit*>(Insts->getElement(IN)); DagInit *DIInst = dynamic_cast<DagInit*>(Insts->getElement(IN));
if (!DIInst) P->error("Result list must contain instructions!"); if (!DIInst) P->error("Result list must contain instructions!");
Pattern *InstPat = getPattern(DIInst->getNodeType()); Record *InstRec = DIInst->getNodeType();
Pattern *InstPat = getPattern(InstRec);
if (!InstPat || InstPat->getPatternType() != Pattern::Instruction) if (!InstPat || InstPat->getPatternType() != Pattern::Instruction)
P->error("Instruction list must contain Instruction patterns!"); P->error("Instruction list must contain Instruction patterns!");
@ -1225,10 +1236,10 @@ void InstrSelectorEmitter::run(std::ostream &OS) {
// Start emission of the instruction... // Start emission of the instruction...
OS << " BuildMI(MBB, " << Target.getName() << "::" OS << " BuildMI(MBB, " << Target.getName() << "::"
<< InstPat->getRecord()->getName() << ", " << InstRec->getName() << ", "
<< DIInst->getNumArgs()-hasResult; << DIInst->getNumArgs()-hasResult;
// Emit register result if necessary.. // Emit register result if necessary..
if (Record *R = InstPat->getResult()) { if (hasResult) {
std::string ArgNameVal = std::string ArgNameVal =
getArgName(P, DIInst->getArgName(0), Operands); getArgName(P, DIInst->getArgName(0), Operands);
PrintExpanderOperand(DIInst->getArg(0), ArgNameVal, PrintExpanderOperand(DIInst->getArg(0), ArgNameVal,

2
utils/TableGen/InstrSelectorEmitter.h
View File

@ -20,7 +20,7 @@ class InstrSelectorEmitter;
/// ///
struct NodeType { struct NodeType {
enum ArgResultTypes { enum ArgResultTypes {
// Both argument and return types... Any, // No constraint on type
Val, // A non-void type Val, // A non-void type
Arg0, // Value matches the type of Arg0 Arg0, // Value matches the type of Arg0
Arg1, // Value matches the type of Arg1 Arg1, // Value matches the type of Arg1