RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 12:41:49 +01:00
Code Issues Projects Releases Wiki Activity

[ADT] Add methods to SmallString for efficient concatenation

Browse Source 
A common pattern when using SmallString is to repeatedly call append to build a larger string.
The issue here is the optimizer can't see through this and often has to check there is enough space in the storage for each string you try to append.
This results in lots of conditional branches and potentially multiple calls to grow needing to be emitted if the buffer wasn't large enough.
By taking an initializer_list of StringRefs, SmallString can preallocate the storage it needs for all of the StringRefs which only need to grow one time at most, then use a fast path of copying all the strings into its storage knowing there is guaranteed to be enough capacity.
By using StringRefs, this also means you can append different string like types in one go as they will all be implicitly converted to a StringRef.

Reviewed By: dblaikie

Differential Revision: https://reviews.llvm.org/D90386
This commit is contained in:
Nathan James 2020-10-30 10:07:39 +00:00
parent 61cfd5c5c0
commit 21052ba8d6
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/llvm/ADT/SmallString.h
View File

@ -30,6 +30,12 @@ public:
/// Initialize from a StringRef.
SmallString(StringRef S) : SmallVector<char, InternalLen>(S.begin(), S.end()) {}
/// Initialize by concatenating a list of StringRefs.
SmallString(std::initializer_list<StringRef> Refs)
: SmallVector<char, InternalLen>() {
this->append(Refs);
}
/// Initialize with a range.
template<typename ItTy>
SmallString(ItTy S, ItTy E) : SmallVector<char, InternalLen>(S, E) {}
@ -65,6 +71,12 @@ public:
SmallVectorImpl<char>::append(RHS.begin(), RHS.end());
}
/// Assign from a list of StringRefs.
void assign(std::initializer_list<StringRef> Refs) {
this->clear();
append(Refs);
}
/// @}
/// @name String Concatenation
/// @{
@ -89,6 +101,20 @@ public:
SmallVectorImpl<char>::append(RHS.begin(), RHS.end());
}
/// Append from a list of StringRefs.
void append(std::initializer_list<StringRef> Refs) {
size_t SizeNeeded = this->size();
for (const StringRef &Ref : Refs)
SizeNeeded += Ref.size();
this->reserve(SizeNeeded);
auto CurEnd = this->end();
for (const StringRef &Ref : Refs) {
this->uninitialized_copy(Ref.begin(), Ref.end(), CurEnd);
CurEnd += Ref.size();
}
this->set_size(SizeNeeded);
}
/// @}
/// @name String Comparison
/// @{

19
unittests/ADT/SmallStringTest.cpp
View File

@ -71,6 +71,12 @@ TEST_F(SmallStringTest, AssignSmallVector) {
EXPECT_STREQ("abc", theString.c_str());
}
TEST_F(SmallStringTest, AssignStringRefs) {
theString.assign({"abc", "def", "ghi"});
EXPECT_EQ(9u, theString.size());
EXPECT_STREQ("abcdefghi", theString.c_str());
}
TEST_F(SmallStringTest, AppendIterPair) {
StringRef abc = "abc";
theString.append(abc.begin(), abc.end());
@ -96,6 +102,19 @@ TEST_F(SmallStringTest, AppendSmallVector) {
EXPECT_STREQ("abcabc", theString.c_str());
}
TEST_F(SmallStringTest, AppendStringRefs) {
theString.append({"abc", "def", "ghi"});
EXPECT_EQ(9u, theString.size());
EXPECT_STREQ("abcdefghi", theString.c_str());
StringRef Jkl = "jkl";
std::string Mno = "mno";
SmallString<4> Pqr("pqr");
const char *Stu = "stu";
theString.append({Jkl, Mno, Pqr, Stu});
EXPECT_EQ(21u, theString.size());
EXPECT_STREQ("abcdefghijklmnopqrstu", theString.c_str());
}
TEST_F(SmallStringTest, StringRefConversion) {
StringRef abc = "abc";
theString.assign(abc.begin(), abc.end());