Skip to content

Move block parsing to preload for optimized --preload-measurement-range performance #2625

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

Open
jzulauf-lunarg wants to merge 1 commit into
base: dev
Choose a base branch
from
+400 −212
Open

Move block parsing to preload for optimized --preload-measurement-range performance #2625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 28 additions & 21 deletions framework/decode/block_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ template <typename ArgPayload>
if (ShouldDeferDecompression(block_buffer.GetData().size()))
{
return ParsedBlock(ParsedBlock::DeferredDecompressBlockTag{},
block_index_,
block_buffer,
block_reference_policy_,
std::forward<ArgPayload>(args));
Expand All @@ -216,20 +217,22 @@ template <typename ArgPayload>
DecompressSpan(read_result.buffer, read_result.uncompressed_size, UseParserLocalStorageTag{});
if (uncompressed_data == nullptr)
{
return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}
args.data = uncompressed_data;
return ParsedBlock(ParsedBlock::DecompressedBlockTag{}, block_buffer, std::forward<ArgPayload>(args));
return ParsedBlock(
ParsedBlock::DecompressedBlockTag{}, block_index_, block_buffer, std::forward<ArgPayload>(args));
}

// Use owned uncompressed storage only as needed
UncompressedStore uncompressed_store = DecompressSpan(read_result.buffer, read_result.uncompressed_size);
args.data = uncompressed_store.template GetAs<const uint8_t>();
if (uncompressed_store.empty())
{
return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}
return ParsedBlock(ParsedBlock::DecompressedBlockTag{},
block_index_,
block_buffer,
block_reference_policy_,
std::move(uncompressed_store),
Expand All @@ -238,8 +241,11 @@ template <typename ArgPayload>
}
else
{
return ParsedBlock(
ParsedBlock::UncompressedBlockTag{}, block_buffer, block_reference_policy_, std::forward<ArgPayload>(args));
return ParsedBlock(ParsedBlock::UncompressedBlockTag{},
block_index_,
block_buffer,
block_reference_policy_,
std::forward<ArgPayload>(args));
}
}
// Create a block that is never compressed with correct handling of both compression state and decompression policy
Expand All @@ -248,6 +254,7 @@ template <typename ArgPayload>
BlockParser::MakeIncompressibleParsedBlock(BlockBuffer& block_buffer, ArgPayload&& args, bool references_block_buffer)
{
return ParsedBlock(ParsedBlock::IncompressibleBlockTag{ block_buffer },
block_index_,
block_buffer,
block_reference_policy_,
references_block_buffer,
Expand Down Expand Up @@ -283,7 +290,7 @@ ParsedBlock BlockParser::ParseBlock(BlockBuffer& block_buffer)
case format::kUnknownBlock:
default:
WarnUnknownBlock(block_buffer);
return ParsedBlock{ ParsedBlock::UnknownBlockTag(), block_buffer.ReleaseData() };
return ParsedBlock{ ParsedBlock::UnknownBlockTag(), block_index_, block_buffer.ReleaseData() };
break;
}
}
Expand Down Expand Up @@ -401,7 +408,7 @@ ParsedBlock BlockParser::ParseFunctionCall(BlockBuffer& block_buffer)
HandleBlockReadError(kErrorReadingBlockHeader, "Failed to read function call block header");
}

return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

ParsedBlock BlockParser::ParseMethodCall(BlockBuffer& block_buffer)
Expand Down Expand Up @@ -439,7 +446,7 @@ ParsedBlock BlockParser::ParseMethodCall(BlockBuffer& block_buffer)
HandleBlockReadError(kErrorReadingBlockHeader, "Failed to read method call block header");
}

return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

