GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-10-16 19:16:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add debug pipeline statistics recording for finding redundant pipelines

Browse Source
This commit is contained in:
Billy Laws 2023-01-18 20:09:27 +00:00
parent 6333a92b53
commit be6f08cd97
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_manager.cpp
View File

@ -921,10 +921,31 @@ namespace skyline::gpu::interconnect::maxwell3d {
while (bundle.Deserialise(stream)) {
lastKnownGoodOffset = stream.tellg();
auto accessor{FilePipelineStateAccessor{bundle}};
map.emplace(bundle.GetKey<PackedPipelineState>(), std::make_unique<Pipeline>(gpu, accessor, bundle.GetKey<PackedPipelineState>()));
auto *pipeline{map.emplace(bundle.GetKey<PackedPipelineState>(), std::make_unique<Pipeline>(gpu, accessor, bundle.GetKey<PackedPipelineState>())).first.value().get()};
#ifdef PIPELINE_STATS
auto sharedIt{sharedPipelines.find(pipeline->sourcePackedState.shaderHashes)};
if (sharedIt == sharedPipelines.end())
sharedPipelines.emplace(pipeline->sourcePackedState.shaderHashes, std::list<Pipeline *>{pipeline});
else
sharedIt->second.push_back(pipeline);
#else
(void)pipeline;
#endif
}
Logger::Info("Loaded {} graphics pipelines in {}ms", map.size(), (util::GetTimeNs() - startTime) / constant::NsInMillisecond);
#ifdef PIPELINE_STATS
for (auto &[key, list] : sharedPipelines) {
sortedSharedPipelines.push_back(&list);
}
std::sort(sortedSharedPipelines.begin(), sortedSharedPipelines.end(), [](const auto &a, const auto &b) {
return a->size() > b->size();
});
raise(SIGTRAP);
#endif
} catch (const exception &e) {
Logger::Warn("Pipeline cache corrupted at: 0x{:X}, error: {}", lastKnownGoodOffset, e.what());
gpu.graphicsPipelineCacheManager->InvalidateAllAfter(static_cast<u64>(lastKnownGoodOffset));
@ -940,7 +961,17 @@ namespace skyline::gpu::interconnect::maxwell3d {
auto bundle{std::make_unique<PipelineStateBundle>()};
bundle->Reset(packedState);
auto accessor{RuntimeGraphicsPipelineStateAccessor{std::move(bundle), ctx, textures, constantBuffers, shaderBinaries}};
return map.emplace(packedState, std::make_unique<Pipeline>(ctx.gpu, accessor, packedState)).first->second.get();
auto *pipeline{map.emplace(packedState, std::make_unique<Pipeline>(ctx.gpu, accessor, packedState)).first->second.get()};
#ifdef PIPELINE_STATS
auto sharedIt{sharedPipelines.find(pipeline->sourcePackedState.shaderHashes)};
if (sharedIt == sharedPipelines.end())
sharedPipelines.emplace(pipeline->sourcePackedState.shaderHashes, std::list<Pipeline *>{pipeline});
else
sharedIt->second.push_back(pipeline);
#endif
return pipeline;
}
}

7
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_manager.h
View File

@ -1,6 +1,8 @@
// SPDX-License-Identifier: MPL-2.0
// Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/)
// #define PIPELINE_STATS //!< Enables recording and ranking of pipelines by the number of variants-per-shader set
#pragma once
#include <tsl/robin_map.h>
@ -262,6 +264,11 @@ namespace skyline::gpu::interconnect::maxwell3d {
private:
tsl::robin_map<PackedPipelineState, std::unique_ptr<Pipeline>, PackedPipelineStateHash> map;
#ifdef PIPELINE_STATS
std::unordered_map<std::array<u64, engine::PipelineCount>, std::list<Pipeline*>, util::ObjectHash<std::array<u64, engine::PipelineCount>>> sharedPipelines; //!< Maps a shader set to all pipelines sharing that same set
std::vector<std::list<Pipeline*>*> sortedSharedPipelines; //!< Sorted list of shared pipelines
#endif
public:
PipelineManager(GPU &gpu);