Skip to content

Commit

Permalink
Merge branch 'wip-counter'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonasmr
jonasmr committed Jan 21, 2024
2 parents 4bc0367 + fb92139 commit 456e79e
Show file tree
Hide file tree
Showing 6 changed files with 1,723 additions and 859 deletions.
52 changes: 51 additions & 1 deletion demo/workbench/demo_workbench.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@
#include <unistd.h>
#endif

#ifdef _WIN32
#include <windows.h>
#include <stdio.h>
#include <psapi.h>
#endif


//generate zipped results
#define MICROPROFILE_MINIZ 1
#if MICROPROFILE_MINIZ
Expand Down Expand Up @@ -229,7 +236,7 @@ int main(int argc, char* argv[])

MICROPROFILE_COUNTER_ADD("memory/main", 1000);
MICROPROFILE_COUNTER_ADD("memory/gpu/vertexbuffers", 1000);
MICROPROFILE_COUNTER_ADD("memory/gpu/indexbuffersxsxsxsxsxsxsxxsxsxsxs", 200);
MICROPROFILE_COUNTER_ADD("memory/gpu/indexbuffersxsxsxsxsxsxsxxasdfasdfasdfasdfasdfsxsxsxs", 200);
MICROPROFILE_COUNTER_ADD("memory//main", 1000);
MICROPROFILE_COUNTER_ADD("memory//", 1000);
MICROPROFILE_COUNTER_ADD("//memory//mainx/\\//", 1000);
Expand Down Expand Up @@ -443,6 +450,49 @@ int main(int argc, char* argv[])
int cosinus = int(cosf(f*1.3f) * 100000 + 50000);
MICROPROFILE_COUNTER_SET("/test/sinus", sinus);
MICROPROFILE_COUNTER_SET("/test/cosinus", cosinus);

#ifdef _WIN32
typedef struct _PROCESS_MEMORY_COUNTERS_EX2 {
DWORD cb;
DWORD PageFaultCount;
SIZE_T PeakWorkingSetSize;
SIZE_T WorkingSetSize;
SIZE_T QuotaPeakPagedPoolUsage;
SIZE_T QuotaPagedPoolUsage;
SIZE_T QuotaPeakNonPagedPoolUsage;
SIZE_T QuotaNonPagedPoolUsage;
SIZE_T PagefileUsage;
SIZE_T PeakPagefileUsage;
SIZE_T PrivateUsage;
SIZE_T PrivateWorkingSetSize;
ULONG64 SharedCommitUsage;
} PROCESS_MEMORY_COUNTERS_EX2;

PROCESS_MEMORY_COUNTERS_EX2 pmc;
static HANDLE hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, GetCurrentProcessId() );
if(GetProcessMemoryInfo(hProcess, (PPROCESS_MEMORY_COUNTERS)&pmc, sizeof(pmc)))
{
if(sizeof(pmc) == pmc.cb)
{

MICROPROFILE_COUNTER_CONFIG_ONCE("/windows/PeakWorkingSetSize", MICROPROFILE_COUNTER_FORMAT_BYTES, 0, MICROPROFILE_COUNTER_FLAG_DETAILED);
MICROPROFILE_COUNTER_CONFIG_ONCE("/windows/WorkingSetSize", MICROPROFILE_COUNTER_FORMAT_BYTES, 0, MICROPROFILE_COUNTER_FLAG_DETAILED);
MICROPROFILE_COUNTER_CONFIG_ONCE("/windows/PrivateUsage", MICROPROFILE_COUNTER_FORMAT_BYTES, 0, MICROPROFILE_COUNTER_FLAG_DETAILED);
MICROPROFILE_COUNTER_CONFIG_ONCE("/windows/PrivateWorkingSetSize", MICROPROFILE_COUNTER_FORMAT_BYTES, 0, MICROPROFILE_COUNTER_FLAG_DETAILED);
MICROPROFILE_COUNTER_CONFIG_ONCE("/windows/SharedCommitUsage", MICROPROFILE_COUNTER_FORMAT_BYTES, 0, MICROPROFILE_COUNTER_FLAG_DETAILED);
MICROPROFILE_COUNTER_CONFIG_ONCE("/windows/PeakPagefileUsage", MICROPROFILE_COUNTER_FORMAT_BYTES, 0, MICROPROFILE_COUNTER_FLAG_DETAILED);
MICROPROFILE_COUNTER_CONFIG_ONCE("/windows/PagefileUsage", MICROPROFILE_COUNTER_FORMAT_BYTES, 0, MICROPROFILE_COUNTER_FLAG_DETAILED);
MICROPROFILE_COUNTER_SET("/windows/PeakWorkingSetSize", pmc.PeakWorkingSetSize);
MICROPROFILE_COUNTER_SET("/windows/WorkingSetSize", pmc.WorkingSetSize);
MICROPROFILE_COUNTER_SET("/windows/PrivateUsage", pmc.PrivateUsage);
MICROPROFILE_COUNTER_SET("/windows/PrivateWorkingSetSize", pmc.PrivateWorkingSetSize);
MICROPROFILE_COUNTER_SET("/windows/SharedCommitUsage", pmc.SharedCommitUsage);
MICROPROFILE_COUNTER_SET("/windows/PeakPagefileUsage", pmc.PeakPagefileUsage);
MICROPROFILE_COUNTER_SET("/windows/PagefileUsage", pmc.PagefileUsage);
}
}

