Code generator / OpenCL

Author: mirkosertic

pom.xml

@@ -56,7 +56,6 @@
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit.version}</version>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
@@ -91,6 +90,11 @@
                         <target>${java.version}</target>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.5.4</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -110,7 +114,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.4</version>
             </plugin>
 
             <plugin>

src/main/java/de/mirkosertic/metair/ir/MethodAnalyzer.java

@@ -801,7 +801,15 @@ private void step5FollowCFGAndInterpret(final CodeModel code) {
                             // the outgoing status for this node is not computed yet.
                             if (edge.flowType() == FlowType.FORWARD) {
                                 final Frame incomingFrame = posToFrame.get(edge.fromIndex());
-                                incomingFrame.out.control.controlFlowsTo(target, FlowType.FORWARD);
+                                Node source = incomingFrame.out.control;
+                                if (source instanceof TupleNode) {
+                                    source = ((TupleNode) source).getNamedNode(edge.projection().name());
+                                } else if (FrameNamedProjection.DEFAULT.equals(edge.projection())) {
+                                    // No nothing in this case, we just keep the incoming control node
+                                } else {
+                                    illegalState("Unknown projection type " + edge.projection() + " or unsupported node : " + incomingStatus.control);
+                                }
+                                source.controlFlowsTo(target, FlowType.FORWARD);
                             }
                         }
 

src/main/java/de/mirkosertic/metair/ir/Sequencer.java

@@ -55,6 +55,7 @@ private void visitDominationTreeOf(final Node startNode, final Deque<Block> acti
                                 // We can continue to the child
                                 return user;
                             }
+                            codegenerator.writePreJump(node);
                             generateGOTO(node, user, activeStack);
                         }
                     }

src/test/java/de/mirkosertic/metair/ir/opencl/AliceBobCarolDaveTest.java

@@ -8,6 +8,7 @@
 import de.mirkosertic.metair.opencl.api.Platform;
 import de.mirkosertic.metair.opencl.api.PlatformFactory;
 import de.mirkosertic.metair.opencl.api.PlatformProperties;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static de.mirkosertic.metair.opencl.api.Float4.float4;
@@ -16,6 +17,7 @@
 import static de.mirkosertic.metair.opencl.api.VectorFunctions.dot;
 import static de.mirkosertic.metair.opencl.api.VectorFunctions.length;
 
+@Disabled
 public class AliceBobCarolDaveTest {
 
     @Test

src/test/java/de/mirkosertic/metair/ir/opencl/ContextTest.java

@@ -6,12 +6,14 @@
 import de.mirkosertic.metair.opencl.api.OpenCLOptions;
 import de.mirkosertic.metair.opencl.api.Platform;
 import de.mirkosertic.metair.opencl.api.PlatformFactory;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static de.mirkosertic.metair.opencl.api.Float2.float2;
 import static de.mirkosertic.metair.opencl.api.GlobalFunctions.get_global_id;
 import static de.mirkosertic.metair.opencl.api.VectorFunctions.normalize;
 
+@Disabled
 public class ContextTest {
 
     @Test