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

Replace memory region API with memory pool API #7

Closed
wants to merge 11 commits into from
Closed

Replace memory region API with memory pool API #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a5024d3
Modify hcc runtime to use memory pool api
facao Mar 23, 2016
02ffcb2
Fix type error
facao Mar 23, 2016
f48034c
Add hsa_ext_amd.h header to hc_am.cpp
facao Mar 23, 2016
55cea95
Fix compilation error
facao Mar 24, 2016
758050b
Fix bug to modify agent to host_
facao Mar 24, 2016
b03d8a6
Remove reference to HSA_AMD_MEMORY_POOL_INFO_ALLOC_MAX_SIZE and some …
bwicakso Mar 24, 2016
2dde8aa
Misc cleanup
bwicakso Mar 24, 2016
1a861af
Merge remote-tracking branch 'refs/remotes/facao/master' into memory_…
bwicakso Mar 24, 2016
6374b93
Merge pull request #1 from bwicakso/memory_pool
facao Mar 24, 2016
d1bb525
Using lock/umlock API on C++/OS allocated memory
facao Mar 28, 2016
da0b13a
Remove hsa_amd_memory_lock/unlock
facao Mar 28, 2016
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
3 changes: 3 additions & 0 deletions include/kalmar_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@ class CPUDevice final : public KalmarDevice
class KalmarContext
{
private:
//TODO: Think about a system which has multiple CPU socket, e.g. server. In this case,
//We might be able to assume that only the first device is CPU, or we only mimic one cpu
//device when constructing KalmarContext.
KalmarDevice* get_default_dev() {
if (!def) {
if (Devices.size() <= 1) {
Expand Down
34 changes: 21 additions & 13 deletions lib/hsa/hc_am.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

#include "hc_am.hpp"
#include "hsa.h"
#include "hsa_ext_amd.h"

#define DB_TRACKER 0

Expand Down Expand Up @@ -135,7 +136,7 @@ size_t AmPointerTracker::reset (const hc::accelerator &acc)
for (auto iter = _tracker.begin() ; iter != _tracker.end(); ) {
if (iter->second._acc == acc) {
if (iter->second._isAmManaged) {
hsa_memory_free(const_cast<void*> (iter->first._basePointer));
hsa_amd_memory_pool_free(const_cast<void*> (iter->first._basePointer));
}
count++;

Expand Down Expand Up @@ -172,27 +173,34 @@ auto_voidp am_alloc(size_t sizeBytes, hc::accelerator &acc, unsigned flags)
if (sizeBytes != 0 ) {
if (acc.is_hsa_accelerator()) {
hsa_agent_t *hsa_agent = static_cast<hsa_agent_t*> (acc.get_default_view().get_hsa_agent());
hsa_region_t *alloc_region;
hsa_amd_memory_pool_t *alloc_region;
if (flags & amHostPinned) {
alloc_region = static_cast<hsa_region_t*>(acc.get_hsa_am_system_region());
alloc_region = static_cast<hsa_amd_memory_pool_t*>(acc.get_hsa_am_system_region());
} else {
alloc_region = static_cast<hsa_region_t*>(acc.get_hsa_am_region());
alloc_region = static_cast<hsa_amd_memory_pool_t*>(acc.get_hsa_am_region());
}

if (alloc_region->handle != -1) {

hsa_status_t s1 = hsa_memory_allocate(*alloc_region, sizeBytes, &ptr);
hsa_status_t s2 = hsa_memory_assign_agent(ptr, *hsa_agent, HSA_ACCESS_PERMISSION_RW);
hsa_status_t s1 = hsa_amd_memory_pool_allocate(*alloc_region, sizeBytes, 0, &ptr);

if ((s1 != HSA_STATUS_SUCCESS) || (s2 != HSA_STATUS_SUCCESS)) {
if (s1 != HSA_STATUS_SUCCESS) {
ptr = NULL;
} else {
if (flags & amHostPinned) {
g_amPointerTracker.insert(ptr,
hc::AmPointerInfo(ptr/*hostPointer*/, ptr /*devicePointer*/, sizeBytes, acc, false/*isDevice*/, true /*isAMManaged*/));
} else {
g_amPointerTracker.insert(ptr,
hc::AmPointerInfo(NULL/*hostPointer*/, ptr /*devicePointer*/, sizeBytes, acc, true/*isDevice*/, true /*isAMManaged*/));
s1 = hsa_amd_agents_allow_access(1, hsa_agent, NULL, ptr);
if (s1 != HSA_STATUS_SUCCESS) {
hsa_amd_memory_pool_free(ptr);
ptr = NULL;
}
else {
g_amPointerTracker.insert(ptr,
hc::AmPointerInfo(ptr/*hostPointer*/, ptr /*devicePointer*/, sizeBytes, acc, false/*isDevice*/, true /*isAMManaged*/));
}
}
else {
g_amPointerTracker.insert(ptr,
hc::AmPointerInfo(NULL/*hostPointer*/, ptr /*devicePointer*/, sizeBytes, acc, true/*isDevice*/, true /*isAMManaged*/));
}
}
}
Expand All @@ -209,7 +217,7 @@ am_status_t am_free(void* ptr)

if (ptr != NULL) {
// See also tracker::reset which can free memory.
hsa_memory_free(ptr);
hsa_amd_memory_pool_free(ptr);

int numRemoved = g_amPointerTracker.remove(ptr) ;
if (numRemoved == 0) {
Expand Down
Loading