Merge pull request 'PIDeque important performance fix' (#74) from pideque into master

Reviewed-on: https://git.shs.tools/SHS/pip/pulls/74
2021-06-11 19:11:15 +03:00
parent ef80a72e38 f03781f898
commit bfb64bab21
3 changed files with 102 additions and 66 deletions
--- a/cmake/FindPIP.cmake
+++ b/cmake/FindPIP.cmake
@@ -78,6 +78,7 @@ endif()

 if (NOT BUILDING_pip)
 	shstk_find_header(pip PIP "pip_version.h" "${_PIP_LIBRARY_PATH_}")
+	set(PIP_INCLUDES "${pip_INCLUDES}" CACHE STRING "")
 endif()
 if(PIP_FIND_VERSION VERSION_GREATER PIP_VERSION)
 	message(FATAL_ERROR "PIP version ${PIP_VERSION} is available, but ${PIP_FIND_VERSION} requested!")
--- a/libs/main/containers/pideque.h
+++ b/libs/main/containers/pideque.h
@@ -228,6 +228,7 @@ public:
 	inline PIDeque<T> & clear() {
 		PIINTROSPECTION_CONTAINER_UNUSED(T, pid_size)
 		pid_size = 0;
+		pid_start = (pid_rsize - pid_size) / 2;
 		return *this;
 	}

@@ -258,6 +259,8 @@ public:
 		if (new_size < pid_size) {
 			deleteT(&(pid_data[new_size + pid_start]), pid_size - new_size);
 			pid_size = new_size;
+			if (new_size == 0)
+				pid_start = (pid_rsize - pid_size) / 2;
 		}
 		if (new_size > pid_size) {
 			size_t os = pid_size;
@@ -291,6 +294,8 @@ public:
 	}

 	inline PIDeque<T> & insert(size_t index, const T & v = T()) {
+		if (index == pid_size) return push_back(v);
+		PIINTROSPECTION_CONTAINER_USED(T, 1)
 		bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
 		if (dir) {
 			alloc(pid_size + 1, true);
@@ -303,11 +308,12 @@ public:
 			if (index > 0)
 				memmove((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + 1])), index * sizeof(T));
 		}
-		PIINTROSPECTION_CONTAINER_USED(T, 1)
 		elementNew(pid_data + pid_start + index, v);
 		return *this;
 	}
 	inline PIDeque<T> & insert(size_t index, T && v) {
+		if (index == pid_size) return push_back(v);
+		PIINTROSPECTION_CONTAINER_USED(T, 1)
 		bool dir = pid_rsize <= 2 ? true : (index >= pid_rsize / 2 ? true : false);
 		if (dir) {
 			alloc(pid_size + 1, true);
@@ -320,7 +326,6 @@ public:
 			if (index > 0)
 				memmove((void*)(&(pid_data[pid_start])), (const void*)(&(pid_data[pid_start + 1])), index * sizeof(T));
 		}
-		PIINTROSPECTION_CONTAINER_USED(T, 1)
 		elementNew(pid_data + pid_start + index, std::move(v));
 		return *this;
 	}
--- a/main.cpp
+++ b/main.cpp
@@ -1,22 +1,26 @@
 #include "pip.h"


