RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-24 19:52:37 +01:00
Code Issues Releases Wiki Activity

Savestates: Multi-threaded compression, use ZSTD

Browse Source
This commit is contained in:
Elad Ashkenazi 2024-05-11 06:44:57 +03:00
parent 7c313703a2
commit 66008d5ca4
17 changed files with 985 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -88,3 +88,7 @@
path = 3rdparty/rtmidi/rtmidi path = 3rdparty/rtmidi/rtmidi
url = ../../thestk/rtmidi url = ../../thestk/rtmidi
ignore = dirty ignore = dirty
[submodule "3rdparty/zstd/zstd"]
path = 3rdparty/zstd/zstd
url = ../../facebook/zstd
ignore = dirty

4
3rdparty/CMakeLists.txt vendored
View File

@ -16,6 +16,9 @@ add_library(3rdparty_dummy_lib INTERFACE)
# ZLib # ZLib
add_subdirectory(zlib EXCLUDE_FROM_ALL) add_subdirectory(zlib EXCLUDE_FROM_ALL)
# ZSTD
add_subdirectory(zstd EXCLUDE_FROM_ALL)
# 7z sdk # 7z sdk
add_subdirectory(7z EXCLUDE_FROM_ALL) add_subdirectory(7z EXCLUDE_FROM_ALL)
@ -356,6 +359,7 @@ else()
add_library(3rdparty::libusb ALIAS usb-1.0-static) add_library(3rdparty::libusb ALIAS usb-1.0-static)
endif() endif()
add_library(3rdparty::zlib ALIAS 3rdparty_zlib) add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
add_library(3rdparty::zstd ALIAS 3rdparty_zstd)
add_library(3rdparty::7z ALIAS 3rdparty_7z) add_library(3rdparty::7z ALIAS 3rdparty_7z)
add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers) add_library(3rdparty::flatbuffers ALIAS 3rdparty_flatbuffers)
add_library(3rdparty::pugixml ALIAS pugixml) add_library(3rdparty::pugixml ALIAS pugixml)

1
3rdparty/rtmidi/CMakeLists.txt vendored
View File

@ -1,2 +1,3 @@
option(RTMIDI_API_JACK "Compile with JACK support." OFF) option(RTMIDI_API_JACK "Compile with JACK support." OFF)
set(RTMIDI_TARGETNAME_UNINSTALL "uninstall-rpcs3-rtmidi")
add_subdirectory(rtmidi EXCLUDE_FROM_ALL) add_subdirectory(rtmidi EXCLUDE_FROM_ALL)

9
3rdparty/zstd/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,9 @@
project(3rdparty_zstd)
add_library(3rdparty_zstd INTERFACE)
add_subdirectory(zstd/build/cmake EXLUDE_FROM_ALL)
target_include_directories(3rdparty_zstd INTERFACE zstd zstd/lib)

1
3rdparty/zstd/zstd vendored Submodule

@ -0,0 +1 @@
Subproject commit 97291fc5020a8994019ab76cf0cda83a9824374c

51
3rdparty/zstd/zstd.rc vendored Normal file
View File

@ -0,0 +1,51 @@
// Microsoft Visual C++ generated resource script.
//
#include "zstd\lib\zstd.h" /* ZSTD_VERSION_STRING */
#define APSTUDIO_READONLY_SYMBOLS
#include "verrsrc.h"
#undef APSTUDIO_READONLY_SYMBOLS
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE 9, 1
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION ZSTD_VERSION_MAJOR,ZSTD_VERSION_MINOR,ZSTD_VERSION_RELEASE,0
PRODUCTVERSION ZSTD_VERSION_MAJOR,ZSTD_VERSION_MINOR,ZSTD_VERSION_RELEASE,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS_NT_WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE VFT2_UNKNOWN
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904B0"
BEGIN
VALUE "CompanyName", "Meta Platforms, Inc."
VALUE "FileDescription", "Zstandard - Fast and efficient compression algorithm"
VALUE "FileVersion", ZSTD_VERSION_STRING
VALUE "InternalName", "zstd.exe"
VALUE "LegalCopyright", "Copyright (c) Meta Platforms, Inc. and affiliates."
VALUE "OriginalFilename", "zstd.exe"
VALUE "ProductName", "Zstandard"
VALUE "ProductVersion", ZSTD_VERSION_STRING
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0409, 1200
END
END
#endif

193
3rdparty/zstd/zstd.vcxproj vendored Normal file
View File

