Skip to content

WIP: memory span #348

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

Draft
2dm wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

WIP: memory span #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
226670e
Address list operations and dimension utilities
2dm Sep 2, 2025
b6d0cc3
initial impl
2dm Nov 3, 2025
a93641b
bytes_panding: span_list -> span_iter
2dm Nov 3, 2025
f21c773
Extending to 4 dimension to cover address list contiguous block tracking
2dm Nov 4, 2025
29174f0
clang-format
2dm Nov 4, 2025
6382c0f
complete address list refactor
2dm Nov 4, 2025
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
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ set(REALM_SOURCES
realm_c.cc
fragmented_message.cc
transfer/lowlevel_disk.cc
transfer/address_list.cc
transfer/memory_span.cc
transfer/channel_common.cc
transfer/memcpy_channel.cc
transfer/channel.cc
Expand Down
198 changes: 98 additions & 100 deletions src/realm/cuda/cuda_internal.cc
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 65 additions & 65 deletions src/realm/hip/hip_internal.cc
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions src/realm/idx_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@ namespace Realm {
if(!layout)
return false; // dimension mismatch

std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(fid);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(fid);
if(it == layout->fields.end())
return false; // invalid field ID

Expand Down
6 changes: 3 additions & 3 deletions src/realm/inst_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ namespace Realm {
// each piece list that's used will turn into a program
std::map<int, size_t> piece_list_starts;
std::map<int, PieceSplitNode<T> *> piece_list_plans;
for(std::map<FieldID, FieldLayout>::const_iterator it = fields.begin();
for(InstanceLayoutGeneric::FieldMap::const_iterator it = fields.begin();
it != fields.end(); ++it) {
// did we already do this piece list?
if(piece_list_starts.count(it->second.list_idx) > 0)
Expand Down Expand Up @@ -417,7 +417,7 @@ namespace Realm {
}

// fill in per field info
for(std::map<FieldID, FieldLayout>::const_iterator it = fields.begin();
for(InstanceLayoutGeneric::FieldMap::const_iterator it = fields.begin();
it != fields.end(); ++it) {
PieceLookup::CompiledProgram::PerField &pf = p.fields[it->first];
pf.start_inst = reinterpret_cast<const PieceLookup::Instruction *>(
Expand Down Expand Up @@ -1523,7 +1523,7 @@ namespace Realm {
assert(inst_layout != 0);

// look up the right field
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
InstanceLayoutGeneric::FieldMap::const_iterator it =
inst_layout->fields.find(field_offset);
assert(it != inst_layout->fields.end());

Expand Down
5 changes: 3 additions & 2 deletions src/realm/inst_layout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ namespace Realm {
int size_in_bytes;
};

std::map<FieldID, FieldLayout> fields;
using FieldMap = std::map<FieldID, FieldLayout>;
FieldMap fields;
};

REALM_PUBLIC_API
Expand Down Expand Up @@ -714,7 +715,7 @@ namespace Realm {
// protected:
// friend
// std::ostream& operator<<(std::ostream& os, const AffineAccessor<FT,N,T>& a);
//#define REALM_ACCESSOR_DEBUG
// #define REALM_ACCESSOR_DEBUG
#if defined(REALM_ACCESSOR_DEBUG) || defined(REALM_USE_KOKKOS)
Rect<N, T> bounds;
#endif
Expand Down
36 changes: 12 additions & 24 deletions src/realm/inst_layout.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,7 @@ namespace Realm {
{
os << "Layout(bytes=" << bytes_used << ", align=" << alignment_reqd << ", fields={";
bool first = true;
for(std::map<FieldID, FieldLayout>::const_iterator it = fields.begin();
it != fields.end(); ++it) {
for(FieldMap::const_iterator it = fields.begin(); it != fields.end(); ++it) {
if(!first)
os << ", ";
first = false;
Expand All @@ -582,8 +581,7 @@ namespace Realm {
inline size_t InstanceLayout<N, T>::calculate_offset(Point<N, T> p, FieldID fid) const
{
// first look up the field to see which piece list it uses (and get offset)
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
fields.find(fid);
FieldMap::const_iterator it = fields.find(fid);
assert(it != fields.end());

const InstanceLayoutPiece<N, T> *ilp = piece_lists[it->second.list_idx].find_piece(p);
Expand Down Expand Up @@ -769,8 +767,7 @@ namespace Realm {
// find the right piece list for our field
const InstanceLayout<N, T> *layout =
checked_cast<const InstanceLayout<N, T> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
assert(it != layout->fields.end());

this->piece_list = &layout->piece_lists[it->second.list_idx];
Expand All @@ -789,8 +786,7 @@ namespace Realm {
// find the right piece list for our field
const InstanceLayout<N, T> *layout =
checked_cast<const InstanceLayout<N, T> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
assert(it != layout->fields.end());

this->piece_list = &layout->piece_lists[it->second.list_idx];
Expand Down Expand Up @@ -913,8 +909,7 @@ namespace Realm {
{
const InstanceLayout<N, T> *layout =
checked_cast<const InstanceLayout<N, T> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
assert(it != layout->fields.end());
const InstancePieceList<N, T> &ipl = layout->piece_lists[it->second.list_idx];

Expand Down Expand Up @@ -963,8 +958,7 @@ namespace Realm {
{
const InstanceLayout<N, T> *layout =
checked_cast<const InstanceLayout<N, T> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
assert(it != layout->fields.end());
const InstancePieceList<N, T> &ipl = layout->piece_lists[it->second.list_idx];

Expand Down Expand Up @@ -1020,8 +1014,7 @@ namespace Realm {
// instance's dimensionality should be <N2,T2>
const InstanceLayout<N2, T2> *layout =
checked_cast<const InstanceLayout<N2, T2> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
assert(it != layout->fields.end());
const InstancePieceList<N2, T2> &ipl = layout->piece_lists[it->second.list_idx];

Expand Down Expand Up @@ -1088,8 +1081,7 @@ namespace Realm {
// instance's dimensionality should be <N2,T2>
const InstanceLayout<N2, T2> *layout =
checked_cast<const InstanceLayout<N2, T2> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
assert(it != layout->fields.end());
const InstancePieceList<N2, T2> &ipl = layout->piece_lists[it->second.list_idx];

Expand Down Expand Up @@ -1146,8 +1138,7 @@ namespace Realm {
{
const InstanceLayout<N, T> *layout =
checked_cast<const InstanceLayout<N, T> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
if(it == layout->fields.end())
return false;
const InstancePieceList<N, T> &ipl = layout->piece_lists[it->second.list_idx];
Expand All @@ -1173,8 +1164,7 @@ namespace Realm {
{
const InstanceLayout<N, T> *layout =
checked_cast<const InstanceLayout<N, T> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
if(it == layout->fields.end())
return false;
const InstancePieceList<N, T> &ipl = layout->piece_lists[it->second.list_idx];
Expand Down Expand Up @@ -1209,8 +1199,7 @@ namespace Realm {
// instance's dimensionality should be <N2,T2>
const InstanceLayout<N2, T2> *layout =
checked_cast<const InstanceLayout<N2, T2> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
if(it == layout->fields.end())
return false;
const InstancePieceList<N2, T2> &ipl = layout->piece_lists[it->second.list_idx];
Expand Down Expand Up @@ -1238,8 +1227,7 @@ namespace Realm {
// instance's dimensionality should be <N2,T2>
const InstanceLayout<N2, T2> *layout =
checked_cast<const InstanceLayout<N2, T2> *>(inst.get_layout());
std::map<FieldID, InstanceLayoutGeneric::FieldLayout>::const_iterator it =
layout->fields.find(field_id);
InstanceLayoutGeneric::FieldMap::const_iterator it = layout->fields.find(field_id);
if(it == layout->fields.end())
return false;
const InstancePieceList<N2, T2> &ipl = layout->piece_lists[it->second.list_idx];
Expand Down
4 changes: 2 additions & 2 deletions src/realm/repl_heap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ namespace Realm {
void cleanup();

// objects may be allocated and freed
void *alloc_obj(size_t bytes, size_t alignment);
void free_obj(void *ptr);
virtual void *alloc_obj(size_t bytes, size_t alignment);
virtual void free_obj(void *ptr);

// writes to an object must be via the address at which is was allocated,
// and be followed by a call to commit_writes for the appropriate address
Expand Down
Loading
Loading