From 8d98b90f49faece57fac3020e8bda36f848b7171 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 30 Sep 2026 20:52:37 +0200 Subject: [PATCH] Optimize: Avoid std::string allocations in string comparison This could take up ~25% of config loading time with e.g. the ACES Studio Config or the Blender configuration. This is around 2-3ms on Apple M3 Max. Signed-off-by: Brecht Van Lommel --- src/OpenColorIO/ColorSpaceSet.cpp | 6 ++--- src/OpenColorIO/Config.cpp | 37 +++++++++++++++---------------- src/OpenColorIO/ParseUtils.cpp | 3 +-- src/OpenColorIO/TokensManager.h | 21 +++++------------- src/OpenColorIO/ViewingRules.cpp | 4 +--- src/utils/StringUtils.h | 18 +++++++++++++-- 6 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/OpenColorIO/ColorSpaceSet.cpp b/src/OpenColorIO/ColorSpaceSet.cpp index 488099be6..90ca31240 100644 --- a/src/OpenColorIO/ColorSpaceSet.cpp +++ b/src/OpenColorIO/ColorSpaceSet.cpp @@ -91,7 +91,7 @@ class ColorSpaceSet::Impl // Search for name and aliases. if (csName && *csName) { - const std::string str = StringUtils::Lower(csName); + const std::string_view str(csName); for (size_t idx = 0; idx < m_colorSpaces.size(); ++idx) { if (StringUtils::Compare(m_colorSpaces[idx]->getName(), str)) @@ -181,12 +181,10 @@ class ColorSpaceSet::Impl void remove(const char * csName) { if (!csName || !*csName) return; - const std::string name = StringUtils::Lower(csName); - if (name.empty()) return; for (auto itr = m_colorSpaces.begin(); itr != m_colorSpaces.end(); ++itr) { - if (StringUtils::Lower((*itr)->getName())==name) + if (StringUtils::Compare((*itr)->getName(), csName)) { m_colorSpaces.erase(itr); return; diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp index 331f2113f..03eae7469 100644 --- a/src/OpenColorIO/Config.cpp +++ b/src/OpenColorIO/Config.cpp @@ -520,17 +520,16 @@ class Config::Impl { if (name && *name) { - const std::string str = StringUtils::Lower(name); for (size_t idx = 0; idx < m_allNamedTransforms.size(); ++idx) { - if (StringUtils::Lower(m_allNamedTransforms[idx]->getName()) == str) + if (StringUtils::Compare(m_allNamedTransforms[idx]->getName(), name)) { return idx; } const auto numAliases = m_allNamedTransforms[idx]->getNumAliases(); for (size_t alias = 0; alias < numAliases; ++alias) { - if (StringUtils::Lower(m_allNamedTransforms[idx]->getAlias(alias)) == str) + if (StringUtils::Compare(m_allNamedTransforms[idx]->getAlias(alias), name)) { return idx; } @@ -551,11 +550,14 @@ class Config::Impl ConstViewTransformRcPtr getViewTransform(const char * name) const noexcept { - const std::string namelower = StringUtils::Lower(name); + if (!name) + { + return ConstViewTransformRcPtr(); + } for (const auto & vt : m_viewTransforms) { - if (StringUtils::Lower(vt->getName()) == namelower) + if (StringUtils::Compare(vt->getName(), name)) { return vt; } @@ -566,11 +568,14 @@ class Config::Impl ConstLookRcPtr getLook(const char * name) const { - const std::string namelower = StringUtils::Lower(name); + if (!name) + { + return ConstLookRcPtr(); + } for (const auto & look : m_looksList) { - if (StringUtils::Lower(look->getName()) == namelower) + if (StringUtils::Compare(look->getName(), name)) { return look; } @@ -907,7 +912,6 @@ class Config::Impl viewNames = GetViewNames(views); StringUtils::StringVec activeViews = getActiveViews(viewNames); - const std::string imageColorSpaceName{ StringUtils::Lower(imageCSName) }; StringUtils::StringVec filteredActiveViews; for (const auto & view : activeViews) { @@ -929,8 +933,8 @@ class Config::Impl const char * rolename = m_viewingRules->getColorSpace(ruleIdx, csIdx); const char * csname = LookupRole(m_roles, rolename); - const std::string csName{ *csname ? csname : rolename }; - if (StringUtils::Lower(csName) == imageColorSpaceName) + const char * csName = *csname ? csname : rolename; + if (StringUtils::Compare(csName, imageCSName)) { // Include a view if its rule contains the image's color space. filteredActiveViews.push_back(view); @@ -3528,12 +3532,11 @@ void Config::addNamedTransform(const ConstNamedTransformRcPtr & nt) void Config::removeNamedTransform(const char * name) { - const std::string nameToSearch = StringUtils::Lower(name); - if (nameToSearch.empty()) return; + if (!name || !*name) return; for (auto itr = getImpl()->m_allNamedTransforms.begin(); itr != getImpl()->m_allNamedTransforms.end(); ++itr) { - if (StringUtils::Lower((*itr)->getName()) == nameToSearch) + if (StringUtils::Compare((*itr)->getName(), name)) { getImpl()->m_allNamedTransforms.erase(itr); return; @@ -5112,12 +5115,10 @@ void Config::addLook(const ConstLookRcPtr & look) if(name.empty()) throw Exception("Cannot addLook with an empty name."); - const std::string namelower = StringUtils::Lower(name); - // If the look exists, replace it for(unsigned int i=0; im_looksList.size(); ++i) { - if(StringUtils::Lower(getImpl()->m_looksList[i]->getName()) == namelower) + if(StringUtils::Compare(getImpl()->m_looksList[i]->getName(), name)) { getImpl()->m_looksList[i] = look->createEditableCopy(); @@ -5221,14 +5222,12 @@ void Config::addViewTransform(const ConstViewTransformRcPtr & viewTransform) throw Exception(os.str().c_str()); } - const std::string namelower = StringUtils::Lower(name); - bool addIt = true; // If the view transform exists, replace it. for (auto && vt : getImpl()->m_viewTransforms) { - if (StringUtils::Lower(vt->getName()) == namelower) + if (StringUtils::Compare(vt->getName(), name)) { vt = viewTransform->createEditableCopy(); addIt = false; diff --git a/src/OpenColorIO/ParseUtils.cpp b/src/OpenColorIO/ParseUtils.cpp index d2e407b15..fa333c9e2 100644 --- a/src/OpenColorIO/ParseUtils.cpp +++ b/src/OpenColorIO/ParseUtils.cpp @@ -880,10 +880,9 @@ StringUtils::StringVec IntersectStringVecsCaseIgnore(const StringUtils::StringVe int FindInStringVecCaseIgnore(const StringUtils::StringVec & vec, const std::string & str) { - const std::string teststr = StringUtils::Lower(str); for(unsigned int i=0; i(i); + if(StringUtils::Compare(vec[i], str)) return static_cast(i); } return -1; diff --git a/src/OpenColorIO/TokensManager.h b/src/OpenColorIO/TokensManager.h index b2f02f3b0..b46197603 100644 --- a/src/OpenColorIO/TokensManager.h +++ b/src/OpenColorIO/TokensManager.h @@ -31,11 +31,12 @@ class TokensManager if (!token || !*token) return m_tokens.end(); // NB: Categories are not case-sensitive and whitespace is stripped. - const std::string ref(StringUtils::Trim(StringUtils::Lower(token))); + // Stored tokens are already trimmed by addToken(). + const std::string ref(StringUtils::Trim(token)); for (auto itr = m_tokens.begin(); itr != m_tokens.end(); ++itr) { - if (StringUtils::Trim(StringUtils::Lower(*itr)) == ref) + if (StringUtils::Compare(*itr, ref)) { return itr; } @@ -60,21 +61,11 @@ class TokensManager void removeToken(const char * token) noexcept { - if (!token || !*token) return; - - // NB: Categories are not case-sensitive and whitespace is stripped. - const std::string ref(StringUtils::Trim(StringUtils::Lower(token))); - - for (auto itr = m_tokens.begin(); itr != m_tokens.end(); ++itr) + const auto itr = findToken(token); + if (itr != m_tokens.end()) { - if (StringUtils::Trim(StringUtils::Lower(*itr)) == ref) - { - m_tokens.erase(itr); - return; - } + m_tokens.erase(itr); } - - return; } int getNumTokens() const noexcept diff --git a/src/OpenColorIO/ViewingRules.cpp b/src/OpenColorIO/ViewingRules.cpp index 543681e26..7aaf3a56e 100644 --- a/src/OpenColorIO/ViewingRules.cpp +++ b/src/OpenColorIO/ViewingRules.cpp @@ -19,13 +19,11 @@ namespace { bool IsEncodingUsed(const ColorSpaceSetRcPtr & colorspaces, const char * encName) { - const std::string teststr = StringUtils::Lower(encName); const int numCS = colorspaces->getNumColorSpaces(); for (int cs = 0; cs < numCS; ++cs) { auto colorspace = colorspaces->getColorSpaceByIndex(cs); - const std::string csis{ colorspace->getEncoding() }; - if (StringUtils::Lower(csis) == teststr) + if (StringUtils::Compare(colorspace->getEncoding(), encName)) { return true; } diff --git a/src/utils/StringUtils.h b/src/utils/StringUtils.h index 25600a276..0499a2226 100644 --- a/src/utils/StringUtils.h +++ b/src/utils/StringUtils.h @@ -9,6 +9,7 @@ #include #include #include +#include #include @@ -82,9 +83,22 @@ inline std::string Upper(const char * str) } // Case insensitive comparison of strings. -inline bool Compare(const std::string & left, const std::string & right) +inline bool Compare(std::string_view left, std::string_view right) { - return Lower(left) == Lower(right); + if (left.size() != right.size()) + { + return false; + } + + // Manual comparison by character to avoid std::string allocation overhead. + for (size_t i = 0; i < left.size(); ++i) + { + if (Lower((unsigned char)left[i]) != Lower((unsigned char)right[i])) + { + return false; + } + } + return true; } // Return true if the string ends with the suffix.