[llvm-commits] [llvm] r156000 - in /llvm/trunk: include/llvm/TableGen/StringMatcher.h lib/TableGen/CMakeLists.txt lib/TableGen/StringMatcher.cpp utils/TableGen/AsmMatcherEmitter.cpp utils/TableGen/CMakeLists.txt utils/TableGen/IntrinsicEmitter.cpp utils/TableGen/StringMatcher.cpp utils/TableGen/StringMatcher.h
Douglas Gregor
dgregor at apple.com
Wed May 2 10:32:49 PDT 2012
Author: dgregor
Date: Wed May 2 12:32:48 2012
New Revision: 156000
URL: http://llvm.org/viewvc/llvm-project?rev=156000&view=rev
Log:
Move llvm-tblgen's StringMatcher into the TableGen library so it can
be used by clang-tblgen.
Added:
llvm/trunk/include/llvm/TableGen/StringMatcher.h
- copied unchanged from r155986, llvm/trunk/utils/TableGen/StringMatcher.h
llvm/trunk/lib/TableGen/StringMatcher.cpp
- copied, changed from r155986, llvm/trunk/utils/TableGen/StringMatcher.cpp
Removed:
llvm/trunk/utils/TableGen/StringMatcher.cpp
llvm/trunk/utils/TableGen/StringMatcher.h
Modified:
llvm/trunk/lib/TableGen/CMakeLists.txt
llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp
llvm/trunk/utils/TableGen/CMakeLists.txt
llvm/trunk/utils/TableGen/IntrinsicEmitter.cpp
Modified: llvm/trunk/lib/TableGen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/CMakeLists.txt?rev=156000&r1=155999&r2=156000&view=diff
==============================================================================
--- llvm/trunk/lib/TableGen/CMakeLists.txt (original)
+++ llvm/trunk/lib/TableGen/CMakeLists.txt Wed May 2 12:32:48 2012
@@ -6,6 +6,7 @@
Error.cpp
Main.cpp
Record.cpp
+ StringMatcher.cpp
TableGenAction.cpp
TableGenBackend.cpp
TGLexer.cpp
Copied: llvm/trunk/lib/TableGen/StringMatcher.cpp (from r155986, llvm/trunk/utils/TableGen/StringMatcher.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/TableGen/StringMatcher.cpp?p2=llvm/trunk/lib/TableGen/StringMatcher.cpp&p1=llvm/trunk/utils/TableGen/StringMatcher.cpp&r1=155986&r2=156000&rev=156000&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/StringMatcher.cpp (original)
+++ llvm/trunk/lib/TableGen/StringMatcher.cpp Wed May 2 12:32:48 2012
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "StringMatcher.h"
+#include "llvm/TableGen/StringMatcher.h"
#include "llvm/Support/raw_ostream.h"
#include <map>
using namespace llvm;
Modified: llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp?rev=156000&r1=155999&r2=156000&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/AsmMatcherEmitter.cpp Wed May 2 12:32:48 2012
@@ -98,7 +98,6 @@
#include "AsmMatcherEmitter.h"
#include "CodeGenTarget.h"
-#include "StringMatcher.h"
#include "StringToOffsetTable.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/PointerUnion.h"
@@ -111,6 +110,7 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/TableGen/Error.h"
#include "llvm/TableGen/Record.h"
+#include "llvm/TableGen/StringMatcher.h"
#include <map>
#include <set>
using namespace llvm;
Modified: llvm/trunk/utils/TableGen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CMakeLists.txt?rev=156000&r1=155999&r2=156000&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/CMakeLists.txt (original)
+++ llvm/trunk/utils/TableGen/CMakeLists.txt Wed May 2 12:32:48 2012
@@ -27,7 +27,6 @@
PseudoLoweringEmitter.cpp
RegisterInfoEmitter.cpp
SetTheory.cpp
- StringMatcher.cpp
SubtargetEmitter.cpp
TGValueTypes.cpp
TableGen.cpp
Modified: llvm/trunk/utils/TableGen/IntrinsicEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/IntrinsicEmitter.cpp?rev=156000&r1=155999&r2=156000&view=diff
==============================================================================
--- llvm/trunk/utils/TableGen/IntrinsicEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/IntrinsicEmitter.cpp Wed May 2 12:32:48 2012
@@ -13,8 +13,8 @@
#include "CodeGenTarget.h"
#include "IntrinsicEmitter.h"
-#include "StringMatcher.h"
#include "llvm/TableGen/Record.h"
+#include "llvm/TableGen/StringMatcher.h"
#include "llvm/ADT/StringExtras.h"
#include <algorithm>
using namespace llvm;
Removed: llvm/trunk/utils/TableGen/StringMatcher.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/StringMatcher.cpp?rev=155999&view=auto
==============================================================================
--- llvm/trunk/utils/TableGen/StringMatcher.cpp (original)
+++ llvm/trunk/utils/TableGen/StringMatcher.cpp (removed)
@@ -1,149 +0,0 @@
-//===- StringMatcher.cpp - Generate a matcher for input strings -----------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the StringMatcher class.
-//
-//===----------------------------------------------------------------------===//
-
-#include "StringMatcher.h"
-#include "llvm/Support/raw_ostream.h"
-#include <map>
-using namespace llvm;
-
-/// FindFirstNonCommonLetter - Find the first character in the keys of the
-/// string pairs that is not shared across the whole set of strings. All
-/// strings are assumed to have the same length.
-static unsigned
-FindFirstNonCommonLetter(const std::vector<const
- StringMatcher::StringPair*> &Matches) {
- assert(!Matches.empty());
- for (unsigned i = 0, e = Matches[0]->first.size(); i != e; ++i) {
- // Check to see if letter i is the same across the set.
- char Letter = Matches[0]->first[i];
-
- for (unsigned str = 0, e = Matches.size(); str != e; ++str)
- if (Matches[str]->first[i] != Letter)
- return i;
- }
-
- return Matches[0]->first.size();
-}
-
-/// EmitStringMatcherForChar - Given a set of strings that are known to be the
-/// same length and whose characters leading up to CharNo are the same, emit
-/// code to verify that CharNo and later are the same.
-///
-/// \return - True if control can leave the emitted code fragment.
-bool StringMatcher::
-EmitStringMatcherForChar(const std::vector<const StringPair*> &Matches,
- unsigned CharNo, unsigned IndentCount) const {
- assert(!Matches.empty() && "Must have at least one string to match!");
- std::string Indent(IndentCount*2+4, ' ');
-
- // If we have verified that the entire string matches, we're done: output the
- // matching code.
- if (CharNo == Matches[0]->first.size()) {
- assert(Matches.size() == 1 && "Had duplicate keys to match on");
-
- // If the to-execute code has \n's in it, indent each subsequent line.
- StringRef Code = Matches[0]->second;
-
- std::pair<StringRef, StringRef> Split = Code.split('\n');
- OS << Indent << Split.first << "\t // \"" << Matches[0]->first << "\"\n";
-
- Code = Split.second;
- while (!Code.empty()) {
- Split = Code.split('\n');
- OS << Indent << Split.first << "\n";
- Code = Split.second;
- }
- return false;
- }
-
- // Bucket the matches by the character we are comparing.
- std::map<char, std::vector<const StringPair*> > MatchesByLetter;
-
- for (unsigned i = 0, e = Matches.size(); i != e; ++i)
- MatchesByLetter[Matches[i]->first[CharNo]].push_back(Matches[i]);
-
-
- // If we have exactly one bucket to match, see how many characters are common
- // across the whole set and match all of them at once.
- if (MatchesByLetter.size() == 1) {
- unsigned FirstNonCommonLetter = FindFirstNonCommonLetter(Matches);
- unsigned NumChars = FirstNonCommonLetter-CharNo;
-
- // Emit code to break out if the prefix doesn't match.
- if (NumChars == 1) {
- // Do the comparison with if (Str[1] != 'f')
- // FIXME: Need to escape general characters.
- OS << Indent << "if (" << StrVariableName << "[" << CharNo << "] != '"
- << Matches[0]->first[CharNo] << "')\n";
- OS << Indent << " break;\n";
- } else {
- // Do the comparison with if (Str.substr(1, 3) != "foo").
- // FIXME: Need to escape general strings.
- OS << Indent << "if (" << StrVariableName << ".substr(" << CharNo << ", "
- << NumChars << ") != \"";
- OS << Matches[0]->first.substr(CharNo, NumChars) << "\")\n";
- OS << Indent << " break;\n";
- }
-
- return EmitStringMatcherForChar(Matches, FirstNonCommonLetter, IndentCount);
- }
-
- // Otherwise, we have multiple possible things, emit a switch on the
- // character.
- OS << Indent << "switch (" << StrVariableName << "[" << CharNo << "]) {\n";
- OS << Indent << "default: break;\n";
-
- for (std::map<char, std::vector<const StringPair*> >::iterator LI =
- MatchesByLetter.begin(), E = MatchesByLetter.end(); LI != E; ++LI) {
- // TODO: escape hard stuff (like \n) if we ever care about it.
- OS << Indent << "case '" << LI->first << "':\t // "
- << LI->second.size() << " string";
- if (LI->second.size() != 1) OS << 's';
- OS << " to match.\n";
- if (EmitStringMatcherForChar(LI->second, CharNo+1, IndentCount+1))
- OS << Indent << " break;\n";
- }
-
- OS << Indent << "}\n";
- return true;
-}
-
-
-/// Emit - Top level entry point.
-///
-void StringMatcher::Emit(unsigned Indent) const {
- // If nothing to match, just fall through.
- if (Matches.empty()) return;
-
- // First level categorization: group strings by length.
- std::map<unsigned, std::vector<const StringPair*> > MatchesByLength;
-
- for (unsigned i = 0, e = Matches.size(); i != e; ++i)
- MatchesByLength[Matches[i].first.size()].push_back(&Matches[i]);
-
- // Output a switch statement on length and categorize the elements within each
- // bin.
- OS.indent(Indent*2+2) << "switch (" << StrVariableName << ".size()) {\n";
- OS.indent(Indent*2+2) << "default: break;\n";
-
- for (std::map<unsigned, std::vector<const StringPair*> >::iterator LI =
- MatchesByLength.begin(), E = MatchesByLength.end(); LI != E; ++LI) {
- OS.indent(Indent*2+2) << "case " << LI->first << ":\t // "
- << LI->second.size()
- << " string" << (LI->second.size() == 1 ? "" : "s") << " to match.\n";
- if (EmitStringMatcherForChar(LI->second, 0, Indent))
- OS.indent(Indent*2+4) << "break;\n";
- }
-
- OS.indent(Indent*2+2) << "}\n";
-}
Removed: llvm/trunk/utils/TableGen/StringMatcher.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/StringMatcher.h?rev=155999&view=auto
==============================================================================
--- llvm/trunk/utils/TableGen/StringMatcher.h (original)
+++ llvm/trunk/utils/TableGen/StringMatcher.h (removed)
@@ -1,54 +0,0 @@
-//===- StringMatcher.h - Generate a matcher for input strings ---*- C++ -*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This file implements the StringMatcher class.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef STRINGMATCHER_H
-#define STRINGMATCHER_H
-
-#include <vector>
-#include <string>
-#include <utility>
-#include "llvm/ADT/StringRef.h"
-
-namespace llvm {
- class raw_ostream;
-
-/// StringMatcher - Given a list of strings and code to execute when they match,
-/// output a simple switch tree to classify the input string.
-///
-/// If a match is found, the code in Vals[i].second is executed; control must
-/// not exit this code fragment. If nothing matches, execution falls through.
-///
-class StringMatcher {
-public:
- typedef std::pair<std::string, std::string> StringPair;
-private:
- StringRef StrVariableName;
- const std::vector<StringPair> &Matches;
- raw_ostream &OS;
-
-public:
- StringMatcher(StringRef strVariableName,
- const std::vector<StringPair> &matches, raw_ostream &os)
- : StrVariableName(strVariableName), Matches(matches), OS(os) {}
-
- void Emit(unsigned Indent = 0) const;
-
-
-private:
- bool EmitStringMatcherForChar(const std::vector<const StringPair*> &Matches,
- unsigned CharNo, unsigned IndentCount) const;
-};
-
-} // end llvm namespace.
-
-#endif
More information about the llvm-commits
mailing list