JavaCL: run tests on all detected devices, rather than just on the best one

ochafik · ochafik · commit 22832c526041 · 2012-07-22T01:24:57.000+01:00
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/AbstractCommon.java b/Core/src/test/java/com/nativelibs4java/opencl/AbstractCommon.java
@@ -9,46 +9,38 @@
 import org.junit.BeforeClass;
 
 import com.nativelibs4java.test.MiscTestUtils;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.After;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 /**
  *
  * @author ochafik
  */
+@RunWith(Parameterized.class)
 public abstract class AbstractCommon {
 
 	CLPlatform platform;
 	CLContext context;
 	CLQueue queue;
 	CLDevice device;
 	CLImageFormat[] formatsRead2D, formatsRead3D, formatsWrite2D, formatsWrite3D, formatsReadWrite2D, formatsReadWrite3D;
-
+	/*
     @BeforeClass
     public static void setup() {
         MiscTestUtils.protectJNI();
     }
+    */
     
-    static String chosenPlatformName = System.getProperty("javacl.test.platform", System.getenv("JAVACL_TEST_PLATFORM"));
     static boolean listedPlatforms;
     
-    @Before
-    public void setUp() {
-    	CLPlatform chosenPlatform = null;
-    	for (CLPlatform platform : JavaCL.listPlatforms()) {
-    		if (!listedPlatforms)
-    			System.out.println("Platform Detected : \"" + platform.getName() + "\"");
-    		if (chosenPlatformName != null && platform.getName().contains(chosenPlatformName)) {
-    			chosenPlatform = platform;
-    		}
-    	}
-    	listedPlatforms = true;
-    	if (chosenPlatform != null) {
-    		platform = chosenPlatform;
-    		context = platform.createContext(null, platform.getBestDevice());
-		} else {
-			context = JavaCL.createBestContext();
-			platform = context.getPlatform();
-		}
-		queue = context.createDefaultQueue();
+    AbstractCommon(CLDevice device) {
+        this.device = device;
+        platform = device.getPlatform();
+        context = platform.createContext(null, device);
+        queue = context.createDefaultQueue();
 		device = context.getDevices()[0];
 		formatsRead2D = context.getSupportedImageFormats(CLMem.Flags.ReadOnly, CLMem.ObjectType.Image2D);
 		formatsWrite2D = context.getSupportedImageFormats(CLMem.Flags.WriteOnly, CLMem.ObjectType.Image2D);
@@ -57,6 +49,23 @@ public void setUp() {
 		formatsReadWrite2D = context.getSupportedImageFormats(CLMem.Flags.ReadWrite, CLMem.ObjectType.Image2D);
 		formatsReadWrite3D = context.getSupportedImageFormats(CLMem.Flags.ReadWrite, CLMem.ObjectType.Image3D);
     }
-
-
+    
+    @Parameterized.Parameters
+    public static List<Object[]> getDeviceParameters() {
+        List<Object[]> ret = new ArrayList<Object[]>();
+        for (CLPlatform platform : JavaCL.listPlatforms())
+            for (CLDevice device : platform.listAllDevices(true))
+                ret.add(new Object[] { device });
+        return ret;
+    }
+    /*
+    @After
+    public void cleanup() {
+        queue.finish();
+        queue.release();
+        context.release();
+        device.release();
+        platform.release();
+    }    
+    */
 }
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/BinaryKernelTest.java b/Core/src/test/java/com/nativelibs4java/opencl/BinaryKernelTest.java
@@ -9,17 +9,22 @@
 import org.bridj.Pointer;
 import static org.bridj.Pointer.*;
 import com.nativelibs4java.test.MiscTestUtils;
+import java.util.List;
+import org.junit.runners.Parameterized;
 
 /**
  *
  * @author Kazo Csaba
  */
 @SuppressWarnings("unchecked")
 public class BinaryKernelTest extends AbstractCommon {
-
-    @BeforeClass
-    public static void setup() {
-        MiscTestUtils.protectJNI();
+    public BinaryKernelTest(CLDevice device) {
+        super(device);
+    }
+    
+    @Parameterized.Parameters
+    public static List<Object[]> getDeviceParameters() {
+        return AbstractCommon.getDeviceParameters();
     }
 
     @Test
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/BufferTest.java b/Core/src/test/java/com/nativelibs4java/opencl/BufferTest.java
@@ -21,17 +21,22 @@
 import java.nio.ByteOrder;
 import static org.bridj.Pointer.*;
 import java.nio.ByteOrder;
+import java.util.List;
+import org.junit.runners.Parameterized;
 
 /**
  *
  * @author ochafik
  */
 @SuppressWarnings("unchecked")
 public class BufferTest extends AbstractCommon {
-
-    @BeforeClass
-    public static void setup() {
-        MiscTestUtils.protectJNI();
+    public BufferTest(CLDevice device) {
+        super(device);
+    }
+    
+    @Parameterized.Parameters
+    public static List<Object[]> getDeviceParameters() {
+        return AbstractCommon.getDeviceParameters();
     }
 
     @Test
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/ByteOrderHackTest.java b/Core/src/test/java/com/nativelibs4java/opencl/ByteOrderHackTest.java
@@ -9,9 +9,20 @@
 import org.bridj.Pointer;
 import static org.bridj.Pointer.*;
 import com.nativelibs4java.test.MiscTestUtils;
+import java.util.List;
+import org.junit.runners.Parameterized;
 
 @SuppressWarnings("unchecked")
 public class ByteOrderHackTest extends AbstractCommon {
+    public ByteOrderHackTest(CLDevice device) {
+        super(device);
+    }
+    
+    @Parameterized.Parameters
+    public static List<Object[]> getDeviceParameters() {
+        return AbstractCommon.getDeviceParameters();
+    }
+    
 	@Test
 	public void test() {
 		if (!ByteOrderHack.hackEnabled)
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/EventTest.java b/Core/src/test/java/com/nativelibs4java/opencl/EventTest.java
@@ -9,13 +9,18 @@
 import org.bridj.Pointer;
 import static org.bridj.Pointer.*;
 import com.nativelibs4java.test.MiscTestUtils;
+import java.util.List;
+import org.junit.runners.Parameterized;
 
 @SuppressWarnings("unchecked")
 public class EventTest extends AbstractCommon {
-
-    @BeforeClass
-    public static void setup() {
-        MiscTestUtils.protectJNI();
+    public EventTest(CLDevice device) {
+        super(device);
+    }
+    
+    @Parameterized.Parameters
+    public static List<Object[]> getDeviceParameters() {
+        return AbstractCommon.getDeviceParameters();
     }
 
     @Test
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/ImageTest.java b/Core/src/test/java/com/nativelibs4java/opencl/ImageTest.java
@@ -23,16 +23,20 @@
 import java.nio.FloatBuffer;
 import java.util.Arrays;
 import java.util.List;
+import org.junit.runners.Parameterized;
 
 /**
  *
  * @author ochafik
  */
 public class ImageTest extends AbstractCommon {
-
-    @BeforeClass
-    public static void setup() {
-        MiscTestUtils.protectJNI();
+    public ImageTest(CLDevice device) {
+        super(device);
+    }
+    
+    @Parameterized.Parameters
+    public static List<Object[]> getDeviceParameters() {
+        return AbstractCommon.getDeviceParameters();
     }
 
     public boolean supportsImages() {
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/InfoGettersTest.java b/Core/src/test/java/com/nativelibs4java/opencl/InfoGettersTest.java
@@ -20,12 +20,6 @@
  * @author ochafik
  */
 public class InfoGettersTest {
-
-    @BeforeClass
-    public static void setup() {
-        MiscTestUtils.protectJNI();
-    }
-
     @Before
     public void gc() {
         System.gc();
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/OpenCL4JavaBasicTest.java b/Core/src/test/java/com/nativelibs4java/opencl/OpenCL4JavaBasicTest.java
@@ -20,11 +20,6 @@ public class OpenCL4JavaBasicTest {
     public static final double ABSOLUTE_FLOAT_ERROR_TOLERANCE = 1e-4;
     public static final double RELATIVE_FLOAT_ERROR_TOLERANCE = 1e-8;
 
-    @BeforeClass
-    public static void setup() {
-        MiscTestUtils.protectJNI();
-    }
-
     @Test
     public void simpleTest() {
         try {
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/OpenCL4JavaBenchmarkTest.java b/Core/src/test/java/com/nativelibs4java/opencl/OpenCL4JavaBenchmarkTest.java
@@ -23,12 +23,6 @@
 //import com.nativelibs4java.scalacl.*;
 /// @see http://ati.amd.com/technology/streamcomputing/intro_opencl.html#simple
 public class OpenCL4JavaBenchmarkTest {
-
-    @BeforeClass
-    public static void setup() {
-        MiscTestUtils.protectJNI();
-    }
-
     static final boolean warmup = true;
 
     static ExecResult<FloatBuffer> testJava_float_aSinB(int loops, int dataSize) throws CLBuildException {
diff --git a/Core/src/test/java/com/nativelibs4java/opencl/OverheadTest.java b/Core/src/test/java/com/nativelibs4java/opencl/OverheadTest.java
@@ -19,13 +19,22 @@
 import java.util.logging.Logger;
 
 import java.nio.ByteBuffer;
+import java.util.List;
+import org.junit.runners.Parameterized;
 /**
  *
  * @author Kazo Csaba
  */
 @SuppressWarnings("unchecked")
 public class OverheadTest extends AbstractCommon {
-
+    public OverheadTest(CLDevice device) {
+        super(device);
+    }
+    
+    @Parameterized.Parameters
+    public static List<Object[]> getDeviceParameters() {
+        return AbstractCommon.getDeviceParameters();
+    }
     static void gc() {
         try {
             System.gc();
