summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorTilka <tilkax@gmail.com>2017-05-04 00:31:48 +0100
committerGitHub <noreply@github.com>2017-05-04 00:31:48 +0100
commitb0fdd81f45f8ad2ed0f824423651fe78e63f324d (patch)
tree01c2074f05a84a9e4c934c6c1cc579b7bae814e3 /Source/Core
parentd9d8ed64975255dfa756ae04724fd5a66f486055 (diff)
parent7389f0f55e160e9b0299bbae0c217457fdc4f1de (diff)
Merge pull request #5367 from degasus/arm
JitArm64: Drop ps_res instruction.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Common/Analytics.cpp2
-rw-r--r--Source/Core/Core/PowerPC/JitArm64/Jit.h1
-rw-r--r--Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp23
-rw-r--r--Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp2
-rw-r--r--Source/Core/VideoBackends/OGL/Render.cpp5
5 files changed, 8 insertions, 25 deletions
diff --git a/Source/Core/Common/Analytics.cpp b/Source/Core/Common/Analytics.cpp
index 233badebd2..ed9f8cf112 100644
--- a/Source/Core/Common/Analytics.cpp
+++ b/Source/Core/Common/Analytics.cpp
@@ -10,6 +10,7 @@
#include "Common/Analytics.h"
#include "Common/CommonTypes.h"
#include "Common/StringUtil.h"
+#include "Common/Thread.h"
namespace Common
{
@@ -147,6 +148,7 @@ void AnalyticsReporter::Send(AnalyticsReportBuilder&& report)
void AnalyticsReporter::ThreadProc()
{
+ Common::SetCurrentThreadName("Analytics");
while (true)
{
m_reporter_event.Wait();
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h
index 192a0203a9..98f4510bbf 100644
--- a/Source/Core/Core/PowerPC/JitArm64/Jit.h
+++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h
@@ -142,7 +142,6 @@ public:
void ps_maddXX(UGeckoInstruction inst);
void ps_mergeXX(UGeckoInstruction inst);
void ps_mulsX(UGeckoInstruction inst);
- void ps_res(UGeckoInstruction inst);
void ps_sel(UGeckoInstruction inst);
void ps_sumX(UGeckoInstruction inst);
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp
index 93306bf5a4..3aba8aae4b 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp
@@ -152,29 +152,6 @@ void JitArm64::ps_maddXX(UGeckoInstruction inst)
fpr.Unlock(V0Q);
}
-void JitArm64::ps_res(UGeckoInstruction inst)
-{
- INSTRUCTION_START
- JITDISABLE(bJITPairedOff);
- FALLBACK_IF(inst.Rc);
- FALLBACK_IF(SConfig::GetInstance().bFPRF && js.op->wantsFPRF);
-
- u32 b = inst.FB, d = inst.FD;
-
- bool singles = fpr.IsSingle(b);
- RegType type = singles ? REG_REG_SINGLE : REG_REG;
- u8 size = singles ? 32 : 64;
- ARM64Reg (*reg_encoder)(ARM64Reg) = singles ? EncodeRegToDouble : EncodeRegToQuad;
-
- ARM64Reg VB = fpr.R(b, type);
- ARM64Reg VD = fpr.RW(d, type);
-
- // FIXME: implement the same LUT as in the interpreter
- m_float_emit.FRECPE(size, reg_encoder(VD), reg_encoder(VB));
-
- fpr.FixSinglePrecision(d);
-}
-
void JitArm64::ps_sel(UGeckoInstruction inst)
{
INSTRUCTION_START
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
index e6141476ab..7e9696a339 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
@@ -145,7 +145,7 @@ constexpr GekkoOPTemplate table4_2[] = {
{20, &JitArm64::fp_arith}, // ps_sub
{21, &JitArm64::fp_arith}, // ps_add
{23, &JitArm64::ps_sel}, // ps_sel
- {24, &JitArm64::ps_res}, // ps_res
+ {24, &JitArm64::FallBackToInterpreter}, // ps_res
{25, &JitArm64::fp_arith}, // ps_mul
{26, &JitArm64::FallBackToInterpreter}, // ps_rsqrte
{28, &JitArm64::ps_maddXX}, // ps_msub
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index 360bc76a70..d9edb74327 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -84,6 +84,11 @@ static void APIENTRY ErrorCallback(GLenum source, GLenum type, GLuint id, GLenum
const char* s_source;
const char* s_type;
+ // Performance - DualCore driver performance warning:
+ // DualCore application thread syncing with server thread
+ if (id == 0x200b0)
+ return;
+
switch (source)
{
case GL_DEBUG_SOURCE_API_ARB: