-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
Cuda interop #49
Closed
Closed
Cuda interop #49
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3a02134
working cuda vulkan interop example
atkurtul c90032d
proper cleanup
atkurtul 6d0a577
add cuda to vulkan example
atkurtul 867b435
refactor
atkurtul 831e61e
semaphore interop
atkurtul 1396829
update
atkurtul d7fb50e
texture sharing
atkurtul 682a8c1
update to latest changes
atkurtul File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
|
||
include(common RESULT_VARIABLE RES) | ||
if(NOT RES) | ||
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory") | ||
endif() | ||
|
||
set(CUDA_INTEROP_EXAMPLE_INCLUDE_DIRS | ||
${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES} | ||
) | ||
|
||
nbl_create_executable_project( | ||
"" | ||
"" | ||
"${CUDA_INTEROP_EXAMPLE_INCLUDE_DIRS}" | ||
"" | ||
"${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}" | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,311 @@ | ||
// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O. | ||
// This file is part of the "Nabla Engine". | ||
// For conditions of distribution and use, see copyright notice in nabla.h | ||
|
||
#define _NBL_STATIC_LIB_ | ||
#include <nabla.h> | ||
|
||
#include "nbl/video/CCUDAHandler.h" | ||
#include "nbl/video/CCUDASharedMemory.h" | ||
#include "nbl/video/CCUDASharedSemaphore.h" | ||
|
||
#include "../common/CommonAPI.h" | ||
|
||
/** | ||
This example just shows a screen which clears to red, | ||
nothing fancy, just to show that Irrlicht links fine | ||
**/ | ||
using namespace nbl; | ||
|
||
|
||
/* | ||
The start of the main function starts like in most other example. We ask the | ||
user for the desired renderer and start it up. | ||
*/ | ||
|
||
#define ASSERT_SUCCESS(expr) \ | ||
if (auto re = expr; CUDA_SUCCESS != re) { \ | ||
const char* name = 0, *str = 0; \ | ||
cu.pcuGetErrorName(re, &name); \ | ||
cu.pcuGetErrorString(re, &str); \ | ||
printf("%s:%d %s:\n\t%s\n", __FILE__, __LINE__, name, str); \ | ||
abort(); \ | ||
} | ||
|
||
#define ASSERT_SUCCESS_NV(expr) \ | ||
if (auto re = expr; NVRTC_SUCCESS != re) { \ | ||
const char* str = cudaHandler->getNVRTCFunctionTable().pnvrtcGetErrorString(re); \ | ||
printf("%s:%d %s\n", __FILE__, __LINE__, str); \ | ||
abort(); \ | ||
} | ||
|
||
constexpr uint32_t gridDim[3] = { 4096,1,1 }; | ||
constexpr uint32_t blockDim[3] = { 1024,1,1 }; | ||
size_t numElements = gridDim[0] * blockDim[0]; | ||
size_t size = sizeof(float) * numElements; | ||
|
||
struct CUDA2VK | ||
{ | ||
core::smart_refctd_ptr<video::CCUDAHandler> cudaHandler; | ||
core::smart_refctd_ptr<video::CCUDADevice> cudaDevice; | ||
video::IUtilities* util; | ||
video::ILogicalDevice* logicalDevice; | ||
nbl::video::IGPUQueue** queues; | ||
|
||
std::array<core::smart_refctd_ptr<asset::ICPUBuffer>, 2> cpubuffers; | ||
std::array<core::smart_refctd_ptr<video::CCUDASharedMemory>, 3> mem = {}; | ||
core::smart_refctd_ptr<video::CCUDASharedSemaphore> cusema; | ||
|
||
core::smart_refctd_ptr<video::IGPUBuffer> importedbuf, stagingbuf, stagingbuf2; | ||
core::smart_refctd_ptr<video::IGPUImage> importedimg; | ||
core::smart_refctd_ptr<video::IGPUSemaphore> sema; | ||
core::smart_refctd_ptr<video::IGPUCommandPool> commandPool; | ||
core::smart_refctd_ptr<video::IGPUCommandBuffer> cmd; | ||
core::smart_refctd_ptr<video::IGPUFence> fence; | ||
|
||
CUDA2VK( | ||
core::smart_refctd_ptr<video::CCUDAHandler> _cudaHandler, | ||
core::smart_refctd_ptr<video::CCUDADevice> _cudaDevice, | ||
video::IUtilities* _util, | ||
video::ILogicalDevice* _logicalDevice, | ||
video::IGPUQueue** _queues) | ||
: cudaHandler(std::move(_cudaHandler)) | ||
, cudaDevice(std::move(_cudaDevice)) | ||
, util(_util) | ||
, logicalDevice(_logicalDevice) | ||
, queues(_queues) | ||
{ | ||
createResources(); | ||
} | ||
|
||
void createResources() | ||
{ | ||
auto& cu = cudaHandler->getCUDAFunctionTable(); | ||
|
||
for (auto& buf : cpubuffers) | ||
buf = core::make_smart_refctd_ptr<asset::ICPUBuffer>(size); | ||
|
||
for (auto j = 0; j < 2; j++) | ||
for (auto i = 0; i < numElements; i++) | ||
reinterpret_cast<float*>(cpubuffers[j]->getPointer())[i] = rand() / float(RAND_MAX); | ||
|
||
sema = logicalDevice->createSemaphore({ .externalHandleTypes = video::IGPUSemaphore::EHT_OPAQUE_WIN32 }); | ||
ASSERT_SUCCESS(cudaDevice->importGPUSemaphore(&cusema, sema.get())); | ||
|
||
ASSERT_SUCCESS(cudaDevice->createSharedMemory(&mem[0], { .size = size, .alignment = sizeof(float), .location = CU_MEM_LOCATION_TYPE_DEVICE })); | ||
ASSERT_SUCCESS(cudaDevice->createSharedMemory(&mem[1], { .size = size, .alignment = sizeof(float), .location = CU_MEM_LOCATION_TYPE_DEVICE })); | ||
ASSERT_SUCCESS(cudaDevice->createSharedMemory(&mem[2], { .size = size, .alignment = sizeof(float), .location = CU_MEM_LOCATION_TYPE_DEVICE })); | ||
|
||
{ | ||
auto devmemory = mem[2]->exportAsMemory(logicalDevice); | ||
assert(devmemory); | ||
video::IGPUBuffer::SCreationParams params = {}; | ||
params.size = devmemory->getAllocationSize(); | ||
params.usage = asset::IBuffer::EUF_STORAGE_BUFFER_BIT | asset::IBuffer::EUF_TRANSFER_SRC_BIT; | ||
params.externalHandleTypes = video::CCUDADevice::EXTERNAL_MEMORY_HANDLE_TYPE; | ||
importedbuf = logicalDevice->createBuffer(std::move(params)); | ||
assert(importedbuf); | ||
bool re = logicalDevice->bindBufferMemory(video::ILogicalDevice::SBindBufferMemoryInfo{.buffer = importedbuf.get(), .memory = devmemory.get() }); | ||
assert(re); | ||
} | ||
|
||
{ | ||
|
||
video::IGPUImage::SCreationParams params = {}; | ||
params.type = video::IGPUImage::ET_2D; | ||
params.samples = video::IGPUImage::ESCF_1_BIT; | ||
params.format = asset::EF_R32_SFLOAT; | ||
params.extent = { gridDim[0], blockDim[0], 1 }; | ||
params.mipLevels = 1; | ||
params.arrayLayers = 1; | ||
params.usage = video::IGPUImage::EUF_STORAGE_BIT | video::IGPUImage::EUF_TRANSFER_SRC_BIT; | ||
params.externalHandleTypes = video::CCUDADevice::EXTERNAL_MEMORY_HANDLE_TYPE; | ||
params.tiling = video::IGPUImage::ET_LINEAR; | ||
importedimg = mem[2]->exportAsImage(logicalDevice, std::move(params)); | ||
assert(importedimg); | ||
} | ||
|
||
fence = logicalDevice->createFence(video::IGPUFence::ECF_UNSIGNALED); | ||
commandPool = logicalDevice->createCommandPool(queues[CommonAPI::InitOutput::EQT_COMPUTE]->getFamilyIndex(), {}); | ||
bool re = logicalDevice->createCommandBuffers(commandPool.get(), video::IGPUCommandBuffer::EL_PRIMARY, 1, &cmd); | ||
assert(re); | ||
|
||
auto createStaging = [logicalDevice=logicalDevice]() | ||
{ | ||
auto buf = logicalDevice->createBuffer({ {.size = size, .usage = asset::IBuffer::EUF_TRANSFER_DST_BIT} }); | ||
auto req = buf->getMemoryReqs(); | ||
req.memoryTypeBits &= logicalDevice->getPhysicalDevice()->getDownStreamingMemoryTypeBits(); | ||
auto allocation = logicalDevice->allocate(req, buf.get()); | ||
assert(allocation.memory && allocation.offset != video::ILogicalDevice::InvalidMemoryOffset); | ||
assert(buf->getBoundMemory()->isMappable()); | ||
logicalDevice->mapMemory(video::IDeviceMemoryAllocation::MappedMemoryRange(buf->getBoundMemory(), buf->getBoundMemoryOffset(), req.size), video::IDeviceMemoryAllocation::EMCAF_READ); | ||
assert(buf->getBoundMemory()->getMappedPointer()); | ||
memset(buf->getBoundMemory()->getMappedPointer(), 0, req.size); | ||
return buf; | ||
}; | ||
|
||
stagingbuf = createStaging(); | ||
stagingbuf2 = createStaging(); | ||
} | ||
|
||
void launchKernel(CUfunction kernel, CUstream stream) | ||
{ | ||
auto queue = queues[CommonAPI::InitOutput::EQT_COMPUTE]; | ||
|
||
auto& cu = cudaHandler->getCUDAFunctionTable(); | ||
// Launch kernel | ||
{ | ||
CUdeviceptr ptrs[] = { | ||
mem[0]->getDeviceptr(), | ||
mem[1]->getDeviceptr(), | ||
mem[2]->getDeviceptr(), | ||
}; | ||
void* parameters[] = { &ptrs[0], &ptrs[1], &ptrs[2], &numElements }; | ||
ASSERT_SUCCESS(cu.pcuMemcpyHtoDAsync_v2(ptrs[0], cpubuffers[0]->getPointer(), size, stream)); | ||
ASSERT_SUCCESS(cu.pcuMemcpyHtoDAsync_v2(ptrs[1], cpubuffers[1]->getPointer(), size, stream)); | ||
ASSERT_SUCCESS(cu.pcuLaunchKernel(kernel, gridDim[0], gridDim[1], gridDim[2], blockDim[0], blockDim[1], blockDim[2], 0, stream, parameters, nullptr)); | ||
CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS signalParams = {}; | ||
auto semaphore = cusema->getInternalObject(); | ||
ASSERT_SUCCESS(cu.pcuSignalExternalSemaphoresAsync(&semaphore, &signalParams, 1, stream)); // Signal the imported semaphore | ||
} | ||
|
||
// After the cuda kernel has signalled our exported vk semaphore, we will download the results through the buffer imported from CUDA | ||
{ | ||
video::IGPUSemaphore* waitSemaphores[] = { sema.get() }; | ||
asset::E_PIPELINE_STAGE_FLAGS waitStages[] = { asset::EPSF_ALL_COMMANDS_BIT }; | ||
video::IGPUCommandBuffer* cmdBuffers[] = { cmd.get() }; | ||
|
||
video::IGPUCommandBuffer::SBufferMemoryBarrier bufBarrier = { | ||
.barrier = { .dstAccessMask = asset::E_ACCESS_FLAGS::EAF_ALL_ACCESSES_BIT_DEVSH }, | ||
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_EXTERNAL_KHR, | ||
.dstQueueFamilyIndex = queue->getFamilyIndex(), | ||
.buffer = importedbuf, | ||
.offset = 0, | ||
.size = size, | ||
}; | ||
|
||
bool re = true; | ||
re &= cmd->begin(video::IGPUCommandBuffer::EU_ONE_TIME_SUBMIT_BIT); | ||
/*Acquire?*/ | ||
re &= cmd->pipelineBarrier(asset::EPSF_ALL_COMMANDS_BIT, asset::EPSF_ALL_COMMANDS_BIT, asset::EDF_NONE, 0u, nullptr, 1u, &bufBarrier, 0u, nullptr); // Ownership transfer? | ||
asset::SBufferCopy region = { .size = size }; | ||
re &= cmd->copyBuffer(importedbuf.get(), stagingbuf.get(), 1, ®ion); | ||
|
||
video::IGPUCommandBuffer::SImageMemoryBarrier imgBarrier = { | ||
.barrier = { .dstAccessMask = asset::E_ACCESS_FLAGS::EAF_ALL_ACCESSES_BIT_DEVSH }, | ||
.oldLayout = asset::IImage::EL_PREINITIALIZED, | ||
.newLayout = asset::IImage::EL_TRANSFER_SRC_OPTIMAL, | ||
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_EXTERNAL_KHR, | ||
.dstQueueFamilyIndex = queue->getFamilyIndex(), | ||
.image = importedimg, | ||
.subresourceRange = { | ||
.aspectMask = asset::IImage::EAF_COLOR_BIT, | ||
.levelCount = 1u, | ||
.layerCount = 1u, | ||
} | ||
}; | ||
|
||
re &= cmd->pipelineBarrier(asset::EPSF_ALL_COMMANDS_BIT, asset::EPSF_ALL_COMMANDS_BIT, asset::EDF_NONE, 0u, nullptr, 0u, nullptr, 1u, &imgBarrier); | ||
|
||
asset::IImage::SBufferCopy imgRegion = { | ||
.imageSubresource = { | ||
.aspectMask = imgBarrier.subresourceRange.aspectMask, | ||
.layerCount = imgBarrier.subresourceRange.layerCount, | ||
}, | ||
.imageExtent = importedimg->getCreationParameters().extent, | ||
}; | ||
|
||
re &= cmd->copyImageToBuffer(importedimg.get(), imgBarrier.newLayout, stagingbuf2.get(), 1, &imgRegion); | ||
re &= cmd->end(); | ||
|
||
video::IGPUQueue::SSubmitInfo submitInfo = { | ||
.waitSemaphoreCount = 1, | ||
.pWaitSemaphores = waitSemaphores, | ||
.pWaitDstStageMask = waitStages, | ||
.commandBufferCount = 1, | ||
.commandBuffers = cmdBuffers | ||
}; | ||
|
||
re &= queue->submit(1, &submitInfo, fence.get()); | ||
assert(re); | ||
} | ||
|
||
ASSERT_SUCCESS(cu.pcuLaunchHostFunc(stream, [](void* userData) { decltype(this)(userData)->kernelCallback(); }, this)); | ||
} | ||
|
||
void kernelCallback() | ||
{ | ||
// Make sure we are also done with the readback | ||
{ | ||
video::IGPUFence* fences[] = { fence.get() }; | ||
auto status = logicalDevice->waitForFences(1, fences, true, -1); | ||
assert(video::IGPUFence::ES_SUCCESS == status); | ||
} | ||
|
||
float* A = reinterpret_cast<float*>(cpubuffers[0]->getPointer()); | ||
float* B = reinterpret_cast<float*>(cpubuffers[1]->getPointer()); | ||
float* CBuf = reinterpret_cast<float*>(stagingbuf->getBoundMemory()->getMappedPointer()); | ||
float* CImg = reinterpret_cast<float*>(stagingbuf2->getBoundMemory()->getMappedPointer()); | ||
|
||
assert(!memcmp(CBuf, CImg, size)); | ||
|
||
for (auto i = 0; i < numElements; i++) | ||
{ | ||
assert(abs(CBuf[i] - A[i] - B[i]) < 0.01f); | ||
assert(abs(CImg[i] - A[i] - B[i]) < 0.01f); | ||
} | ||
|
||
std::cout << "Success\n"; | ||
} | ||
}; | ||
|
||
int main(int argc, char** argv) | ||
{ | ||
auto initOutput = CommonAPI::InitWithDefaultExt(CommonAPI::InitParams{ | ||
.appName = { "63.CUDAInterop" }, | ||
.apiType = video::EAT_VULKAN, | ||
.swapchainImageUsage = nbl::asset::IImage::EUF_NONE, | ||
}); | ||
|
||
auto& system = initOutput.system; | ||
auto& apiConnection = initOutput.apiConnection; | ||
auto& physicalDevice = initOutput.physicalDevice; | ||
auto& logicalDevice = initOutput.logicalDevice; | ||
auto& utilities = initOutput.utilities; | ||
auto& queues = initOutput.queues; | ||
auto& logger = initOutput.logger; | ||
|
||
assert(physicalDevice->getLimits().externalMemory); | ||
auto cudaHandler = video::CCUDAHandler::create(system.get(), core::smart_refctd_ptr<system::ILogger>(logger)); | ||
assert(cudaHandler); | ||
auto cudaDevice = cudaHandler->createDevice(core::smart_refctd_ptr_dynamic_cast<video::CVulkanConnection>(apiConnection), physicalDevice); | ||
auto& cu = cudaHandler->getCUDAFunctionTable(); | ||
|
||
core::smart_refctd_ptr<asset::ICPUBuffer> ptx; | ||
CUmodule module; | ||
CUfunction kernel; | ||
CUstream stream; | ||
|
||
{ | ||
system::ISystem::future_t<core::smart_refctd_ptr<system::IFile>> fut; | ||
system->createFile(fut, "../vectorAdd_kernel.cu", system::IFileBase::ECF_READ); | ||
auto [ptx_, res] = cudaHandler->compileDirectlyToPTX(fut.copy().get(), cudaDevice->geDefaultCompileOptions()); | ||
Comment on lines
+290
to
+292
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @AnastaZIuk can you show @atkurtul how to declare that file as a builtin resource, I think we should use them whenever possible going foward |
||
ASSERT_SUCCESS_NV(res); | ||
ptx = std::move(ptx_); | ||
} | ||
|
||
ASSERT_SUCCESS(cu.pcuModuleLoadDataEx(&module, ptx->getPointer(), 0u, nullptr, nullptr)); | ||
ASSERT_SUCCESS(cu.pcuModuleGetFunction(&kernel, module, "vectorAdd")); | ||
ASSERT_SUCCESS(cu.pcuStreamCreate(&stream, CU_STREAM_NON_BLOCKING)); | ||
|
||
{ | ||
auto cuda2vk = CUDA2VK(cudaHandler, cudaDevice, utilities.get(), logicalDevice.get(), queues.data()); | ||
cuda2vk.launchKernel(kernel, stream); | ||
ASSERT_SUCCESS(cu.pcuStreamSynchronize(stream)); | ||
} | ||
|
||
ASSERT_SUCCESS(cu.pcuModuleUnload(module)); | ||
ASSERT_SUCCESS(cu.pcuStreamDestroy_v2(stream)); | ||
|
||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import org.DevshGraphicsProgramming.Agent | ||
import org.DevshGraphicsProgramming.BuilderInfo | ||
import org.DevshGraphicsProgramming.IBuilder | ||
|
||
class CCUDAInteropBuilder extends IBuilder | ||
{ | ||
public CCUDAInteropBuilder(Agent _agent, _info) | ||
{ | ||
super(_agent, _info) | ||
} | ||
|
||
@Override | ||
public boolean prepare(Map axisMapping) | ||
{ | ||
return true | ||
} | ||
|
||
@Override | ||
public boolean build(Map axisMapping) | ||
{ | ||
IBuilder.CONFIGURATION config = axisMapping.get("CONFIGURATION") | ||
IBuilder.BUILD_TYPE buildType = axisMapping.get("BUILD_TYPE") | ||
|
||
def nameOfBuildDirectory = getNameOfBuildDirectory(buildType) | ||
def nameOfConfig = getNameOfConfig(config) | ||
|
||
agent.execute("cmake --build ${info.rootProjectPath}/${nameOfBuildDirectory}/${info.targetProjectPathRelativeToRoot} --target ${info.targetBaseName} --config ${nameOfConfig} -j12 -v") | ||
|
||
return true | ||
} | ||
|
||
@Override | ||
public boolean test(Map axisMapping) | ||
{ | ||
return true | ||
} | ||
|
||
@Override | ||
public boolean install(Map axisMapping) | ||
{ | ||
return true | ||
} | ||
} | ||
|
||
def create(Agent _agent, _info) | ||
{ | ||
return new CCUDAInteropBuilder(_agent, _info) | ||
} | ||
|
||
return this |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
functions or lambdas would have been better practice, this is kinda meh when you're stepping with a debugger.