Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

All domain Registry Traversal per Backend #106

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

All domain Registry Traversal per Backend #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f73258
Added registry_fill_ptrs function
DoeringChristian Oct 19, 2024
07b77a8
Addressed comments from @merlinND
DoeringChristian Nov 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions include/drjit-core/jit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,15 @@ extern JIT_EXPORT void jit_registry_remove(const void *ptr);
extern JIT_EXPORT uint32_t jit_registry_id(const void *ptr);

/// Return the largest instance ID for the given domain
/// If the \c domain is a nullptr, it returns the number of active entries in
/// all domains for the given backend
extern JIT_EXPORT uint32_t jit_registry_id_bound(JitBackend backend,
const char *domain);

/// Fills the \c dest pointer array with all pointers registered in the registry
/// \c dest has to point to an array with \c jit_registry_id_bound(backend, nullptr) entries
extern JIT_EXPORT void jit_registry_get_pointers(JitBackend backend, void **dest);

/// Return the pointer value associated with a given instance ID
extern JIT_EXPORT void *jit_registry_ptr(JitBackend backend,
const char *domain, uint32_t id);
Expand Down
5 changes: 5 additions & 0 deletions src/api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,11 @@ uint32_t jit_registry_id_bound(JitBackend backend, const char *domain) {
return jitc_registry_id_bound(backend, domain);
}

void jit_registry_get_pointers(JitBackend backend, void **dest) {
lock_guard guard(state.lock);
return jitc_registry_get_pointers(backend, dest);
}

void *jit_registry_ptr(JitBackend backend, const char *domain, uint32_t id) {
lock_guard guard(state.lock);
return jitc_registry_ptr(backend, domain, id);
Expand Down
27 changes: 27 additions & 0 deletions src/registry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ struct Ptr {
// Per-domain information: a forward map (index-> pointer) and a list of unused entries
struct Domain {
const char *name;
JitBackend backend;
uint32_t id_bound;
std::vector<Ptr> fwd_map;
std::priority_queue<uint32_t, std::vector<uint32_t>, std::greater<uint32_t>>
Expand Down Expand Up @@ -76,6 +77,7 @@ uint32_t jitc_registry_put(JitBackend backend, const char *domain_name, void *pt
r.domains.emplace_back();
Domain &domain = r.domains.back();
domain.name = domain_name;
domain.backend = backend;
domain.id_bound = 0;
}

Expand Down Expand Up @@ -149,13 +151,38 @@ uint32_t jitc_registry_id(const void *ptr) {

uint32_t jitc_registry_id_bound(JitBackend backend, const char *domain) {
Registry &r = registry;
if (!domain) {
uint32_t n = 0;
for (Domain &domain : r.domains) {
if (domain.backend == backend)
Comment on lines +156 to +157
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you could create a DomainKey{ backend, domain_name } to look up the domain ID into r.domain_ids, but I don't think it would be faster than your current implementation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. I guess it depends on how many domains there are with a different backend.

for (auto ptr : domain.fwd_map)
if (ptr.active)
n++;
}
return n;
}
auto it = r.domain_ids.find(DomainKey{ backend, domain });
if (it == r.domain_ids.end())
return 0;
else
return r.domains[it->second].id_bound;
}

void jitc_registry_get_pointers(JitBackend backend, void **dest) {
const Registry &r = registry;

uint32_t n = 0;
for (const Domain &domain : r.domains) {
if (domain.backend == backend)
for (auto ptr : domain.fwd_map) {
if (ptr.active) {
dest[n] = ptr.ptr;
n++;
}
}
}
}

void *jitc_registry_ptr(JitBackend backend, const char *domain_name, uint32_t id) {
if (id == 0)
return nullptr;
Expand Down
6 changes: 6 additions & 0 deletions src/registry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,14 @@ extern void jitc_registry_remove(const void *ptr);
extern uint32_t jitc_registry_id(const void *ptr);

/// Return the largest instance ID for the given domain
/// If the \c domain is a nullptr, it returns the number of active entries in
/// all domains for the given backend
extern uint32_t jitc_registry_id_bound(JitBackend backend, const char *domain);

/// Fills the \c dest pointer array with all pointers registered in the registry
/// \c dest has to point to an array with \c jit_registry_id_bound(backend, nullptr) entries
void extern jitc_registry_get_pointers(JitBackend backend, void **dest);

/// Return the pointer value associated with a given instance ID
extern void *jitc_registry_ptr(JitBackend backend, const char *domain, uint32_t id);

Expand Down