Update dependency: deps/kwasm_release (#241)

* deps/kwasm_release: Set Version 0.1.38 * kmultiversx/: sync poetry files 0.1.38 * deps/k_release: sync release file version 7.0.17 * Add target `mx-semantics.source` * Set Version: 0.1.41 --------- Co-authored-by: devops <[email protected]> Co-authored-by: Tamás Tóth <[email protected]>
runtimeverification · Apr 25, 2024 · f92c286 · f92c286
1 parent a806622
commit f92c286
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 156 deletions.
diff --git a/deps/k_release b/deps/k_release
@@ -1 +1 @@
-7.0.9
+7.0.17
diff --git a/deps/kwasm_release b/deps/kwasm_release
@@ -1 +1 @@
-0.1.35
+0.1.38
diff --git a/kmultiversx/poetry.lock b/kmultiversx/poetry.lock
diff --git a/kmultiversx/pyproject.toml b/kmultiversx/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "kmultiversx"
-version = "0.1.40"
+version = "0.1.41"
 description = "Python tools for Elrond semantics"
 authors = [
     "Runtime Verification, Inc. <[email protected]>",
@@ -20,7 +20,7 @@ mx-semantics = "kmultiversx.kdist.plugin"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "v0.1.35", subdirectory = "pykwasm" }
+pykwasm = { git = "https://github.com/runtimeverification/wasm-semantics.git", tag = "v0.1.38", subdirectory = "pykwasm" }
 pycryptodomex = "^3.18.0"
 hypothesis = "^6.82.6"
 

diff --git a/kmultiversx/src/kmultiversx/kdist/plugin.py b/kmultiversx/src/kmultiversx/kdist/plugin.py
@@ -1,52 +1,62 @@
 from __future__ import annotations
 
+import shutil
 from pathlib import Path
 from typing import TYPE_CHECKING
 
 from pyk.kbuild.utils import k_version
 from pyk.kdist.api import Target
 from pyk.ktool.kompile import KompileBackend, kompile
-from pykwasm.kdist.plugin import SOURCE_DIR as WASM_DIR
 
 if TYPE_CHECKING:
-    from collections.abc import Mapping
+    from collections.abc import Callable, Mapping
     from typing import Any, Final
 
 
 CURRENT_DIR: Final = Path(__file__).parent
-SOURCE_DIR: Final = CURRENT_DIR / 'mx-semantics'
 PLUGIN_DIR: Final = CURRENT_DIR.parents[3] / 'deps/plugin'  # TODO Distribute plugin files with Python
 
 
+class SourceTarget(Target):
+    SRC_DIR: Final = Path(__file__).parent
+
+    def build(self, output_dir: Path, deps: dict[str, Path], args: dict[str, Any], verbose: bool) -> None:
+        shutil.copytree(deps['wasm-semantics.source'] / 'wasm-semantics', output_dir / 'wasm-semantics')
+        shutil.copytree(self.SRC_DIR / 'mx-semantics', output_dir / 'mx-semantics')
+
+    def source(self) -> tuple[Path, ...]:
+        return (self.SRC_DIR,)
+
+    def deps(self) -> tuple[str]:
+        return ('wasm-semantics.source',)
+
+
 class KompileTarget(Target):
-    _kompile_args: dict[str, Any]
+    _kompile_args: Callable[[Path], Mapping[str, Any]]
 
-    def __init__(self, kompile_args: Mapping[str, Any]):
-        self._kompile_args = dict(kompile_args)
+    def __init__(self, kompile_args: Callable[[Path], Mapping[str, Any]]):
+        self._kompile_args = kompile_args
 
     def build(self, output_dir: Path, deps: dict[str, Path], args: dict[str, Any], verbose: bool) -> None:
         # TODO Pass K_OPTS='-Xmx8G -Xss512m'
-        kompile(
-            output_dir=output_dir,
-            verbose=verbose,
-            **self._kompile_args,
-        )
-
-    def source(self) -> tuple[Path, ...]:
-        return (SOURCE_DIR,)
+        kompile_args = self._kompile_args(deps['mx-semantics.source'])
+        kompile(output_dir=output_dir, verbose=verbose, **kompile_args)
 
     def context(self) -> dict[str, str]:
         return {'k-version': k_version().text}
 
+    def deps(self) -> tuple[str]:
+        return ('mx-semantics.source',)
+
 
-def llvm_target(main_file: Path, main_module: str, syntax_module: str) -> KompileTarget:
+def llvm_target(main_file_name: str, main_module: str, syntax_module: str) -> KompileTarget:
     return KompileTarget(
-        {
+        lambda src_dir: {
             'backend': KompileBackend.LLVM,
-            'main_file': main_file,
+            'main_file': src_dir / 'mx-semantics' / main_file_name,
             'main_module': main_module,
             'syntax_module': syntax_module,
-            'include_dirs': [WASM_DIR, PLUGIN_DIR],
+            'include_dirs': [src_dir, PLUGIN_DIR],
             'md_selector': 'k',
             'hook_namespaces': ['KRYPTO'],
             'opt_level': 2,
@@ -70,14 +80,14 @@ def llvm_target(main_file: Path, main_module: str, syntax_module: str) -> Kompil
     )
 
 
-def haskell_target(main_file: Path, main_module: str, syntax_module: str) -> KompileTarget:
+def haskell_target(main_file_name: str, main_module: str, syntax_module: str) -> KompileTarget:
     return KompileTarget(
-        {
+        lambda src_dir: {
             'backend': KompileBackend.HASKELL,
-            'main_file': main_file,
+            'main_file': src_dir / 'mx-semantics' / main_file_name,
             'main_module': main_module,
             'syntax_module': syntax_module,
-            'include_dirs': [WASM_DIR, PLUGIN_DIR],
+            'include_dirs': [src_dir, PLUGIN_DIR],
             'md_selector': 'k',
             'hook_namespaces': ['KRYPTO'],
             'warnings_to_errors': True,
@@ -86,8 +96,9 @@ def haskell_target(main_file: Path, main_module: str, syntax_module: str) -> Kom
 
 
 __TARGETS__: Final = {
-    'llvm-mandos': llvm_target(SOURCE_DIR / 'mandos.md', 'MANDOS', 'MANDOS-SYNTAX'),
-    'llvm-kasmer': llvm_target(SOURCE_DIR / 'kasmer.md', 'KASMER', 'KASMER-SYNTAX'),
-    'haskell-mandos': haskell_target(SOURCE_DIR / 'mandos.md', 'MANDOS', 'MANDOS-SYNTAX'),
-    'haskell-kasmer': haskell_target(SOURCE_DIR / 'kasmer.md', 'KASMER', 'KASMER-SYNTAX'),
+    'source': SourceTarget(),
+    'llvm-mandos': llvm_target('mandos.md', 'MANDOS', 'MANDOS-SYNTAX'),
+    'llvm-kasmer': llvm_target('kasmer.md', 'KASMER', 'KASMER-SYNTAX'),
+    'haskell-mandos': haskell_target('mandos.md', 'MANDOS', 'MANDOS-SYNTAX'),
+    'haskell-kasmer': haskell_target('kasmer.md', 'KASMER', 'KASMER-SYNTAX'),
 }
diff --git a/package/version b/package/version
@@ -1 +1 @@
-0.1.40
+0.1.41