@ -0,0 +1,193 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include=".\zstd\lib\common\debug.c" />
<ClCompile Include=".\zstd\lib\common\entropy_common.c" />
<ClCompile Include=".\zstd\lib\common\error_private.c" />
<ClCompile Include=".\zstd\lib\common\pool.c" />
<ClCompile Include=".\zstd\lib\common\threading.c" />
<ClCompile Include=".\zstd\lib\common\xxhash.c" />
<ClCompile Include=".\zstd\lib\common\zstd_common.c" />
<ClCompile Include=".\zstd\lib\common\fse_decompress.c" />
<ClCompile Include=".\zstd\lib\compress\hist.c" />
<ClCompile Include=".\zstd\lib\compress\fse_compress.c" />
<ClCompile Include=".\zstd\lib\compress\huf_compress.c" />
<ClCompile Include=".\zstd\lib\compress\zstdmt_compress.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_compress.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_compress_literals.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_compress_sequences.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_compress_superblock.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_fast.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_double_fast.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_lazy.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_opt.c" />
<ClCompile Include=".\zstd\lib\compress\zstd_ldm.c" />
<ClCompile Include=".\zstd\lib\decompress\huf_decompress.c" />
<ClCompile Include=".\zstd\lib\decompress\zstd_decompress.c" />
<ClCompile Include=".\zstd\lib\decompress\zstd_decompress_block.c" />
<ClCompile Include=".\zstd\lib\decompress\zstd_ddict.c" />
<ClCompile Include=".\zstd\lib\dictBuilder\cover.c" />
<ClCompile Include=".\zstd\lib\dictBuilder\fastcover.c" />
<ClCompile Include=".\zstd\lib\dictBuilder\divsufsort.c" />
<ClCompile Include=".\zstd\lib\dictBuilder\zdict.c" />
<ClCompile Include=".\zstd\lib\legacy\zstd_v01.c" />
<ClCompile Include=".\zstd\lib\legacy\zstd_v02.c" />
<ClCompile Include=".\zstd\lib\legacy\zstd_v03.c" />
<ClCompile Include=".\zstd\lib\legacy\zstd_v04.c" />
<ClCompile Include=".\zstd\lib\legacy\zstd_v05.c" />
<ClCompile Include=".\zstd\lib\legacy\zstd_v06.c" />
<ClCompile Include=".\zstd\lib\legacy\zstd_v07.c" />
<ClCompile Include=".\zstd\programs\util.c" />
<ClCompile Include=".\zstd\programs\timefn.c" />
<ClCompile Include=".\zstd\programs\benchfn.c" />
<ClCompile Include=".\zstd\programs\benchzstd.c" />
<ClCompile Include=".\zstd\programs\datagen.c" />
<ClCompile Include=".\zstd\programs\dibio.c" />
<ClCompile Include=".\zstd\programs\fileio.c" />
<ClCompile Include=".\zstd\programs\fileio_asyncio.c" />
<ClCompile Include=".\zstd\programs\lorem.c" />
<ClCompile Include=".\zstd\programs\zstdcli.c" />
<ClCompile Include=".\zstd\programs\zstdcli_trace.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include=".\zstd\lib\common\pool.h" />
<ClInclude Include=".\zstd\lib\common\threading.h" />
<ClInclude Include=".\zstd\lib\common\xxhash.h" />
<ClInclude Include=".\zstd\lib\compress\zstdmt_compress.h" />
<ClInclude Include=".\zstd\lib\zdict.h" />
<ClInclude Include=".\zstd\lib\dictBuilder\cover.h" />
<ClInclude Include=".\zstd\lib\dictBuilder\divsufsort.h" />
<ClInclude Include=".\zstd\lib\common\fse.h" />
<ClInclude Include=".\zstd\lib\common\huf.h" />
<ClInclude Include=".\zstd\lib\zstd.h" />
<ClInclude Include=".\zstd\lib\common\zstd_internal.h" />
<ClInclude Include=".\zstd\lib\zstd_errors.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_compress.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_compress_literals.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_compress_sequences.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_cwksp.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_compress_superblock.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_fast.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_double_fast.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_lazy.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_opt.h" />
<ClInclude Include=".\zstd\lib\compress\zstd_ldm.h" />
<ClInclude Include=".\zstd\lib\decompress\zstd_ddict.h" />
<ClInclude Include=".\zstd\lib\legacy\zstd_legacy.h" />
<ClInclude Include=".\zstd\lib\legacy\zstd_v01.h" />
<ClInclude Include=".\zstd\lib\legacy\zstd_v02.h" />
<ClInclude Include=".\zstd\lib\legacy\zstd_v03.h" />
<ClInclude Include=".\zstd\lib\legacy\zstd_v04.h" />
<ClInclude Include=".\zstd\lib\legacy\zstd_v05.h" />
<ClInclude Include=".\zstd\lib\legacy\zstd_v06.h" />
<ClInclude Include=".\zstd\lib\legacy\zstd_v07.h" />
<ClInclude Include=".\zstd\programs\benchzstd.h" />
<ClInclude Include=".\zstd\programs\datagen.h" />
<ClInclude Include=".\zstd\programs\dibio.h" />
<ClInclude Include=".\zstd\programs\fileio.h" />
<ClInclude Include=".\zstd\programs\platform.h" />
<ClInclude Include=".\zstd\programs\util.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="zstd.rc" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>zstd</RootNamespace>
<OutDir>$(SolutionDir)lib\$(Configuration)-$(Platform)\</OutDir>
<IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\</IntDir>
<InstructionSet>NotSet</InstructionSet>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath);</IncludePath>
<RunCodeAnalysis>false</RunCodeAnalysis>
<LibraryPath>$(LibraryPath);</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(IncludePath);$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\compress;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(SolutionDir)..\..\lib\dictBuilder;$(UniversalCRT_IncludePath);</IncludePath>
<RunCodeAnalysis>false</RunCodeAnalysis>
<LibraryPath>$(LibraryPath);</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=5;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>true</TreatWarningAsError>
<EnablePREfast>false</EnablePREfast>
<EnableEnhancedInstructionSet>$(InstructionSet)</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level4</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>ZSTD_MULTITHREAD=1;ZSTD_LEGACY_SUPPORT=5;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<TreatWarningAsError>false</TreatWarningAsError>
<EnablePREfast>false</EnablePREfast>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>/DZSTD_MULTITHREAD %(AdditionalOptions)</AdditionalOptions>
<EnableEnhancedInstructionSet>$(InstructionSet)</EnableEnhancedInstructionSet>
<LanguageStandard_C>Default</LanguageStandard_C>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

2
CMakeLists.txt
View File

@ -114,6 +114,8 @@ if(MSVC)
add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled
endif() endif()
set(ALLOW_DUPLICATE_CUSTOM_TARGETS TRUE)
add_subdirectory(3rdparty) add_subdirectory(3rdparty)
if (DISABLE_LTO) if (DISABLE_LTO)

7
rpcs3.sln
View File

@ -100,6 +100,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniupnpc_static", "3rdpart
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtmidi", "3rdparty\rtmidi\rtmidi.vcxproj", "{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtmidi", "3rdparty\rtmidi\rtmidi.vcxproj", "{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "3rdparty\zstd\zstd.vcxproj", "{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
@ -202,6 +204,10 @@ Global
{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Debug|x64.Build.0 = Debug|x64 {2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Debug|x64.Build.0 = Debug|x64
{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Release|x64.ActiveCfg = Release|x64 {2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Release|x64.ActiveCfg = Release|x64
{2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Release|x64.Build.0 = Release|x64 {2C902C67-985C-4BE0-94A3-E0FE2EB929A3}.Release|x64.Build.0 = Release|x64
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Debug|x64.ActiveCfg = Debug|x64
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Debug|x64.Build.0 = Debug|x64
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Release|x64.ActiveCfg = Release|x64
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -233,6 +239,7 @@ Global
{A55DA1B5-CC17-4525-BE7F-1659CE17BB56} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8} {A55DA1B5-CC17-4525-BE7F-1659CE17BB56} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8} {5228F863-E0DD-4DE7-AA7B-5C52B14CD4D0} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{2C902C67-985C-4BE0-94A3-E0FE2EB929A3} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8} {2C902C67-985C-4BE0-94A3-E0FE2EB929A3} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C} = {6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {06CC7920-E085-4B81-9582-8DE8AAD42510} SolutionGuid = {06CC7920-E085-4B81-9582-8DE8AAD42510}

42
rpcs3/Emu/System.cpp
View File

@ -771,10 +771,19 @@ bool Emulator::BootRsxCapture(const std::string& path)
std::unique_ptr<rsx::frame_capture_data> frame = std::make_unique<rsx::frame_capture_data>(); std::unique_ptr<rsx::frame_capture_data> frame = std::make_unique<rsx::frame_capture_data>();
utils::serial load; utils::serial load;
load.set_reading_state(); load.set_reading_state();
const std::string lower = fmt::to_lower(path);
if (fmt::to_lower(path).ends_with(".gz")) if (lower.ends_with(".SAVESTAT.gz") || lower.ends_with(".SAVESTAT.zst"))
{ {
load.m_file_handler = make_compressed_serialization_file_handler(std::move(in_file)); if (lower.ends_with(".SAVESTAT.gz"))
{
load.m_file_handler = make_compressed_serialization_file_handler(std::move(in_file));
}
else
{
load.m_file_handler = make_compressed_zstd_serialization_file_handler(std::move(in_file));
}
// Forcefully read some data to check validity // Forcefully read some data to check validity
load.pop<uchar>(); load.pop<uchar>();
@ -956,13 +965,29 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
{ {
fs::file save{m_path, fs::isfile + fs::read}; fs::file save{m_path, fs::isfile + fs::read};
if (!m_path.ends_with(".gz") && save && save.size() >= 8 && save.read<u64>() == "RPCS3SAV"_u64) if (m_path.ends_with(".SAVESTAT") && save && save.size() >= 8 && save.read<u64>() == "RPCS3SAV"_u64)
{ {
m_ar = std::make_shared<utils::serial>(); m_ar = std::make_shared<utils::serial>();
m_ar->set_reading_state(); m_ar->set_reading_state();
m_ar->m_file_handler = make_uncompressed_serialization_file_handler(std::move(save)); m_ar->m_file_handler = make_uncompressed_serialization_file_handler(std::move(save));
} }
else if (save && m_path.ends_with(".zst"))
{
m_ar = std::make_shared<utils::serial>();
m_ar->set_reading_state();
m_ar->m_file_handler = make_compressed_zstd_serialization_file_handler(std::move(save));
if (m_ar->try_read<u64>().second != "RPCS3SAV"_u64)
{
m_ar.reset();
}
else
{
m_ar->pos = 0;
}
}
else if (save && m_path.ends_with(".gz")) else if (save && m_path.ends_with(".gz"))
{ {
m_ar = std::make_shared<utils::serial>(); m_ar = std::make_shared<utils::serial>();
@ -3138,12 +3163,11 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
path = get_savestate_file(m_title_id, m_path, 0, 0); path = get_savestate_file(m_title_id, m_path, 0, 0);
// The function is meant for reading files, so if there is no GZ file it would not return compressed file path // The function is meant for reading files, so if there is no ZST file it would not return compressed file path
// So this is the only place where the result is edited if need to be // So this is the only place where the result is edited if need to be
if (!path.ends_with(".gz")) constexpr std::string_view save = ".SAVESTAT";
{ path.resize(path.rfind(save) + save.size());
path += ".gz"; path += ".zst";
}
if (!fs::create_path(fs::get_parent_dir(path))) if (!fs::create_path(fs::get_parent_dir(path)))
{ {
@ -3160,7 +3184,7 @@ void Emulator::Kill(bool allow_autoexit, bool savestate, savestate_stage* save_s
} }
auto serial_ptr = stx::make_single<utils::serial>(); auto serial_ptr = stx::make_single<utils::serial>();
serial_ptr->m_file_handler = make_compressed_serialization_file_handler(file.file); serial_ptr->m_file_handler = make_compressed_zstd_serialization_file_handler(file.file);
*to_ar = std::move(serial_ptr); *to_ar = std::move(serial_ptr);
signal_system_cache_can_stay(); signal_system_cache_can_stay();

26
rpcs3/Emu/savestate_utils.cpp
View File

@ -126,8 +126,18 @@ std::vector<version_entry> get_savestate_versioning_data(fs::file&& file, std::s
utils::serial ar; utils::serial ar;
ar.set_reading_state({}, true); ar.set_reading_state({}, true);
ar.m_file_handler = filepath.ends_with(".gz") ? static_cast<std::unique_ptr<utils::serialization_file_handler>>(make_compressed_serialization_file_handler(std::move(file))) if (filepath.ends_with(".zst"))
: make_uncompressed_serialization_file_handler(std::move(file)); {
ar.m_file_handler = make_compressed_zstd_serialization_file_handler(std::move(file));
}
else if (filepath.ends_with(".gz"))
{
ar.m_file_handler = make_compressed_serialization_file_handler(std::move(file));
}
else
{
ar.m_file_handler = make_uncompressed_serialization_file_handler(std::move(file));
}
if (u64 r = 0; ar.try_read(r) != 0 || r != "RPCS3SAV"_u64) if (u64 r = 0; ar.try_read(r) != 0 || r != "RPCS3SAV"_u64)
{ {
@ -228,6 +238,11 @@ std::string get_savestate_file(std::string_view title_id, std::string_view boot_
std::string path = fs::get_cache_dir() + "/savestates/" + title + "/" + title + '_' + prefix + '_' + save_id + ".SAVESTAT"; std::string path = fs::get_cache_dir() + "/savestates/" + title + "/" + title + '_' + prefix + '_' + save_id + ".SAVESTAT";
if (std::string path_compressed = path + ".zst"; fs::is_file(path_compressed))
{
return path_compressed;
}
if (std::string path_compressed = path + ".gz"; fs::is_file(path_compressed)) if (std::string path_compressed = path + ".gz"; fs::is_file(path_compressed))
{ {
return path_compressed; return path_compressed;
@ -278,7 +293,12 @@ bool boot_last_savestate(bool testing)
// Find the latest savestate file compatible with the game (TODO: Check app version and anything more) // Find the latest savestate file compatible with the game (TODO: Check app version and anything more)
if (entry.name.find(Emu.GetTitleID()) != umax && mtime <= entry.mtime) if (entry.name.find(Emu.GetTitleID()) != umax && mtime <= entry.mtime)
{ {
if (std::string path = save_dir + entry.name + ".gz"; is_savestate_compatible(fs::file(path), path)) if (std::string path = save_dir + entry.name + ".zst"; is_savestate_compatible(fs::file(path), path))
{
savestate_path = std::move(path);
mtime = entry.mtime;
}
else if (std::string path = save_dir + entry.name + ".gz"; is_savestate_compatible(fs::file(path), path))
{ {
savestate_path = std::move(path); savestate_path = std::move(path);
mtime = entry.mtime; mtime = entry.mtime;

10
rpcs3/emucore.vcxproj
View File

@ -40,10 +40,12 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<AdditionalIncludeDirectories>..\3rdparty\miniupnp\miniupnp\miniupnpc\include;..\3rdparty\wolfssl\wolfssl;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\SoundTouch\soundtouch\include;..\3rdparty\rtmidi\rtmidi;..\3rdparty\zlib\zlib;..\3rdparty\llvm\llvm\include;..\3rdparty\llvm\llvm\llvm\include;..\3rdparty\llvm\llvm_build\include;$(VULKAN_SDK)\Include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\3rdparty\miniupnp\miniupnp\miniupnpc\include;..\3rdparty\wolfssl\wolfssl;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\SoundTouch\soundtouch\include;..\3rdparty\rtmidi\rtmidi;..\3rdparty\zlib\zlib;..\3rdparty\llvm\llvm\include;..\3rdparty\llvm\llvm\llvm\include;..\3rdparty\llvm\llvm_build\include;$(VULKAN_SDK)\Include;..\3rdparty\zstd\zstd\lib</AdditionalIncludeDirectories>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization> <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;ZLIB_CONST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalModuleDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalModuleDependencies)</AdditionalModuleDependencies>
<AdditionalModuleDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalModuleDependencies)</AdditionalModuleDependencies>
</ClCompile> </ClCompile>
<PreBuildEvent> <PreBuildEvent>
<Command>cmd.exe /c "$(SolutionDir)\Utilities\git-version-gen.cmd"</Command> <Command>cmd.exe /c "$(SolutionDir)\Utilities\git-version-gen.cmd"</Command>
@ -946,6 +948,12 @@
<ProjectReference Include="..\3rdparty\yaml-cpp\yaml-cpp.vcxproj"> <ProjectReference Include="..\3rdparty\yaml-cpp\yaml-cpp.vcxproj">
<Project>{fdc361c5-7734-493b-8cfb-037308b35122}</Project> <Project>{fdc361c5-7734-493b-8cfb-037308b35122}</Project>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\3rdparty\zlib\zlib.vcxproj">
<Project>{60f89955-91c6-3a36-8000-13c592fec2df}</Project>
</ProjectReference>
<ProjectReference Include="..\3rdparty\zstd\zstd.vcxproj">
<Project>{4e52a41a-f33b-4c7a-8c36-a1a6b4f4277c}</Project>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Emu\RSX\Program\GLSLInterpreter\FragmentInterpreter.glsl" /> <None Include="Emu\RSX\Program\GLSLInterpreter\FragmentInterpreter.glsl" />

4
rpcs3/rpcs3.vcxproj
View File

@ -89,7 +89,7 @@
<ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel> <ExternalWarningLevel>TurnOffAllWarnings</ExternalWarningLevel>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Core.lib;Qt6Gui.lib;Qt6Widgets.lib;Qt6Concurrent.lib;Qt6Multimedia.lib;Qt6MultimediaWidgets.lib;Qt6Svg.lib;Qt6SvgWidgets.lib;7zlib.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;imm32.lib;ksuser.lib;version.lib;OpenAL32.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;MachineIndependent.lib;GenericCodeGen.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Core.lib;Qt6Gui.lib;Qt6Widgets.lib;Qt6Concurrent.lib;Qt6Multimedia.lib;Qt6MultimediaWidgets.lib;Qt6Svg.lib;Qt6SvgWidgets.lib;7zlib.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;SDL.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\3rdparty\glslang\build\hlsl\Release;..\3rdparty\glslang\build\SPIRV\Release;..\3rdparty\glslang\build\OGLCompilersDLL\Release;..\3rdparty\glslang\build\glslang\OSDependent\Windows\Release;..\3rdparty\glslang\build\glslang\Release;..\3rdparty\SPIRV\build\source\Release;..\3rdparty\SPIRV\build\source\opt\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\discord-rpc\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories);$(VULKAN_SDK)\Lib</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\3rdparty\glslang\build\hlsl\Release;..\3rdparty\glslang\build\SPIRV\Release;..\3rdparty\glslang\build\OGLCompilersDLL\Release;..\3rdparty\glslang\build\glslang\OSDependent\Windows\Release;..\3rdparty\glslang\build\glslang\Release;..\3rdparty\SPIRV\build\source\Release;..\3rdparty\SPIRV\build\source\opt\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\discord-rpc\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories);$(VULKAN_SDK)\Lib</AdditionalLibraryDirectories>
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
<DataExecutionPrevention>true</DataExecutionPrevention> <DataExecutionPrevention>true</DataExecutionPrevention>
@ -140,7 +140,7 @@
<ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;ksuser.lib;OpenAL32.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslangd.lib;OSDependentd.lib;OGLCompilerd.lib;SPIRVd.lib;MachineIndependentd.lib;GenericCodeGend.lib;Advapi32.lib;user32.lib;zlib.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Cored.lib;Qt6Guid.lib;Qt6Widgetsd.lib;Qt6Concurrentd.lib;Qt6Multimediad.lib;Qt6MultimediaWidgetsd.lib;Qt6Svgd.lib;Qt6SvgWidgetsd.lib;7zlib.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;XAudio.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>DbgHelp.lib;Ole32.lib;gdi32.lib;hidapi.lib;libusb-1.0.lib;winmm.lib;miniupnpc_static.lib;rtmidi.lib;ksuser.lib;OpenAL32.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;wolfssl.lib;libcurl.lib;Wldap32.lib;glslangd.lib;OSDependentd.lib;OGLCompilerd.lib;SPIRVd.lib;MachineIndependentd.lib;GenericCodeGend.lib;Advapi32.lib;user32.lib;zlib.lib;zstd.lib;libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;shell32.lib;Qt6Cored.lib;Qt6Guid.lib;Qt6Widgetsd.lib;Qt6Concurrentd.lib;Qt6Multimediad.lib;Qt6MultimediaWidgetsd.lib;Qt6Svgd.lib;Qt6SvgWidgetsd.lib;7zlib.lib;SPIRV-Tools.lib;SPIRV-Tools-opt.lib;libcubeb.lib;cubeb.lib;soundtouch.lib;Avrt.lib;XAudio.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\3rdparty\glslang\build\hlsl\Debug;..\3rdparty\glslang\build\SPIRV\Debug;..\3rdparty\glslang\build\OGLCompilersDLL\Debug;..\3rdparty\glslang\build\glslang\OSDependent\Windows\Debug;..\3rdparty\glslang\build\glslang\Debug;..\3rdparty\SPIRV\build\source\opt\Debug;..\3rdparty\discord-rpc\lib;..\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;%(AdditionalLibraryDirectories);$(VULKAN_SDK)\Lib</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\3rdparty\OpenAL\libs\Win64;..\3rdparty\glslang\build\hlsl\Debug;..\3rdparty\glslang\build\SPIRV\Debug;..\3rdparty\glslang\build\OGLCompilersDLL\Debug;..\3rdparty\glslang\build\glslang\OSDependent\Windows\Debug;..\3rdparty\glslang\build\glslang\Debug;..\3rdparty\SPIRV\build\source\opt\Debug;..\3rdparty\discord-rpc\lib;..\lib\$(CONFIGURATION)-$(PLATFORM);$(QTDIR)\lib;%(AdditionalLibraryDirectories);$(VULKAN_SDK)\Lib</AdditionalLibraryDirectories>
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /VERBOSE %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /VERBOSE %(AdditionalOptions)</AdditionalOptions>
<DataExecutionPrevention>true</DataExecutionPrevention> <DataExecutionPrevention>true</DataExecutionPrevention>

6
rpcs3/rpcs3qt/main_window.cpp
View File

@ -545,7 +545,7 @@ void main_window::BootElf()
"SELF files (EBOOT.BIN *.self);;" "SELF files (EBOOT.BIN *.self);;"
"BOOT files (*BOOT.BIN);;" "BOOT files (*BOOT.BIN);;"
"BIN files (*.bin);;" "BIN files (*.bin);;"
"All executable files (*.SAVESTAT.gz *.SAVESTAT *.sprx *.SPRX *.self *.SELF *.bin *.BIN *.prx *.PRX *.elf *.ELF *.o *.O);;" "All executable files (*.SAVESTAT.zst *.SAVESTAT.gz *.SAVESTAT *.sprx *.SPRX *.self *.SELF *.bin *.BIN *.prx *.PRX *.elf *.ELF *.o *.O);;"
"All files (*.*)"), "All files (*.*)"),
Q_NULLPTR, QFileDialog::DontResolveSymlinks); Q_NULLPTR, QFileDialog::DontResolveSymlinks);
@ -619,7 +619,7 @@ void main_window::BootSavestate()
} }
const QString file_path = QFileDialog::getOpenFileName(this, tr("Select Savestate To Boot"), qstr(fs::get_cache_dir() + "savestates/"), tr( const QString file_path = QFileDialog::getOpenFileName(this, tr("Select Savestate To Boot"), qstr(fs::get_cache_dir() + "savestates/"), tr(
"Savestate files (*.SAVESTAT *.SAVESTAT.gz);;" "Savestate files (*.SAVESTAT *.SAVESTAT.zst *.SAVESTAT.gz);;"
"All files (*.*)"), "All files (*.*)"),
Q_NULLPTR, QFileDialog::DontResolveSymlinks); Q_NULLPTR, QFileDialog::DontResolveSymlinks);
@ -3746,7 +3746,7 @@ main_window::drop_type main_window::IsValidFile(const QMimeData& md, QStringList
type = drop_type::drop_rrc; type = drop_type::drop_rrc;
} }
// The emulator allows to execute ANY filetype, just not from drag-and-drop because it is confusing to users // The emulator allows to execute ANY filetype, just not from drag-and-drop because it is confusing to users
else if (path.toLower().endsWith(".savestat.gz") || suffix_lo == "savestat" || suffix_lo == "sprx" || suffix_lo == "self" || suffix_lo == "bin" || suffix_lo == "prx" || suffix_lo == "elf" || suffix_lo == "o") else if (path.toLower().endsWith(".savestat.gz") || path.toLower().endsWith(".savestat.zst") || suffix_lo == "savestat" || suffix_lo == "sprx" || suffix_lo == "self" || suffix_lo == "bin" || suffix_lo == "prx" || suffix_lo == "elf" || suffix_lo == "o")
{ {
type = drop_type::drop_game; type = drop_type::drop_game;
} }

561
rpcs3/util/serialization_ext.cpp
View File

@ -10,6 +10,7 @@
#include "serialization_ext.hpp" #include "serialization_ext.hpp"
#include <zlib.h> #include <zlib.h>
#include <3rdparty/zstd/zstd/lib/zstd.h>
LOG_CHANNEL(sys_log, "SYS"); LOG_CHANNEL(sys_log, "SYS");
@ -38,7 +39,7 @@ bool uncompressed_serialization_file_handler::handle_file_op(utils::serial& ar,
{ {
m_file->seek(pos); m_file->seek(pos);
m_file->write(data, size); m_file->write(data, size);
return true; return true;
} }
m_file->seek(ar.data_offset); m_file->seek(ar.data_offset);
@ -218,8 +219,8 @@ void compressed_serialization_file_handler::initialize(utils::serial& ar)
if (!ar.expect_little_data()) if (!ar.expect_little_data())
{ {
m_stream_data_prepare_thread = std::make_unique<named_thread<std::function<void()>>>("Compressed Data Prepare Thread"sv, [this]() { this->stream_data_prepare_thread_op(); }); m_stream_data_prepare_thread = std::make_unique<named_thread<std::function<void()>>>("CompressedPrepare Thread"sv, [this]() { this->stream_data_prepare_thread_op(); });
m_file_writer_thread = std::make_unique<named_thread<std::function<void()>>>("Compressed File Writer Thread"sv, [this]() { this->file_writer_thread_op(); }); m_file_writer_thread = std::make_unique<named_thread<std::function<void()>>>("CompressedWriter Thread"sv, [this]() { this->file_writer_thread_op(); });
} }
} }
else else
@ -274,6 +275,12 @@ bool compressed_serialization_file_handler::handle_file_op(utils::serial& ar, us
if (ar.data.empty()) if (ar.data.empty())
{ {
if (pos == umax && size == umax && *m_file)
{
// Request to flush the file to disk
m_file->sync();
}
return true; return true;
} }
@ -601,8 +608,11 @@ void compressed_serialization_file_handler::finalize(utils::serial& ar)
m_stream_data = {}; m_stream_data = {};
ensure(deflateEnd(&m_zs) == Z_OK); ensure(deflateEnd(&m_zs) == Z_OK);
m_write_inited = false; m_write_inited = false;
ar.data = {}; // Deallocate and clear ar.data = {}; // Deallocate and clear
m_file->sync();
} }
void compressed_serialization_file_handler::stream_data_prepare_thread_op() void compressed_serialization_file_handler::stream_data_prepare_thread_op()
@ -770,6 +780,551 @@ usz compressed_serialization_file_handler::get_size(const utils::serial& ar, usz
return std::max<usz>(utils::mul_saturate<usz>(m_file->size(), 6), memory_available); return std::max<usz>(utils::mul_saturate<usz>(m_file->size(), 6), memory_available);
} }
struct compressed_zstd_stream_data
{
ZSTD_DCtx* m_zd{};
ZSTD_DStream* m_zs{};
lf_queue<std::vector<u8>> m_queued_data_to_process;
lf_queue<std::vector<u8>> m_queued_data_to_write;
};
void compressed_zstd_serialization_file_handler::initialize(utils::serial& ar)
{
if (!m_stream)
{
m_stream = std::make_shared<compressed_zstd_stream_data>();
}
if (ar.is_writing())
{
if (m_write_inited)
{
return;
}
if (m_read_inited && m_stream->m_zd)
{
finalize(ar);
}
m_write_inited = true;
m_errored = false;
m_compression_threads.clear();
m_file_writer_thread.reset();
// Make sure at least one thread is free
// Limit thread count in order to make sure memory limits are under control (TODO: scale with RAM size)
const usz thread_count = std::min<u32>(std::max<u32>(utils::get_thread_count(), 2) - 1, 16);
for (usz i = 0; i < thread_count; i++)
{
m_compression_threads.emplace_back().m_thread = std::make_unique<named_thread<std::function<void()>>>(fmt::format("CompressedPrepare Thread %d", i + 1), [this]() { this->stream_data_prepare_thread_op(); });
}
m_file_writer_thread = std::make_unique<named_thread<std::function<void()>>>("CompressedWriter Thread"sv, [this]() { this->file_writer_thread_op(); });
}
else
{
if (m_read_inited)
{
return;
}
if (m_write_inited)
{
finalize(ar);
}
auto& m_zd = m_stream->m_zd;
m_zd = ZSTD_createDCtx();
m_stream->m_zs = ZSTD_createDStream();
m_read_inited = true;
m_errored = false;
}
}
bool compressed_zstd_serialization_file_handler::handle_file_op(utils::serial& ar, usz pos, usz size, const void* data)
{
if (ar.is_writing())
{
initialize(ar);
if (m_errored)
{
return false;
}
auto& manager = *m_stream;
if (data)
{
ensure(false);
}
// Writing not at the end is forbidden
ensure(ar.pos == ar.data_offset + ar.data.size());
if (ar.data.empty())
{
if (pos == umax && size == umax && *m_file)
{
// Request to flush the file to disk
m_file->sync();
}
return true;
}
ar.seek_end();
const usz buffer_idx = m_input_buffer_index++ % m_compression_threads.size();
auto& input = m_compression_threads[buffer_idx].m_input;
while (input)
{
// No waiting support on non-null pointer
thread_ctrl::wait_for(2'000);
}
input.store(stx::make_single_value(std::move(ar.data)));
input.notify_all();
ar.data_offset = ar.pos;
ar.data.clear();
if (pos == umax && size == umax && *m_file)
{
// Request to flush the file to disk
m_file->sync();
}
return true;
}
initialize(ar);
if (m_errored)
{
return false;
}
if (!size)
{
return true;
}
if (pos == 0 && size == umax)
{
// Discard loaded data until pos if profitable
const usz limit = ar.data_offset + ar.data.size();
if (ar.pos > ar.data_offset && ar.pos < limit)
{
const usz may_discard_bytes = ar.pos - ar.data_offset;
const usz moved_byte_count_on_discard = limit - ar.pos;
// Cheeck profitability (check recycled memory and std::memmove costs)
if (may_discard_bytes >= 0x50'0000 || (may_discard_bytes >= 0x20'0000 && moved_byte_count_on_discard / may_discard_bytes < 3))
{
ar.data_offset += may_discard_bytes;
ar.data.erase(ar.data.begin(), ar.data.begin() + may_discard_bytes);
if (ar.data.capacity() >= 0x200'0000)
{
// Discard memory
ar.data.shrink_to_fit();
}
}
return true;
}
// Discard all loaded data
ar.data_offset += ar.data.size();
ensure(ar.pos >= ar.data_offset);
ar.data.clear();
if (ar.data.capacity() >= 0x200'0000)
{
// Discard memory
ar.data.shrink_to_fit();
}
return true;
}
if (~pos < size - 1)
{
// Overflow
return false;
}
// TODO: Investigate if this optimization is worth an implementation for compressed stream
// if (ar.data.empty() && pos != ar.pos)
// {
// // Relocate instead of over-fetch
// ar.seek_pos(pos);
// }
const usz read_pre_buffer = utils::sub_saturate<usz>(ar.data_offset, pos);
if (read_pre_buffer)
{
// Not allowed with compressed data for now
// Unless someone implements mechanism for it
ensure(false);
}
// Adjustment to prevent overflow
const usz subtrahend = ar.data.empty() ? 0 : 1;
const usz read_past_buffer = utils::sub_saturate<usz>(pos + (size - subtrahend), ar.data_offset + (ar.data.size() - subtrahend));
const usz read_limit = utils::sub_saturate<usz>(ar.m_max_data, ar.data_offset);
if (read_past_buffer)
{
// Read proceeding data
// More lightweight operation, this is the common operation
// Allowed to fail, if memory is truly needed an assert would take place later
const usz old_size = ar.data.size();
// Try to prefetch data by reading more than requested
const usz new_size = std::min<usz>(read_limit, std::max<usz>({ ar.data.capacity(), ar.data.size() + read_past_buffer * 3 / 2, ar.expect_little_data() ? usz{4096} : usz{0x10'0000} }));
if (new_size < old_size)
{
// Read limit forbids further reads at this point
return true;
}
ar.data.resize(new_size);
ar.data.resize(this->read_at(ar, old_size + ar.data_offset, data ? const_cast<void*>(data) : ar.data.data() + old_size, ar.data.size() - old_size) + old_size);
}
return true;
}
usz compressed_zstd_serialization_file_handler::read_at(utils::serial& ar, usz read_pos, void* data, usz size)
{
ensure(read_pos == ar.data.size() + ar.data_offset - size);
if (!size || m_errored)
{
return 0;
}
initialize(ar);
auto& m_zd = m_stream->m_zd;
const usz total_to_read = size;
usz read_size = 0;
u8* out_data = static_cast<u8*>(data);
for (; read_size < total_to_read;)
{
// Drain extracted memory stash (also before first file read)
out_data = static_cast<u8*>(data) + read_size;
auto avail_in = m_stream_data.size() - m_stream_data_index;
auto next_in = reinterpret_cast<const u8*>(m_stream_data.data() + m_stream_data_index);
auto next_out = out_data;
auto avail_out = size - read_size;
for (bool is_first = true; read_size < total_to_read && avail_in; is_first = false)
{
bool need_more_file_memory = false;
ZSTD_outBuffer outs{next_out, avail_out, 0};
// Try to extract previously held data first
ZSTD_inBuffer ins{next_in, is_first ? 0 : avail_in, 0};
const usz res = ZSTD_decompressStream(m_zd, &outs, &ins);
if (ZSTD_isError(res))
{
need_more_file_memory = true;
// finalize(ar);
// m_errored = true;
// sys_log.error("Failure of compressed data reading. (res=%d, read_size=0x%x, avail_in=0x%x, avail_out=0x%x, ar=%s)", res, read_size, avail_in, avail_out, ar);
// return read_size;
}
read_size += outs.pos;
next_out += outs.pos;
avail_out -= outs.pos;
next_in += ins.pos;
avail_in -= ins.pos;
m_stream_data_index = next_in - m_stream_data.data();
if (need_more_file_memory)
{
break;
}
}
if (read_size >= total_to_read)
{
break;
}
const usz add_size = ar.expect_little_data() ? 0x1'0000 : 0x10'0000;
const usz old_file_buf_size = m_stream_data.size();
m_stream_data.resize(old_file_buf_size + add_size);
m_stream_data.resize(old_file_buf_size + m_file->read_at(m_file_read_index, m_stream_data.data() + old_file_buf_size, add_size));
if (m_stream_data.size() == old_file_buf_size)
{
// EOF
//ensure(read_size == total_to_read);
break;
}
m_file_read_index += m_stream_data.size() - old_file_buf_size;
}
if (m_stream_data.size() - m_stream_data_index <= m_stream_data_index / 5)
{
// Shrink to required memory size
m_stream_data.erase(m_stream_data.begin(), m_stream_data.begin() + m_stream_data_index);
if (m_stream_data.capacity() >= 0x200'0000)
{
// Discard memory
m_stream_data.shrink_to_fit();
}
m_stream_data_index = 0;
}
return read_size;
}
void compressed_zstd_serialization_file_handler::skip_until(utils::serial& ar)
{
ensure(!ar.is_writing() && ar.pos >= ar.data_offset);
if (ar.pos > ar.data_offset)
{
handle_file_op(ar, ar.data_offset, ar.pos - ar.data_offset, nullptr);
}
}
void compressed_zstd_serialization_file_handler::finalize(utils::serial& ar)
{
handle_file_op(ar, 0, umax, nullptr);
if (!m_stream)
{
return;
}
auto& m_zd = m_stream->m_zd;
if (m_read_inited)
{
//ZSTD_decompressEnd(m_stream->m_zd);
ensure(ZSTD_freeDCtx(m_zd));
m_read_inited = false;
return;
}
const stx::shared_ptr<std::vector<u8>> empty_data = stx::make_single<std::vector<u8>>();
const stx::shared_ptr<std::vector<u8>> null_ptr = stx::null_ptr;
for (auto& context : m_compression_threads)
{
// Try to notify all on the first iteration
if (context.m_input.compare_and_swap_test(null_ptr, empty_data))
{
context.notified = true;
context.m_input.notify_one();
}
}
for (auto& context : m_compression_threads)
{
// Notify to abort
while (!context.notified)
{
const auto data = context.m_input.compare_and_swap(null_ptr, empty_data);
if (!data)
{
context.notified = true;
context.m_input.notify_one();
break;
}
// Wait until valid input is processed
thread_ctrl::wait_for(1000);
}
}
for (auto& context : m_compression_threads)
{
// Wait for notification to be consumed
while (context.m_input)
{
thread_ctrl::wait_for(1000);
}
}
for (auto& context : m_compression_threads)
{
// Wait for data to be writen to be read by the thread
while (context.m_output)
{
thread_ctrl::wait_for(1000);
}
}
for (usz idx = m_output_buffer_index;;)
{
auto& out_cur = m_compression_threads[idx % m_compression_threads.size()].m_output;
auto& out_next = m_compression_threads[(idx + 1) % m_compression_threads.size()].m_output;
out_cur.compare_and_swap_test(null_ptr, empty_data);
out_next.compare_and_swap_test(null_ptr, empty_data);
if (usz new_val = m_output_buffer_index; idx != new_val)
{
// Index was changed inbetween, retry on the next index
idx = new_val;
continue;
}
// Must be waiting on either of the two
out_cur.notify_all();
// Check for single thread
if (&out_next != &out_cur)
{
out_next.notify_all();
}
break;
}
if (m_file_writer_thread)
{
// Join here to avoid log messages in the destructor
(*m_file_writer_thread)();
}
m_compression_threads.clear();
m_file_writer_thread.reset();
m_stream_data = {};
m_write_inited = false;
ar.data = {}; // Deallocate and clear
m_file->sync();
}
void compressed_zstd_serialization_file_handler::stream_data_prepare_thread_op()
{
ZSTD_CCtx* m_zc = ZSTD_createCCtx();
std::vector<u8> stream_data;
const stx::shared_ptr<std::vector<u8>> null_ptr = stx::null_ptr;
const usz thread_index = m_thread_buffer_index++;
while (true)
{
auto& input = m_compression_threads[thread_index].m_input;
auto& output = m_compression_threads[thread_index].m_output;
while (!input)
{
input.wait(nullptr);
}
auto data = input.exchange(stx::null_ptr);
input.notify_all();
if (data->empty())
{
// Abort is requested, flush data and exit
break;
}
usz buffer_offset = 0;
stream_data.resize(::ZSTD_compressBound(data->size()));
const usz out_size = ZSTD_compressCCtx(m_zc, stream_data.data(), stream_data.size(), data->data(), data->size(), ZSTD_btultra);
ensure(!ZSTD_isError(out_size) && out_size);
if (m_errored)
{
break;
}
stream_data.resize(out_size);
const stx::shared_ptr<std::vector<u8>> data_ptr = make_single<std::vector<u8>>(std::move(stream_data));
while (output || !output.compare_and_swap_test(null_ptr, data_ptr))
{
thread_ctrl::wait_for(1000);
}
//if (m_output_buffer_index % m_compression_threads.size() == thread_index)
{
output.notify_all();
}
}
ZSTD_freeCCtx(m_zc);
}
void compressed_zstd_serialization_file_handler::file_writer_thread_op()
{
for (m_output_buffer_index = 0;; m_output_buffer_index++)
{
auto& output = m_compression_threads[m_output_buffer_index % m_compression_threads.size()].m_output;
while (!output)
{
output.wait(nullptr);
}
auto data = output.exchange(stx::null_ptr);
output.notify_all();
if (data->empty())
{
break;
}
const usz last_size = data->size();
m_file->write(*data);
}
}
usz compressed_zstd_serialization_file_handler::get_size(const utils::serial& ar, usz recommended) const
{
if (ar.is_writing())
{
return *m_file ? m_file->size() : 0;
}
const usz memory_available = ar.data_offset + ar.data.size();
if (memory_available >= recommended || !*m_file)
{
// Avoid calling size() if possible
return memory_available;
}
return recommended;
//return std::max<usz>(utils::mul_saturate<usz>(ZSTD_decompressBound(m_file->size()), 2), memory_available);
}
bool null_serialization_file_handler::handle_file_op(utils::serial&, usz, usz, const void*) bool null_serialization_file_handler::handle_file_op(utils::serial&, usz, usz, const void*)
{ {
return true; return true;

82
rpcs3/util/serialization_ext.hpp
View File

@ -1,9 +1,12 @@
#pragma once #pragma once
#include "util/serialization.hpp" #include "util/serialization.hpp"
#include "util/shared_ptr.hpp"
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include <deque>
namespace fs namespace fs
{ {
class file; class file;
@ -115,6 +118,85 @@ inline std::unique_ptr<compressed_serialization_file_handler> make_compressed_se
return std::make_unique<compressed_serialization_file_handler>(std::forward<File>(file)); return std::make_unique<compressed_serialization_file_handler>(std::forward<File>(file));
} }
struct compressed_zstd_stream_data;
// Compressed file serialization handler
struct compressed_zstd_serialization_file_handler : utils::serialization_file_handler
{
explicit compressed_zstd_serialization_file_handler(fs::file&& file) noexcept
: utils::serialization_file_handler()
, m_file_storage(std::make_unique<fs::file>(std::move(file)))
, m_file(m_file_storage.get())
{
}
explicit compressed_zstd_serialization_file_handler(const fs::file& file) noexcept
: utils::serialization_file_handler()
, m_file_storage(nullptr)
, m_file(std::addressof(file))
{
}
compressed_zstd_serialization_file_handler(const compressed_zstd_serialization_file_handler&) = delete;
compressed_zstd_serialization_file_handler& operator=(const compressed_zstd_serialization_file_handler&) = delete;
// Handle file read and write requests
bool handle_file_op(utils::serial& ar, usz pos, usz size, const void* data) override;
// Get available memory or file size
// Preferably memory size if is already greater/equal to recommended to avoid additional file ops
usz get_size(const utils::serial& ar, usz recommended) const override;
void skip_until(utils::serial& ar) override;
bool is_valid() const override
{
return !m_errored;
}
void finalize(utils::serial& ar) override;
private:
const std::unique_ptr<fs::file> m_file_storage;
const std::add_pointer_t<const fs::file> m_file;
std::vector<u8> m_stream_data;
usz m_stream_data_index = 0;
usz m_file_read_index = 0;
atomic_t<usz> m_pending_bytes = 0;
atomic_t<bool> m_pending_signal = false;
bool m_write_inited = false;
bool m_read_inited = false;
atomic_t<bool> m_errored = false;
usz m_input_buffer_index = 0;
atomic_t<usz> m_output_buffer_index = 0;
atomic_t<usz> m_thread_buffer_index = 0;
struct compression_thread_context_t
{
atomic_ptr<std::vector<u8>> m_input;
atomic_ptr<std::vector<u8>> m_output;
bool notified = false;
std::unique_ptr<named_thread<std::function<void()>>> m_thread;
};
std::deque<compression_thread_context_t> m_compression_threads;
std::shared_ptr<compressed_zstd_stream_data> m_stream;
std::unique_ptr<named_thread<std::function<void()>>> m_file_writer_thread;
usz read_at(utils::serial& ar, usz read_pos, void* data, usz size);
void initialize(utils::serial& ar);
void stream_data_prepare_thread_op();
void file_writer_thread_op();
void blocked_compressed_write(const std::vector<u8>& data);
};
template <typename File> requires (std::is_same_v<std::remove_cvref_t<File>, fs::file>)
inline std::unique_ptr<compressed_zstd_serialization_file_handler> make_compressed_zstd_serialization_file_handler(File&& file)
{
ensure(file);
return std::make_unique<compressed_zstd_serialization_file_handler>(std::forward<File>(file));
}
// Null file serialization handler // Null file serialization handler
struct null_serialization_file_handler : utils::serialization_file_handler struct null_serialization_file_handler : utils::serialization_file_handler
{ {

6
rpcs3/util/shared_ptr.hpp
View File

@ -867,7 +867,7 @@ namespace stx
if (exch.m_ptr) if (exch.m_ptr)
{ {
exch.d().refs += c_ref_mask; exch.d()->refs += c_ref_mask;
} }
atomic_ptr old; atomic_ptr old;
@ -903,7 +903,7 @@ namespace stx
old_exch.m_val.raw() = reinterpret_cast<uptr>(std::exchange(exch.m_ptr, nullptr)) << c_ref_size; old_exch.m_val.raw() = reinterpret_cast<uptr>(std::exchange(exch.m_ptr, nullptr)) << c_ref_size;
// Set to reset old cmp_and_old value // Set to reset old cmp_and_old value
old.m_val.raw() = (cmp_and_old.m_ptr << c_ref_size) | c_ref_mask; old.m_val.raw() = (reinterpret_cast<uptr>(cmp_and_old.m_ptr) << c_ref_size) | c_ref_mask;
if (!_val) if (!_val)
{ {
@ -953,7 +953,7 @@ namespace stx
if (exch.m_ptr) if (exch.m_ptr)
{ {
exch.d().refs += c_ref_mask; exch.d()->refs += c_ref_mask;
} }
atomic_ptr old; atomic_ptr old;