+
+
 int main() {
-	const int iters = 10;
-	const int sz = 100000000;
-	{
-		piCout << "PIVector push back";
-		PIVector<int> v;
-		//v.reserve(sz);
-		for (int n=0; n<iters; ++n) {
-			PITimeMeasurer tm;
-			for (int i=0; i<sz; ++i) {
-				v.push_back(i);
-			}
-			piCout << tm.elapsed_m();
-			v.clear();
-		}
-	}
+	const int iters = 4;
+	const int sz = 10000000;
+
+
+//	{
+//		piCout << "PIVector push back";
+//		PIVector<int> v;
+//		//v.reserve(sz);
+//		for (int n=0; n<iters; ++n) {
+//			PITimeMeasurer tm;
+//			for (int i=0; i<sz; ++i) {
+//				v.push_back(i);
+//			}
+//			piCout << tm.elapsed_m() << v.capacity();
+//			v.clear();
+//		}
+//	}
 //	piCout << "\n";
 //	{
 //		piCout << "PIVector push front";
@@ -27,7 +31,7 @@ int main() {
 //			for (int i=0; i<sz; ++i) {
 //				v.push_front(i);
 //			}
-//			piCout << tm.elapsed_m();
+//			piCout << tm.elapsed_m() << v.capacity();
 //			v.clear();
 //		}
 //	}
@@ -45,34 +49,36 @@ int main() {
 //			v.clear();
 //		}
 //	}
-	piCout << "\n";
-	{
-		piCout << "PIDeque push back";
-		PIDeque<int> v;
-		//v.reserve(sz);
-		for (int n=0; n<iters; ++n) {
-			PITimeMeasurer tm;
-			for (int i=0; i<sz; ++i) {
-				v.push_back(i);
-			}
-			piCout << tm.elapsed_m();
-			v.clear();
-		}
-	}
-	piCout << "\n";
-	{
-		piCout << "PIDeque push front";
-		PIDeque<int> v;
-		//v.reserve(sz);
-		for (int n=0; n<iters; ++n) {
-			PITimeMeasurer tm;
-			for (int i=0; i<sz; ++i) {
-				v.push_front(i);
-			}
-			piCout << tm.elapsed_m();
-			v.clear();
-		}
-	}
+
+
+//	piCout << "\n";
+//	{
+//		piCout << "PIDeque push back";
+//		PIDeque<int> v;
+//		//v.reserve(sz);
+//		for (int n=0; n<iters; ++n) {
+//			PITimeMeasurer tm;
+//			for (int i=0; i<sz; ++i) {
+//				v.push_back(i);
+//			}
+//			piCout << tm.elapsed_m() << v.capacity();
+//			v.clear();
+//		}
+//	}
+//	piCout << "\n";
+//	{
+//		piCout << "PIDeque push front";
+//		PIDeque<int> v;
+//		//v.reserve(sz);
+//		for (int n=0; n<iters; ++n) {
+//			PITimeMeasurer tm;
+//			for (int i=0; i<sz; ++i) {
+//				v.push_front(i);
+//			}
+//			piCout << tm.elapsed_m() << v.capacity();
+//			v.clear();
+//		}
+//	}
 //	piCout << "\n";
 //	{
 //		piCout << "PIDeque insert center";
@@ -83,21 +89,25 @@ int main() {
 //			for (int i=0; i<sz; ++i) {
 //				v.insert(v.size()/2, i);
 //			}
-//			piCout << tm.elapsed_m();
+//			piCout << tm.elapsed_m() << v.capacity();
 //			v.clear();
 //		}
 //	}
+
+	PIVector<llong> ind;
+	for (int i=0; i<sz; ++i) {
+		ind << randomi();
+	}
+
 	piCout << "\n";
 	{
-		piCout << "Multi insert";
-		PIVector<int> v;
-		PIDeque<int> v2;
+		piCout << "PIMap insert back";
+		PIMap<llong, int> v;
 		//v.reserve(sz);
 		for (int n=0; n<iters; ++n) {
 			PITimeMeasurer tm;
 			for (int i=0; i<sz; ++i) {
-				v << i;
-				v2 << v[i];
+				v[i] = i;
 			}
 			piCout << tm.elapsed_m();
 			v.clear();
@@ -105,28 +115,45 @@ int main() {
 	}
 	piCout << "\n";
 	{
-		piCout << "Multi insert 2";
-		PIVector<int> v;
-		PIDeque<PIPair<int,int>> v2;
+		piCout << "PIMap insert front";
+		PIMap<llong, int> v;
 		//v.reserve(sz);
 		for (int n=0; n<iters; ++n) {
 			PITimeMeasurer tm;
-			for (int i=0; i<sz; ++i) v << i;
-			for (int i=0; i<sz; ++i) v2 << PIPair<int,int>(i, v[i]);
+			for (int i=0; i<sz; ++i) {
+				v[sz - i] = i;
+			}
 			piCout << tm.elapsed_m();
 			v.clear();
-			v2.clear();
 		}
 	}
+	piCout << "\n";
+	{
+		piCout << "PIMap insert random";
+		PIMap<llong, int> v;
+		//v.reserve(sz);
+		for (int n=0; n<iters; ++n) {
+			PITimeMeasurer tm;
+			for (int i=0; i<sz; ++i) {
+				v[ind[i]] = i;
+			}
+			piCout << tm.elapsed_m();
+			v.clear();
+		}
+	}
+
+
 //	piCout << "\n";
 //	{
-//		piCout << "PIMap insert";
-//		PIMap<llong, int> v;
+//		piCout << "Multi insert";
+//		PIVector<int> v;
+//		PIDeque<int> v2;
 //		//v.reserve(sz);
 //		for (int n=0; n<iters; ++n) {
 //			PITimeMeasurer tm;
 //			for (int i=0; i<sz; ++i) {
-//				v.insert(i, i);
+//				v << i;
+//				v2 << v[i];
 //			}
 //			piCout << tm.elapsed_m();
 //			v.clear();
@@ -134,17 +161,20 @@ int main() {
 //	}
 //	piCout << "\n";
 //	{
-//		piCout << "PIMap insert 2";
-//		PIMap<llong, int> v;
+//		piCout << "Multi insert 2";
+//		PIVector<int> v;
+//		PIDeque<PIPair<int,int>> v2;
 //		//v.reserve(sz);
 //		for (int n=0; n<iters; ++n) {
 //			PITimeMeasurer tm;
-//			for (int i=0; i<sz; ++i) {
-//				v[i] = i;
-//			}
+//			for (int i=0; i<sz; ++i) v << i;
+//			for (int i=0; i<sz; ++i) v2 << PIPair<int,int>(i, v[i]);
 //			piCout << tm.elapsed_m();
 //			v.clear();
+//			v2.clear();
 //		}
 //	}
+
+
 	return 0;
 }