Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Yaml parser: reserve additional space for nesting + simplify reserving logic 

Signed-off-by: Kacper Nowak <kacper.nowak@intel.com>
This commit is contained in:
Kacper Nowak 2022-07-19 11:29:21 +00:00 committed by Compute-Runtime-Automation
parent b86de2e4d0
commit 3a446e75cf
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shared/source/device_binary_format/yaml/yaml_parser.cpp
View File

@ -348,7 +348,6 @@ bool isEmptyVector(const Token &token, size_t lineId, std::string &outError) {
} }
bool buildTree(const LinesCache &lines, const TokensCache &tokens, NodesCache &outNodes, std::string &outErrReason, std::string &outWarning) { bool buildTree(const LinesCache &lines, const TokensCache &tokens, NodesCache &outNodes, std::string &outErrReason, std::string &outWarning) {
const auto tokensCacheSize = tokens.size();
StackVec<NodeId, 64> nesting; StackVec<NodeId, 64> nesting;
size_t lineId = 0U; size_t lineId = 0U;
size_t lastUsedLine = 0u; size_t lastUsedLine = 0u;
@ -367,20 +366,20 @@ bool buildTree(const LinesCache &lines, const TokensCache &tokens, NodesCache &o
if (lineId > 0u && false == isEmptyVector(tokens[lines[lastUsedLine].first], lastUsedLine, outErrReason)) { if (lineId > 0u && false == isEmptyVector(tokens[lines[lastUsedLine].first], lastUsedLine, outErrReason)) {
return false; return false;
} }
reserveBasedOnEstimates(outNodes, static_cast<TokenId>(0u), static_cast<TokenId>(tokensCacheSize), lines[lineId].first); reserveBasedOnEstimates(outNodes, static_cast<size_t>(0U), lines.size(), lineId);
auto &prev = *outNodes.rbegin(); auto &prev = *outNodes.rbegin();
auto &parent = outNodes[*nesting.rbegin()]; auto &parent = outNodes[*nesting.rbegin()];
auto &curr = addNode(outNodes, prev, parent); auto &curr = addNode(outNodes, prev, parent);
curr.indent = currLineIndent; curr.indent = currLineIndent;
} else if (currLineIndent > outNodes.rbegin()->indent) { } else if (currLineIndent > outNodes.rbegin()->indent) {
reserveBasedOnEstimates(outNodes, static_cast<TokenId>(0u), static_cast<TokenId>(tokensCacheSize), lines[lineId].first); reserveBasedOnEstimates(outNodes, static_cast<size_t>(0U), lines.size(), lineId);
auto &parent = *outNodes.rbegin(); auto &parent = *outNodes.rbegin();
auto &curr = addNode(outNodes, parent); auto &curr = addNode(outNodes, parent);
curr.indent = currLineIndent; curr.indent = currLineIndent;
nesting.push_back(parent.id); nesting.push_back(parent.id);
} else { } else {
while (currLineIndent < outNodes[*nesting.rbegin()].indent) { while (currLineIndent < outNodes[*nesting.rbegin()].indent) {
reserveBasedOnEstimates(outNodes, static_cast<TokenId>(0u), static_cast<TokenId>(tokensCacheSize), lines[lineId].first); reserveBasedOnEstimates(outNodes, static_cast<size_t>(0U), lines.size(), lineId);
finalizeNode(*nesting.rbegin(), tokens, outNodes, outErrReason, outWarning); finalizeNode(*nesting.rbegin(), tokens, outNodes, outErrReason, outWarning);
UNRECOVERABLE_IF(nesting.empty()); UNRECOVERABLE_IF(nesting.empty());
nesting.pop_back(); nesting.pop_back();
@ -390,7 +389,7 @@ bool buildTree(const LinesCache &lines, const TokensCache &tokens, NodesCache &o
outErrReason = constructYamlError(lineId, tokens[lines[lineId].first].pos, tokens[lines[lineId].first].pos + 1, "Invalid indentation"); outErrReason = constructYamlError(lineId, tokens[lines[lineId].first].pos, tokens[lines[lineId].first].pos + 1, "Invalid indentation");
return false; return false;
} else { } else {
reserveBasedOnEstimates(outNodes, static_cast<TokenId>(0u), static_cast<TokenId>(tokensCacheSize), lines[lineId].first); reserveBasedOnEstimates(outNodes, static_cast<size_t>(0U), lines.size(), lineId);
auto &prev = outNodes[*nesting.rbegin()]; auto &prev = outNodes[*nesting.rbegin()];
auto &parent = outNodes[prev.parentId]; auto &parent = outNodes[prev.parentId];
auto &curr = addNode(outNodes, prev, parent); auto &curr = addNode(outNodes, prev, parent);
@ -414,7 +413,7 @@ bool buildTree(const LinesCache &lines, const TokensCache &tokens, NodesCache &o
for (auto currTokenId = collectionBeg + 1; currTokenId < collectionEnd; currTokenId += 2) { for (auto currTokenId = collectionBeg + 1; currTokenId < collectionEnd; currTokenId += 2) {
auto tokenType = tokens[currTokenId].traits.type; auto tokenType = tokens[currTokenId].traits.type;
UNRECOVERABLE_IF(tokenType != Token::Type::LiteralNumber && tokenType != Token::Type::LiteralString); UNRECOVERABLE_IF(tokenType != Token::Type::LiteralNumber && tokenType != Token::Type::LiteralString);
reserveBasedOnEstimates(outNodes, static_cast<TokenId>(0u), static_cast<TokenId>(tokensCacheSize), lines[lineId].first); reserveBasedOnEstimates(outNodes, static_cast<size_t>(0U), lines.size(), lineId);
auto &parentNode = outNodes[parentNodeId]; auto &parentNode = outNodes[parentNodeId];
if (previousSiblingId == std::numeric_limits<size_t>::max()) { if (previousSiblingId == std::numeric_limits<size_t>::max()) {
@ -444,7 +443,7 @@ bool buildTree(const LinesCache &lines, const TokensCache &tokens, NodesCache &o
lastUsedLine = lineId; lastUsedLine = lineId;
++lineId; ++lineId;
} }
outNodes.reserve(outNodes.size() + nesting.size());
while (false == nesting.empty()) { while (false == nesting.empty()) {
finalizeNode(*nesting.rbegin(), tokens, outNodes, outErrReason, outWarning); finalizeNode(*nesting.rbegin(), tokens, outNodes, outErrReason, outWarning);
nesting.pop_back(); nesting.pop_back();