ParsedBlock BlockParser::ParseMetaData(BlockBuffer& block_buffer)
Expand All @@ -454,7 +461,7 @@ ParsedBlock BlockParser::ParseMetaData(BlockBuffer& block_buffer)
if (!success)
{
HandleBlockReadError(kErrorReadingBlockHeader, "Failed to read function call block header");
return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

// Optional backing store for the various uncompressed metadata contents
Expand Down Expand Up @@ -1415,7 +1422,7 @@ ParsedBlock BlockParser::ParseMetaData(BlockBuffer& block_buffer)
if (!success)
{
HandleBlockReadError(kErrorReadingBlockHeader, "Failed to read environment variable block header");
return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

GFXRECON_CHECK_CONVERSION_DATA_LOSS(size_t, header.string_length);
Expand All @@ -1426,7 +1433,7 @@ ParsedBlock BlockParser::ParseMetaData(BlockBuffer& block_buffer)
if (!success)
{
HandleBlockReadError(kErrorReadingBlockData, "Failed to read environment variable block data");
return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

const char* env_string = reinterpret_cast<const char*>(parameter_data.data());
Expand Down Expand Up @@ -1632,7 +1639,7 @@ ParsedBlock BlockParser::ParseMetaData(BlockBuffer& block_buffer)
// be passed through, even as unknown.
//
// A warning has been generated above
return ParsedBlock(ParsedBlock::UnknownBlockTag(), block_buffer.ReleaseData());
return ParsedBlock(ParsedBlock::UnknownBlockTag{}, block_index_, block_buffer.ReleaseData());
}
else
{
Expand All @@ -1641,7 +1648,7 @@ ParsedBlock BlockParser::ParseMetaData(BlockBuffer& block_buffer)
}
}

return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

ParsedBlock BlockParser::ParseFrameMarker(BlockBuffer& block_buffer)
Expand All @@ -1655,7 +1662,7 @@ ParsedBlock BlockParser::ParseFrameMarker(BlockBuffer& block_buffer)
if (!success)
{
HandleBlockReadError(kErrorReadingBlockHeader, "Failed to read frame marker block header");
return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

// Read the rest of the frame marker data. Currently frame markers are not dispatched to decoders.
Expand All @@ -1673,15 +1680,15 @@ ParsedBlock BlockParser::ParseFrameMarker(BlockBuffer& block_buffer)
else
{
WarnUnknownBlock(block_buffer, "frame marker", static_cast<uint32_t>(marker_type));
return ParsedBlock(ParsedBlock::UnknownBlockTag(), block_buffer.ReleaseData());
return ParsedBlock(ParsedBlock::UnknownBlockTag{}, block_index_, block_buffer.ReleaseData());
}
}
else
{
HandleBlockReadError(kErrorReadingBlockData, "Failed to read frame marker data");
}

return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

ParsedBlock BlockParser::ParseStateMarker(BlockBuffer& block_buffer)
Expand All @@ -1695,7 +1702,7 @@ ParsedBlock BlockParser::ParseStateMarker(BlockBuffer& block_buffer)
if (!success)
{
HandleBlockReadError(kErrorReadingBlockHeader, "Failed to read state marker block header");
return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

uint64_t frame_number = 0;
Expand All @@ -1716,15 +1723,15 @@ ParsedBlock BlockParser::ParseStateMarker(BlockBuffer& block_buffer)
else
{
WarnUnknownBlock(block_buffer, "state marker", static_cast<uint32_t>(marker_type));
return ParsedBlock(ParsedBlock::UnknownBlockTag(), block_buffer.ReleaseData());
return ParsedBlock(ParsedBlock::UnknownBlockTag{}, block_index_, block_buffer.ReleaseData());
}
}
else
{
HandleBlockReadError(kErrorReadingBlockData, "Failed to read state marker data");
}

return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

ParsedBlock BlockParser::ParseAnnotation(BlockBuffer& block_buffer)
Expand All @@ -1738,7 +1745,7 @@ ParsedBlock BlockParser::ParseAnnotation(BlockBuffer& block_buffer)
if (!success)
{
HandleBlockReadError(kErrorReadingBlockHeader, "Failed to read annotation block header");
return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

decltype(format::AnnotationHeader::label_length) label_length = 0;
Expand Down Expand Up @@ -1790,7 +1797,7 @@ ParsedBlock BlockParser::ParseAnnotation(BlockBuffer& block_buffer)
HandleBlockReadError(kErrorReadingBlockHeader, "Failed to read annotation block header");
}

return ParsedBlock(ParsedBlock::InvalidBlockTag());
return ParsedBlock(ParsedBlock::InvalidBlockTag(), block_index_);
}

GFXRECON_END_NAMESPACE(decode)
Expand Down
Loading
Loading