Allow multiclass def names to contain "#NAME"" where TableGen replaces

#NAME# with the name of the defm instantiating the multiclass.  This is
useful for AVX instruction naming where a "V" prefix is standard
throughout the ISA.  For example:

multiclass SSE_AVX_Inst<...> {
   def SS : Instr<...>;
   def SD : Instr<...>;
   def PS : Instr<...>;
   def PD : Instr<...>;

   def V#NAME#SS : Instr<...>;
   def V#NAME#SD : Instr<...>;
   def V#NAME#PS : Instr<...>;
   def V#NAME#PD : Instr<...>;
}

defm ADD : SSE_AVX_Inst<...>;

Results in 

ADDSS
ADDSD
ADDPS
ADDPD

VADDSS
VADDSD
VADDPS
VADDPD

llvm-svn: 70979
This commit is contained in:
David Greene 2009-05-05 16:28:25 +00:00
parent d953cd9401
commit 44f9d7a8f0
3 changed files with 39 additions and 6 deletions

View File

@ -0,0 +1,12 @@
// RUN: tblgen %s | grep WorldHelloCC | count 1
class C<string n> {
string name = n;
}
multiclass Names<string n, string m> {
def CC : C<n>;
def World#NAME#CC : C<m>;
}
defm Hello : Names<"hello", "world">;

View File

@ -98,7 +98,7 @@ tgtok::TokKind TGLexer::LexToken() {
switch (CurChar) { switch (CurChar) {
default: default:
// Handle letters: [a-zA-Z_] // Handle letters: [a-zA-Z_]
if (isalpha(CurChar) || CurChar == '_') if (isalpha(CurChar) || CurChar == '_' || CurChar == '#')
return LexIdentifier(); return LexIdentifier();
// Unknown character, emit an error. // Unknown character, emit an error.
@ -220,8 +220,20 @@ tgtok::TokKind TGLexer::LexIdentifier() {
const char *IdentStart = TokStart; const char *IdentStart = TokStart;
// Match the rest of the identifier regex: [0-9a-zA-Z_]* // Match the rest of the identifier regex: [0-9a-zA-Z_]*
while (isalpha(*CurPtr) || isdigit(*CurPtr) || *CurPtr == '_') while (isalpha(*CurPtr) || isdigit(*CurPtr) || *CurPtr == '_'
|| *CurPtr == '#') {
// If this contains a '#', make sure it's value
if (*CurPtr == '#') {
if (strncmp(CurPtr, "#NAME#", 6) != 0) {
return tgtok::Error;
}
CurPtr += 6;
}
else {
++CurPtr; ++CurPtr;
}
}
// Check to see if this identifier is a keyword. // Check to see if this identifier is a keyword.
unsigned Len = CurPtr-IdentStart; unsigned Len = CurPtr-IdentStart;

View File

@ -1609,9 +1609,18 @@ bool TGParser::ParseDefm() {
for (unsigned i = 0, e = MC->DefPrototypes.size(); i != e; ++i) { for (unsigned i = 0, e = MC->DefPrototypes.size(); i != e; ++i) {
Record *DefProto = MC->DefPrototypes[i]; Record *DefProto = MC->DefPrototypes[i];
// Add in the defm name
std::string DefName = DefProto->getName();
std::string::size_type idx = DefName.find("#NAME#");
if (idx != std::string::npos) {
DefName.replace(idx, 6, DefmPrefix);
}
else {
// Add the suffix to the defm name to get the new name. // Add the suffix to the defm name to get the new name.
Record *CurRec = new Record(DefmPrefix + DefProto->getName(), DefName = DefmPrefix + DefName;
DefmPrefixLoc); }
Record *CurRec = new Record(DefName, DefmPrefixLoc);
SubClassReference Ref; SubClassReference Ref;
Ref.RefLoc = DefmPrefixLoc; Ref.RefLoc = DefmPrefixLoc;