From 8a5c37cda2f242a728b7d1adaa3967358cf19270 Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Fri, 25 Aug 2023 15:45:38 +0800 Subject: [PATCH 1/6] Make booster, with-llvm-library default in Foundry --- kevm-pyk/src/kontrol/__main__.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/kevm-pyk/src/kontrol/__main__.py b/kevm-pyk/src/kontrol/__main__.py index 402b0ea57f..e91568babb 100644 --- a/kevm-pyk/src/kontrol/__main__.py +++ b/kevm-pyk/src/kontrol/__main__.py @@ -459,6 +459,7 @@ def _parse_test_id_tuple(value: str) -> tuple[str, str | None]: kevm_cli_args.kompile_args, kevm_cli_args.foundry_args, ], + conflict_handler='resolve', ) foundry_kompile.add_argument( '--regen', @@ -474,6 +475,19 @@ def _parse_test_id_tuple(value: str) -> tuple[str, str | None]: action='store_true', help='Rekompile foundry.k even if kompiled definition already exists.', ) + foundry_kompile.add_argument( + '--with-llvm-library', + dest='llvm_library', + default=True, + action='store_true', + help='Make kompile generate a dynamic llvm library.', + ) + foundry_kompile.add_argument( + '--no-llvm-library', + dest='llvm_library', + action='store_false', + help='Do not generate a dynamic llvm library during kompile.', + ) foundry_prove_args = command_parser.add_parser( 'foundry-prove', @@ -522,7 +536,7 @@ def _parse_test_id_tuple(value: str) -> tuple[str, str | None]: foundry_prove_args.add_argument( '--use-booster', dest='use_booster', - default=False, + default=True, action='store_true', help='Use the booster RPC server instead of kore-rpc.', ) From c011549e61e16109dfc1ae163b73e928bd5c2776 Mon Sep 17 00:00:00 2001 From: devops Date: Fri, 25 Aug 2023 07:50:59 +0000 Subject: [PATCH 2/6] Set Version: 1.0.279 --- deps/k | 1 + 1 file changed, 1 insertion(+) create mode 160000 deps/k diff --git a/deps/k b/deps/k new file mode 160000 index 0000000000..1463749082 --- /dev/null +++ b/deps/k @@ -0,0 +1 @@ +Subproject commit 14637490829833d7b5871b372fb72fb097116e92 From 45680be990171f604a9a06bd243b6d4d673a65bd Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Mon, 28 Aug 2023 12:43:38 +0800 Subject: [PATCH 3/6] Rename option to `--no-use-booster`;fix CI command --- .github/workflows/test-pr.yml | 4 ++-- kevm-pyk/src/kontrol/__main__.py | 20 ++++++-------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 04ac322dbc..5a60a654d4 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -198,7 +198,7 @@ jobs: - name: 'Build Foundry' run: docker exec -u github-user kevm-ci-foundry-${GITHUB_SHA} /bin/bash -c 'make build-foundry -j2' - name: 'Foundry Prove' - run: docker exec -u github-user kevm-ci-foundry-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS=-vv' + run: docker exec -u github-user kevm-ci-foundry-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS=-vv --no-use-booster' - name: 'Tear down Docker' if: always() run: | @@ -226,7 +226,7 @@ jobs: - name: 'Build Foundry' run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make build-foundry -j2' - name: 'Foundry Prove' - run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS="-vv --use-booster"' + run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS="-vv"' - name: 'Tear down Docker' if: always() run: | diff --git a/kevm-pyk/src/kontrol/__main__.py b/kevm-pyk/src/kontrol/__main__.py index e91568babb..9ff4c6e925 100644 --- a/kevm-pyk/src/kontrol/__main__.py +++ b/kevm-pyk/src/kontrol/__main__.py @@ -459,7 +459,6 @@ def _parse_test_id_tuple(value: str) -> tuple[str, str | None]: kevm_cli_args.kompile_args, kevm_cli_args.foundry_args, ], - conflict_handler='resolve', ) foundry_kompile.add_argument( '--regen', @@ -475,19 +474,6 @@ def _parse_test_id_tuple(value: str) -> tuple[str, str | None]: action='store_true', help='Rekompile foundry.k even if kompiled definition already exists.', ) - foundry_kompile.add_argument( - '--with-llvm-library', - dest='llvm_library', - default=True, - action='store_true', - help='Make kompile generate a dynamic llvm library.', - ) - foundry_kompile.add_argument( - '--no-llvm-library', - dest='llvm_library', - action='store_false', - help='Do not generate a dynamic llvm library during kompile.', - ) foundry_prove_args = command_parser.add_parser( 'foundry-prove', @@ -540,6 +526,12 @@ def _parse_test_id_tuple(value: str) -> tuple[str, str | None]: action='store_true', help='Use the booster RPC server instead of kore-rpc.', ) + foundry_prove_args.add_argument( + '--no-use-booster', + dest='use_booster', + action='store_false', + help='Do not use the booster RPC server instead of kore-rpc.', + ) foundry_show_args = command_parser.add_parser( 'foundry-show', From aa03b3ba88522d10684f04afde5b24d150ad0b55 Mon Sep 17 00:00:00 2001 From: devops Date: Mon, 4 Sep 2023 08:25:10 +0000 Subject: [PATCH 4/6] Set Version: 1.0.287 --- kevm-pyk/pyproject.toml | 2 +- package/debian/changelog | 2 +- package/version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml index 9512696aee..cbdbc5f1a3 100644 --- a/kevm-pyk/pyproject.toml +++ b/kevm-pyk/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kevm-pyk" -version = "1.0.286" +version = "1.0.287" description = "" authors = [ "Runtime Verification, Inc. ", diff --git a/package/debian/changelog b/package/debian/changelog index 27122956db..66c9cdbe80 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,4 +1,4 @@ -kevm (1.0.286) unstable; urgency=medium +kevm (1.0.287) unstable; urgency=medium * Initial Release. diff --git a/package/version b/package/version index c3ace87fe2..44b743e430 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -1.0.286 +1.0.287 From 578cbd5df3ab35f8211305a50057ad4af4c007c9 Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Tue, 5 Sep 2023 14:33:53 +0800 Subject: [PATCH 5/6] Fix merge conflict: remove `k/deps` --- deps/k | 1 - 1 file changed, 1 deletion(-) delete mode 160000 deps/k diff --git a/deps/k b/deps/k deleted file mode 160000 index 1463749082..0000000000 --- a/deps/k +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14637490829833d7b5871b372fb72fb097116e92 From b9aa27f3ec7c51a97d6e38a3662dbeb6c2e6d689 Mon Sep 17 00:00:00 2001 From: palinatolmach Date: Tue, 5 Sep 2023 14:48:50 +0800 Subject: [PATCH 6/6] Revert adding `--no-use-booster` in CI --- .github/workflows/test-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 5a60a654d4..04ac322dbc 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -198,7 +198,7 @@ jobs: - name: 'Build Foundry' run: docker exec -u github-user kevm-ci-foundry-${GITHUB_SHA} /bin/bash -c 'make build-foundry -j2' - name: 'Foundry Prove' - run: docker exec -u github-user kevm-ci-foundry-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS=-vv --no-use-booster' + run: docker exec -u github-user kevm-ci-foundry-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS=-vv' - name: 'Tear down Docker' if: always() run: | @@ -226,7 +226,7 @@ jobs: - name: 'Build Foundry' run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make build-foundry -j2' - name: 'Foundry Prove' - run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS="-vv"' + run: docker exec -u github-user kevm-ci-booster-${GITHUB_SHA} /bin/bash -c 'make test-foundry-prove PYTEST_ARGS="-vv --use-booster"' - name: 'Tear down Docker' if: always() run: |