Change python script to include eos-vm in benchmarks

Author: hugo-dc

wasm-engines/docker/wasm-engines-bench.Dockerfile

@@ -9,7 +9,7 @@ FROM ewasm/wavm:1 AS wavm
 FROM ewasm/fizzy:1 AS fizzy
 FROM ewasm/asmble:1 AS asmble
 FROM ewasm/wasmi:1 AS wasmi
-FROM eos-bench AS eos
+FROM ewasm/eos-bench:1 AS eos
 
 FROM ewasm/llvm-10:1
 
@@ -47,7 +47,7 @@ COPY --from=wamr /wasm-micro-runtime/product-mini/platforms/linux/build_interp/i
 COPY --from=wamr /wasm-micro-runtime/wamr-compiler/build/wamrc /engines/wamr/wamrc
 COPY --from=asmble /asmble/ /engines/asmble/
 COPY --from=wagon /wagon/cmd/wasm-run/wasm-run /engines/wagon/wasm-run
-COPY --from=eos /eos-vm/build/tools/bench-interp /eos-vm/build/tools/bench-interp
+COPY --from=eos /eos-vm/build/tools/bench-interp /engines/eos-vm/build/tools/bench-interp
 
 RUN mkdir /benchmark_results_data
 

wasm-engines/fluence_bencher/WasmVMBencher.py

@@ -156,6 +156,8 @@ def run_engine(self, vm, cmd):
             result_record = self.do_fizzy_test(cmd)
         elif vm == "ssvm":
             result_record = self.do_ssvm_test(cmd)
+        elif vm == "eos-vm":
+            result_record = self.do_eos_test(cmd)
         else:
             result_record = self.doElapsedTest(cmd)
 
@@ -469,6 +471,18 @@ def do_ssvm_test(self, vm_cmd):
             'exec_regex' : "Total execution time: ([\w\.]+)"
         }
         return self.doCompilerTest(vm_cmd, time_parse_info)
+    def do_eos_test(self, vm_cmd):
+        """
+        Startup 188835
+        Execution 689115
+        """
+        time_parse_info = {
+            'compile_line_num': 0,
+            'exec_line_num': 1,
+            'compile_regex' : "Startup ([\w\.]+)",
+            'exec_regex' : "Execution ([\w\.]+)"
+        }
+        return self.doCompilerTest(vm_cmd, time_parse_info)
 
     def doElapsedTest(self, vm_cmd):
         """Launches provided shell command string via subprocess.Popen and measure its execution time.

wasm-engines/fluence_bencher/settings.py

@@ -48,7 +48,7 @@
     "wasm3" : VMDescriptor("/engines/wasm3/wasm3", "--func {function_name} {wasm_file_path}"),
     "fizzy" : VMDescriptor("/engines/fizzy/fizzy.sh", "{function_name} {wasm_file_path}"),
     "ssvm"  : VMDescriptor("/engines/ssvm/ssvm", "{wasm_file_path} {function_name}"),
-
+    "eos-vm" : VMDescriptor("/engines/eos-vm/build/tools/bench-interp", "{wasm_file_path}"),
     # "wasmer" : VMDescriptor("/engines/wasmer/target/release/wasmer", "run {wasm_file_path}", True),
     # we have binaryen, but calling wasm-shell -e main is not working
 }