CPU: Add new experimental recompiler

CMakeLists.txt

@@ -23,6 +23,7 @@ endif()
 # Renderer options.
 option(ENABLE_OPENGL "Build with OpenGL renderer" ON)
 option(ENABLE_VULKAN "Build with Vulkan renderer" ON)
+option(ENABLE_NEWREC "Build with experimental new dynarec (needed for RISC-V)" ON)
 
 # Global options.
 if(NOT ANDROID)
@@ -171,6 +172,9 @@ elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm" OR "${CMAKE_SYSTEM_PROCESSOR}"
   endif()
 elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "riscv64")
   set(CPU_ARCH "riscv64")
+
+  # Not done for us. Or we should inline atomics?
+  link_libraries("-latomic")
 else()
   message(FATAL_ERROR "Unknown system processor: ${CMAKE_SYSTEM_PROCESSOR}")
 endif()

src/core/CMakeLists.txt

@@ -121,6 +121,11 @@ set(RECOMPILER_SRCS
   cpu_recompiler_types.h
 )
 
+set(NEWREC_SOURCES
+  cpu_newrec_compiler.cpp
+  cpu_newrec_compiler.h
+)
+
 target_precompile_headers(core PRIVATE "pch.h")
 target_include_directories(core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
 target_include_directories(core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
@@ -134,6 +139,15 @@ if(${CPU_ARCH} STREQUAL "x64")
     cpu_recompiler_code_generator_x64.cpp
   )
   message("Building x64 recompiler")
+
+  if(ENABLE_NEWREC)
+    target_compile_definitions(core PUBLIC "ENABLE_NEWREC=1")
+    target_sources(core PRIVATE ${NEWREC_SOURCES}
+      cpu_newrec_compiler_x64.cpp
+      cpu_newrec_compiler_x64.h
+    )
+    message("Building x64 newrec")
+  endif()
 elseif(${CPU_ARCH} STREQUAL "aarch32")
   target_compile_definitions(core PUBLIC "ENABLE_RECOMPILER=1")
   target_sources(core PRIVATE ${RECOMPILER_SRCS}
@@ -148,6 +162,25 @@ elseif(${CPU_ARCH} STREQUAL "aarch64")
   )
   target_link_libraries(core PUBLIC vixl)
   message("Building AArch64 recompiler")
+  if(ENABLE_NEWREC)
+    target_compile_definitions(core PUBLIC "ENABLE_NEWREC=1")
+    target_sources(core PRIVATE ${NEWREC_SOURCES}
+      cpu_newrec_compiler_aarch64.cpp
+      cpu_newrec_compiler_aarch64.h
+    )
+    message("Building AArch64 newrec")
+  endif()
+elseif(${CPU_ARCH} STREQUAL "riscv64")
+  target_compile_definitions(core PUBLIC "ENABLE_MMAP_FASTMEM=1")
+  if(ENABLE_NEWREC)
+    target_compile_definitions(core PUBLIC "ENABLE_NEWREC=1")
+    target_sources(core PRIVATE ${NEWREC_SOURCES}
+      cpu_newrec_compiler_riscv64.cpp
+      cpu_newrec_compiler_riscv64.h
+    )
+    target_link_libraries(core PUBLIC biscuit::biscuit riscv-disas)
+    message("Building RISC-V 64-bit newrec")
+  endif()
 else()
   message("Not building recompiler")
 endif()

src/core/core.props

@@ -8,6 +8,7 @@
       <PreprocessorDefinitions Condition="('$(Platform)'!='ARM64')">ENABLE_RAINTEGRATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM' Or '$(Platform)'=='ARM64')">ENABLE_RECOMPILER=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM64')">ENABLE_MMAP_FASTMEM=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM64')">ENABLE_NEWREC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)dep\xxhash\include;$(SolutionDir)dep\zlib\include;$(SolutionDir)dep\rcheevos\include;$(SolutionDir)dep\rapidjson\include;$(SolutionDir)dep\discord-rpc\include</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'!='ARM64'">%(AdditionalIncludeDirectories);$(SolutionDir)dep\rainterface</AdditionalIncludeDirectories>

src/core/core.vcxproj

@@ -13,6 +13,13 @@
     <ClCompile Include="cpu_core.cpp" />
     <ClCompile Include="cpu_disasm.cpp" />
     <ClCompile Include="cpu_code_cache.cpp" />
+    <ClCompile Include="cpu_newrec_compiler.cpp" />
+    <ClCompile Include="cpu_newrec_compiler_aarch64.cpp">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="cpu_newrec_compiler_x64.cpp">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="cpu_recompiler_code_generator.cpp">
       <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
     </ClCompile>
