Skip to content

Attempt to fix resource::omp. #36

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

Open
rchen20 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Attempt to fix resource::omp. #36

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd63cff
Initial attempt to hostify omp resource.
rchen20 Jun 19, 2020
ffbada7
Host allocation and map design. XL memcpy does not work, clang-ibm se…
rchen20 Jul 7, 2020
657b713
Add exit data to deallocate.
rchen20 Jul 7, 2020
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
66 changes: 27 additions & 39 deletions include/camp/resource/omp_target.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ namespace resources
inline namespace v1
{

struct hdmem
{
void * host_arr[10];
};

class OmpEvent
{
public:
Expand Down Expand Up @@ -122,37 +127,46 @@ namespace resources
template <typename T>
T *allocate(size_t size)
{
T *ret = static_cast<T *>(omp_target_alloc(sizeof(T) * size, dev));
register_ptr_dev(ret, dev);
return ret;
T * hostmem = (T*)malloc(sizeof(T)*sizehost);

#pragma omp target enter data map( to: hostmem[0:size] )

return hostmem;
}

void *calloc(size_t size)
{
void *p = allocate<char>(size);
this->memset(p, 0, size);
return p;
}

void deallocate(void *p)
{
#pragma omp critical(camp_register_ptr)
{
get_dev_register().erase(p);
}
omp_target_free(p, dev);
char * pp = (char *)p;
CAMP_ALLOW_UNUSED_LOCAL(pp);
#pragma omp target exit data map( release: pp[:0] )
free(p);
}

void memcpy(void *dst, const void *src, size_t size)
{
// this is truly, insanely awful, need to think of something better
int dd = get_ptr_dev(dst);
int sd = get_ptr_dev(src);
// extra cast due to GCC openmp header bug
omp_target_memcpy(dst, (void *)src, size, 0, 0, dd, sd);
int initdev = omp_get_initial_device();
int sdevice = omp_target_is_present( (void *)src, dev ) ? dev : initdev;
int ddevice = omp_target_is_present( (void *)dst, dev ) ? dev : initdev;
#pragma omp target data if(sdevice != initdev) device(sdevice) use_device_ptr(src)
#pragma omp target data if(ddevice != initdev) device(ddevice) use_device_ptr(dst)
{
omp_target_memcpy(dst, (void *)src, size, 0, 0, ddevice, sdevice);
}
}

void memset(void *p, int val, size_t size)
{
char *local_addr = addr;
CAMP_ALLOW_UNUSED_LOCAL(local_addr);
char *pc = (char *)p;
#pragma omp target data use_device_ptr(pc)
#pragma omp target teams distribute parallel for device(dev) \
depend(inout \
: local_addr[0]) is_device_ptr(pc) nowait
Expand All @@ -161,35 +175,9 @@ namespace resources
}
}

void register_ptr_dev(void *p, int device)
{
#pragma omp critical(camp_register_ptr)
{
get_dev_register()[p] = device;
}
}
int get_ptr_dev(void const *p)
{
int ret = omp_get_initial_device();
#pragma omp critical(camp_register_ptr)
{
auto it = get_dev_register().find(p);
if (it != get_dev_register().end()) {
ret = it->second;
}
}
return ret;
}

private:
char *addr;
int dev;
template <typename always_void_odr_helper = void>
std::map<const void *, int> &get_dev_register()
{
static std::map<const void *, int> dev_register;
return dev_register;
}
};

} // namespace v1
Expand Down