mirror of
https://github.com/skyline-emu/skyline.git
synced 2024-11-29 13:14:14 +01:00
Add debug pipeline statistics recording for finding redundant pipelines
This commit is contained in:
parent
6333a92b53
commit
be6f08cd97
@ -921,10 +921,31 @@ namespace skyline::gpu::interconnect::maxwell3d {
|
|||||||
while (bundle.Deserialise(stream)) {
|
while (bundle.Deserialise(stream)) {
|
||||||
lastKnownGoodOffset = stream.tellg();
|
lastKnownGoodOffset = stream.tellg();
|
||||||
auto accessor{FilePipelineStateAccessor{bundle}};
|
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);
|
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) {
|
} catch (const exception &e) {
|
||||||
Logger::Warn("Pipeline cache corrupted at: 0x{:X}, error: {}", lastKnownGoodOffset, e.what());
|
Logger::Warn("Pipeline cache corrupted at: 0x{:X}, error: {}", lastKnownGoodOffset, e.what());
|
||||||
gpu.graphicsPipelineCacheManager->InvalidateAllAfter(static_cast<u64>(lastKnownGoodOffset));
|
gpu.graphicsPipelineCacheManager->InvalidateAllAfter(static_cast<u64>(lastKnownGoodOffset));
|
||||||
@ -940,7 +961,17 @@ namespace skyline::gpu::interconnect::maxwell3d {
|
|||||||
auto bundle{std::make_unique<PipelineStateBundle>()};
|
auto bundle{std::make_unique<PipelineStateBundle>()};
|
||||||
bundle->Reset(packedState);
|
bundle->Reset(packedState);
|
||||||
auto accessor{RuntimeGraphicsPipelineStateAccessor{std::move(bundle), ctx, textures, constantBuffers, shaderBinaries}};
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
// SPDX-License-Identifier: MPL-2.0
|
// SPDX-License-Identifier: MPL-2.0
|
||||||
// Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/)
|
// 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
|
#pragma once
|
||||||
|
|
||||||
#include <tsl/robin_map.h>
|
#include <tsl/robin_map.h>
|
||||||
@ -262,6 +264,11 @@ namespace skyline::gpu::interconnect::maxwell3d {
|
|||||||
private:
|
private:
|
||||||
tsl::robin_map<PackedPipelineState, std::unique_ptr<Pipeline>, PackedPipelineStateHash> map;
|
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:
|
public:
|
||||||
PipelineManager(GPU &gpu);
|
PipelineManager(GPU &gpu);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user