gallium,clover: add OpenCL interoperability support for CL events
v2: - move interop.cpp to clover/api - change intptr_t to void* in the interface - add a virtual function fence() to simplify some code v3: - use bool in the interface v4: - enclose the last two interop functions in try..catch Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
parent
7070b0dd66
commit
952b5e84db
|
@ -0,0 +1,40 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2015 Advanced Micro Devices, Inc.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
||||
* IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR
|
||||
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef OPENCL_INTEROP_H
|
||||
#define OPENCL_INTEROP_H
|
||||
|
||||
/* dlsym these without the "_t" suffix. You should get the correct symbols
|
||||
* if the OpenCL driver is loaded.
|
||||
*/
|
||||
|
||||
typedef bool (*opencl_dri_event_add_ref_t)(void *cl_event);
|
||||
typedef bool (*opencl_dri_event_release_t)(void *cl_event);
|
||||
typedef bool (*opencl_dri_event_wait_t)(void *cl_event, uint64_t timeout);
|
||||
typedef struct pipe_fence_handle *(*opencl_dri_event_get_fence_t)(void *cl_event);
|
||||
|
||||
#endif /* OPENCL_INTEROP_H */
|
|
@ -4,6 +4,7 @@ CPP_SOURCES := \
|
|||
api/dispatch.cpp \
|
||||
api/dispatch.hpp \
|
||||
api/event.cpp \
|
||||
api/interop.cpp \
|
||||
api/kernel.cpp \
|
||||
api/memory.cpp \
|
||||
api/platform.cpp \
|
||||
|
|
|
@ -0,0 +1,64 @@
|
|||
//
|
||||
// Copyright 2015 Advanced Micro Devices, Inc.
|
||||
// All Rights Reserved.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a
|
||||
// copy of this software and associated documentation files (the "Software"),
|
||||
// to deal in the Software without restriction, including without limitation
|
||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
// and/or sell copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in
|
||||
// all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
#include "core/event.hpp"
|
||||
#include "api/util.hpp"
|
||||
|
||||
using namespace clover;
|
||||
|
||||
extern "C" {
|
||||
|
||||
PUBLIC bool
|
||||
opencl_dri_event_add_ref(cl_event event)
|
||||
{
|
||||
return clRetainEvent(event) == CL_SUCCESS;
|
||||
}
|
||||
|
||||
PUBLIC bool
|
||||
opencl_dri_event_release(cl_event event)
|
||||
{
|
||||
return clReleaseEvent(event) == CL_SUCCESS;
|
||||
}
|
||||
|
||||
PUBLIC bool
|
||||
opencl_dri_event_wait(cl_event event, uint64_t timeout) try {
|
||||
if (!timeout) {
|
||||
return obj(event).status() == CL_COMPLETE;
|
||||
}
|
||||
|
||||
obj(event).wait();
|
||||
return true;
|
||||
|
||||
} catch (error &) {
|
||||
return false;
|
||||
}
|
||||
|
||||
PUBLIC struct pipe_fence_handle *
|
||||
opencl_dri_event_get_fence(cl_event event) try {
|
||||
return obj(event).fence();
|
||||
|
||||
} catch (error &) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
}
|
|
@ -70,6 +70,10 @@ namespace clover {
|
|||
virtual cl_command_type command() const = 0;
|
||||
virtual void wait() const = 0;
|
||||
|
||||
virtual struct pipe_fence_handle *fence() const {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const intrusive_ref<clover::context> context;
|
||||
|
||||
protected:
|
||||
|
@ -116,6 +120,10 @@ namespace clover {
|
|||
|
||||
friend class command_queue;
|
||||
|
||||
virtual struct pipe_fence_handle *fence() const {
|
||||
return _fence;
|
||||
}
|
||||
|
||||
private:
|
||||
virtual void fence(pipe_fence_handle *fence);
|
||||
action profile(command_queue &q, const action &action) const;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
global:
|
||||
cl*;
|
||||
opencl_dri_*;
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue