X Tutup
Skip to content

Commit 2c01c57

Browse files
ochafikochafik
committed
JavaCL: only use synchronized bindings when there's an OpenCL 1.0 platform ; optimize usage of CLEvent (less typed pointers, more raw pointers)
1 parent 527a461 commit 2c01c57

File tree

19 files changed

+593
-305
lines changed

19 files changed

+593
-305
lines changed

‎Core/src/main/java/com/nativelibs4java/opencl/CLAbstractEntity.java‎

Lines changed: 63 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,47 @@
3333
import static org.bridj.Pointer.*;
3434

3535
abstract class CLAbstractEntity<T extends TypedPointer> {
36-
protected T entity;
36+
private long entityPeer;
37+
private T entity;
3738
private final boolean nullable;
3839

3940
CLAbstractEntity(T entity) {
4041
this(entity, false);
41-
42+
}
43+
CLAbstractEntity(long entityPeer) {
44+
this(entityPeer, false);
4245
}
4346
CLAbstractEntity(T entity, boolean nullable) {
44-
if (!nullable && entity == null) {
45-
throw new IllegalArgumentException("Null OpenCL " + getClass().getSimpleName() + " !");
46-
}
47+
this(entity, getPeer(entity), nullable);
48+
}
49+
50+
CLAbstractEntity(long entityPeer, boolean nullable) {
51+
this(null, entityPeer, nullable);
52+
}
53+
private CLAbstractEntity(T entity, long entityPeer, boolean nullable) {
4754
this.nullable = nullable;
4855
this.entity = entity;
56+
this.entityPeer = entityPeer;
57+
checkNullity(entityPeer);
58+
}
59+
60+
private void checkNullity(long entityPeer) {
61+
if (!nullable && entityPeer == 0) {
62+
throw new IllegalArgumentException("Null OpenCL " + getClass().getSimpleName() + " !");
63+
}
64+
}
65+
66+
protected void setEntity(T entity) {
67+
long entityPeer = getPeer(entity);
68+
checkNullity(entityPeer);
69+
this.entity = entity;
70+
this.entityPeer = entityPeer;
71+
}
72+
73+
protected void setEntity(long entityPeer) {
74+
checkNullity(entityPeer);
75+
this.entity = null;
76+
this.entityPeer = entityPeer;
4977
}
5078

5179
static <T> Pointer<T> copyNonNullEntities(CLAbstractEntity[] entities, int[] countOut, ReusablePointer tmp) {
@@ -60,12 +88,12 @@ static <T> Pointer<T> copyNonNullEntities(CLAbstractEntity[] entities, int[] cou
6088
for (int i = 0; i < n; i++) {
6189
CLAbstractEntity entity = entities[i];
6290
if (entity != null) {
63-
Pointer<?> pointer = entity.getEntity();
64-
if (pointer != null) {
91+
long pointer = entity.getEntityPeer();
92+
if (pointer != 0) {
6593
if (out == null)
6694
out = tmp.getPointerToBytes(Pointer.SIZE * (n - i));
6795

68-
out.setPointerAtOffset(Pointer.SIZE * count, pointer);
96+
out.setSizeTAtOffset(Pointer.SIZE * count, pointer);
6997

7098
count++;
7199
}
@@ -82,7 +110,7 @@ static <T> Pointer<T> copyNonNullEntities(CLAbstractEntity[] entities, int[] cou
82110
* Note that release() does not necessarily free the object immediately : OpenCL maintains a reference count for all its objects, and an object released on the Java side might still be pointed to by running kernels or queued operations.
83111
*/
84112
public synchronized void release() {
85-
if (entity == null) {
113+
if (entityPeer == 0) {
86114
if (!nullable)
87115
throw new RuntimeException("This " + getClass().getSimpleName() + " has already been released ! Besides, keep in mind that manual release is not necessary, as it will automatically be done by the garbage collector.");
88116
else
@@ -94,20 +122,33 @@ public synchronized void release() {
94122

95123
public static <E extends TypedPointer, A extends CLAbstractEntity<E>> Pointer<E> getEntities(A[] objects, Pointer<E> out) {
96124
for (int i = 0, len = objects.length; i < len; i++)
97-
out.setPointerAtOffset(i * Pointer.SIZE, objects[i].getEntity());
125+
out.setSizeTAtOffset(i * Pointer.SIZE, objects[i].getEntityPeer());
98126
return out;
99127
}
100-
synchronized T getEntity() {
101-
if (entity == null && !nullable)
128+
private void checkNullity() {
129+
if (entityPeer == 0 && !nullable)
102130
throw new RuntimeException("This " + getClass().getSimpleName() + " has been manually released and can't be used anymore !");
103-
104-
return entity;
131+
}
132+
133+
protected abstract T createEntityPointer(long peer);
134+
135+
synchronized T getEntity() {
136+
checkNullity();
137+
if (entity == null && entityPeer != 0) {
138+
entity = createEntityPointer(entityPeer);
139+
}
140+
return entity;
141+
}
142+
synchronized long getEntityPeer() {
143+
checkNullity();
144+
return entityPeer;
105145
}
106146

107147
synchronized void doRelease() {
108-
if (entity != null) {
148+
if (entityPeer != 0) {
109149
clear();
110150
entity = null;
151+
entityPeer = 0;
111152
}
112153
}
113154
@Override
@@ -122,18 +163,22 @@ protected void finalize() throws Throwable {
122163
*/
123164
@Override
124165
public int hashCode() {
125-
return getEntity() == null ? 0 : getEntity().hashCode();
166+
return entityPeer == 0
167+
? 0
168+
: entity == null
169+
? Long.valueOf(entityPeer).hashCode()
170+
: entity.hashCode();
126171
}
127172

128173
/**
129174
* Underyling implementation pointer-based equality test
130175
*/
131176
@Override
132177
public boolean equals(Object obj) {
133-
if (obj == null || !getClass().isInstance(obj))
178+
if (!getClass().isInstance(obj))
134179
return false;
135180
CLAbstractEntity<?> e = (CLAbstractEntity<?>)obj;
136-
return getEntity().equals(e.getEntity());
181+
return getEntityPeer() == e.getEntityPeer();
137182
}
138183

139184
}

‎Core/src/main/java/com/nativelibs4java/opencl/CLDevice.java‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,12 @@ protected int getInfo(cl_device_id entity, int infoTypeEnum, long size, Pointer
7474
super(device);
7575
this.platform = platform;
7676
}
77-
77+
78+
@Override
79+
protected cl_device_id createEntityPointer(long peer) {
80+
return new cl_device_id(peer);
81+
}
82+
7883
public synchronized CLPlatform getPlatform() {
7984
if (platform == null) {
8085
Pointer pplat = infos.getPointer(getEntity(), CL_DEVICE_PLATFORM);
@@ -338,21 +343,23 @@ public String toString() {
338343
*/
339344
@SuppressWarnings("deprecation")
340345
public CLQueue createQueue(CLContext context, QueueProperties... queueProperties) {
341-
Pointer<Integer> pErr = allocateInt();
342-
long flags = 0;
346+
ReusablePointers ptrs = ReusablePointers.get();
347+
Pointer<Integer> pErr = ptrs.pErr;
348+
long flags = 0;
343349
for (QueueProperties prop : queueProperties)
344350
flags |= prop.value();
345351
cl_command_queue queue = CL.clCreateCommandQueue(context.getEntity(), getEntity(), flags, pErr);
346-
error(pErr.get());
352+
error(pErr.getInt());
347353

348354
return new CLQueue(context, queue, this);
349355
}
350356

351357
@Deprecated
352358
public CLQueue createQueue(EnumSet<QueueProperties> queueProperties, CLContext context) {
353-
Pointer<Integer> pErr = allocateInt();
354-
cl_command_queue queue = CL.clCreateCommandQueue(context.getEntity(), getEntity(), QueueProperties.getValue(queueProperties), pErr);
355-
error(pErr.get());
359+
ReusablePointers ptrs = ReusablePointers.get();
360+
Pointer<Integer> pErr = ptrs.pErr;
361+
cl_command_queue queue = CL.clCreateCommandQueue(context.getEntity(), getEntity(), QueueProperties.getValue(queueProperties), pErr);
362+
error(pErr.getInt());
356363

357364
return new CLQueue(context, queue, this);
358365
}

‎Core/src/main/java/com/nativelibs4java/opencl/CLEvent.java‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@
5959
*/
6060
public class CLEvent extends CLAbstractEntity<cl_event> {
6161

62+
/**
63+
* Pass this to any method that expects a variable number of events to wait for and that returns an event, to completely bypass the events : no event will then be returned at all.
64+
*/
65+
public static final CLEvent[] DISABLE_EVENTS = null;
66+
6267
private static CLInfoGetter<cl_event> infos = new CLInfoGetter<cl_event>() {
6368
@Override
6469
protected int getInfo(cl_event entity, int infoTypeEnum, long size, Pointer out, Pointer<SizeT> sizeOut) {
@@ -77,9 +82,14 @@ protected int getInfo(cl_event entity, int infoTypeEnum, long size, Pointer out,
7782
super(evt, false);
7883
}
7984

80-
CLEvent() {
81-
super(null, true);
85+
CLEvent(long evt) {
86+
super(evt, false);
8287
}
88+
89+
@Override
90+
protected cl_event createEntityPointer(long peer) {
91+
return new cl_event(peer);
92+
}
8393

8494
public interface EventCallback {
8595
public void callback(CLEvent event, int executionStatus);
@@ -138,16 +148,14 @@ static CLEvent createEventFromPointer(CLQueue queue, Pointer<cl_event> evt1) {
138148
if (peer == 0)
139149
return null;
140150

141-
return new CLEvent(new cl_event(peer));
151+
return new CLEvent(peer);
142152
}
143153

144154

145155
/**
146156
* Wait for this event, blocking the caller thread independently of any queue until all of the command associated with this events completes.
147157
*/
148158
public void waitFor() {
149-
if (entity == null)
150-
return;
151159
waitFor(this);
152160
}
153161

@@ -214,7 +222,7 @@ static Pointer<cl_event> to_cl_event_array(CLEvent... events) {
214222

215223
@Override
216224
protected void clear() {
217-
error(CL.clReleaseEvent(getPeer(getEntity())));
225+
error(CL.clReleaseEvent(getEntityPeer()));
218226
}
219227

220228
/** Values for CL_EVENT_COMMAND_EXECUTION_STATUS */

‎Core/src/main/java/com/nativelibs4java/opencl/CLException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,6 @@ public static void error(int err) {
249249
if (toThrow == null)
250250
toThrow = new CLException("OpenCL Error : " + errorString(err) + logSuffix, err);
251251

252-
throw toThrow;
252+
throw toThrow;
253253
}
254254
}

‎Core/src/main/java/com/nativelibs4java/opencl/CLImage.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
public abstract class CLImage extends CLMem {
6262

6363
CLImageFormat format;
64-
CLImage(CLContext context, cl_mem entity, CLImageFormat format) {
65-
super(context, -1, entity);
64+
CLImage(CLContext context, long entityPeer, CLImageFormat format) {
65+
super(context, -1, entityPeer);
6666
this.format = format;
6767
}
6868

@@ -148,9 +148,10 @@ protected Pair<ByteBuffer, CLEvent> map(CLQueue queue, MapFlags flags,
148148
boolean blocking, CLEvent... eventsToWaitFor)
149149
{
150150
//checkBounds(offset, length);
151-
Pointer<cl_event> eventOut = blocking ? null : CLEvent.new_event_out(eventsToWaitFor);
152-
Pointer<Integer> pErr = allocateInt();
153-
151+
ReusablePointers ptrs = ReusablePointers.get();
152+
Pointer<Integer> pErr = ptrs.pErr;
153+
Pointer<cl_event> eventOut = blocking || eventsToWaitFor == null ? null : ptrs.event_out;
154+
154155
Pointer<cl_event> evts = CLEvent.to_cl_event_array(eventsToWaitFor);
155156
Pointer p = CL.clEnqueueMapImage(
156157
queue.getEntity(), getEntity(), blocking ? CL_TRUE : CL_FALSE,
@@ -163,7 +164,7 @@ protected Pair<ByteBuffer, CLEvent> map(CLQueue queue, MapFlags flags,
163164
eventOut,
164165
pErr
165166
);
166-
error(pErr.get());
167+
error(pErr.getInt());
167168
return new Pair<ByteBuffer, CLEvent>(
168169
p.getByteBuffer(getByteCount()),
169170
CLEvent.createEventFromPointer(queue, eventOut)
@@ -175,8 +176,8 @@ protected Pair<ByteBuffer, CLEvent> map(CLQueue queue, MapFlags flags,
175176
* see {@link CLImage3D#map(com.nativelibs4java.opencl.CLQueue, com.nativelibs4java.opencl.CLMem.MapFlags, com.nativelibs4java.opencl.CLEvent[]) }
176177
* @param queue
177178
* @param buffer
178-
* @param eventsToWaitFor
179-
* @return Event which completion indicates that the OpenCL was unmapped
179+
* @param eventsToWaitFor Events that need to complete before this particular command can be executed. Special value {@link CLEvent#DISABLE_EVENTS} can be used to avoid returning a CLEvent.
180+
* @return Event which completion indicates that the OpenCL was unmapped, or null if eventsToWaitFor is {@link CLEvent#DISABLE_EVENTS}.
180181
*/
181182
public CLEvent unmap(CLQueue queue, ByteBuffer buffer, CLEvent... eventsToWaitFor) {
182183
Pointer<cl_event> eventOut = CLEvent.new_event_out(eventsToWaitFor);

0 commit comments

Comments
 (0)
X Tutup