ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[CPU] Enable repetitive computation pass of optimizations from Chrispy

This commit is contained in:
Cancerous 2020-01-16 22:55:18 -05:00 committed by illusion
parent 2cbbca30e3
commit 93584b831e
3 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/cpu/compiler/compiler_passes.h
View File

@ -21,6 +21,7 @@
#include "xenia/cpu/compiler/passes/finalization_pass.h" #include "xenia/cpu/compiler/passes/finalization_pass.h"
#include "xenia/cpu/compiler/passes/memory_sequence_combination_pass.h" #include "xenia/cpu/compiler/passes/memory_sequence_combination_pass.h"
#include "xenia/cpu/compiler/passes/register_allocation_pass.h" #include "xenia/cpu/compiler/passes/register_allocation_pass.h"
#include "xenia/cpu/compiler/passes/repetitive_computation_merger_pass.h"
#include "xenia/cpu/compiler/passes/simplification_pass.h" #include "xenia/cpu/compiler/passes/simplification_pass.h"
#include "xenia/cpu/compiler/passes/validation_pass.h" #include "xenia/cpu/compiler/passes/validation_pass.h"
#include "xenia/cpu/compiler/passes/value_reduction_pass.h" #include "xenia/cpu/compiler/passes/value_reduction_pass.h"

81
src/xenia/cpu/compiler/passes/peephole_rules_impl.h
View File

@ -28,8 +28,8 @@ static bool do_cvt_opt(HIRBuilder* builder, Block* block) {
if (target_next_use->src1.value != insn->dest) continue; if (target_next_use->src1.value != insn->dest) continue;
if (target_next_use->dest->type != insn->src1.value->type || if (target_next_use->dest->type != insn->src1.value->type ||
!is_rvalue(target_next_use->dest)) !is_rvalue(target_next_use->dest)) continue;
continue;
++n_cvt_opts; ++n_cvt_opts;
make_assignment(target_next_use, insn->src1); make_assignment(target_next_use, insn->src1);
@ -465,25 +465,24 @@ Re-enable these one by one or add flags to control them until each is proven to
*/ */
#if 0 #if 0
static const optblock_pass_t g_passes[] = {do_cvt_opt, static const optblock_pass_t g_passes[] = {do_cvt_opt, // idk
do_vector_shift_opt, elim_useless_ctx_stores<false>, // idk
elim_useless_ctx_stores<false>, elim_useless_ctx_stores<true>, // idk
replace_assignment_uses, redundant_local_slot_load_optimizer, //ok
elim_useless_ctx_stores<true>, do_vector_shift_opt,//
optimize_repeated_loads, replace_assignment_uses, //
and1_optimizer, optimize_repeated_loads, //ok
trunc_ext_optimizer, and1_optimizer, // instability?
unused_conversion_eliminator, trunc_ext_optimizer, // ok
useless_operation_eliminator, unused_conversion_eliminator, //ok
rlwinm_sanitizer, useless_operation_eliminator, //bad
rlwinm_sanitizer_useless_or, rlwinm_sanitizer, // maybe
ssa_merger, rlwinm_sanitizer_useless_or, //ok
ssa_merger, //bad
signbit_rol_optimizer, signbit_rol_optimizer, //artifacts?
rol_bitextract_optimizer, rol_bitextract_optimizer, //artifacts?
shl_shr_mask_optimizer, shl_shr_mask_optimizer, //ok
redundant_local_slot_load_optimizer, nop_deleter}; //ok
nop_deleter};
void dump_opts() { void dump_opts() {
FILE* lel = fopen("Optdump.txt", "w"); FILE* lel = fopen("Optdump.txt", "w");
@ -509,12 +508,40 @@ void dump_opts() {
fclose(lel); fclose(lel);
} }
#else #else
static const optblock_pass_t g_passes[] = {rlwinm_sanitizer_useless_or, static const optblock_pass_t g_passes[] = { redundant_local_slot_load_optimizer,
do_vector_shift_opt,
shl_shr_mask_optimizer,
rlwinm_sanitizer_useless_or,
and1_optimizer,
trunc_ext_optimizer,
unused_conversion_eliminator,
optimize_repeated_loads,
replace_assignment_uses,
rlwinm_sanitizer, rlwinm_sanitizer,
nop_deleter };
nop_deleter, void dump_opts() {
rol_bitextract_optimizer, FILE* lel = fopen("Optdump.txt", "w");
signbit_rol_optimizer,
shl_shr_mask_optimizer fprintf(
}; lel,
"Optimized %lld converts\nOptimized %lld vector shifts\nOptimized %lld "
"context stores\nOptimized away %lld useless assignments\nOptimized "
"away "
"%lld redundant loads."
"\nOptimized away %lld and 1 instructions\nOptimized away %lld useless "
"truncate-extends\nEliminated %lld unused operation "
"results.\nOptimized away %lld no-op operations.\nLowered %lld left "
"rotates to left shifts.\nRemoved %lld useless rlwinm rotate-or "
"sequences.\nShortened %lld assignment chains\nOptimized %lld signbit "
"rotate lefts.\nOptimized %lld rol bitextracts.\nConverted %lld shift "
"sequences to bitmasks.\n Optimized %lld redundant local loads.",
n_cvt_opts, n_vec_shift_opts, n_useless_ctx_store_opts,
n_replaced_assignments, n_replaced_loads, n_and1s_optimized, n_trunc_exts,
n_eliminated_unused_conversion_results, n_useless_operations,
n_rotates_lowered_to_shifts, n_useless_rlwinm_ors_removed, n_ssa_merges,
n_signbit_rols_optimized, n_rol_bitextracts_optimized,
n_shl_shr_masks_gen, n_redundant_loads_local);
fclose(lel);
}
#endif #endif

4
src/xenia/cpu/ppc/ppc_translator.cc
View File

@ -81,6 +81,10 @@ PPCTranslator::PPCTranslator(PPCFrontend* frontend) : frontend_(frontend) {
// compiler_->AddPass(new passes::ValueReductionPass()); // compiler_->AddPass(new passes::ValueReductionPass());
// if (validate) compiler_->AddPass(new passes::ValidationPass()); // if (validate) compiler_->AddPass(new passes::ValidationPass());
//RepetitiveComputationMergerPass ala Chrispy
compiler_->AddPass(std::make_unique<passes::RepetitiveComputationMergerPass>());
if (validate) compiler_->AddPass(std::make_unique<passes::ValidationPass>());
// Register allocation for the target backend. // Register allocation for the target backend.
// Will modify the HIR to add loads/stores. // Will modify the HIR to add loads/stores.
// This should be the last pass before finalization, as after this all // This should be the last pass before finalization, as after this all