Merge pull request #15163 from unknownbrackets/softjit

Implement a jit for drawing pixels in the software renderer
hrydgard · Nov 28, 2021 · aa12c9b · aa12c9b
2 parents cf6e11e + 6fbcf67
commit aa12c9b
Show file tree

Hide file tree

Showing 18 changed files with 2,671 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1393,6 +1393,7 @@ list(APPEND CoreExtra
 	Core/MIPS/x86/RegCacheFPU.cpp
 	Core/MIPS/x86/RegCacheFPU.h
 	GPU/Common/VertexDecoderX86.cpp
+	GPU/Software/DrawPixelX86.cpp
 	GPU/Software/SamplerX86.cpp
 )
 

diff --git a/Common/x64Emitter.cpp b/Common/x64Emitter.cpp
@@ -1819,8 +1819,13 @@ void XEmitter::PCMPGTB(X64Reg dest, OpArg arg)  {WriteSSEOp(0x66, 0x64, dest, ar
 void XEmitter::PCMPGTW(X64Reg dest, OpArg arg)  {WriteSSEOp(0x66, 0x65, dest, arg);}
 void XEmitter::PCMPGTD(X64Reg dest, OpArg arg)  {WriteSSEOp(0x66, 0x66, dest, arg);}
 
-void XEmitter::PEXTRW(X64Reg dest, OpArg arg, u8 subreg)    {WriteSSEOp(0x66, 0xC5, dest, arg, 1); Write8(subreg);}
+void XEmitter::PEXTRW(X64Reg dest, X64Reg arg, u8 subreg)   {WriteSSEOp(0x66, 0xC5, dest, R(arg), 1); Write8(subreg);}
 void XEmitter::PINSRW(X64Reg dest, OpArg arg, u8 subreg)    {WriteSSEOp(0x66, 0xC4, dest, arg, 1); Write8(subreg);}
+void XEmitter::PEXTRB(OpArg dest, X64Reg arg, u8 subreg)    {WriteSSE41Op(0x66, 0x3A14, arg, dest, 1); Write8(subreg);}
+void XEmitter::PEXTRW(OpArg dest, X64Reg arg, u8 subreg)    {WriteSSE41Op(0x66, 0x3A15, arg, dest, 1); Write8(subreg);}
+void XEmitter::PEXTRD(OpArg dest, X64Reg arg, u8 subreg)    {WriteSSE41Op(0x66, 0x3A16, arg, dest, 1); Write8(subreg);}
+void XEmitter::PINSRB(X64Reg dest, OpArg arg, u8 subreg)    {WriteSSE41Op(0x66, 0x3A20, dest, arg, 1); Write8(subreg);}
+void XEmitter::PINSRD(X64Reg dest, OpArg arg, u8 subreg)    {WriteSSE41Op(0x66, 0x3A22, dest, arg, 1); Write8(subreg);}
 
 void XEmitter::PMADDWD(X64Reg dest, OpArg arg)  {WriteSSEOp(0x66, 0xF5, dest, arg); }
 void XEmitter::PSADBW(X64Reg dest, OpArg arg)   {WriteSSEOp(0x66, 0xF6, dest, arg);}

diff --git a/Common/x64Emitter.h b/Common/x64Emitter.h
@@ -798,8 +798,14 @@ class XEmitter
 	void PCMPGTW(X64Reg dest, OpArg arg);
 	void PCMPGTD(X64Reg dest, OpArg arg);
 
-	void PEXTRW(X64Reg dest, OpArg arg, u8 subreg);
+	void PEXTRW(X64Reg dest, X64Reg arg, u8 subreg);
 	void PINSRW(X64Reg dest, OpArg arg, u8 subreg);
+	// SSE4 inserts and extracts.
+	void PEXTRB(OpArg dest, X64Reg arg, u8 subreg);
+	void PEXTRW(OpArg dest, X64Reg arg, u8 subreg);
+	void PEXTRD(OpArg dest, X64Reg arg, u8 subreg);
+	void PINSRB(X64Reg dest, OpArg arg, u8 subreg);
+	void PINSRD(X64Reg dest, OpArg arg, u8 subreg);
 
 	void PMADDWD(X64Reg dest, OpArg arg);
 	void PSADBW(X64Reg dest, OpArg arg);

diff --git a/Core/Config.cpp b/Core/Config.cpp
@@ -847,6 +847,7 @@ static ConfigSetting graphicsSettings[] = {
 	ConfigSetting("VendorBugChecksEnabled", &g_Config.bVendorBugChecksEnabled, true, false, false),
 	ReportedConfigSetting("RenderingMode", &g_Config.iRenderingMode, 1, true, true),
 	ConfigSetting("SoftwareRenderer", &g_Config.bSoftwareRendering, false, true, true),
+	ConfigSetting("SoftwareRendererJit", &g_Config.bSoftwareRenderingJit, true, true, true),
 	ReportedConfigSetting("HardwareTransform", &g_Config.bHardwareTransform, true, true, true),
 	ReportedConfigSetting("SoftwareSkinning", &g_Config.bSoftwareSkinning, true, true, true),
 	ReportedConfigSetting("TextureFiltering", &g_Config.iTexFiltering, 1, true, true),

diff --git a/Core/Config.h b/Core/Config.h
@@ -155,6 +155,7 @@ struct Config {
 	std::string sMicDevice;
 
 	bool bSoftwareRendering;
+	bool bSoftwareRenderingJit;
 	bool bHardwareTransform; // only used in the GLES backend
 	bool bSoftwareSkinning;  // may speed up some games
 	bool bVendorBugChecksEnabled;

diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj
@@ -631,6 +631,7 @@
     <ClCompile Include="Math3D.cpp" />
     <ClCompile Include="Software\Clipper.cpp" />
     <ClCompile Include="Software\DrawPixel.cpp" />
+    <ClCompile Include="Software\DrawPixelX86.cpp" />
     <ClCompile Include="Software\Lighting.cpp" />
     <ClCompile Include="Software\FuncId.cpp" />
     <ClCompile Include="Software\Rasterizer.cpp" />

diff --git a/GPU/GPU.vcxproj.filters b/GPU/GPU.vcxproj.filters
@@ -542,5 +542,8 @@
     <ClCompile Include="Software\DrawPixel.cpp">
       <Filter>Software</Filter>
     </ClCompile>
+    <ClCompile Include="Software\DrawPixelX86.cpp">
+      <Filter>Software</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>