luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TmpString use thread_local instead of lock 

Signed-off-by: James Cherry <cherry@parallaxsw.com>
This commit is contained in:
James Cherry 2024-08-17 11:11:53 -07:00
parent cb6922d743
commit b51885aa37
4 changed files with 26 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/sta/StringUtil.hh
View File

@ -177,10 +177,6 @@ stringPrintTmp(const char *fmt,
char * char *
makeTmpString(size_t length); makeTmpString(size_t length);
void
initTmpStrings();
void
deleteTmpStrings();
bool bool
isTmpString(const char *str); isTmpString(const char *str);

2
network/Network.cc
View File

@ -258,7 +258,7 @@ Network::pathName(const Instance *instance) const
const Instance *inst = path_iter1.next(); const Instance *inst = path_iter1.next();
name_length += strlen(name(inst)) + 1; name_length += strlen(name(inst)) + 1;
} }
char *path_name = makeTmpString(name_length); char *path_name = makeTmpString(name_length + 1);
char *path_ptr = path_name; char *path_ptr = path_name;
// Top instance has null string name, so terminate the string here. // Top instance has null string name, so terminate the string here.
*path_name = '\0'; *path_name = '\0';

2
search/Sta.cc
View File

@ -225,7 +225,6 @@ initSta()
initElapsedTime(); initElapsedTime();
TimingRole::init(); TimingRole::init();
PortDirection::init(); PortDirection::init();
initTmpStrings();
initLiberty(); initLiberty();
initDelayConstants(); initDelayConstants();
registerDelayCalcs(); registerDelayCalcs();
@ -244,7 +243,6 @@ deleteAllMemory()
Sta::setSta(nullptr); Sta::setSta(nullptr);
} }
deleteDelayCalcs(); deleteDelayCalcs();
deleteTmpStrings();
TimingRole::destroy(); TimingRole::destroy();
PortDirection::destroy(); PortDirection::destroy();
deleteLiberty(); deleteLiberty();

75
util/StringUtil.cc
View File

@ -19,6 +19,7 @@
#include <limits> #include <limits>
#include <cctype> #include <cctype>
#include <cstdio> #include <cstdio>
#include <array>
#include "Machine.hh" #include "Machine.hh"
#include "Mutex.hh" #include "Mutex.hh"
@ -152,69 +153,43 @@ stringPrintTmp(const char *fmt,
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
static int tmp_string_count_ = 100; static constexpr size_t tmp_string_count = 256;
static char **tmp_strings_ = nullptr; static constexpr size_t tmp_string_initial_length = 256;
static size_t *tmp_string_lengths_ = nullptr; thread_local static std::array<char*, tmp_string_count> tmp_strings;
static int tmp_string_next_; thread_local static std::array<size_t, tmp_string_count> tmp_string_lengths;
static std::mutex string_lock_; thread_local static int tmp_string_next = 0;
void
initTmpStrings()
{
size_t initial_length = 100;
tmp_strings_ = new char*[tmp_string_count_];
tmp_string_lengths_ = new size_t[tmp_string_count_];
for (int i = 0; i < tmp_string_count_; i++) {
tmp_strings_[i] = new char[initial_length];
tmp_string_lengths_[i] = initial_length;
}
tmp_string_next_ = 0;
}
void
deleteTmpStrings()
{
if (tmp_strings_) {
for (int i = 0; i < tmp_string_count_; i++)
delete [] tmp_strings_[i];
delete [] tmp_strings_;
tmp_strings_ = nullptr;
delete [] tmp_string_lengths_;
tmp_string_lengths_ = nullptr;
}
}
static void static void
getTmpString(// Return values. getTmpString(// Return values.
char *&str, char *&str,
size_t &length) size_t &length)
{ {
LockGuard lock(string_lock_); if (tmp_string_next == tmp_string_count)
if (tmp_string_next_ == tmp_string_count_) tmp_string_next = 0;
tmp_string_next_ = 0; str = tmp_strings[tmp_string_next];
str = tmp_strings_[tmp_string_next_]; length = tmp_string_lengths[tmp_string_next];
length = tmp_string_lengths_[tmp_string_next_]; if (str == nullptr) {
tmp_string_next_++; str = tmp_strings[tmp_string_next] = new char[tmp_string_initial_length];
length = tmp_string_lengths[tmp_string_next] = tmp_string_initial_length;
}
tmp_string_next++;
} }
char * char *
makeTmpString(size_t length) makeTmpString(size_t length)
{ {
LockGuard lock(string_lock_); if (tmp_string_next == tmp_string_count)
if (tmp_string_next_ == tmp_string_count_) tmp_string_next = 0;
tmp_string_next_ = 0; char *tmp_str = tmp_strings[tmp_string_next];
char *tmp_str = tmp_strings_[tmp_string_next_]; size_t tmp_length = tmp_string_lengths[tmp_string_next];
size_t tmp_length = tmp_string_lengths_[tmp_string_next_];
if (tmp_length < length) { if (tmp_length < length) {
// String isn't long enough. Make a new one. // String isn't long enough. Make a new one.
delete [] tmp_str; delete [] tmp_str;
tmp_str = new char[length]; tmp_str = new char[length];
tmp_strings_[tmp_string_next_] = tmp_str; tmp_strings[tmp_string_next] = tmp_str;
tmp_string_lengths_[tmp_string_next_] = length; tmp_string_lengths[tmp_string_next] = length;
} }
tmp_string_next_++; tmp_string_next++;
return tmp_str; return tmp_str;
} }
@ -230,9 +205,9 @@ stringDeleteCheck(const char *str)
bool bool
isTmpString(const char *str) isTmpString(const char *str)
{ {
if (tmp_strings_) { if (!tmp_strings.empty()) {
for (int i = 0; i < tmp_string_count_; i++) { for (size_t i = 0; i < tmp_string_count; i++) {
if (str == tmp_strings_[i]) if (str == tmp_strings[i])
return true; return true;
} }
} }