@@ -90,6 +97,13 @@
     <ClInclude Include="cpu_core_private.h" />
     <ClInclude Include="cpu_disasm.h" />
     <ClInclude Include="cpu_code_cache.h" />
+    <ClInclude Include="cpu_newrec_compiler.h" />
+    <ClInclude Include="cpu_newrec_compiler_aarch64.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="cpu_newrec_compiler_x64.h">
+      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="cpu_recompiler_code_generator.h">
       <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
     </ClInclude>

src/core/core.vcxproj.filters

@@ -60,6 +60,9 @@
     <ClCompile Include="hotkeys.cpp" />
     <ClCompile Include="gpu_shadergen.cpp" />
     <ClCompile Include="pch.cpp" />
+    <ClCompile Include="cpu_newrec_compiler.cpp" />
+    <ClCompile Include="cpu_newrec_compiler_x64.cpp" />
+    <ClCompile Include="cpu_newrec_compiler_aarch64.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="types.h" />
@@ -125,5 +128,8 @@
     <ClInclude Include="gpu_shadergen.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="cpu_code_cache_private.h" />
+    <ClInclude Include="cpu_newrec_compiler.h" />
+    <ClInclude Include="cpu_newrec_compiler_x64.h" />
+    <ClInclude Include="cpu_newrec_compiler_aarch64.h" />
   </ItemGroup>
 </Project>

src/core/cpu_code_cache.cpp

@@ -21,6 +21,10 @@ Log_SetChannel(CPU::CodeCache);
 #include "cpu_recompiler_code_generator.h"
 #endif
 
+#ifdef ENABLE_NEWREC
+#include "cpu_newrec_compiler.h"
+#endif
+
 #include <unordered_set>
 #include <zlib.h>
 
@@ -144,7 +148,8 @@ static u32 s_total_host_instructions_emitted = 0;
 bool CPU::CodeCache::IsUsingAnyRecompiler()
 {
 #ifdef ENABLE_RECOMPILER_SUPPORT
-  return g_settings.cpu_execution_mode == CPUExecutionMode::Recompiler;
+  return (g_settings.cpu_execution_mode == CPUExecutionMode::Recompiler ||
+          g_settings.cpu_execution_mode == CPUExecutionMode::NewRec);
 #else
   return false;
 #endif
@@ -498,8 +503,8 @@ CPU::CodeCache::Block* CPU::CodeCache::CreateBlock(u32 pc, const BlockInstructio
     return block;
   }
 
-  // TODO: Only used by NewRec for now, don't waste time filling it.
-  if constexpr (false)
+  // Old rec doesn't use backprop info, don't waste time filling it.
+  if (g_settings.cpu_execution_mode == CPUExecutionMode::NewRec)
     FillBlockRegInfo(block);
 
   // add it to the tracking list for its page
@@ -1419,6 +1424,10 @@ bool CPU::CodeCache::CompileBlock(Block* block)
     host_code = codegen.CompileBlock(block, &host_code_size, &host_far_code_size);
   }
 #endif
+#ifdef ENABLE_NEWREC
+  if (g_settings.cpu_execution_mode == CPUExecutionMode::NewRec)
+    host_code = NewRec::g_compiler->CompileBlock(block, &host_code_size, &host_far_code_size);
+#endif
 
   s_code_buffer.WriteProtect(true);
 
@@ -1570,6 +1579,10 @@ void CPU::CodeCache::BackpatchLoadStore(void* host_pc, const LoadstoreBackpatchI
   if (g_settings.cpu_execution_mode == CPUExecutionMode::Recompiler)
     Recompiler::CodeGenerator::BackpatchLoadStore(host_pc, info);
 #endif
+#ifdef ENABLE_NEWREC
+  if (g_settings.cpu_execution_mode == CPUExecutionMode::NewRec)
+    NewRec::BackpatchLoadStore(host_pc, info);
+#endif
 
   s_code_buffer.WriteProtect(true);
 }

src/core/cpu_code_cache_private.h

@@ -227,7 +227,7 @@ void InterpretUncachedBlock();
 
 void LogCurrentState();
 
-#if defined(ENABLE_RECOMPILER)
+#if defined(ENABLE_RECOMPILER) || defined(ENABLE_NEWREC)
 #define ENABLE_RECOMPILER_SUPPORT 1
 
 #if defined(_DEBUG) || false

src/core/cpu_core.cpp

@@ -2231,6 +2231,7 @@ void CPU::Execute()
   {
     case CPUExecutionMode::Recompiler:
     case CPUExecutionMode::CachedInterpreter:
+    case CPUExecutionMode::NewRec:
       CodeCache::Execute();
       break;