From 0e1188565e01350fc4a320c802af6e283fc88a00 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Mon, 7 Dec 2015 08:32:42 +0100 Subject: [PATCH] ee:profiler: count EE instruction execution Based on microVU_Profiler.h It remains to emit all the opcode to use it properly --- pcsx2/x86/R5900_Profiler.h | 230 ++++++++++++++++++++++++++++++++ pcsx2/x86/iR5900.h | 1 + pcsx2/x86/ix86-32/iR5900-32.cpp | 5 + 3 files changed, 236 insertions(+) create mode 100644 pcsx2/x86/R5900_Profiler.h diff --git a/pcsx2/x86/R5900_Profiler.h b/pcsx2/x86/R5900_Profiler.h new file mode 100644 index 0000000000..3712215d48 --- /dev/null +++ b/pcsx2/x86/R5900_Profiler.h @@ -0,0 +1,230 @@ +/* PCSX2 - PS2 Emulator for PCs + * Copyright (C) 2002-2015 PCSX2 Dev Team + * + * PCSX2 is free software: you can redistribute it and/or modify it under the terms + * of the GNU Lesser General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with PCSX2. + * If not, see . + */ + +#pragma once + +enum class eeOpcode { + // Core + special , regimm , J , JAL , BEQ , BNE , BLEZ , BGTZ , + ADDI , ADDIU , SLTI , SLTIU , ANDI , ORI , XORI , LUI , + cop0 , cop1 , cop2 , /*,*/ BEQL , BNEL , BLEZL , BGTZL , + DADDI , DADDIU , LDL , LDR , mmi , /*,*/ LQ , SQ , + LB , LH , LWL , LW , LBU , LHU , LWR , LWU , + SB , SH , SWL , SW , SDL , SDR , SWR , CACHE , + /*,*/ LWC1 , /*,*/ PREF , /*,*/ /*,*/ LQC2 , LD , + /*,*/ SWC1 , /*,*/ /*,*/ /*,*/ /*,*/ SQC2 , SD , + + // Special + SLL , /*,*/ SRL , SRA , SLLV , /*,*/ SRLV , SRAV , + JR , JALR , MOVZ , MOVN , SYSCALL , BREAK , /*,*/ SYNC , + MFHI , MTHI , MFLO , MTLO , DSLLV , /*,*/ DSRLV , DSRAV , + MULT , MULTU , DIV , DIVU , /*,*/ /*,*/ /*,*/ /*,*/ + ADD , ADDU , SUB , SUBU , AND , OR , XOR , NOR , + MFSA , MTSA , SLT , SLTU , DADD , DADDU , DSUB , DSUBU , + TGE , TGEU , TLT , TLTU , TEQ , /*,*/ TNE , /*,*/ + DSLL , /*,*/ DSRL , DSRA , DSLL32 , /*,*/ DSRL32 , DSRA32 , + + // Regimm + BLTZ , BGEZ , BLTZL , BGEZL , /*,*/ /*,*/ /*,*/ /*,*/ + TGEI , TGEIU , TLTI , TLTIU , TEQI , /*,*/ TNEI , /*,*/ + BLTZAL , BGEZAL , BLTZALL , BGEZALL , /*,*/ /*,*/ /*,*/ /*,*/ + MTSAB , MTSAH , /*,*/ /*,*/ /*,*/ /*,*/ /*,*/ /*,*/ + + // MMI + MADD , MADDU , /*,*/ /*,*/ PLZCW , /*,*/ /*,*/ /*,*/ + MMI0 , MMI2 , /*,*/ /*,*/ /*,*/ /*,*/ /*,*/ /*,*/ + MFHI1 , MTHI1 , MFLO1 , MTLO1 , /*,*/ /*,*/ /*,*/ /*,*/ + MULT1 , MULTU1 , DIV1 , DIVU1 , /*,*/ /*,*/ /*,*/ /*,*/ + MADD1 , MADDU1 , /*,*/ /*,*/ /*,*/ /*,*/ /*,*/ /*,*/ + MMI1 , MMI3 , /*,*/ /*,*/ /*,*/ /*,*/ /*,*/ /*,*/ + PMFHL , PMTHL , /*,*/ /*,*/ PSLLH , /*,*/ PSRLH , PSRAH , + /*,*/ /*,*/ /*,*/ /*,*/ PSLLW , /*,*/ PSRLW , PSRAW , + + // MMI0 + PADDW , PSUBW , PCGTW , PMAXW , + PADDH , PSUBH , PCGTH , PMAXH , + PADDB , PSUBB , PCGTB , /*,*/ + /*,*/ /*,*/ /*,*/ /*,*/ + PADDSW , PSUBSW , PEXTLW , PPACW , + PADDSH , PSUBSH , PEXTLH , PPACH , + PADDSB , PSUBSB , PEXTLB , PPACB , + /*,*/ /*,*/ PEXT5 , PPAC5 , + + // MMI1 + /*,*/ PABSW , PCEQW , PMINW , + PADSBH , PABSH , PCEQH , PMINH , + /*,*/ /*,*/ PCEQB , /*,*/ + /*,*/ /*,*/ /*,*/ /*,*/ + PADDUW , PSUBUW , PEXTUW , /*,*/ + PADDUH , PSUBUH , PEXTUH , /*,*/ + PADDUB , PSUBUB , PEXTUB , QFSRV , + /*,*/ /*,*/ /*,*/ /*,*/ + + // MMI2 + PMADDW , /*,*/ PSLLVW , PSRLVW , + PMSUBW , /*,*/ /*,*/ /*,*/ + PMFHI , PMFLO , PINTH , /*,*/ + PMULTW , PDIVW , PCPYLD , /*,*/ + PMADDH , PHMADH , PAND , PXOR , + PMSUBH , PHMSBH , /*,*/ /*,*/ + /*,*/ /*,*/ PEXEH , PREVH , + PMULTH , PDIVBW , PEXEW , PROT3W , + + // MMI3 + PMADDUW , /*,*/ /*,*/ PSRAVW , + /*,*/ /*,*/ /*,*/ /*,*/ + PMTHI , PMTLO , PINTEH , /*,*/ + PMULTUW , PDIVUW , PCPYUD , /*,*/ + /*,*/ /*,*/ POR , PNOR , + /*,*/ /*,*/ /*,*/ /*,*/ + /*,*/ /*,*/ PEXCH , PCPYH , + /*,*/ /*,*/ PEXCW , /*,*/ + + // ADD COP0/1 ?? + + LAST +}; + +static const char eeOpcodeName[][16] = { + // "Core" + "special" , "regimm" , "J" , "JAL" , "BEQ" , "BNE" , "BLEZ" , "BGTZ" , + "ADDI" , "ADDIU" , "SLTI" , "SLTIU" , "ANDI" , "ORI" , "XORI" , "LUI" , + "cop0" , "cop1" , "cop2" , /* , */ "BEQL" , "BNEL" , "BLEZL" , "BGTZL" , + "DADDI" , "DADDIU" , "LDL" , "LDR" , "mmi" , /* , */ "LQ" , "SQ" , + "LB" , "LH" , "LWL" , "LW" , "LBU" , "LHU" , "LWR" , "LWU" , + "SB" , "SH" , "SWL" , "SW" , "SDL" , "SDR" , "SWR" , "CACHE" , + /* , */ "LWC1" , /* , */ "PREF" , /* , */ /* , */ "LQC2" , "LD" , + /* , */ "SWC1" , /* , */ /* , */ /* , */ /* , */ "SQC2" , "SD" , + + // "Special" + "SLL" , /* , */ "SRL" , "SRA" , "SLLV" , /* , */ "SRLV" , "SRAV" , + "JR" , "JALR" , "MOVZ" , "MOVN" , "SYSCALL" , "BREAK" , /* , */ "SYNC" , + "MFHI" , "MTHI" , "MFLO" , "MTLO" , "DSLLV" , /* , */ "DSRLV" , "DSRAV" , + "MULT" , "MULTU" , "DIV" , "DIVU" , /* , */ /* , */ /* , */ /* , */ + "ADD" , "ADDU" , "SUB" , "SUBU" , "AND" , "OR" , "XOR" , "NOR" , + "MFSA" , "MTSA" , "SLT" , "SLTU" , "DADD" , "DADDU" , "DSUB" , "DSUBU" , + "TGE" , "TGEU" , "TLT" , "TLTU" , "TEQ" , /* , */ "TNE" , /* , */ + "DSLL" , /* , */ "DSRL" , "DSRA" , "DSLL32" , /* , */ "DSRL32" , "DSRA32" , + + // "Regimm" + "BLTZ" , "BGEZ" , "BLTZL" , "BGEZL" , /* , */ /* , */ /* , */ /* , */ + "TGEI" , "TGEIU" , "TLTI" , "TLTIU" , "TEQI" , /* , */ "TNEI" , /* , */ + "BLTZAL" , "BGEZAL" , "BLTZALL" , "BGEZALL" , /* , */ /* , */ /* , */ /* , */ + "MTSAB" , "MTSAH" , /* , */ /* , */ /* , */ /* , */ /* , */ /* , */ + + // "MMI" + "MADD" , "MADDU" , /* , */ /* , */ "PLZCW" , /* , */ /* , */ /* , */ + "MMI0" , "MMI2" , /* , */ /* , */ /* , */ /* , */ /* , */ /* , */ + "MFHI1" , "MTHI1" , "MFLO1" , "MTLO1" , /* , */ /* , */ /* , */ /* , */ + "MULT1" , "MULTU1" , "DIV1" , "DIVU1" , /* , */ /* , */ /* , */ /* , */ + "MADD1" , "MADDU1" , /* , */ /* , */ /* , */ /* , */ /* , */ /* , */ + "MMI1" , "MMI3" , /* , */ /* , */ /* , */ /* , */ /* , */ /* , */ + "PMFHL" , "PMTHL" , /* , */ /* , */ "PSLLH" , /* , */ "PSRLH" , "PSRAH" , + /* , */ /* , */ /* , */ /* , */ "PSLLW" , /* , */ "PSRLW" , "PSRAW" , + + // "MMI0" + "PADDW" , "PSUBW" , "PCGTW" , "PMAXW" , + "PADDH" , "PSUBH" , "PCGTH" , "PMAXH" , + "PADDB" , "PSUBB" , "PCGTB" , /* , */ + /* , */ /* , */ /* , */ /* , */ + "PADDSW" , "PSUBSW" , "PEXTLW" , "PPACW" , + "PADDSH" , "PSUBSH" , "PEXTLH" , "PPACH" , + "PADDSB" , "PSUBSB" , "PEXTLB" , "PPACB" , + /* , */ /* , */ "PEXT5" , "PPAC5" , + + // "MMI1" + /* , */ "PABSW" , "PCEQW" , "PMINW" , + "PADSBH" , "PABSH" , "PCEQH" , "PMINH" , + /* , */ /* , */ "PCEQB" , /* , */ + /* , */ /* , */ /* , */ /* , */ + "PADDUW" , "PSUBUW" , "PEXTUW" , /* , */ + "PADDUH" , "PSUBUH" , "PEXTUH" , /* , */ + "PADDUB" , "PSUBUB" , "PEXTUB" , "QFSRV" , + /* , */ /* , */ /* , */ /* , */ + + // "MMI2" + "PMADDW" , /* , */ "PSLLVW" , "PSRLVW" , + "PMSUBW" , /* , */ /* , */ /* , */ + "PMFHI" , "PMFLO" , "PINTH" , /* , */ + "PMULTW" , "PDIVW" , "PCPYLD" , /* , */ + "PMADDH" , "PHMADH" , "PAND" , "PXOR" , + "PMSUBH" , "PHMSBH" , /* , */ /* , */ + /* , */ /* , */ "PEXEH" , "PREVH" , + "PMULTH" , "PDIVBW" , "PEXEW" , "PROT3W" , + + // "MMI3" + "PMADDUW" , /* , */ /* , */ "PSRAVW" , + /* , */ /* , */ /* , */ /* , */ + "PMTHI" , "PMTLO" , "PINTEH" , /* , */ + "PMULTUW" , "PDIVUW" , "PCPYUD" , /* , */ + /* , */ /* , */ "POR" , "PNOR" , + /* , */ /* , */ /* , */ /* , */ + /* , */ /* , */ "PEXCH" , "PCPYH" , + /* , */ /* , */ "PEXCW" , /* , */ + + "!" +}; + +//#define eeProfileProg + +#ifdef eeProfileProg +#include +#include + +struct eeProfiler { + u64 opStats[static_cast(eeOpcode::LAST)]; + + void Reset() { + memzero(*this); + pxAssert(eeOpcodeName[static_cast(eeOpcode::LAST)][0] == '!'); + } + + void EmitOp(eeOpcode opcode) { + int op = static_cast(opcode); + x86Emitter::xADD(x86Emitter::ptr32[&(((u32*)opStats)[op*2+0])], 1); + x86Emitter::xADC(x86Emitter::ptr32[&(((u32*)opStats)[op*2+1])], 0); + } + + void Print() { + u64 total = 0; + std::vector< std::pair > v; + for(int i = 0; i < static_cast(eeOpcode::LAST); i++) { + total += opStats[i]; + v.push_back(std::make_pair(opStats[i], i)); + } + std::sort (v.begin(), v.end()); + std::reverse(v.begin(), v.end()); + + DevCon.WriteLn("EE Profiler:"); + for(u32 i = 0; i < v.size(); i++) { + u64 count = v[i].first; + double stat = (double)count / (double)total * 100.0; + DevCon.WriteLn("%-8s - [%3.4f%%][count=%u]", + eeOpcodeName[v[i].second], stat, (u32)count); + } + DevCon.WriteLn("Total = 0x%x_%x\n\n", (u32)(u64)(total>>32),(u32)total); + } +}; +#else +struct eeProfiler { + __fi void Reset() {} + __fi void EmitOp(eeOpcode op) {} + __fi void Print() {} +}; +#endif + +namespace EE { + extern eeProfiler Profiler; +} diff --git a/pcsx2/x86/iR5900.h b/pcsx2/x86/iR5900.h index 9dcdcb9671..eda6457de7 100644 --- a/pcsx2/x86/iR5900.h +++ b/pcsx2/x86/iR5900.h @@ -21,6 +21,7 @@ #include "R5900.h" #include "VU.h" #include "iCore.h" +#include "R5900_Profiler.h" extern u32 maxrecmem; extern u32 pc; // recompiler pc (also used by the SuperVU! .. why? (air)) diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 5812835905..ea8813ccdc 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -63,6 +63,7 @@ __aligned16 GPR_reg64 g_cpuConstRegs[32] = {0}; u32 g_cpuHasConstReg = 0, g_cpuFlushedConstReg = 0; bool g_cpuFlushedPC, g_cpuFlushedCode, g_recompilingDelaySlot, g_maySignalException; +eeProfiler EE::Profiler; //////////////////////////////////////////////////////////////// // Static Private Variables - R5900 Dynarec @@ -698,6 +699,8 @@ static bool eeCpuExecuting = false; //////////////////////////////////////////////////// static void recResetRaw() { + EE::Profiler.Reset(); + recAlloc(); if( AtomicExchange( eeRecIsReset, true ) ) return; @@ -838,6 +841,8 @@ static void recExecute() if(m_cpuException) m_cpuException->Rethrow(); if(m_Exception) m_Exception->Rethrow(); #endif + + EE::Profiler.Print(); } ////////////////////////////////////////////////////