#endif
}

StopFakeWork();
Expand Down
5 changes: 1 addition & 4 deletions demo/workbench/mppresets.builtin.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@
#format is
#Name {json}
#per line
Defaultxx {"ReferenceTime":50,"TargetTime":30,"AggregateFrames":60,"AutoCaptureTheshold":66,"CaptureFrames":30,"ViewActive":0,"FancyGraph":1,"AutomaticReference":1,"SortColumn":0,"SortColumnOrderFlip":0,"SortColumnMouseOver":"","BarColumnsEnabled":[1,1,1,1,1,1,1,1,1],"Timers":["ThreadSafe/Inner0"],"Groups":["GPU/GPU","default/ThreadSafe","default/MicroProfile","default/MAIN","default/Thread2","default/Thread0","default/Thread1","default/ThreadWork","default/long","default/spin","default/C"],"PresetName":"Defaultxx"}
hest {"ReferenceTime":50,"TargetTime":30,"AggregateFrames":60,"AutoCaptureTheshold":66,"CaptureFrames":30,"ViewActive":0,"FancyGraph":1,"AutomaticReference":1,"SortColumn":0,"SortColumnOrderFlip":0,"SortColumnMouseOver":"","BarColumnsEnabled":[1,1,1,1,1,1,1,1,1],"Timers":["Thread0/Work Thread0"],"Groups":["GPU/GPU","default/ThreadSafe","default/MicroProfile","default/MAIN","default/Thread2","default/Thread0","default/Thread1","default/ThreadWork","default/long","default/spin","default/C","default/geddehest"],"PresetName":"hest"}
lala {"ReferenceTime":50,"TargetTime":30,"AggregateFrames":60,"AutoCaptureTheshold":66,"CaptureFrames":30,"ViewActive":0,"FancyGraph":1,"AutomaticReference":1,"SortColumn":0,"SortColumnOrderFlip":0,"SortColumnMouseOver":"","BarColumnsEnabled":[1,1,1,1,1,1,1,1,1],"Timers":["spin/sleep"],"Groups":["GPU/GPU","default/ThreadSafe","default/MicroProfile","default/MAIN","default/Thread2","default/Thread0","default/Thread1","default/ThreadWork","default/long","default/spin","default/C","default/geddehest"],"PresetName":"lala"}
lalal2 {"ReferenceTime":50,"TargetTime":30,"AggregateFrames":60,"AutoCaptureTheshold":66,"CaptureFrames":30,"ViewActive":0,"FancyGraph":1,"AutomaticReference":1,"SortColumn":0,"SortColumnOrderFlip":0,"SortColumnMouseOver":"","BarColumnsEnabled":[1,1,1,1,1,1,1,1,1],"PresetName":"lalal2","Timers":["spin/sleep"],"Groups":["GPU/GPU","default/ThreadSafe","default/MicroProfile","default/MAIN","default/Thread0","default/Thread2","default/Thread1","default/ThreadWork","default/long","default/spin","default/C","default/geddehest"]}
Default {"SubGraphSettings":{"MicroProfile/MicroProfileSocketSendLoop":{"ReferenceTime":10,"TargetTime":-1,"AutomaticReference":1,"Percentile":0},"ThreadSafe/Main":{"ReferenceTime":250,"TargetTime":-1,"AutomaticReference":0,"Percentile":0},"/test/sinus":{"ReferenceTime":500,"TargetTime":-1,"AutomaticReference":1,"Percentile":0},"/test/cosinus":{"ReferenceTime":50,"TargetTime":-1,"AutomaticReference":0,"Percentile":0}},"SubGraphSettingsPercentile":{},"ReferenceTime":100,"TargetTime":15,"AggregateFrames":60,"AutoCaptureTheshold":66,"AutoCaptureRepeat":1,"CaptureFrames":30,"CaptureDelay":0,"ViewActive":0,"ViewCompressed":0,"AllowHighDPI":1,"AutomaticReference":0,"SortColumnOrderFlip":0,"SortColumnName":"","BarColumnEnabledTable":[1,1,1,1,1,1,1,1,1,1,1,1,1],"BarColumnEnabledSingle":[1,1,1,1,1,1,1],"BarColumnEnabledMulti":[1,1,1,1,1,1,1],"PresetName":"subgraph","FunctionsInstrumented":[],"FunctionsInstrumentedModule":[],"FunctionsInstrumentedUnmangled":[],"Timers":["MicroProfile/MicroProfileSocketSendLoop","ThreadSafe/Main"],"Groups":["default/__NEGATIVE_CPU","default/__NEGATIVE_GPU","default/MicroProfile","default/MAIN","Category0/ThreadSafe","default/__SECTION","default/Thread1","default/Thread0","default/ThreadWork","default/Thread2","default/long","default/C","default/STACK_TEST","default/stack_test_other","default/SPIKE_TEST"],"Counters":["/test/sinus","/test/cosinus"]}
Loading

0 comments on commit 456e79e

Please sign in to comment.