wasm profile select: contributed by Andreas Woess,Florian Huemer and

David Leopoldseder

Author: davleopo

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/BinaryParser.java

@@ -785,7 +785,7 @@ private CodeEntry readFunction(int functionIndex, byte[] locals, byte[] resultTy
                     assertTrue(WasmType.isNumberType(t1) && WasmType.isNumberType(t2), Failure.TYPE_MISMATCH);
                     assertTrue(t1 == t2 || t1 == WasmType.UNKNOWN_TYPE || t2 == WasmType.UNKNOWN_TYPE, Failure.TYPE_MISMATCH);
                     state.push(t1 == WasmType.UNKNOWN_TYPE ? t2 : t1);
-                    state.addInstruction(Bytecode.SELECT);
+                    state.addSelectInstruction(Bytecode.SELECT);
                     break;
                 }
                 case Instructions.SELECT_T: {
@@ -798,9 +798,9 @@ private CodeEntry readFunction(int functionIndex, byte[] locals, byte[] resultTy
                     state.popChecked(t);
                     state.push(t);
                     if (WasmType.isNumberType(t)) {
-                        state.addInstruction(Bytecode.SELECT);
+                        state.addSelectInstruction(Bytecode.SELECT);
                     } else {
-                        state.addInstruction(Bytecode.SELECT_OBJ);
+                        state.addSelectInstruction(Bytecode.SELECT_OBJ);
                     }
                     break;
                 }

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/nodes/WasmFunctionNode.java

@@ -626,22 +626,24 @@ public Object executeBodyFromOffset(WasmInstance instance, VirtualFrame frame, i
                     break;
                 }
                 case Bytecode.SELECT: {
-                    if (popBoolean(frame, stackPointer - 1)) {
+                    if (profileCondition(bytecode, offset, popBoolean(frame, stackPointer - 1))) {
                         drop(frame, stackPointer - 2);
                     } else {
                         WasmFrame.copyPrimitive(frame, stackPointer - 2, stackPointer - 3);
                         dropPrimitive(frame, stackPointer - 2);
                     }
+                    offset += 2;
                     stackPointer -= 2;
                     break;
                 }
                 case Bytecode.SELECT_OBJ: {
-                    if (popBoolean(frame, stackPointer - 1)) {
+                    if (profileCondition(bytecode, offset, popBoolean(frame, stackPointer - 1))) {
                         dropObject(frame, stackPointer - 2);
                     } else {
                         WasmFrame.copyObject(frame, stackPointer - 2, stackPointer - 3);
                         dropObject(frame, stackPointer - 2);
                     }
+                    offset += 2;
                     stackPointer -= 2;
                     break;
                 }

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/parser/bytecode/BytecodeParser.java

@@ -441,14 +441,17 @@ private static List<CallNode> readCallNodes(byte[] bytecode, int startOffset, in
                     offset += 12;
                     break;
                 }
+                case Bytecode.SELECT:
+                case Bytecode.SELECT_OBJ: {
+                    offset += 2;
+                    break;
+                }
                 case Bytecode.UNREACHABLE:
                 case Bytecode.NOP:
                 case Bytecode.RETURN:
                 case Bytecode.LOOP:
                 case Bytecode.DROP:
                 case Bytecode.DROP_OBJ:
-                case Bytecode.SELECT:
-                case Bytecode.SELECT_OBJ:
                 case Bytecode.I32_EQZ:
                 case Bytecode.I32_EQ:
                 case Bytecode.I32_NE:

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/parser/bytecode/RuntimeBytecodeGen.java

@@ -537,6 +537,11 @@ public void addIndirectCall(int nodeIndex, int typeIndex, int tableIndex) {
         }
     }
 
+    public void addSelect(int instruction) {
+        add1(instruction);
+        addProfile();
+    }
+
     private void addDataHeader(int mode, int length, byte[] offsetBytecode, long offsetAddress, int memoryIndex) {
         assert offsetBytecode == null || offsetAddress == -1 : "data header does not allow offset bytecode and offset address";
         assert mode == SegmentMode.ACTIVE || mode == SegmentMode.PASSIVE : "invalid segment mode in data header";

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/parser/validation/ParserState.java

@@ -318,6 +318,10 @@ public void addInstruction(int instruction) {
         bytecode.add(instruction);
     }
 
+    public void addSelectInstruction(int instruction) {
+        bytecode.addSelect(instruction);
+    }
+
     /**
      * Performs the necessary branch checks and adds the conditional branch information in the extra
      * data array.