Trigger JIT in parsing phase

Signed-off-by: HyukWoo Park <[email protected]>
Samsung · Nov 23, 2023 · 1d852c6 · 1d852c6
1 parent b6cbdb1
commit 1d852c6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/src/parser/WASMParser.cpp b/src/parser/WASMParser.cpp
@@ -2498,7 +2498,7 @@ void WASMParsingResult::clear()
     }
 }
 
-std::pair<Optional<Module*>, std::string> WASMParser::parseBinary(Store* store, const std::string& filename, const uint8_t* data, size_t len)
+std::pair<Optional<Module*>, std::string> WASMParser::parseBinary(Store* store, const std::string& filename, const uint8_t* data, size_t len, const bool useJIT, const int jitVerbose)
 {
     wabt::WASMBinaryReader delegate;
 
@@ -2508,6 +2508,10 @@ std::pair<Optional<Module*>, std::string> WASMParser::parseBinary(Store* store,
     }
 
     Module* module = new Module(store, delegate.parsingResult());
+    if (useJIT) {
+        module->jitCompile(nullptr, 0, jitVerbose);
+    }
+
     return std::make_pair(module, std::string());
 }
 

diff --git a/src/parser/WASMParser.h b/src/parser/WASMParser.h
@@ -54,7 +54,7 @@ struct WASMParsingResult {
 class WASMParser {
 public:
     // returns <result, error>
-    static std::pair<Optional<Module*>, std::string> parseBinary(Store* store, const std::string& filename, const uint8_t* data, size_t len);
+    static std::pair<Optional<Module*>, std::string> parseBinary(Store* store, const std::string& filename, const uint8_t* data, size_t len, const bool useJIT = false, const int jitVerbose = 0);
 };
 
 } // namespace Walrus

diff --git a/src/shell/Shell.cpp b/src/shell/Shell.cpp
@@ -113,18 +113,14 @@ static void printF64(double v)
 static Trap::TrapResult executeWASM(Store* store, const std::string& filename, const std::vector<uint8_t>& src, SpecTestFunctionTypes& functionTypes,
                                     std::map<std::string, Instance*>* registeredInstanceMap = nullptr)
 {
-    auto parseResult = WASMParser::parseBinary(store, filename, src.data(), src.size());
+    auto parseResult = WASMParser::parseBinary(store, filename, src.data(), src.size(), useJIT, jitVerbose);
     if (!parseResult.second.empty()) {
         Trap::TrapResult tr;
         tr.exception = Exception::create(parseResult.second);
         return tr;
     }
 
     auto module = parseResult.first;
-    if (useJIT) {
-        module->jitCompile(nullptr, 0, jitVerbose);
-    }
-
     const auto& importTypes = module->imports();
 
     ExternVector importValues;
@@ -874,19 +870,13 @@ static void executeWAST(Store* store, const std::string& filename, const std::ve
 
 static void runExports(Store* store, const std::string& filename, const std::vector<uint8_t>& src, std::string& exportToRun)
 {
-    auto parseResult = WASMParser::parseBinary(store, filename, src.data(), src.size());
-
+    auto parseResult = WASMParser::parseBinary(store, filename, src.data(), src.size(), useJIT, jitVerbose);
     if (!parseResult.second.empty()) {
         fprintf(stderr, "parse error: %s\n", parseResult.second.c_str());
         return;
     }
 
     auto module = parseResult.first;
-
-    if (useJIT) {
-        module->jitCompile(nullptr, 0, jitVerbose);
-    }
-
     const auto& importTypes = module->imports();
 
     if (importTypes.size() != 0) {