Merge pull request #10145 from Kelebek1/code_size
Fix shader code resize to use word size rather than byte size
This commit is contained in:
commit
60d54d911e
|
@ -228,14 +228,14 @@ const ShaderInfo* ShaderCache::MakeShaderInfo(GenericEnvironment& env, VAddr cpu
|
||||||
auto info = std::make_unique<ShaderInfo>();
|
auto info = std::make_unique<ShaderInfo>();
|
||||||
if (const std::optional<u64> cached_hash{env.Analyze()}) {
|
if (const std::optional<u64> cached_hash{env.Analyze()}) {
|
||||||
info->unique_hash = *cached_hash;
|
info->unique_hash = *cached_hash;
|
||||||
info->size_bytes = env.CachedSize();
|
info->size_bytes = env.CachedSizeBytes();
|
||||||
} else {
|
} else {
|
||||||
// Slow path, not really hit on commercial games
|
// Slow path, not really hit on commercial games
|
||||||
// Build a control flow graph to get the real shader size
|
// Build a control flow graph to get the real shader size
|
||||||
Shader::ObjectPool<Shader::Maxwell::Flow::Block> flow_block;
|
Shader::ObjectPool<Shader::Maxwell::Flow::Block> flow_block;
|
||||||
Shader::Maxwell::Flow::CFG cfg{env, flow_block, env.StartAddress()};
|
Shader::Maxwell::Flow::CFG cfg{env, flow_block, env.StartAddress()};
|
||||||
info->unique_hash = env.CalculateHash();
|
info->unique_hash = env.CalculateHash();
|
||||||
info->size_bytes = env.ReadSize();
|
info->size_bytes = env.ReadSizeBytes();
|
||||||
}
|
}
|
||||||
const size_t size_bytes{info->size_bytes};
|
const size_t size_bytes{info->size_bytes};
|
||||||
const ShaderInfo* const result{info.get()};
|
const ShaderInfo* const result{info.get()};
|
||||||
|
|
|
@ -170,15 +170,19 @@ std::optional<u64> GenericEnvironment::Analyze() {
|
||||||
void GenericEnvironment::SetCachedSize(size_t size_bytes) {
|
void GenericEnvironment::SetCachedSize(size_t size_bytes) {
|
||||||
cached_lowest = start_address;
|
cached_lowest = start_address;
|
||||||
cached_highest = start_address + static_cast<u32>(size_bytes);
|
cached_highest = start_address + static_cast<u32>(size_bytes);
|
||||||
code.resize(CachedSize());
|
code.resize(CachedSizeWords());
|
||||||
gpu_memory->ReadBlock(program_base + cached_lowest, code.data(), code.size() * sizeof(u64));
|
gpu_memory->ReadBlock(program_base + cached_lowest, code.data(), code.size() * sizeof(u64));
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GenericEnvironment::CachedSize() const noexcept {
|
size_t GenericEnvironment::CachedSizeWords() const noexcept {
|
||||||
return cached_highest - cached_lowest + INST_SIZE;
|
return CachedSizeBytes() / INST_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t GenericEnvironment::ReadSize() const noexcept {
|
size_t GenericEnvironment::CachedSizeBytes() const noexcept {
|
||||||
|
return static_cast<size_t>(cached_highest) - cached_lowest + INST_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t GenericEnvironment::ReadSizeBytes() const noexcept {
|
||||||
return read_highest - read_lowest + INST_SIZE;
|
return read_highest - read_lowest + INST_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -187,7 +191,7 @@ bool GenericEnvironment::CanBeSerialized() const noexcept {
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 GenericEnvironment::CalculateHash() const {
|
u64 GenericEnvironment::CalculateHash() const {
|
||||||
const size_t size{ReadSize()};
|
const size_t size{ReadSizeBytes()};
|
||||||
const auto data{std::make_unique<char[]>(size)};
|
const auto data{std::make_unique<char[]>(size)};
|
||||||
gpu_memory->ReadBlock(program_base + read_lowest, data.get(), size);
|
gpu_memory->ReadBlock(program_base + read_lowest, data.get(), size);
|
||||||
return Common::CityHash64(data.get(), size);
|
return Common::CityHash64(data.get(), size);
|
||||||
|
@ -198,7 +202,7 @@ void GenericEnvironment::Dump(u64 hash) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenericEnvironment::Serialize(std::ofstream& file) const {
|
void GenericEnvironment::Serialize(std::ofstream& file) const {
|
||||||
const u64 code_size{static_cast<u64>(CachedSize())};
|
const u64 code_size{static_cast<u64>(CachedSizeBytes())};
|
||||||
const u64 num_texture_types{static_cast<u64>(texture_types.size())};
|
const u64 num_texture_types{static_cast<u64>(texture_types.size())};
|
||||||
const u64 num_texture_pixel_formats{static_cast<u64>(texture_pixel_formats.size())};
|
const u64 num_texture_pixel_formats{static_cast<u64>(texture_pixel_formats.size())};
|
||||||
const u64 num_cbuf_values{static_cast<u64>(cbuf_values.size())};
|
const u64 num_cbuf_values{static_cast<u64>(cbuf_values.size())};
|
||||||
|
|
|
@ -48,9 +48,11 @@ public:
|
||||||
|
|
||||||
void SetCachedSize(size_t size_bytes);
|
void SetCachedSize(size_t size_bytes);
|
||||||
|
|
||||||
[[nodiscard]] size_t CachedSize() const noexcept;
|
[[nodiscard]] size_t CachedSizeWords() const noexcept;
|
||||||
|
|
||||||
[[nodiscard]] size_t ReadSize() const noexcept;
|
[[nodiscard]] size_t CachedSizeBytes() const noexcept;
|
||||||
|
|
||||||
|
[[nodiscard]] size_t ReadSizeBytes() const noexcept;
|
||||||
|
|
||||||
[[nodiscard]] bool CanBeSerialized() const noexcept;
|
[[nodiscard]] bool CanBeSerialized() const noexcept;
|
||||||
|
|
||||||
|
|
Reference in New Issue