8000 Preserve device identity array outputs when JNI copies storage by RicheyWorks · Pull Request #61 · jcuda/jcuda · GitHub
[go: up one dir, main page]
Skip to content

Preserve device identity array outputs when JNI copies storage #61

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.

Sign up for GitHub

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

Draft
RicheyWorks wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Preserve device identity array outputs when JNI copies storage #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion JCudaDriverJNI/src/JCudaDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2467,7 +2467,7 @@ JNIEXPORT jint JNICALL Java_jcuda_driver_JCudaDriver_cuDeviceGetNameNative
return JCUDA_INTERNAL_ERROR;
}
int result = cuDeviceGetName(nativeName, len, nativeDev);
env->ReleasePrimitiveArrayCritical(name, nativeName, (isCopy==JNI_TRUE)?0:JNI_ABORT);
env->ReleasePrimitiveArrayCritical(name, nativeName, 0);
return result;
}

Expand Down
124 changes: 124 additions & 0 deletions JCudaJava/src/test/java/jcuda/test/JCudaDeviceIdentityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
/*
* JCuda - Java bindings for CUDA
*
* http://www.jcuda.org
*/
package jcuda.test;

import static jcuda.driver.JCudaDriver.*;
import static org.junit.Assert.*;
import static org.junit.Assume.assumeTrue;

import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.concurrent.*;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import jcuda.driver.*;
import jcuda.runtime.*;

/** Compare runtime device identity output against independent driver queries. */
@RunWith(Parameterized.class)
public class JCudaDeviceIdentityTest
{
@Parameterized.Parameters(name = "{0}")
public static Collection<Object[]> cases()
{
return Arrays.asList(new Object[][] { { "name" }, { "uuid" }, { "luid" } });
}

private final String field;

public JCudaDeviceIdentityTest(String field)
{
this.field = field;
}

private static void check(int result)
{
assertEquals(CUresult.stringFor(result), CUresult.CUDA_SUCCESS, result);
}

@Test
public void runtimeIdentityMatchesDriver() throws Exception
{
check(cuInit(0));
final CUdevice device = new CUdevice();
check(cuDeviceGet(device, 0));
if ("luid".equals(field))
{
assumeTrue("LUID is defined only on Windows WDDM devices",
System.getProperty("os.name").startsWith("Windows"));
int[] tcc = { 0 };
check(cuDeviceGetAttribute(tcc,
CUdevice_attribute.CU_DEVICE_ATTRIBUTE_TCC_DRIVER, device));
assumeTrue("LUID undefined on TCC", tcc[0] == 0);
}
ExecutorService executor = Executors.newSingleThreadExecutor();
try
{
Future<?> future = executor.submit(() -> runWithContext(device));
try
{
future.get(30, TimeUnit.SECONDS);
}
catch (ExecutionException e)
{
if (e.getCause() instanceof Error) throw (Error)e.getCause();
throw e;
}
}
finally
{
executor.shutdownNow();
}
}

private void runWithContext(CUdevice device)
{
CUcontext context = new CUcontext();
check(cuCtxCreate(context, 0, device));
try
{
cudaDeviceProp prop = new cudaDeviceProp();
Arrays.fill(prop.name, (byte)0x55);
Arrays.fill(prop.uuid.bytes, (byte)0x55);
Arrays.fill(prop.luid, (byte)0x55);
assertEquals(cudaError.cudaSuccess, JCuda.cudaGetDeviceProperties(prop, 0));
if ("name".equals(field))
{
byte[] expected = new byte[256];
check(cuDeviceGetName(expected, expected.length, device));
assertFalse(asString(expected).isEmpty());
assertEquals(asString(expected), asString(prop.name));
}
else if ("uuid".equals(field))
{
CUuuid expected = new CUuuid();
check(cuDeviceGetUuid(expected, device));
assertArrayEquals(expected.bytes, prop.uuid.bytes);
}
else
{
byte[] expected = new byte[8];
int[] nodeMask = { 0 };
check(cuDeviceGetLuid(expected, nodeMask, device));
assertArrayEquals(expected, prop.luid);
assertEquals(nodeMask[0], prop.luidDeviceNodeMask);
}
}
finally
{
check(cuCtxDestroy(context));
}
}

private static String asString(byte[] bytes)
{
int end = 0;
while (end < bytes.length && bytes[end] != 0) end++;
return new String(bytes, 0, end, StandardCharsets.US_ASCII);
}
}
6 changes: 3 additions & 3 deletions JCudaRuntimeJNI/src/JCudaRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ void setCudaDeviceProp(JNIEnv *env, jobject prop, cudaDeviceProp &nativeProp)
return;
}
memcpy(propNameMemory, nativeProp.name, 256);
env->ReleasePrimitiveArrayCritical(propName, propNameMemory, JNI_ABORT);
env->ReleasePrimitiveArrayCritical(propName, propNameMemory, 0);

jobject propUuid = env->GetObjectField(prop, cudaDeviceProp_uuid);
if (propUuid == NULL)
Expand All @@ -909,7 +909,7 @@ void setCudaDeviceProp(JNIEnv *env, jobject prop, cudaDeviceProp &nativeProp)
return;
}
memcpy(propUuidBytesMemory, nativeProp.uuid.bytes, 16);
env->ReleasePrimitiveArrayCritical(propUuidBytes, propUuidBytesMemory, JNI_ABORT);
env->ReleasePrimitiveArrayCritical(propUuidBytes, propUuidBytesMemory, 0);

jbyteArray propLuid = (jbyteArray)env->GetObjectField(prop, cudaDeviceProp_luid);
char *propLuidMemory = (char*)env->GetPrimitiveArrayCritical(propLuid, NULL);
Expand All @@ -918,7 +918,7 @@ void setCudaDeviceProp(JNIEnv *env, jobject prop, cudaDeviceProp &nativeProp)
return;
}
memcpy(propLuidMemory, nativeProp.luid, 8);
env->ReleasePrimitiveArrayCritical(propLuid, propLuidMemory, JNI_ABORT);
env->ReleasePrimitiveArrayCritical(propLuid, propLuidMemory, 0);

env->SetIntField(prop, cudaDeviceProp_luidDeviceNodeMask, (jint)nativeProp.luidDeviceNodeMask);

Expand Down
0