Skip to content

Commit 2bcd1e2

Browse files
ochafikochafik
committed
JavaCL: use getEntityPeer() more
1 parent 4609f7c commit 2bcd1e2

4 files changed

Lines changed: 16 additions & 16 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ private void setKernelArg(int i, long size, Pointer<?> ptr) {
255255
if (size <= 0)
256256
throw new IllegalArgumentException("Kernel args must have a known byte size, given " + size + " instead.");
257257
try {
258-
error(CL.clSetKernelArg(getPeer(getEntity()), i, size, getPeer(ptr)));
258+
error(CL.clSetKernelArg(getEntityPeer(), i, size, getPeer(ptr)));
259259
//error(CL.clSetKernelArg(getEntity(), i, size, ptr));
260260
} catch (CLTypedException ex) {
261261
ex.setKernelArg(this, i);
@@ -356,7 +356,7 @@ public CLEvent enqueueTask(CLQueue queue, CLEvent... eventsToWaitFor) {
356356
Pointer<cl_event> eventOut = CLEvent.new_event_out(eventsToWaitFor, ptrs.event_out);
357357
int[] eventsCount = new int[1];
358358
Pointer<cl_event> events = CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsCount, ptrs.events_in);
359-
error(CL.clEnqueueTask(getPeer(queue.getEntity()), getPeer(getEntity()), eventsCount[0], getPeer(events), getPeer(eventOut)));
359+
error(CL.clEnqueueTask(queue.getEntityPeer(), getEntityPeer(), eventsCount[0], getPeer(events), getPeer(eventOut)));
360360
return CLEvent.createEventFromPointer(queue, eventOut);
361361
}
362362

@@ -403,8 +403,8 @@ public CLEvent enqueueNDRange(CLQueue queue, int[] globalOffsets, int[] globalWo
403403
int[] eventsCount = new int[1];
404404
Pointer<cl_event> events = CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsCount, ptrs.events_in);
405405
error(CL.clEnqueueNDRangeKernel(
406-
getPeer(queue.getEntity()),
407-
getPeer(getEntity()),
406+
queue.getEntityPeer(),
407+
getEntityPeer(),
408408
nDims,
409409
getPeer(ptrs.sizeT3_1.pointerToSizeTs(globalOffsets)),
410410
getPeer(ptrs.sizeT3_2.pointerToSizeTs(globalWorkSizes)),

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected void clear() {
121121
* finish() is also a synchronization point.
122122
*/
123123
public void finish() {
124-
error(CL.clFinish(getPeer(getEntity())));
124+
error(CL.clFinish(getEntityPeer()));
125125
}
126126

127127
/**
@@ -130,7 +130,7 @@ public void finish() {
130130
* There is no guarantee that they will be complete after flush() returns.
131131
*/
132132
public void flush() {
133-
error(CL.clFlush(getPeer(getEntity())));
133+
error(CL.clFlush(getEntityPeer()));
134134
}
135135

136136
/**
@@ -142,7 +142,7 @@ public void enqueueWaitForEvents(CLEvent... eventsToWaitFor) {
142142
Pointer<cl_event> events = CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsCount, ptrs.events_in);
143143
if (events == null)
144144
return;
145-
error(CL.clEnqueueWaitForEvents(getPeer(getEntity()), eventsCount[0], getPeer(events)));
145+
error(CL.clEnqueueWaitForEvents(getEntityPeer(), eventsCount[0], getPeer(events)));
146146
}
147147

148148
/**
@@ -151,7 +151,7 @@ public void enqueueWaitForEvents(CLEvent... eventsToWaitFor) {
151151
* enqueueBarrier() is a synchronization point.
152152
*/
153153
public void enqueueBarrier() {
154-
error(CL.clEnqueueBarrier(getPeer(getEntity())));
154+
error(CL.clEnqueueBarrier(getEntityPeer()));
155155
}
156156

157157
/**
@@ -162,7 +162,7 @@ public void enqueueBarrier() {
162162
public CLEvent enqueueMarker() {
163163
ReusablePointers ptrs = ReusablePointers.get();
164164
Pointer<cl_event> eventOut = ptrs.event_out;
165-
error(CL.clEnqueueMarker(getPeer(getEntity()), getPeer(eventOut)));
165+
error(CL.clEnqueueMarker(getEntityPeer(), getPeer(eventOut)));
166166
return CLEvent.createEventFromPointer(this, eventOut);
167167
}
168168

‎Core/src/main/velocity/com/nativelibs4java/opencl/CLBuffer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ public CLEvent read(CLQueue queue, long offset, long length, Pointer<T> out, boo
268268
int[] eventsCount = new int[1];
269269
Pointer<cl_event> events = CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsCount, ptrs.events_in);
270270
error(CL.clEnqueueReadBuffer(
271-
getPeer(queue.getEntity()),
272-
getPeer(getEntity()),
271+
queue.getEntityPeer(),
272+
getEntityPeer(),
273273
blocking ? CL_TRUE : 0,
274274
offset * getElementSize(),
275275
length * getElementSize(),
@@ -337,8 +337,8 @@ public CLEvent write(CLQueue queue, long offset, long length, Pointer<T> in, boo
337337
int[] eventsCount = new int[1];
338338
Pointer<cl_event> events = CLAbstractEntity.copyNonNullEntities(eventsToWaitFor, eventsCount, ptrs.events_in);
339339
error(CL.clEnqueueWriteBuffer(
340-
getPeer(queue.getEntity()),
341-
getPeer(getEntity()),
340+
queue.getEntityPeer(),
341+
getEntityPeer(),
342342
blocking ? CL_TRUE : CL_FALSE,
343343
offset * getElementSize(),
344344
length * getElementSize(),

‎Core/src/test/java/com/nativelibs4java/opencl/OverheadTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ public void run() {
9292
}
9393
};
9494
Runnable setWithRawCLAPI = new Runnable() {
95-
private final long aPeer = getPeer(a.getEntity());
96-
private final long bPeer = getPeer(b.getEntity());
97-
private final long kEntity = getPeer(kernel.getEntity());
95+
private final long aPeer = a.getEntityPeer();
96+
private final long bPeer = b.getEntityPeer();
97+
private final long kEntity = kernel.getEntityPeer();
9898
private final Pointer<?> tmp = allocateBytes(8);
9999
private final long tPeer = getPeer(tmp);
100100
private final OpenCLLibrary CL = new OpenCLLibrary();

0 commit comments

Comments
 (0)