Should be a bit more efficient, and it fixes host memory fallback bugs, where host memory was incorrectly freed during re-copy. For the case where memory should get reallocated on the host, a new mem_move_to_host was added. Thanks to Jorn Visser for investigating and finding this problem. Pull Request: https://projects.blender.org/blender/blender/pulls/132912
241 lines
5.3 KiB
C++
241 lines
5.3 KiB
C++
/* SPDX-FileCopyrightText: 2011-2022 Blender Foundation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 */
|
|
|
|
#include "device/memory.h"
|
|
#include "device/device.h"
|
|
|
|
CCL_NAMESPACE_BEGIN
|
|
|
|
/* Device Memory */
|
|
|
|
device_memory::device_memory(Device *device, const char *_name, MemoryType type)
|
|
: data_type(device_type_traits<uchar>::data_type),
|
|
data_elements(device_type_traits<uchar>::num_elements),
|
|
data_size(0),
|
|
device_size(0),
|
|
data_width(0),
|
|
data_height(0),
|
|
data_depth(0),
|
|
type(type),
|
|
name_storage(_name),
|
|
device(device),
|
|
device_pointer(0),
|
|
host_pointer(nullptr),
|
|
shared_pointer(nullptr),
|
|
shared_counter(0),
|
|
original_device_ptr(0),
|
|
original_device_size(0),
|
|
original_device(nullptr),
|
|
need_realloc_(false),
|
|
modified(false)
|
|
{
|
|
name = name_storage.c_str();
|
|
}
|
|
|
|
device_memory::~device_memory()
|
|
{
|
|
assert(shared_pointer == nullptr);
|
|
assert(shared_counter == 0);
|
|
}
|
|
|
|
void *device_memory::host_alloc(const size_t size)
|
|
{
|
|
if (!size) {
|
|
return nullptr;
|
|
}
|
|
|
|
void *ptr = util_aligned_malloc(size, MIN_ALIGNMENT_CPU_DATA_TYPES);
|
|
|
|
if (ptr == nullptr) {
|
|
throw std::bad_alloc();
|
|
}
|
|
|
|
return ptr;
|
|
}
|
|
|
|
void device_memory::host_free()
|
|
{
|
|
if (host_pointer) {
|
|
util_aligned_free(host_pointer, memory_size());
|
|
host_pointer = nullptr;
|
|
}
|
|
}
|
|
|
|
void device_memory::device_alloc()
|
|
{
|
|
assert(!device_pointer && type != MEM_TEXTURE && type != MEM_GLOBAL);
|
|
device->mem_alloc(*this);
|
|
}
|
|
|
|
void device_memory::device_free()
|
|
{
|
|
if (device_pointer) {
|
|
device->mem_free(*this);
|
|
}
|
|
}
|
|
|
|
void device_memory::device_copy_to()
|
|
{
|
|
if (host_pointer) {
|
|
device->mem_copy_to(*this);
|
|
}
|
|
}
|
|
|
|
void device_memory::device_move_to_host()
|
|
{
|
|
if (host_pointer) {
|
|
device->mem_move_to_host(*this);
|
|
}
|
|
}
|
|
|
|
void device_memory::device_copy_from(const size_t y, const size_t w, size_t h, const size_t elem)
|
|
{
|
|
assert(type != MEM_TEXTURE && type != MEM_READ_ONLY && type != MEM_GLOBAL);
|
|
device->mem_copy_from(*this, y, w, h, elem);
|
|
}
|
|
|
|
void device_memory::device_zero()
|
|
{
|
|
if (data_size) {
|
|
device->mem_zero(*this);
|
|
}
|
|
}
|
|
|
|
bool device_memory::device_is_cpu()
|
|
{
|
|
return (device->info.type == DEVICE_CPU);
|
|
}
|
|
|
|
void device_memory::swap_device(Device *new_device,
|
|
const size_t new_device_size,
|
|
device_ptr new_device_ptr)
|
|
{
|
|
original_device = device;
|
|
original_device_size = device_size;
|
|
original_device_ptr = device_pointer;
|
|
|
|
device = new_device;
|
|
device_size = new_device_size;
|
|
device_pointer = new_device_ptr;
|
|
}
|
|
|
|
void device_memory::restore_device()
|
|
{
|
|
device = original_device;
|
|
device_size = original_device_size;
|
|
device_pointer = original_device_ptr;
|
|
}
|
|
|
|
bool device_memory::is_resident(Device *sub_device) const
|
|
{
|
|
return device->is_resident(device_pointer, sub_device);
|
|
}
|
|
|
|
/* Device Sub `ptr`. */
|
|
|
|
device_sub_ptr::device_sub_ptr(device_memory &mem, const size_t offset, const size_t size)
|
|
: device(mem.device)
|
|
{
|
|
ptr = device->mem_alloc_sub_ptr(mem, offset, size);
|
|
}
|
|
|
|
device_sub_ptr::~device_sub_ptr()
|
|
{
|
|
device->mem_free_sub_ptr(ptr);
|
|
}
|
|
|
|
/* Device Texture */
|
|
|
|
device_texture::device_texture(Device *device,
|
|
const char *name,
|
|
const uint slot,
|
|
ImageDataType image_data_type,
|
|
InterpolationType interpolation,
|
|
ExtensionType extension)
|
|
: device_memory(device, name, MEM_TEXTURE), slot(slot)
|
|
{
|
|
switch (image_data_type) {
|
|
case IMAGE_DATA_TYPE_FLOAT4:
|
|
data_type = TYPE_FLOAT;
|
|
data_elements = 4;
|
|
break;
|
|
case IMAGE_DATA_TYPE_FLOAT:
|
|
data_type = TYPE_FLOAT;
|
|
data_elements = 1;
|
|
break;
|
|
case IMAGE_DATA_TYPE_BYTE4:
|
|
data_type = TYPE_UCHAR;
|
|
data_elements = 4;
|
|
break;
|
|
case IMAGE_DATA_TYPE_BYTE:
|
|
case IMAGE_DATA_TYPE_NANOVDB_FLOAT:
|
|
case IMAGE_DATA_TYPE_NANOVDB_FLOAT3:
|
|
case IMAGE_DATA_TYPE_NANOVDB_FPN:
|
|
case IMAGE_DATA_TYPE_NANOVDB_FP16:
|
|
data_type = TYPE_UCHAR;
|
|
data_elements = 1;
|
|
break;
|
|
case IMAGE_DATA_TYPE_HALF4:
|
|
data_type = TYPE_HALF;
|
|
data_elements = 4;
|
|
break;
|
|
case IMAGE_DATA_TYPE_HALF:
|
|
data_type = TYPE_HALF;
|
|
data_elements = 1;
|
|
break;
|
|
case IMAGE_DATA_TYPE_USHORT4:
|
|
data_type = TYPE_UINT16;
|
|
data_elements = 4;
|
|
break;
|
|
case IMAGE_DATA_TYPE_USHORT:
|
|
data_type = TYPE_UINT16;
|
|
data_elements = 1;
|
|
break;
|
|
case IMAGE_DATA_NUM_TYPES:
|
|
assert(0);
|
|
return;
|
|
}
|
|
|
|
info.data_type = image_data_type;
|
|
info.interpolation = interpolation;
|
|
info.extension = extension;
|
|
}
|
|
|
|
device_texture::~device_texture()
|
|
{
|
|
device_free();
|
|
host_free();
|
|
}
|
|
|
|
/* Host memory allocation. */
|
|
void *device_texture::alloc(const size_t width, const size_t height, const size_t depth)
|
|
{
|
|
const size_t new_size = size(width, height, depth);
|
|
|
|
if (new_size != data_size) {
|
|
device_free();
|
|
host_free();
|
|
host_pointer = host_alloc(data_elements * datatype_size(data_type) * new_size);
|
|
assert(device_pointer == 0);
|
|
}
|
|
|
|
data_size = new_size;
|
|
data_width = width;
|
|
data_height = height;
|
|
data_depth = depth;
|
|
|
|
info.width = width;
|
|
info.height = height;
|
|
info.depth = depth;
|
|
|
|
return host_pointer;
|
|
}
|
|
|
|
void device_texture::copy_to_device()
|
|
{
|
|
device_copy_to();
|
|
}
|
|
|
|
CCL_NAMESPACE_END
|