Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speed up stringf/vstringf by 1.8x #3974

Merged
merged 4 commits into from
Oct 3, 2023
Merged

Speed up stringf/vstringf by 1.8x #3974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c0027d
Speed up stringf / vstringf by 1.8x.
rmlarsen Oct 2, 2023
3a58a95
Update comment.
rmlarsen Oct 2, 2023
31c334e
Remove local modifications.
rmlarsen Oct 2, 2023
5739174
Fix compiler warnings from GCC.
rmlarsen Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions kernel/yosys.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,48 +175,6 @@ int ceil_log2(int x)
#endif
}

std::string stringf(const char *fmt, ...)
{
std::string string;
va_list ap;

va_start(ap, fmt);
string = vstringf(fmt, ap);
va_end(ap);

return string;
}

std::string vstringf(const char *fmt, va_list ap)
{
std::string string;
char *str = NULL;

#if defined(_WIN32 )|| defined(__CYGWIN__)
int sz = 64, rc;
while (1) {
va_list apc;
va_copy(apc, ap);
str = (char*)realloc(str, sz);
rc = vsnprintf(str, sz, fmt, apc);
va_end(apc);
if (rc >= 0 && rc < sz)
break;
sz *= 2;
}
#else
if (vasprintf(&str, fmt, ap) < 0)
str = NULL;
#endif

if (str != NULL) {
string = str;
free(str);
}

return string;
}

int readsome(std::istream &f, char *s, int n)
{
int rc = int(f.readsome(s, n));
Expand Down
58 changes: 57 additions & 1 deletion kernel/yosys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,64 @@ inline void memhasher() { if (memhasher_active) memhasher_do(); }

void yosys_banner();
int ceil_log2(int x) YS_ATTRIBUTE(const);

inline std::string vstringf(const char *fmt, va_list ap)
{
// For the common case of strings shorter than 128, save a heap
// allocation by using a stack allocated buffer.
const int kBufSize = 128;
char buf[kBufSize];
buf[0] = '\0';
va_list apc;
va_copy(apc, ap);
int n = vsnprintf(buf, kBufSize, fmt, apc);
va_end(apc);
if (n < kBufSize)
return std::string(buf);

std::string string;
char *str = NULL;
#if defined(_WIN32 )|| defined(__CYGWIN__)
int sz = 2 * kBufSize, rc;
while (1) {
va_copy(apc, ap);
str = (char*)realloc(str, sz);
rc = vsnprintf(str, sz, fmt, apc);
va_end(apc);
if (rc >= 0 && rc < sz)
break;
sz *= 2;
}
if (str != NULL) {
string = str;
free(str);
}
return string;
#else
if (vasprintf(&str, fmt, ap) < 0)
str = NULL;
if (str != NULL) {
string = str;
free(str);
}
return string;
#endif
}

std::string stringf(const char *fmt, ...) YS_ATTRIBUTE(format(printf, 1, 2));
std::string vstringf(const char *fmt, va_list ap);

inline std::string stringf(const char *fmt, ...)
{
std::string string;
va_list ap;

va_start(ap, fmt);
string = vstringf(fmt, ap);
va_end(ap);

return string;
}

int readsome(std::istream &f, char *s, int n);
std::string next_token(std::string &text, const char *sep = " \t\r\n", bool long_strings = false);
std::vector<std::string> split_tokens(const std::string &text, const char *sep = " \t\r\n");
Expand Down