.benchmarks

git-svn-id: svn://ultimatepp.org/upp/trunk@13459 f0d560ea-af0d-0410-9eb7-867de7ffcac7

benchmarks/HeapIde/HeapIde.cpp

@@ -1,4 +1,5 @@
 #include <Core/Core.h>
+#include <plugin/lzma/lzma.h>
 
 using namespace Upp;
 
@@ -12,23 +13,57 @@ struct Record {
 
 CONSOLE_APP_MAIN
 {
-	String name = "c:/xxx/heap.bog";
+	StdLogSetup(LOG_COUT|LOG_FILE);
-	
+	RLOG("Decompressing");
-	int64 l = GetFileLength(name);
+	Record *r;
-	Record *r = (Record *)malloc(l);
+	int64 l;
-	FileIn in(name);
+	{
-	if((l & 15) || in.Get64(r, l) != l) {
+		String s = LZMADecompress(LoadDataFile(
+//			"ide.lzma"
+			"index3.lzma"
+		));
+		l = s.GetCount();
+		RLOG("decompressed size: " << l << ", records: " << l / 16);
+		r = (Record *)malloc(l);
+		memcpy(r, ~s, l);
+		RDUMP(MemoryProfile());
+	}
+	RDUMP(MemoryProfile());
+
+	if(l & 15) {
 		Cout() << "Invalid input";
 		exit(1);
 	}
 
-	RTIMING("Heap");
+	int smalln = 0;
+	int largen = 0;
+	int hugen = 0;
+
 	Record *end = r + l / 16;
-	while(r < end) {
+	for(Record *s = r; s < end; s++)
-		if(r->sz == 0xffffffffffffffff)
+		if(s->sz != 0xffffffffffffffff)
-			MemoryFree(ptr[r->ptr]);
+			if(s->sz <= 992)
-		else
+				smalln++;
-			ptr[r->ptr] = MemoryAlloc(r->sz);
+			else
-		r++;
+			if(s->sz < 255 * 256)
+				largen++;
+			else
+				hugen++;
+
+	RDUMP(smalln);
+	RDUMP(largen);
+	RDUMP(hugen);
+	
+	{
+		RTIMING("Heap");
+		while(r < end) {
+			if(r->sz == 0xffffffffffffffff)
+				MemoryFree(ptr[r->ptr]);
+			else
+				ptr[r->ptr] = MemoryAlloc(r->sz);
+			r++;
+		}
 	}
+
+	RDUMP(MemoryProfile());
 }

benchmarks/HeapIde/HeapIde.upp

@@ -1,5 +1,6 @@
 uses
-	Core;
+	Core,
+	plugin/lzma;
 
 file
 	HeapIde.cpp;

benchmarks/HeapLog/HeapLog.cpp

@@ -1,4 +1,5 @@
 #include <Core/Core.h>
+#include <plugin/lzma/lzma.h>
 
 using namespace Upp;
 
@@ -6,12 +7,12 @@ CONSOLE_APP_MAIN
 {
 	SetVppLogSizeLimit(INT_MAX);
 
-	FileIn in("C:/upp/heap.log");
+	FileIn in("C:/xxx/heap.log");
-	FileOut out("C:/xxx/heap.bog");
+
-	
 	Index<int> th;
 	Index<int64> ps;
-	
+
+	StringStream out;
 	while(!in.IsEof()) {
 		String s = in.GetLine();
 		CParser p(s);
@@ -37,6 +38,9 @@ CONSOLE_APP_MAIN
 			out.Put64(sz);
 		}
 	}
-	RDUMP(ps.GetCount());
+	Cout() << "Pointers: " << ps.GetCount() << ", threads: " << th.GetCount() << '\n';
-	RDUMP(th.GetCount());
+	Cout() << "Compressing\n";
+	String s = LZMACompress(out.GetResult());
+	Cout() << "Compressed length: " << s.GetCount() << "\n";
+	SaveFile("c:/xxx/heap.lzma", s);
 }

benchmarks/HeapLog/HeapLog.upp

@@ -1,5 +1,6 @@
 uses
-	Core;
+	Core,
+	plugin/lzma;
 
 file
 	HeapLog.cpp;

benchmarks/Index3/Index3.upp

@@ -7,5 +7,6 @@ file
 
 mainconfig
 	"" = "USEMALLOC",
-	"" = "";
+	"" = "",
+	"" = "HEAPLOG";
 

benchmarks/idmapBench/idmapBench.upp

@@ -11,5 +11,6 @@ mainconfig
 	"" = "USEMALLOC",
 	"" = "MT",
 	"" = "USEMALLOC MT",
-	"" = "USEMALLOC MEMORYTEST";
+	"" = "USEMALLOC MEMORYTEST",
+	"" = "HEAPLOG";