Update memkind mpool for new mpool interface
Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
Этот коммит содержится в:
Nathan Hjelm
родитель
8024142f46
Коммит
69d9266497
@ -1,3 +1,4 @@
|
||||
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
||||
/*
|
||||
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
@ -11,8 +12,8 @@
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2010-2012 Los Alamos National Security, LLC.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights
|
||||
* reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -31,24 +32,16 @@
|
||||
#include "opal/mca/mpool/mpool.h"
|
||||
|
||||
#include "opal/mca/allocator/allocator.h"
|
||||
#include "memkind.h"
|
||||
#include <memkind.h>
|
||||
|
||||
BEGIN_C_DECLS
|
||||
|
||||
struct mca_mpool_base_resources_t {
|
||||
char *pool_name;
|
||||
void *reg_data;
|
||||
size_t size;
|
||||
};
|
||||
static const int mca_mpool_memkind_default_pagesize = 4096;
|
||||
|
||||
|
||||
typedef struct mca_mpool_base_resources_t mca_mpool_base_resources_t;
|
||||
|
||||
struct mca_mpool_memkind_module_t {
|
||||
mca_mpool_base_module_t super;
|
||||
size_t alloc_size;
|
||||
struct mca_mpool_base_resources_t resources;
|
||||
memkind_t kind;
|
||||
int page_size;
|
||||
};
|
||||
typedef struct mca_mpool_memkind_module_t mca_mpool_memkind_module_t;
|
||||
|
||||
@ -57,10 +50,11 @@ struct mca_mpool_memkind_component_t {
|
||||
int hbw;
|
||||
int pagesize;
|
||||
int bind;
|
||||
memkind_t kind;
|
||||
char *memkind_name;
|
||||
int default_partition;
|
||||
int priority;
|
||||
char *memkind_file;
|
||||
int verbose;
|
||||
int output;
|
||||
mca_mpool_memkind_module_t modules[MEMKIND_NUM_BASE_KIND];
|
||||
};
|
||||
typedef struct mca_mpool_memkind_component_t mca_mpool_memkind_component_t;
|
||||
OPAL_MODULE_DECLSPEC extern mca_mpool_memkind_component_t mca_mpool_memkind_component;
|
||||
@ -69,7 +63,7 @@ OPAL_MODULE_DECLSPEC extern mca_mpool_memkind_component_t mca_mpool_memkind_comp
|
||||
* Initializes the mpool module.
|
||||
*/
|
||||
|
||||
void mca_mpool_memkind_module_init(mca_mpool_memkind_module_t *mpool);
|
||||
void mca_mpool_memkind_module_init(mca_mpool_memkind_module_t *mpool, int partition);
|
||||
|
||||
/**
|
||||
* Allocate block of high bandwidth memory.
|
||||
@ -78,8 +72,7 @@ void* mca_mpool_memkind_alloc(
|
||||
mca_mpool_base_module_t* mpool,
|
||||
size_t size,
|
||||
size_t align,
|
||||
uint32_t flags,
|
||||
mca_mpool_base_registration_t** registration);
|
||||
uint32_t flags);
|
||||
|
||||
/**
|
||||
* realloc function typedef
|
||||
@ -87,16 +80,14 @@ void* mca_mpool_memkind_alloc(
|
||||
void* mca_mpool_memkind_realloc(
|
||||
mca_mpool_base_module_t* mpool,
|
||||
void* addr,
|
||||
size_t size,
|
||||
mca_mpool_base_registration_t** registration);
|
||||
size_t size);
|
||||
|
||||
/**
|
||||
* free function typedef
|
||||
*/
|
||||
void mca_mpool_memkind_free(
|
||||
mca_mpool_base_module_t* mpool,
|
||||
void * addr,
|
||||
mca_mpool_base_registration_t* registration);
|
||||
void * addr);
|
||||
|
||||
END_C_DECLS
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
||||
/*
|
||||
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
@ -11,8 +12,8 @@
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2007-2009 Sun Microsystems, Inc. All rights reserved.
|
||||
* Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2010-2013 Los Alamos National Security, LLC.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2014 NVIDIA Corporation. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
@ -48,175 +49,117 @@ mca_mpool_memkind_open(void);
|
||||
static int
|
||||
mca_mpool_memkind_close(void);
|
||||
|
||||
static mca_mpool_base_module_t*
|
||||
mca_mpool_memkind_init(struct mca_mpool_base_resources_t* resources);
|
||||
|
||||
static int mca_mpool_memkind_query (const char *hints, int *priority,
|
||||
mca_mpool_base_module_t **module);
|
||||
|
||||
mca_mpool_memkind_component_t mca_mpool_memkind_component = {
|
||||
{
|
||||
/* First, the mca_base_component_t struct containing meta
|
||||
information about the component itself */
|
||||
{
|
||||
MCA_MPOOL_BASE_VERSION_2_0_0,
|
||||
"memkind", /* MCA component name */
|
||||
OPAL_MAJOR_VERSION, /* MCA component major version */
|
||||
OPAL_MINOR_VERSION, /* MCA component minor version */
|
||||
OPAL_RELEASE_VERSION, /* MCA component release version */
|
||||
mca_mpool_memkind_open, /* component open */
|
||||
mca_mpool_memkind_close,
|
||||
NULL,
|
||||
mca_mpool_memkind_register
|
||||
.mpool_version = {
|
||||
MCA_MPOOL_BASE_VERSION_3_0_0,
|
||||
"memkind", /* MCA component name */
|
||||
MCA_BASE_MAKE_VERSION(component, OPAL_MAJOR_VERSION, OPAL_MINOR_VERSION,
|
||||
OPAL_RELEASE_VERSION),
|
||||
.mca_open_component = mca_mpool_memkind_open,
|
||||
.mca_close_component = mca_mpool_memkind_close,
|
||||
.mca_register_component_params = mca_mpool_memkind_register
|
||||
},
|
||||
{
|
||||
.mpool_data = {
|
||||
/* The component is checkpoint ready */
|
||||
MCA_BASE_METADATA_PARAM_CHECKPOINT
|
||||
},
|
||||
|
||||
mca_mpool_memkind_init
|
||||
.mpool_query = mca_mpool_memkind_query,
|
||||
}
|
||||
};
|
||||
|
||||
static mca_base_var_enum_value_t memory_kinds[] = {
|
||||
{.value = MEMKIND_PARTITION_DEFAULT, .string = "memkind_default"},
|
||||
{.value = MEMKIND_PARTITION_HBW, .string = "memkind_hbw"},
|
||||
{.value = MEMKIND_PARTITION_HBW_HUGETLB, .string = "memkind_hwb_hugetlb"},
|
||||
{.value = MEMKIND_PARTITION_HBW_PREFERRED, .string = "memkind_hbw_preferred"},
|
||||
{.value = MEMKIND_PARTITION_HBW_PREFERRED_HUGETLB, .string = "memkind_hbw_preferred_hugetlb"},
|
||||
{.value = MEMKIND_PARTITION_HUGETLB, .string = "memkind_hugetlb"},
|
||||
{.value = MEMKIND_PARTITION_HBW_GBTLB, .string = "memkind_hbw_gbtlb"},
|
||||
{.value = MEMKIND_PARTITION_HBW_PREFERRED_GBTLB, .string = "memkind_hbw_preferred_gbtlb"},
|
||||
{.value = MEMKIND_PARTITION_GBTLB, .string = "memkind_gbtlb"},
|
||||
{.value = MEMKIND_PARTITION_HBW_INTERLEAVE, .string = "memkind_hbw_interleave"},
|
||||
{.value = MEMKIND_PARTITION_INTERLEAVE, .string = "memkind_interleave"},
|
||||
{.string = NULL},
|
||||
};
|
||||
|
||||
static mca_base_var_enum_t *mca_mpool_memkind_enum = NULL;
|
||||
|
||||
static int opal_mpool_memkind_verbose;
|
||||
static int mca_mpool_memkind_register(void)
|
||||
{
|
||||
int rc;
|
||||
|
||||
char *memkind_names;
|
||||
/* register MEMKIND component parameters */
|
||||
mca_mpool_memkind_component.hbw = 1;
|
||||
mca_mpool_memkind_component.bind = 0;
|
||||
mca_mpool_memkind_component.pagesize = mca_mpool_memkind_default_pagesize;
|
||||
mca_mpool_memkind_component.default_partition = memory_kinds[0].value;
|
||||
|
||||
memkind_names = (char *) malloc (2048 * sizeof(char));
|
||||
if (NULL == memkind_names){
|
||||
return OPAL_ERROR;
|
||||
rc = mca_base_var_enum_create ("memkind partition types", memory_kinds, &mca_mpool_memkind_enum);
|
||||
if (OPAL_SUCCESS != rc) {
|
||||
return rc;
|
||||
}
|
||||
|
||||
mca_mpool_memkind_component.memkind_name = (char *) malloc (4096 * sizeof(char));
|
||||
if (NULL == mca_mpool_memkind_component.memkind_name){
|
||||
return OPAL_ERROR;
|
||||
}
|
||||
|
||||
mca_mpool_memkind_component.memkind_file = (char *) malloc (4096 * sizeof(char));
|
||||
if (NULL ==mca_mpool_memkind_component.memkind_file){
|
||||
return OPAL_ERROR;
|
||||
}
|
||||
|
||||
strncpy (mca_mpool_memkind_component.memkind_name, "memkind_default", 17);
|
||||
sprintf(memkind_names, "Use a specific kind of memory from (memkind_default, memkind_hugetlb, memkind_hbw, memkind_hbw_preferred, memkind_hbw_hugetlb, memkind_hbw_preferred_hugetlb, memkind_hbw_gbtlb memkind_hbw_preferred_gbtlb, memkind_gbtlb)");
|
||||
|
||||
(void) mca_base_component_var_register(&mca_mpool_memkind_component.super.mpool_version,"high_bandwidth",
|
||||
"Allocate in high bandwidth node (0-> no, 1 -> yes)",
|
||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||
OPAL_INFO_LVL_9,
|
||||
MCA_BASE_VAR_SCOPE_READONLY,
|
||||
&mca_mpool_memkind_component.hbw);
|
||||
|
||||
(void) mca_base_component_var_register(&mca_mpool_memkind_component.super.mpool_version,"page_size",
|
||||
"Allocate with different page size (4096, 2097152, 1073741824)",
|
||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||
OPAL_INFO_LVL_9,
|
||||
MCA_BASE_VAR_SCOPE_READONLY,
|
||||
&mca_mpool_memkind_component.pagesize);
|
||||
|
||||
(void) mca_base_component_var_register(&mca_mpool_memkind_component.super.mpool_version, "bind",
|
||||
"Bind allocations to specific nodes (0->preferred, 1-> bind)",
|
||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||
OPAL_INFO_LVL_9,
|
||||
MCA_BASE_VAR_SCOPE_READONLY,
|
||||
&mca_mpool_memkind_component.bind);
|
||||
|
||||
(void) mca_base_component_var_register(&mca_mpool_memkind_component.super.mpool_version,
|
||||
"verbose", "Enable verbose output for mpool memkind component",
|
||||
"default_partition", "Default memkind partition to use",
|
||||
MCA_BASE_VAR_TYPE_INT, mca_mpool_memkind_enum, 0, 0,
|
||||
OPAL_INFO_LVL_5, MCA_BASE_VAR_SCOPE_LOCAL,
|
||||
&mca_mpool_memkind_component.default_partition);
|
||||
|
||||
mca_mpool_memkind_component.priority = 10;
|
||||
(void) mca_base_component_var_register(&mca_mpool_memkind_component.super.mpool_version,
|
||||
"priority", "Default priority of the memkind component",
|
||||
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
|
||||
OPAL_INFO_LVL_9,
|
||||
MCA_BASE_VAR_SCOPE_READONLY,
|
||||
OPAL_INFO_LVL_5, MCA_BASE_VAR_SCOPE_LOCAL,
|
||||
&mca_mpool_memkind_component.priority);
|
||||
|
||||
opal_mpool_memkind_verbose = 0;
|
||||
(void) mca_base_component_var_register(&mca_mpool_memkind_component.super.mpool_version,
|
||||
"verbose", "Verbosity of the memkind mpool component",
|
||||
MCA_BASE_VAR_TYPE_INT, &mca_base_var_enum_verbose, 0, 0,
|
||||
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_LOCAL,
|
||||
&opal_mpool_memkind_verbose);
|
||||
|
||||
(void) mca_base_component_var_register(&mca_mpool_memkind_component.super.mpool_version,
|
||||
"name",
|
||||
memkind_names,
|
||||
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
|
||||
OPAL_INFO_LVL_9,
|
||||
MCA_BASE_VAR_SCOPE_READONLY,
|
||||
&mca_mpool_memkind_component.memkind_name);
|
||||
|
||||
(void) mca_base_component_var_register(&mca_mpool_memkind_component.super.mpool_version,
|
||||
"config",
|
||||
"Config file user defined hints",
|
||||
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
|
||||
OPAL_INFO_LVL_9,
|
||||
MCA_BASE_VAR_SCOPE_READONLY,
|
||||
&mca_mpool_memkind_component.memkind_file);
|
||||
|
||||
|
||||
opal_output(mca_mpool_memkind_component.verbose,
|
||||
"mca_mpool_memkind_register: Allocating with hbw: %d, pagesize: %d",
|
||||
mca_mpool_memkind_component.hbw, mca_mpool_memkind_component.pagesize);
|
||||
|
||||
/*Setting the appropriate based on mca parameters
|
||||
default allocates with 4K pages on high bandwidth memory on preferred mode.
|
||||
For more information about the kinds, (refer to the manpage of memkind)
|
||||
www.github.com/memkind
|
||||
*/
|
||||
if (!mca_mpool_memkind_component.hbw) {
|
||||
switch (mca_mpool_memkind_component.pagesize) {
|
||||
case 4096:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_DEFAULT;
|
||||
break;
|
||||
case 2097152:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_HUGETLB;
|
||||
break;
|
||||
case 1073741824:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_GBTLB;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (1 == mca_mpool_memkind_component.hbw){
|
||||
switch(mca_mpool_memkind_component.pagesize) {
|
||||
case 4096:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_HBW;
|
||||
break;
|
||||
case 2097152:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_HBW_HUGETLB;
|
||||
break;
|
||||
case 1073741824:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_HBW_GBTLB;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
switch (mca_mpool_memkind_component.pagesize) {
|
||||
case 4096:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_HBW_PREFERRED;
|
||||
break;
|
||||
case 2097152:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_HBW_PREFERRED_HUGETLB;
|
||||
break;
|
||||
case 1073741824:
|
||||
mca_mpool_memkind_component.kind = MEMKIND_HBW_PREFERRED_GBTLB;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(NULL != memkind_names){
|
||||
free (memkind_names);
|
||||
memkind_names = NULL;
|
||||
}
|
||||
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* component open/close/init function
|
||||
*/
|
||||
static int mca_mpool_memkind_open(void)
|
||||
static int mca_mpool_memkind_open (void)
|
||||
{
|
||||
memkind_t default_kind;
|
||||
int rc;
|
||||
|
||||
if (opal_mpool_memkind_verbose != 0) {
|
||||
mca_mpool_memkind_component.verbose = opal_output_open(NULL);
|
||||
mca_mpool_memkind_component.output = opal_output_open(NULL);
|
||||
} else {
|
||||
mca_mpool_memkind_component.output = -1;
|
||||
}
|
||||
else {
|
||||
mca_mpool_memkind_component.verbose = -1;
|
||||
|
||||
rc = memkind_get_kind_by_partition (mca_mpool_memkind_component.default_partition,
|
||||
&default_kind);
|
||||
if (0 != rc) {
|
||||
return OPAL_ERR_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
if (memkind_check_available (default_kind)) {
|
||||
const char *kind_string;
|
||||
|
||||
mca_mpool_memkind_enum->string_from_value (mca_mpool_memkind_enum,
|
||||
mca_mpool_memkind_component.default_partition,
|
||||
&kind_string);
|
||||
opal_output_verbose (MCA_BASE_VERBOSE_WARN, mca_mpool_memkind_component.output,
|
||||
"default kind %s not available", kind_string);
|
||||
return OPAL_ERR_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
for (int i = 0 ; i < MEMKIND_NUM_BASE_KIND ; ++i) {
|
||||
mca_mpool_memkind_module_init (mca_mpool_memkind_component.modules + i, i);
|
||||
}
|
||||
|
||||
return OPAL_SUCCESS;
|
||||
@ -224,33 +167,100 @@ static int mca_mpool_memkind_open(void)
|
||||
|
||||
static int mca_mpool_memkind_close(void)
|
||||
{
|
||||
opal_output_close (mca_mpool_memkind_component.output);
|
||||
mca_mpool_memkind_component.output = -1;
|
||||
|
||||
if (mca_mpool_memkind_enum) {
|
||||
OBJ_RELEASE(mca_mpool_memkind_enum);
|
||||
mca_mpool_memkind_enum = NULL;
|
||||
}
|
||||
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
|
||||
static mca_mpool_base_module_t*
|
||||
mca_mpool_memkind_init(struct mca_mpool_base_resources_t* resources)
|
||||
static int mca_mpool_memkind_query (const char *hints, int *priority_out,
|
||||
mca_mpool_base_module_t **module)
|
||||
{
|
||||
mca_mpool_memkind_module_t* mpool_module;
|
||||
mca_mpool_base_module_t* ret_val;
|
||||
int my_priority = mca_mpool_memkind_component.priority;
|
||||
char **hint_array, *partition_name;
|
||||
int partition = -1, rc;
|
||||
|
||||
/*Check if the high bandwidth node is available ?*/
|
||||
if (!memkind_check_available(MEMKIND_HBW)) {
|
||||
opal_output(mca_mpool_memkind_component.verbose,
|
||||
"mca_mpool_memkind_init: High bandwidth node not available");
|
||||
ret_val = NULL;
|
||||
}
|
||||
else {
|
||||
mpool_module =
|
||||
(mca_mpool_memkind_module_t*)malloc(sizeof(mca_mpool_memkind_module_t));
|
||||
mca_mpool_memkind_module_init(mpool_module);
|
||||
|
||||
mpool_module->alloc_size = resources->size;
|
||||
opal_output(mca_mpool_memkind_component.verbose,
|
||||
"mca_mpool_memkind_init: allocation size requested: (%ld)",
|
||||
mpool_module->alloc_size);
|
||||
|
||||
ret_val = &mpool_module->super;
|
||||
if (module) {
|
||||
*module = &mca_mpool_memkind_component.modules[mca_mpool_memkind_component.default_partition].super;
|
||||
}
|
||||
|
||||
return ret_val;
|
||||
if (NULL == hints) {
|
||||
if (priority_out) {
|
||||
*priority_out = my_priority;
|
||||
}
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
|
||||
hint_array = opal_argv_split (hints, ',');
|
||||
if (NULL == hint_array) {
|
||||
if (priority_out) {
|
||||
*priority_out = my_priority;
|
||||
}
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
|
||||
for (int i = 0 ; hint_array[i] ; ++i) {
|
||||
char *tmp, *key, *value;
|
||||
|
||||
key = hint_array[i];
|
||||
tmp = strchr (key, '=');
|
||||
if (tmp) {
|
||||
*tmp = '\0';
|
||||
value = tmp + 1;
|
||||
}
|
||||
|
||||
if (0 == strcasecmp (key, "mpool")) {
|
||||
if (0 == strcasecmp (value, "memkind")) {
|
||||
/* specifically selected */
|
||||
|
||||
my_priority = 100;
|
||||
} else {
|
||||
if (priority_out) {
|
||||
*priority_out = 0;
|
||||
}
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
} else if (0 == strcasecmp (key, "partition")) {
|
||||
rc = mca_mpool_memkind_enum->value_from_string (mca_mpool_memkind_enum,
|
||||
value, &partition);
|
||||
if (OPAL_SUCCESS != rc) {
|
||||
opal_output_verbose (MCA_BASE_VERBOSE_WARN, mca_mpool_memkind_component.output,
|
||||
"invalid partition %s specified", value);
|
||||
}
|
||||
|
||||
partition_name = value;
|
||||
}
|
||||
}
|
||||
|
||||
if (-1 != partition) {
|
||||
memkind_t kind;
|
||||
|
||||
my_priority = 0;
|
||||
|
||||
if (!memkind_get_kind_by_partition (partition, &kind)) {
|
||||
if (memkind_check_available (kind)) {
|
||||
opal_output_verbose (MCA_BASE_VERBOSE_WARN, mca_mpool_memkind_component.output,
|
||||
"kind %s not available", partition_name);
|
||||
} else {
|
||||
my_priority = 100;
|
||||
}
|
||||
}
|
||||
|
||||
if (module) {
|
||||
*module = &mca_mpool_memkind_component.modules[partition].super;
|
||||
}
|
||||
}
|
||||
|
||||
opal_argv_free (hint_array);
|
||||
|
||||
if (priority_out) {
|
||||
*priority_out = my_priority;
|
||||
}
|
||||
|
||||
return OPAL_SUCCESS;
|
||||
}
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
|
||||
/*
|
||||
* Copyright (c) 2004-2011 The Trustees of Indiana University and Indiana
|
||||
* University Research and Technology
|
||||
@ -10,8 +11,8 @@
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2009-2012 Cisco Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2011-2012 Los Alamos National Security, LLC.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2011-2015 Los Alamos National Security, LLC. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2011-2014 NVIDIA Corporation. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
@ -28,22 +29,23 @@
|
||||
#endif
|
||||
#include "opal/mca/mpool/base/base.h"
|
||||
|
||||
|
||||
size_t partition_page_sizes[MEMKIND_NUM_BASE_KIND] = {
|
||||
4096, 4069, 2097152, 4096, 2097152, 2097152,
|
||||
1073741824, 1073741824, 1073741824, 4096, 4096,
|
||||
};
|
||||
|
||||
/*
|
||||
* Initializes the mpool module.
|
||||
*/
|
||||
void mca_mpool_memkind_module_init(mca_mpool_memkind_module_t* mpool)
|
||||
void mca_mpool_memkind_module_init(mca_mpool_memkind_module_t *mpool, int partition)
|
||||
{
|
||||
mpool->super.mpool_component = &mca_mpool_memkind_component.super;
|
||||
mpool->super.mpool_alloc = mca_mpool_memkind_alloc;
|
||||
mpool->super.mpool_realloc = mca_mpool_memkind_realloc;
|
||||
mpool->super.mpool_free = mca_mpool_memkind_free;
|
||||
mpool->super.mpool_find = NULL;
|
||||
mpool->super.mpool_register = NULL;
|
||||
mpool->super.mpool_deregister = NULL;
|
||||
mpool->super.mpool_release_memory = NULL;
|
||||
mpool->super.flags = 0;
|
||||
mpool->super.flags = MCA_MPOOL_FLAGS_MPI_ALLOC_MEM;
|
||||
memkind_get_kind_by_partition (partition, &mpool->kind);
|
||||
mpool->page_size = partition_page_sizes[partition];
|
||||
}
|
||||
|
||||
|
||||
@ -51,33 +53,31 @@ void* mca_mpool_memkind_alloc(
|
||||
mca_mpool_base_module_t* mpool,
|
||||
size_t size,
|
||||
size_t align,
|
||||
uint32_t flags,
|
||||
mca_mpool_base_registration_t** registration)
|
||||
uint32_t flags)
|
||||
{
|
||||
|
||||
mca_mpool_memkind_module_t *memkind_module = (mca_mpool_memkind_module_t *) mpool;
|
||||
void *addr;
|
||||
|
||||
if(0 == align)
|
||||
align = mca_mpool_base_page_size;
|
||||
if (0 == align) {
|
||||
align = memkind_module->page_size;
|
||||
}
|
||||
|
||||
if ((errno = memkind_posix_memalign(mca_mpool_memkind_component.kind,
|
||||
&addr, align, size))!= 0){
|
||||
if ((errno = memkind_posix_memalign(memkind_module->kind, &addr, align, size))!= 0){
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return addr;
|
||||
}
|
||||
|
||||
void* mca_mpool_memkind_realloc(mca_mpool_base_module_t *mpool, void *addr,
|
||||
size_t size, mca_mpool_base_registration_t **registration)
|
||||
size_t size)
|
||||
{
|
||||
return memkind_realloc(mca_mpool_memkind_component.kind,
|
||||
addr, size);
|
||||
|
||||
mca_mpool_memkind_module_t *memkind_module = (mca_mpool_memkind_module_t *) mpool;
|
||||
return memkind_realloc (memkind_module->kind, addr, size);
|
||||
}
|
||||
|
||||
void mca_mpool_memkind_free(mca_mpool_base_module_t *mpool, void *addr,
|
||||
mca_mpool_base_registration_t *registration)
|
||||
void mca_mpool_memkind_free(mca_mpool_base_module_t *mpool, void *addr)
|
||||
{
|
||||
memkind_free(mca_mpool_memkind_component.kind,
|
||||
addr);
|
||||
mca_mpool_memkind_module_t *memkind_module = (mca_mpool_memkind_module_t *) mpool;
|
||||
memkind_free(memkind_module->kind, addr);
|
||||
}
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user