JavaCL Generator: add support for 3-components vectors (issue #497)

ochafik · ochafik · commit eab2fac37302 · 2014-04-21T18:50:51.000+02:00
diff --git a/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java b/Generator/src/main/java/com/nativelibs4java/opencl/generator/JavaCLGenerator.java
@@ -305,7 +305,7 @@ static class Conversion {
             "float", Float.TYPE, float[].class, Float.class,
             "bool", Boolean.TYPE, boolean[].class, Boolean.class
         };
-        for (int arity : new int[] { 1, 2, 4, 8, 16 }) {
+        for (int arity : new int[] { 1, 2, 3, 4, 8, 16 }) {
             String suffix = arity == 1 ? "" : arity +"";
             for (int i = 0; i < data.length; i += 4) {
                 String rawType = (String)data[i];
diff --git a/JavaCL/src/test/java/com/nativelibs4java/opencl/generator/GeneratorTest.java b/JavaCL/src/test/java/com/nativelibs4java/opencl/generator/GeneratorTest.java
@@ -10,15 +10,22 @@
 import org.bridj.Pointer;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import org.junit.Before;
 
 public class GeneratorTest {
-    
+    CLContext context;
+    CLQueue queue;
+    Structs structs;
+        
+    @Before
+    public void setup() throws IOException {
+        context = JavaCL.createBestContext();
+        queue = context.createDefaultQueue();
+        structs = new Structs(context);
+    }
+
     @Test
     public void testStructs() throws IOException {
-        CLContext context = JavaCL.createBestContext();
-        CLQueue queue = context.createDefaultQueue();
-        
-        Structs structs = new Structs(context);
         Structs.S s = new Structs.S();
         Pointer<Structs.S> pS = Pointer.getPointer(s);
         CLBuffer<Structs.S> b = context.createBuffer(CLMem.Usage.InputOutput, pS);
@@ -36,4 +43,13 @@ public void testStructs() throws IOException {
         assertEquals(120, s.b());
         
     }
+    
+    @Test
+    public void testFloat3() {
+        float[] input = new float[] { 1, 2, 3 };
+        CLBuffer<Float> outputBuffer = context.createFloatBuffer(CLMem.Usage.Output, 3);
+        CLEvent e = structs.g(queue, input, outputBuffer, new int[] { 1 }, null);
+        float[] output = outputBuffer.read(queue, e).getFloats();
+        assertArrayEquals(input, output, 0.0f);
+    }
 }
diff --git a/JavaCL/src/test/opencl/com/nativelibs4java/opencl/generator/Structs.c b/JavaCL/src/test/opencl/com/nativelibs4java/opencl/generator/Structs.c
@@ -6,3 +6,9 @@ kernel void f(__global S *pS) {
   pS->a = pS->a * 2 + 10;
   pS->b = pS->b * 10 + 100;
 }
+
+kernel void g(float3 floats, __global float *out) {
+  out[0] = floats.x;
+  out[1] = floats.y;
+  out[2] = floats.z;
+}
