Skip to content

Commit

Permalink
Add gch/small_vector, and use for dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@PeterTh
PeterTh committed Mar 3, 2022
1 parent c2853ca commit c9dab18
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 45 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
[submodule "vendor/Catch2"]
path = vendor/Catch2
url = https://github.com/catchorg/Catch2
[submodule "vendor/small_vector"]
path = vendor/small_vector
url = https://github.com/gharveymn/small_vector.git
branch = main
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ target_include_directories(celerity_runtime PUBLIC
$<INSTALL_INTERFACE:include/celerity>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/vendor>
$<INSTALL_INTERFACE:include/celerity/vendor>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/vendor/small_vector/source/include>
$<INSTALL_INTERFACE:include/celerity/vendor/small_vector/include>
)

target_link_libraries(celerity_runtime PUBLIC
Expand Down Expand Up @@ -352,6 +354,10 @@ install(
FILES ${PROJECT_SOURCE_DIR}/vendor/ctpl_stl.h
DESTINATION include/celerity/vendor
)
install(
FILES ${PROJECT_SOURCE_DIR}/vendor/small_vector/source/include/gch/small_vector.hpp
DESTINATION include/celerity/vendor/small_vector/include/gch
)
install(
TARGETS celerity_runtime
EXPORT install_exports
Expand Down
76 changes: 38 additions & 38 deletions ci/perf/gpuc1_bench.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[2022-03-02 13:59:51.114] [0] [info] Celerity runtime version 0.3.2 1e9fac9-dirty running on hipSYCL 0.9.1. PID = 333714, build type = release
[2022-03-02 13:59:52.087] [0] [info] Using platform 'CUDA', device 'NVIDIA GeForce RTX 2070' (automatically selected platform 1, device 0)
[2022-03-02 14:08:41.795] [0] [info] Celerity runtime version 0.3.2 3709d91-dirty running on hipSYCL 0.9.1. PID = 339167, build type = release
[2022-03-02 14:08:42.810] [0] [info] Using platform 'CUDA', device 'NVIDIA GeForce RTX 2070' (automatically selected platform 1, device 0)

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
benchmarks is a Catch v2.13.8 host application.
Expand All @@ -15,21 +15,21 @@ benchmark name samples iterations estimated
mean low mean high mean
std dev low std dev high std dev
-------------------------------------------------------------------------------
creating nodes 100 4961 1.9844 ms
5.21801 ns 5.19983 ns 5.30536 ns
0.176351 ns 0.00730106 ns 0.420381 ns
creating nodes 100 5543 2.2172 ms
3.38076 ns 3.38057 ns 3.381 ns
0.00108166 ns 0.00088833 ns 0.00167342 ns

creating and adding dependencies 100 522 2.4012 ms
43.6724 ns 43.0861 ns 44.2722 ns
3.03143 ns 2.93459 ns 3.37543 ns
creating and adding dependencies 100 1042 2.3966 ms
23.5743 ns 23.5216 ns 23.7766 ns
0.470046 ns 0.0990779 ns 1.09972 ns

adding and removing dependencies 100 610 2.44 ms
39.9986 ns 39.9105 ns 40.287 ns
0.730811 ns 0.263142 ns 1.6246 ns
adding and removing dependencies 100 1561 2.3415 ms
16.1523 ns 16.053 ns 16.5475 ns
0.980084 ns 0.00379986 ns 2.33919 ns

checking for dependencies 100 30117 0 ns
0.826139 ns 0.824279 ns 0.834236 ns
0.0170003 ns 0.00271225 ns 0.0400652 ns
checking for dependencies 100 20268 2.0268 ms
1.21099 ns 1.20719 ns 1.22986 ns
0.0376068 ns 0.000249798 ns 0.0897478 ns


-------------------------------------------------------------------------------
Expand All @@ -42,21 +42,21 @@ benchmark name samples iterations estimated
mean low mean high mean
std dev low std dev high std dev
-------------------------------------------------------------------------------
creating nodes 100 404 2.424 ms
64.252 ns 64.0988 ns 64.8569 ns
1.45773 ns 0.112241 ns 3.46626 ns
creating nodes 100 608 2.4928 ms
44.4335 ns 44.3602 ns 44.7154 ns
0.662176 ns 0.107918 ns 1.55587 ns

creating and adding dependencies 100 42 2.4738 ms
589.408 ns 587.877 ns 595.84 ns
13.7171 ns 1.48863 ns 32.1303 ns
creating and adding dependencies 100 85 2.499 ms
285.053 ns 284.167 ns 288.583 ns
8.17627 ns 1.14128 ns 19.3201 ns

adding and removing dependencies 100 44 2.442 ms
572.738 ns 572.461 ns 573.511 ns
2.19484 ns 1.00408 ns 4.73079 ns
adding and removing dependencies 100 121 2.5047 ms
189.905 ns 189.845 ns 190.102 ns
0.473099 ns 0.0179169 ns 1.07008 ns

checking for dependencies 100 903 2.4381 ms
27.3515 ns 27.3091 ns 27.3985 ns
0.227501 ns 0.199505 ns 0.258621 ns
checking for dependencies 100 1043 2.3989 ms
24.2469 ns 24.0798 ns 24.4669 ns
0.962934 ns 0.775704 ns 1.46298 ns


-------------------------------------------------------------------------------
Expand All @@ -69,21 +69,21 @@ benchmark name samples iterations estimated
mean low mean high mean
std dev low std dev high std dev
-------------------------------------------------------------------------------
creating nodes 100 38 2.4396 ms
643.098 ns 642.726 ns 643.452 ns
1.84686 ns 1.65161 ns 2.07119 ns
creating nodes 100 54 2.538 ms
472.415 ns 471.485 ns 476.103 ns
8.35764 ns 1.56203 ns 19.5945 ns

creating and adding dependencies 100 2 3.4124 ms
17.1069 us 17.0971 us 17.1352 us
78.0725 ns 34.6157 ns 169.666 ns
creating and adding dependencies 100 6 2.6808 ms
4.63913 us 4.62863 us 4.64906 us
52.1297 ns 43.585 ns 66.6578 ns

adding and removing dependencies 100 3 3.2802 ms
10.9672 us 10.9459 us 11.0629 us
197.05 ns 25.6187 ns 466.055 ns
adding and removing dependencies 100 6 2.5266 ms
4.58994 us 4.57289 us 4.62819 us
124.078 ns 66.3878 ns 254.847 ns

checking for dependencies 100 5 2.6525 ms
5.3111 us 5.29436 us 5.37616 us
142.51 ns 13.1282 ns 330 ns
checking for dependencies 100 14 2.5816 ms
1.84775 us 1.84677 us 1.84949 us
6.46367 ns 4.22064 ns 12.1414 ns


===============================================================================
Expand Down
9 changes: 5 additions & 4 deletions include/intrusive_graph.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include <optional>
#include <type_traits>

#include <gch/small_vector.hpp>

namespace celerity {
namespace detail {

Expand Down Expand Up @@ -124,17 +126,16 @@ namespace detail {
int get_pseudo_critical_path_length() const { return pseudo_critical_path_length; }

private:
// TODO grep "list<" and think about each (here probably boost::small_vector)
std::list<dependency> dependencies;
std::list<dependent> dependents;
gch::small_vector<dependency> dependencies;
gch::small_vector<dependent> dependents;

// This only (potentially) grows when adding dependencies,
// it never shrinks and does not take into account later changes further up in the dependency chain
// (that is all that is needed for celerity use).
int pseudo_critical_path_length = 0;

template <typename Dep>
std::optional<typename std::list<Dep>::iterator> maybe_get_dep(std::list<Dep>& deps, T* node) {
std::optional<typename gch::small_vector<Dep>::iterator> maybe_get_dep(gch::small_vector<Dep>& deps, T* node) {
auto it = std::find_if(deps.begin(), deps.end(), [&](auto d) { return d.node == node; });
if(it == deps.end()) return std::nullopt;
return it;
Expand Down
7 changes: 5 additions & 2 deletions test/benchmarks.cc
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
#include <catch2/catch.hpp>

#include <intrusive_graph.h>
#include "intrusive_graph.h"

using namespace celerity::detail;

struct bench_graph_node : intrusive_graph_node<bench_graph_node> {};


template <int N>
void intrusive_graph_benchmark() {
// note that bench_graph_nodes are created/destroyed *within* the BENCHMARK
// in the first two cases while the latter 2 cases only operate on already
// existing nodes -- this is intentional; both cases are relevant in practise

BENCHMARK("creating nodes") {
bench_graph_node nodes[N];
return nodes[N - 1].get_pseudo_critical_path_length(); // trick the compiler
Expand Down
2 changes: 1 addition & 1 deletion test/intrusive_graph_tests.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <catch2/catch.hpp>

#include <intrusive_graph.h>
#include "intrusive_graph.h"

namespace celerity {
namespace detail {
Expand Down
1 change: 1 addition & 0 deletions vendor/small_vector
Submodule small_vector added at 7d4237

0 comments on commit c9dab18

Please sign in to comment.