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

Testing environment: Improved formatting of CSV faile with results of main benchmark.

Browse source
This commit is contained in:
Adam Sawicki 2018-08-27 13:42:07 +02:00
parent 1d2d627146
commit 740b08f6eb
1 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/Tests.cpp
View file

@ -3318,8 +3318,8 @@ static void TestMappingMultithreaded()
static void WriteMainTestResultHeader(FILE* file) static void WriteMainTestResultHeader(FILE* file)
{ {
fprintf(file, fprintf(file,
"Code,Test,Time," "Code,Time,"
"Config," "Threads,Buffers and images,Sizes,Operations,Allocation strategy,Free order,"
"Total Time (us)," "Total Time (us),"
"Allocation Time Min (us)," "Allocation Time Min (us),"
"Allocation Time Avg (us)," "Allocation Time Avg (us),"
@ -3353,12 +3353,10 @@ static void WriteMainTestResult(
fprintf(file, fprintf(file,
"%s,%s,%s," "%s,%s,%s,"
"BeginBytesToAllocate=%I64u MaxBytesToAllocate=%I64u AdditionalOperationCount=%u ThreadCount=%u FreeOrder=%s,"
"%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%I64u,%I64u,%I64u\n", "%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%I64u,%I64u,%I64u\n",
codeDescription, codeDescription,
testDescription,
timeStr, timeStr,
config.BeginBytesToAllocate, config.MaxBytesToAllocate, config.AdditionalOperationCount, config.ThreadCount, FREE_ORDER_NAMES[(uint32_t)config.FreeOrder], testDescription,
totalTimeSeconds * 1e6f, totalTimeSeconds * 1e6f,
allocationTimeMinSeconds * 1e6f, allocationTimeMinSeconds * 1e6f,
allocationTimeAvgSeconds * 1e6f, allocationTimeAvgSeconds * 1e6f,
@ -3590,9 +3588,9 @@ static void PerformMainTests(FILE* file)
std::string desc2 = desc1; std::string desc2 = desc1;
switch(buffersVsImagesIndex) switch(buffersVsImagesIndex)
{ {
case 0: desc2 += " Buffers"; break; case 0: desc2 += ",Buffers"; break;
case 1: desc2 += " Images"; break; case 1: desc2 += ",Images"; break;
case 2: desc2 += " Buffers+Images"; break; case 2: desc2 += ",Buffers+Images"; break;
default: assert(0); default: assert(0);
} }
@ -3604,9 +3602,9 @@ static void PerformMainTests(FILE* file)
std::string desc3 = desc2; std::string desc3 = desc2;
switch(smallVsLargeIndex) switch(smallVsLargeIndex)
{ {
case 0: desc3 += " Small"; break; case 0: desc3 += ",Small"; break;
case 1: desc3 += " Large"; break; case 1: desc3 += ",Large"; break;
case 2: desc3 += " Small+Large"; break; case 2: desc3 += ",Small+Large"; break;
default: assert(0); default: assert(0);
} }
@ -3710,22 +3708,22 @@ static void PerformMainTests(FILE* file)
switch(beginBytesToAllocateIndex) switch(beginBytesToAllocateIndex)
{ {
case 0: case 0:
desc5 += " Allocate_100%"; desc5 += ",Allocate_100%";
config.BeginBytesToAllocate = config.MaxBytesToAllocate; config.BeginBytesToAllocate = config.MaxBytesToAllocate;
config.AdditionalOperationCount = 0; config.AdditionalOperationCount = 0;
break; break;
case 1: case 1:
desc5 += " Allocate_50%+Operations"; desc5 += ",Allocate_50%+Operations";
config.BeginBytesToAllocate = config.MaxBytesToAllocate * 50 / 100; config.BeginBytesToAllocate = config.MaxBytesToAllocate * 50 / 100;
config.AdditionalOperationCount = 1024; config.AdditionalOperationCount = 1024;
break; break;
case 2: case 2:
desc5 += " Allocate_5%+Operations"; desc5 += ",Allocate_5%+Operations";
config.BeginBytesToAllocate = config.MaxBytesToAllocate * 5 / 100; config.BeginBytesToAllocate = config.MaxBytesToAllocate * 5 / 100;
config.AdditionalOperationCount = 1024; config.AdditionalOperationCount = 1024;
break; break;
case 3: case 3:
desc5 += " Allocate_95%+Operations"; desc5 += ",Allocate_95%+Operations";
config.BeginBytesToAllocate = config.MaxBytesToAllocate * 95 / 100; config.BeginBytesToAllocate = config.MaxBytesToAllocate * 95 / 100;
config.AdditionalOperationCount = 1024; config.AdditionalOperationCount = 1024;
break; break;
@ -3739,30 +3737,40 @@ static void PerformMainTests(FILE* file)
switch(strategyIndex) switch(strategyIndex)
{ {
case 0: case 0:
desc6 += " BestFit"; desc6 += ",BestFit";
config.AllocationStrategy = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT; config.AllocationStrategy = VMA_ALLOCATION_CREATE_STRATEGY_BEST_FIT_BIT;
break; break;
case 1: case 1:
desc6 += " WorstFit"; desc6 += ",WorstFit";
config.AllocationStrategy = VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT; config.AllocationStrategy = VMA_ALLOCATION_CREATE_STRATEGY_WORST_FIT_BIT;
break; break;
case 2: case 2:
desc6 += " FirstFit"; desc6 += ",FirstFit";
config.AllocationStrategy = VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT; config.AllocationStrategy = VMA_ALLOCATION_CREATE_STRATEGY_FIRST_FIT_BIT;
break; break;
default: default:
assert(0); assert(0);
} }
switch(config.FreeOrder)
{
case FREE_ORDER::FORWARD: desc6 += ",Forward"; break;
case FREE_ORDER::BACKWARD: desc6 += ",Backward"; break;
case FREE_ORDER::RANDOM: desc6 += ",Random"; break;
default: assert(0);
}
const char* testDescription = desc6.c_str(); const char* testDescription = desc6.c_str();
for(size_t repeat = 0; repeat < repeatCount; ++repeat) for(size_t repeat = 0; repeat < repeatCount; ++repeat)
{ {
printf("%s Repeat %u\n", testDescription, (uint32_t)repeat); printf("%s #%u\n", testDescription, (uint32_t)repeat);
Result result{}; Result result{};
VkResult res = MainTest(result, config); VkResult res = MainTest(result, config);
assert(res == VK_SUCCESS); assert(res == VK_SUCCESS);
if(file)
{
WriteMainTestResult(file, CODE_DESCRIPTION, testDescription, config, result); WriteMainTestResult(file, CODE_DESCRIPTION, testDescription, config, result);
} }
} }
@ -3772,6 +3780,7 @@ static void PerformMainTests(FILE* file)
} }
} }
} }
}
static void PerformPoolTests(FILE* file) static void PerformPoolTests(FILE* file)
{ {
@ -3984,7 +3993,7 @@ static void PerformPoolTests(FILE* file)
for(size_t repeat = 0; repeat < repeatCount; ++repeat) for(size_t repeat = 0; repeat < repeatCount; ++repeat)
{ {
printf("%s Repeat %u\n", testDescription, (uint32_t)repeat); printf("%s #%u\n", testDescription, (uint32_t)repeat);
PoolTestResult result{}; PoolTestResult result{};
g_MemoryAliasingWarningEnabled = false; g_MemoryAliasingWarningEnabled = false;
@ -4006,16 +4015,11 @@ void Test()
if(false) if(false)
{ {
// # Temporarily insert custom tests here // # Temporarily insert custom tests here
TestLinearAllocator();
ManuallyTestLinearAllocator();
TestLinearAllocatorMultiBlock();
BenchmarkLinearAllocator();
return; return;
} }
// # Simple tests // # Simple tests
#if 0
TestBasics(); TestBasics();
#if VMA_DEBUG_MARGIN #if VMA_DEBUG_MARGIN
TestDebugMargin(); TestDebugMargin();
@ -4034,7 +4038,6 @@ BenchmarkLinearAllocator();
BenchmarkLinearAllocator(); BenchmarkLinearAllocator();
TestDefragmentationSimple(); TestDefragmentationSimple();
TestDefragmentationFull(); TestDefragmentationFull();
#endif
// # Detailed tests // # Detailed tests
FILE* file; FILE* file;
@ -4045,10 +4048,8 @@ BenchmarkLinearAllocator();
PerformMainTests(file); PerformMainTests(file);
//PerformCustomMainTest(file); //PerformCustomMainTest(file);
#if 0
WritePoolTestResultHeader(file); WritePoolTestResultHeader(file);
PerformPoolTests(file); PerformPoolTests(file);
#endif
//PerformCustomPoolTest(file); //PerformCustomPoolTest(file);
fclose(file); fclose(file);