early-access version 3050
This commit is contained in:
parent
604f9582d6
commit
3dfc19dfb1
6 changed files with 48 additions and 112 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 3049.
|
This is the source code for early-access 3050.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
|
#include "common/settings.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
#include "common/swap.h"
|
#include "common/swap.h"
|
||||||
#include "core/file_sys/control_metadata.h"
|
#include "core/file_sys/control_metadata.h"
|
||||||
|
@ -37,6 +38,27 @@ std::string LanguageEntry::GetDeveloperName() const {
|
||||||
developer_name.size());
|
developer_name.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
constexpr std::array<Language, 18> language_to_codes = {{
|
||||||
|
Language::Japanese,
|
||||||
|
Language::AmericanEnglish,
|
||||||
|
Language::French,
|
||||||
|
Language::German,
|
||||||
|
Language::Italian,
|
||||||
|
Language::Spanish,
|
||||||
|
Language::Chinese,
|
||||||
|
Language::Korean,
|
||||||
|
Language::Dutch,
|
||||||
|
Language::Portuguese,
|
||||||
|
Language::Russian,
|
||||||
|
Language::Taiwanese,
|
||||||
|
Language::BritishEnglish,
|
||||||
|
Language::CanadianFrench,
|
||||||
|
Language::LatinAmericanSpanish,
|
||||||
|
Language::Chinese,
|
||||||
|
Language::Taiwanese,
|
||||||
|
Language::BrazilianPortuguese,
|
||||||
|
}};
|
||||||
|
|
||||||
NACP::NACP() = default;
|
NACP::NACP() = default;
|
||||||
|
|
||||||
NACP::NACP(VirtualFile file) {
|
NACP::NACP(VirtualFile file) {
|
||||||
|
@ -45,9 +67,13 @@ NACP::NACP(VirtualFile file) {
|
||||||
|
|
||||||
NACP::~NACP() = default;
|
NACP::~NACP() = default;
|
||||||
|
|
||||||
const LanguageEntry& NACP::GetLanguageEntry(Language language) const {
|
const LanguageEntry& NACP::GetLanguageEntry() const {
|
||||||
if (language != Language::Default) {
|
Language language = language_to_codes[Settings::values.language_index.GetValue()];
|
||||||
return raw.language_entries.at(static_cast<u8>(language));
|
|
||||||
|
{
|
||||||
|
const auto& language_entry = raw.language_entries.at(static_cast<u8>(language));
|
||||||
|
if (!language_entry.GetApplicationName().empty())
|
||||||
|
return language_entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto& language_entry : raw.language_entries) {
|
for (const auto& language_entry : raw.language_entries) {
|
||||||
|
@ -55,16 +81,15 @@ const LanguageEntry& NACP::GetLanguageEntry(Language language) const {
|
||||||
return language_entry;
|
return language_entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fallback to English
|
return raw.language_entries.at(static_cast<u8>(Language::AmericanEnglish));
|
||||||
return GetLanguageEntry(Language::AmericanEnglish);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string NACP::GetApplicationName(Language language) const {
|
std::string NACP::GetApplicationName() const {
|
||||||
return GetLanguageEntry(language).GetApplicationName();
|
return GetLanguageEntry().GetApplicationName();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string NACP::GetDeveloperName(Language language) const {
|
std::string NACP::GetDeveloperName() const {
|
||||||
return GetLanguageEntry(language).GetDeveloperName();
|
return GetLanguageEntry().GetDeveloperName();
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 NACP::GetTitleId() const {
|
u64 NACP::GetTitleId() const {
|
||||||
|
|
|
@ -101,9 +101,9 @@ public:
|
||||||
explicit NACP(VirtualFile file);
|
explicit NACP(VirtualFile file);
|
||||||
~NACP();
|
~NACP();
|
||||||
|
|
||||||
const LanguageEntry& GetLanguageEntry(Language language = Language::Default) const;
|
const LanguageEntry& GetLanguageEntry() const;
|
||||||
std::string GetApplicationName(Language language = Language::Default) const;
|
std::string GetApplicationName() const;
|
||||||
std::string GetDeveloperName(Language language = Language::Default) const;
|
std::string GetDeveloperName() const;
|
||||||
u64 GetTitleId() const;
|
u64 GetTitleId() const;
|
||||||
u64 GetDLCBaseTitleId() const;
|
u64 GetDLCBaseTitleId() const;
|
||||||
std::string GetVersionString() const;
|
std::string GetVersionString() const;
|
||||||
|
|
|
@ -325,11 +325,6 @@ void Inst::AddPhiOperand(Block* predecessor, const Value& value) {
|
||||||
phi_args.emplace_back(predecessor, value);
|
phi_args.emplace_back(predecessor, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Inst::ErasePhiOperand(size_t index) {
|
|
||||||
const auto operand_it{phi_args.begin() + static_cast<ptrdiff_t>(index)};
|
|
||||||
phi_args.erase(operand_it);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Inst::OrderPhiArgs() {
|
void Inst::OrderPhiArgs() {
|
||||||
if (op != Opcode::Phi) {
|
if (op != Opcode::Phi) {
|
||||||
throw LogicError("{} is not a Phi instruction", op);
|
throw LogicError("{} is not a Phi instruction", op);
|
||||||
|
|
|
@ -178,13 +178,9 @@ public:
|
||||||
|
|
||||||
/// Get a pointer to the block of a phi argument.
|
/// Get a pointer to the block of a phi argument.
|
||||||
[[nodiscard]] Block* PhiBlock(size_t index) const;
|
[[nodiscard]] Block* PhiBlock(size_t index) const;
|
||||||
|
|
||||||
/// Add phi operand to a phi instruction.
|
/// Add phi operand to a phi instruction.
|
||||||
void AddPhiOperand(Block* predecessor, const Value& value);
|
void AddPhiOperand(Block* predecessor, const Value& value);
|
||||||
|
|
||||||
// Erase the phi operand at the given index.
|
|
||||||
void ErasePhiOperand(size_t index);
|
|
||||||
|
|
||||||
/// Orders the Phi arguments from farthest away to nearest.
|
/// Orders the Phi arguments from farthest away to nearest.
|
||||||
void OrderPhiArgs();
|
void OrderPhiArgs();
|
||||||
|
|
||||||
|
|
|
@ -1,104 +1,24 @@
|
||||||
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
|
||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
|
|
||||||
#include <boost/container/small_vector.hpp>
|
|
||||||
|
|
||||||
#include "shader_recompiler/frontend/ir/basic_block.h"
|
#include "shader_recompiler/frontend/ir/basic_block.h"
|
||||||
#include "shader_recompiler/frontend/ir/value.h"
|
#include "shader_recompiler/frontend/ir/value.h"
|
||||||
#include "shader_recompiler/ir_opt/passes.h"
|
#include "shader_recompiler/ir_opt/passes.h"
|
||||||
|
|
||||||
namespace Shader::Optimization {
|
namespace Shader::Optimization {
|
||||||
namespace {
|
|
||||||
template <bool TEST_USES>
|
|
||||||
void DeadInstElimination(IR::Block* const block) {
|
|
||||||
// We iterate over the instructions in reverse order.
|
|
||||||
// This is because removing an instruction reduces the number of uses for earlier instructions.
|
|
||||||
auto it{block->end()};
|
|
||||||
while (it != block->begin()) {
|
|
||||||
--it;
|
|
||||||
if constexpr (TEST_USES) {
|
|
||||||
if (it->HasUses() || it->MayHaveSideEffects()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
it->Invalidate();
|
|
||||||
it = block->Instructions().erase(it);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DeletedPhiArgElimination(IR::Program& program, std::span<const IR::Block*> dead_blocks) {
|
|
||||||
for (IR::Block* const block : program.blocks) {
|
|
||||||
for (IR::Inst& phi : *block) {
|
|
||||||
if (!IR::IsPhi(phi)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
for (size_t i = 0; i < phi.NumArgs(); ++i) {
|
|
||||||
if (std::ranges::find(dead_blocks, phi.PhiBlock(i)) == dead_blocks.end()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
// Phi operand at this index is an unreachable block
|
|
||||||
phi.ErasePhiOperand(i);
|
|
||||||
--i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DeadBranchElimination(IR::Program& program) {
|
|
||||||
boost::container::small_vector<const IR::Block*, 3> dead_blocks;
|
|
||||||
const auto begin_it{program.syntax_list.begin()};
|
|
||||||
for (auto node_it = begin_it; node_it != program.syntax_list.end(); ++node_it) {
|
|
||||||
if (node_it->type != IR::AbstractSyntaxNode::Type::If) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
IR::Inst* const cond_ref{node_it->data.if_node.cond.Inst()};
|
|
||||||
const IR::U1 cond{cond_ref->Arg(0)};
|
|
||||||
if (!cond.IsImmediate()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (cond.U1()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
// False immediate condition. Remove condition ref, erase the entire branch.
|
|
||||||
cond_ref->Invalidate();
|
|
||||||
// Account for nested if-statements within the if(false) branch
|
|
||||||
u32 nested_ifs{1u};
|
|
||||||
while (node_it->type != IR::AbstractSyntaxNode::Type::EndIf || nested_ifs > 0) {
|
|
||||||
node_it = program.syntax_list.erase(node_it);
|
|
||||||
switch (node_it->type) {
|
|
||||||
case IR::AbstractSyntaxNode::Type::If:
|
|
||||||
++nested_ifs;
|
|
||||||
break;
|
|
||||||
case IR::AbstractSyntaxNode::Type::EndIf:
|
|
||||||
--nested_ifs;
|
|
||||||
break;
|
|
||||||
case IR::AbstractSyntaxNode::Type::Block: {
|
|
||||||
IR::Block* const block{node_it->data.block};
|
|
||||||
DeadInstElimination<false>(block);
|
|
||||||
dead_blocks.push_back(block);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Erase EndIf node of the if(false) branch
|
|
||||||
node_it = program.syntax_list.erase(node_it);
|
|
||||||
// Account for loop increment
|
|
||||||
--node_it;
|
|
||||||
}
|
|
||||||
if (!dead_blocks.empty()) {
|
|
||||||
DeletedPhiArgElimination(program, std::span(dead_blocks.data(), dead_blocks.size()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
void DeadCodeEliminationPass(IR::Program& program) {
|
void DeadCodeEliminationPass(IR::Program& program) {
|
||||||
DeadBranchElimination(program);
|
// We iterate over the instructions in reverse order.
|
||||||
|
// This is because removing an instruction reduces the number of uses for earlier instructions.
|
||||||
for (IR::Block* const block : program.post_order_blocks) {
|
for (IR::Block* const block : program.post_order_blocks) {
|
||||||
DeadInstElimination<true>(block);
|
auto it{block->end()};
|
||||||
|
while (it != block->begin()) {
|
||||||
|
--it;
|
||||||
|
if (!it->HasUses() && !it->MayHaveSideEffects()) {
|
||||||
|
it->Invalidate();
|
||||||
|
it = block->Instructions().erase(it);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue