eden-emu/VulkanMemoryAllocator
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VmaReplay: Added parameter --DefragmentatationFlags <Flags>.

Browse source
This commit is contained in:
Adam Sawicki 2018-11-16 17:22:20 +01:00
parent c6ede15fab
commit 8ec2ab69d6
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/VmaReplay/VmaReplay.cpp
View file

@ -42,6 +42,7 @@ enum CMD_LINE_OPT
CMD_LINE_OPT_MEM_STATS, CMD_LINE_OPT_MEM_STATS,
CMD_LINE_OPT_DUMP_STATS_AFTER_LINE, CMD_LINE_OPT_DUMP_STATS_AFTER_LINE,
CMD_LINE_OPT_DEFRAGMENT_AFTER_LINE, CMD_LINE_OPT_DEFRAGMENT_AFTER_LINE,
CMD_LINE_OPT_DEFRAGMENTATION_FLAGS,
CMD_LINE_OPT_DUMP_DETAILED_STATS_AFTER_LINE, CMD_LINE_OPT_DUMP_DETAILED_STATS_AFTER_LINE,
}; };
@ -142,6 +143,7 @@ struct StatsAfterLineEntry
}; };
static std::vector<StatsAfterLineEntry> g_DumpStatsAfterLine; static std::vector<StatsAfterLineEntry> g_DumpStatsAfterLine;
static std::vector<size_t> g_DefragmentAfterLine; static std::vector<size_t> g_DefragmentAfterLine;
static uint32_t g_DefragmentationFlags = 0;
static size_t g_DumpStatsAfterLineNextIndex = 0; static size_t g_DumpStatsAfterLineNextIndex = 0;
static size_t g_DefragmentAfterLineNextIndex = 0; static size_t g_DefragmentAfterLineNextIndex = 0;
@ -1754,7 +1756,7 @@ void Player::Defragment()
defragInfo.maxCpuBytesToMove = VK_WHOLE_SIZE; defragInfo.maxCpuBytesToMove = VK_WHOLE_SIZE;
defragInfo.maxGpuAllocationsToMove = UINT32_MAX; defragInfo.maxGpuAllocationsToMove = UINT32_MAX;
defragInfo.maxGpuBytesToMove = VK_WHOLE_SIZE; defragInfo.maxGpuBytesToMove = VK_WHOLE_SIZE;
defragInfo.flags = 0; defragInfo.flags = g_DefragmentationFlags;
defragInfo.commandBuffer = m_CommandBuffer; defragInfo.commandBuffer = m_CommandBuffer;
VmaDefragmentationContext defragCtx = VK_NULL_HANDLE; VmaDefragmentationContext defragCtx = VK_NULL_HANDLE;
@ -2916,6 +2918,8 @@ static void PrintCommandLineSyntax()
" --DumpDetailedStatsAfterLine <Line> - Like command above, but includes detailed map.\n" " --DumpDetailedStatsAfterLine <Line> - Like command above, but includes detailed map.\n"
" --DefragmentAfterLine <Line> - Defragment memory after specified source file line and print statistics.\n" " --DefragmentAfterLine <Line> - Defragment memory after specified source file line and print statistics.\n"
" It also prints detailed statistics to files VmaReplay_Line####_Defragment*.json\n" " It also prints detailed statistics to files VmaReplay_Line####_Defragment*.json\n"
" --DefragmentatationFlags <Flags> - Flags to be applied when using DefragmentAfterLine.\n"
" E.g. 1 for FAST algorithm, 2 for OPTIMAL algorithm.\n"
" --Lines <Ranges> - Replay only limited set of lines from file\n" " --Lines <Ranges> - Replay only limited set of lines from file\n"
" Ranges is comma-separated list of ranges, e.g. \"-10,15,18-25,31-\".\n" " Ranges is comma-separated list of ranges, e.g. \"-10,15,18-25,31-\".\n"
" --PhysicalDevice <Index> - Choice of Vulkan physical device. Default: 0.\n" " --PhysicalDevice <Index> - Choice of Vulkan physical device. Default: 0.\n"
@ -3148,6 +3152,7 @@ static int main2(int argc, char** argv)
cmdLineParser.RegisterOpt(CMD_LINE_OPT_MEM_STATS, "MemStats", true); cmdLineParser.RegisterOpt(CMD_LINE_OPT_MEM_STATS, "MemStats", true);
cmdLineParser.RegisterOpt(CMD_LINE_OPT_DUMP_STATS_AFTER_LINE, "DumpStatsAfterLine", true); cmdLineParser.RegisterOpt(CMD_LINE_OPT_DUMP_STATS_AFTER_LINE, "DumpStatsAfterLine", true);
cmdLineParser.RegisterOpt(CMD_LINE_OPT_DEFRAGMENT_AFTER_LINE, "DefragmentAfterLine", true); cmdLineParser.RegisterOpt(CMD_LINE_OPT_DEFRAGMENT_AFTER_LINE, "DefragmentAfterLine", true);
cmdLineParser.RegisterOpt(CMD_LINE_OPT_DEFRAGMENTATION_FLAGS, "DefragmentationFlags", true);
cmdLineParser.RegisterOpt(CMD_LINE_OPT_DUMP_DETAILED_STATS_AFTER_LINE, "DumpDetailedStatsAfterLine", true); cmdLineParser.RegisterOpt(CMD_LINE_OPT_DUMP_DETAILED_STATS_AFTER_LINE, "DumpDetailedStatsAfterLine", true);
CmdLineParser::RESULT res; CmdLineParser::RESULT res;
@ -3271,6 +3276,15 @@ static int main2(int argc, char** argv)
} }
} }
break; break;
case CMD_LINE_OPT_DEFRAGMENTATION_FLAGS:
{
if(!StrRangeToUint(StrRange(cmdLineParser.GetParameter()), g_DefragmentationFlags))
{
PrintCommandLineSyntax();
return RESULT_ERROR_COMMAND_LINE;
}
}
break;
default: default:
assert(0); assert(0);
} }

4
src/vk_mem_alloc.h
View file

@ -2585,12 +2585,12 @@ typedef enum VmaDefragmentationFlagBits {
Defragmentation will be done as fast and move as little allocations and bytes as possible while Defragmentation will be done as fast and move as little allocations and bytes as possible while
still providing some benefits. still providing some benefits.
*/ */
VMA_DEFRAGMENTATION_FAST_ALGORITHM_BIT = 0x00001000, VMA_DEFRAGMENTATION_FAST_ALGORITHM_BIT = 0x00000001,
/** Add this flag to change defragmentation algorithm to optimal rather than default (balanced). /** Add this flag to change defragmentation algorithm to optimal rather than default (balanced).
This algorithm will favor quality of defragmentation over speed. This algorithm will favor quality of defragmentation over speed.
Allocations will be as perfectly compacted as possible. Allocations will be as perfectly compacted as possible.
*/ */
VMA_DEFRAGMENTATION_OPTIMAL_ALGORITHM_BIT = 0x00002000, VMA_DEFRAGMENTATION_OPTIMAL_ALGORITHM_BIT = 0x00000002,
/** \brief A bit mask to extract only `ALGORITHM` bits from entire set of flags. /** \brief A bit mask to extract only `ALGORITHM` bits from entire set of flags.
*/ */
VMA_DEFRAGMENTATION_ALGORITHM_MASK = VMA_DEFRAGMENTATION_ALGORITHM_MASK =