summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Jamfile.jam6
-rw-r--r--test/perf-instancing.cpp43
-rw-r--r--test/test-instancing.cpp94
-rw-r--r--test/testHelpers.h8
4 files changed, 141 insertions, 10 deletions
diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index f021d85..1266854 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -55,11 +55,12 @@ run test-enumDetails.cpp ;
run test-render.cpp : -- : test-assetFactory : <library>test ;
run test-glContextBhvr.cpp ;
run test-assetFactory.cpp : -- : [ sequence.insertion-sort [ glob-tree $(res) : *.* ] fixtures/rgb.txt test-instancing ] : <library>test ;
-run perf-assetFactory.cpp : -- : test-assetFactory : <library>benchmark <library>test ;
+run perf-assetFactory.cpp : <\ : test-assetFactory : <library>benchmark <library>test ;
run perf-geoData.cpp : : : <library>test <library>benchmark ;
-run perf-persistence.cpp : -- : test-persistence : <library>benchmark <library>test ;
+run perf-persistence.cpp : \< : test-persistence : <library>benchmark <library>test ;
run test-worker.cpp ;
run test-instancing.cpp : -- : test-glContainer : <library>test ;
+run perf-instancing.cpp : \< : test-instancing : <library>benchmark <library>test ;
run test-glContainer.cpp : : : <library>test ;
run test-pack.cpp : : : <library>test ;
compile test-static-enumDetails.cpp ;
@@ -67,5 +68,6 @@ compile test-static-stream_support.cpp ;
explicit perf-assetFactory ;
explicit perf-persistence ;
explicit perf-terrain ;
+explicit perf-instancing ;
alias perf : perf-assetFactory perf-persistence perf-terrain ;
explicit perf ;
diff --git a/test/perf-instancing.cpp b/test/perf-instancing.cpp
new file mode 100644
index 0000000..829ea50
--- /dev/null
+++ b/test/perf-instancing.cpp
@@ -0,0 +1,43 @@
+#include "gfx/gl/instanceVertices.h"
+#include "testMainWindow.h"
+#include <benchmark/benchmark.h>
+#include <random>
+
+struct Instance {
+ GlobalPosition3D pos;
+ glm::mat3 rot;
+};
+
+struct data {
+ explicit data(size_t n)
+ {
+ std::mt19937 gen(std::random_device {}());
+ std::uniform_int_distribution<GlobalDistance> xy(0, 1000000);
+ std::uniform_int_distribution<GlobalDistance> z(0, 10000);
+ while (n--) {
+ proxies.emplace_back(instances.acquire(GlobalPosition3D {xy(gen), xy(gen), z(gen)}, glm::mat3 {}));
+ }
+ }
+
+ InstanceVertices<Instance> instances;
+ std::vector<InstanceVertices<Instance>::InstanceProxy> proxies;
+};
+
+static void
+partition(benchmark::State & state)
+{
+ TestMainWindow window;
+ data d(static_cast<size_t>(state.range()));
+ GlobalPosition2D pos {};
+ for (auto _ : state) {
+ d.instances.partition([&pos](const auto & i) {
+ return std::abs(i.pos.x - pos.x) < 5 && std::abs(i.pos.y - pos.y) < 5;
+ });
+ pos += GlobalPosition2D {33, 17};
+ pos %= 1000000;
+ }
+}
+
+BENCHMARK(partition)->Range(0, 1 << 20);
+
+BENCHMARK_MAIN();
diff --git a/test/test-instancing.cpp b/test/test-instancing.cpp
index 3244bad..40c2c4f 100644
--- a/test/test-instancing.cpp
+++ b/test/test-instancing.cpp
@@ -10,12 +10,33 @@
BOOST_GLOBAL_FIXTURE(TestMainWindowAppBase);
-BOOST_FIXTURE_TEST_SUITE(i, InstanceVertices<int>)
+struct TestInstanceVertices : public InstanceVertices<int> {
+ void
+ checkReverseIndex(std::source_location ctx = std::source_location::current())
+ {
+ BOOST_TEST_CONTEXT(ctx.function_name() << ":" << ctx.line()) {
+ std::vector<size_t> genIndexIndex(size(), npos);
+ for (size_t i {}; i < index.size(); i++) {
+ if (index[i] != npos) {
+ BOOST_REQUIRE_EQUAL(genIndexIndex.at(index[i]), npos);
+ genIndexIndex.at(index[i]) = i;
+ }
+ }
+
+ BOOST_TEST_CONTEXT(reverseIndex << genIndexIndex) {
+ BOOST_CHECK_EQUAL_COLCOL(reverseIndex, genIndexIndex);
+ }
+ }
+ }
+};
+
+BOOST_FIXTURE_TEST_SUITE(i, TestInstanceVertices)
BOOST_AUTO_TEST_CASE(createDestroy)
{
BOOST_CHECK(unused.empty());
BOOST_CHECK(index.empty());
+ BOOST_CHECK(reverseIndex.empty());
}
BOOST_AUTO_TEST_CASE(acquireRelease)
@@ -26,11 +47,14 @@ BOOST_AUTO_TEST_CASE(acquireRelease)
BOOST_CHECK_EQUAL(1, size());
BOOST_REQUIRE_EQUAL(1, index.size());
BOOST_CHECK_EQUAL(0, index.front());
+ BOOST_REQUIRE_EQUAL(1, reverseIndex.size());
+ BOOST_CHECK_EQUAL(0, reverseIndex.front());
BOOST_CHECK(unused.empty());
}
BOOST_CHECK_EQUAL(0, size());
BOOST_CHECK(unused.empty());
BOOST_CHECK(index.empty());
+ BOOST_CHECK(reverseIndex.empty());
}
BOOST_AUTO_TEST_CASE(acquireReleaseMove)
@@ -47,6 +71,7 @@ BOOST_AUTO_TEST_CASE(acquireReleaseMove)
BOOST_CHECK_EQUAL(0, size());
BOOST_CHECK(unused.empty());
BOOST_CHECK(index.empty());
+ BOOST_CHECK(reverseIndex.empty());
}
BOOST_AUTO_TEST_CASE(autoMapUnmap)
@@ -97,15 +122,13 @@ BOOST_AUTO_TEST_CASE(shuffle)
BOOST_CHECK_EQUAL(at(2), *proxies[2].get());
BOOST_CHECK_EQUAL(at(3), *proxies[3].get());
BOOST_CHECK(unused.empty());
- BOOST_REQUIRE_EQUAL(4, index.size());
- BOOST_CHECK_EQUAL(0, index[0]);
- BOOST_CHECK_EQUAL(1, index[1]);
- BOOST_CHECK_EQUAL(2, index[2]);
- BOOST_CHECK_EQUAL(3, index[3]);
+ BOOST_CHECK_EQUAL_COLVALS(index, 0, 1, 2, 3);
+ checkReverseIndex();
// Remove 1, 3 moves to [1]
proxies.erase(proxies.begin() + 1);
BOOST_REQUIRE_EQUAL(3, proxies.size());
- BOOST_REQUIRE_EQUAL(4, index.size());
+ BOOST_CHECK_EQUAL_COLVALS(index, 0, npos, 2, 1);
+ BOOST_CHECK_EQUAL_COLVALS(reverseIndex, 0, 3, 2);
BOOST_REQUIRE_EQUAL(1, unused.size());
BOOST_CHECK_EQUAL(1, unused[0]);
BOOST_CHECK_EQUAL(at(0), *proxies[0].get());
@@ -114,6 +137,8 @@ BOOST_AUTO_TEST_CASE(shuffle)
// Remove 1, 2 moves to [1]
proxies.erase(proxies.begin() + 1);
BOOST_REQUIRE_EQUAL(4, index.size());
+ BOOST_CHECK_EQUAL_COLVALS(index, 0, npos, npos, 1);
+ checkReverseIndex();
BOOST_REQUIRE_EQUAL(2, unused.size());
BOOST_CHECK_EQUAL(1, unused[0]);
BOOST_CHECK_EQUAL(2, unused[1]);
@@ -121,12 +146,33 @@ BOOST_AUTO_TEST_CASE(shuffle)
BOOST_CHECK_EQUAL(at(1), *proxies[1].get());
// Add new, takes 2 at [2]
BOOST_CHECK_EQUAL(4, proxies.emplace_back(acquire(4)));
- BOOST_REQUIRE_EQUAL(4, index.size());
+ BOOST_CHECK_EQUAL_COLVALS(index, 0, npos, 2, 1);
+ checkReverseIndex();
BOOST_REQUIRE_EQUAL(1, unused.size());
BOOST_CHECK_EQUAL(1, unused[0]);
BOOST_CHECK_EQUAL(at(0), *proxies[0].get());
BOOST_CHECK_EQUAL(at(1), *proxies[1].get());
BOOST_CHECK_EQUAL(at(2), *proxies[2].get());
+ // Add new, takes 1 at [3]
+ BOOST_CHECK_EQUAL(5, proxies.emplace_back(acquire(5)));
+ BOOST_REQUIRE_EQUAL(proxies.size(), reverseIndex.size());
+ BOOST_CHECK_EQUAL_COLVALS(index, 0, 3, 2, 1);
+ checkReverseIndex();
+ // Add new, takes 4 at [4]
+ BOOST_CHECK_EQUAL(6, proxies.emplace_back(acquire(6)));
+ BOOST_REQUIRE_EQUAL(proxies.size(), reverseIndex.size());
+ BOOST_CHECK_EQUAL_COLVALS(index, 0, 3, 2, 1, 4);
+ checkReverseIndex();
+ // Remove [0]
+ proxies.erase(proxies.begin());
+ BOOST_REQUIRE_EQUAL(proxies.size(), reverseIndex.size());
+ BOOST_CHECK_EQUAL_COLVALS(index, npos, 3, 2, 1, 0);
+ checkReverseIndex();
+ // Remove [3]
+ proxies.erase(proxies.begin());
+ BOOST_REQUIRE_EQUAL(proxies.size(), reverseIndex.size());
+ BOOST_CHECK_EQUAL_COLVALS(index, npos, 1, 2, npos, 0);
+ checkReverseIndex();
}
BOOST_DATA_TEST_CASE(shuffle_random, boost::unit_test::data::xrange(0, 10), x)
@@ -160,6 +206,7 @@ BOOST_DATA_TEST_CASE(shuffle_random, boost::unit_test::data::xrange(0, 10), x)
iused.emplace(index[i]);
}
}
+ checkReverseIndex();
BOOST_TEST_CONTEXT(index) {
BOOST_REQUIRE_EQUAL(iused.size(), size());
@@ -171,4 +218,35 @@ BOOST_DATA_TEST_CASE(shuffle_random, boost::unit_test::data::xrange(0, 10), x)
}
}
+BOOST_AUTO_TEST_CASE(partition_by, *boost::unit_test::timeout(1))
+{
+ std::mt19937 gen(std::random_device {}());
+ std::uniform_int_distribution<int> dist(0, 100000);
+ static constexpr auto N = 1000;
+ reserve(N);
+ std::vector<decltype(acquire(0))> instances;
+ instances.reserve(N);
+ // At least one of each
+ instances.push_back(acquire(1));
+ instances.push_back(acquire(3));
+ while (instances.size() < N) {
+ instances.push_back(acquire(dist(gen)));
+ }
+ const std::vector<int> values(instances.begin(), instances.end());
+ BOOST_REQUIRE_EQUAL(size(), N);
+
+ const auto pred = [](auto x) {
+ return (x % 3) == 0;
+ };
+ auto matchedEnd = partition(pred);
+ // The underlying data is partitioned...
+ BOOST_REQUIRE(std::is_partitioned(mkcspan().cbegin(), mkcspan().cend(), pred));
+ // The external view of the data is unchanged...
+ BOOST_CHECK_EQUAL_COLLECTIONS(values.cbegin(), values.cend(), instances.cbegin(), instances.cend());
+ // The partition point is right...
+ BOOST_CHECK(!pred(*matchedEnd));
+ BOOST_CHECK(pred(*--matchedEnd));
+ checkReverseIndex();
+}
+
BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/testHelpers.h b/test/testHelpers.h
index c9fd6dc..a261b3d 100644
--- a/test/testHelpers.h
+++ b/test/testHelpers.h
@@ -51,3 +51,11 @@ loadFixtureJson(const std::filesystem::path & path)
BOOST_CHECK(VAR); \
} \
else
+
+#define BOOST_CHECK_EQUAL_COLCOL(cola_, colb_) \
+ BOOST_CHECK_EQUAL_COLLECTIONS(cola_.begin(), cola_.end(), colb_.begin(), colb_.end())
+#define BOOST_CHECK_EQUAL_COLVALS(col_, ...) \
+ { \
+ const std::initializer_list<decltype(col_)::value_type> vals {__VA_ARGS__}; \
+ BOOST_CHECK_EQUAL_COLLECTIONS(col_.begin(), col_.end(), vals.begin(), vals.end()); \
+ }
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 02:34:36 +0000