summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-07-24 19:46:53 +0200
committerGitHub <noreply@github.com>2023-07-24 19:46:53 +0200
commit099295d7c6ecea79dac9da950f11e6ac742dd4ba (patch)
treeb28db9e5d4d2d9ba811e26c39bd548aa8bea37eb
parentMerge pull request #11042 from lat9nq/wayland-appimage (diff)
parentssa_rewrite_pass: use proper maps (diff)
downloadyuzu-099295d7c6ecea79dac9da950f11e6ac742dd4ba.tar
yuzu-099295d7c6ecea79dac9da950f11e6ac742dd4ba.tar.gz
yuzu-099295d7c6ecea79dac9da950f11e6ac742dd4ba.tar.bz2
yuzu-099295d7c6ecea79dac9da950f11e6ac742dd4ba.tar.lz
yuzu-099295d7c6ecea79dac9da950f11e6ac742dd4ba.tar.xz
yuzu-099295d7c6ecea79dac9da950f11e6ac742dd4ba.tar.zst
yuzu-099295d7c6ecea79dac9da950f11e6ac742dd4ba.zip
-rw-r--r--src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp b/src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp
index d0b145860..07cabca43 100644
--- a/src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp
+++ b/src/shader_recompiler/ir_opt/ssa_rewrite_pass.cpp
@@ -14,12 +14,12 @@
//
#include <deque>
+#include <map>
#include <span>
+#include <unordered_map>
#include <variant>
#include <vector>
-#include <boost/container/flat_map.hpp>
-
#include "shader_recompiler/frontend/ir/basic_block.h"
#include "shader_recompiler/frontend/ir/opcodes.h"
#include "shader_recompiler/frontend/ir/pred.h"
@@ -52,7 +52,7 @@ struct IndirectBranchVariable {
using Variant = std::variant<IR::Reg, IR::Pred, ZeroFlagTag, SignFlagTag, CarryFlagTag,
OverflowFlagTag, GotoVariable, IndirectBranchVariable>;
-using ValueMap = boost::container::flat_map<IR::Block*, IR::Value>;
+using ValueMap = std::unordered_map<IR::Block*, IR::Value>;
struct DefTable {
const IR::Value& Def(IR::Block* block, IR::Reg variable) {
@@ -112,7 +112,7 @@ struct DefTable {
}
std::array<ValueMap, IR::NUM_USER_PREDS> preds;
- boost::container::flat_map<u32, ValueMap> goto_vars;
+ std::unordered_map<u32, ValueMap> goto_vars;
ValueMap indirect_branch_var;
ValueMap zero_flag;
ValueMap sign_flag;
@@ -295,8 +295,7 @@ private:
return same;
}
- boost::container::flat_map<IR::Block*, boost::container::flat_map<Variant, IR::Inst*>>
- incomplete_phis;
+ std::unordered_map<IR::Block*, std::map<Variant, IR::Inst*>> incomplete_phis;
DefTable current_def;
};