Skip to content

Commit f8fc873

Browse files
Merge branch 'master' into add-bytes-lookup-lemmas
2 parents 4cc162b + 2358da5 commit f8fc873

25 files changed

Lines changed: 1518 additions & 451 deletions

.github/workflows/test-pr.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
test-suite: 'test-prove-rules'
9797
test-args: '--use-booster-dev'
9898
timeout: 45
99-
parallel: 8
99+
parallel: 6
100100
- name: 'Functional'
101101
test-suite: 'test-prove-functional'
102102
test-args:
@@ -107,6 +107,11 @@ jobs:
107107
test-args:
108108
timeout: 45
109109
parallel: 1
110+
- name: 'Summarization'
111+
test-suite: 'test-summarize'
112+
test-args:
113+
timeout: 30
114+
parallel: 6
110115
- name: 'DSS'
111116
test-suite: 'test-prove-dss'
112117
test-args:
@@ -127,7 +132,7 @@ jobs:
127132
- name: 'Build kevm-pyk'
128133
run: docker exec -u github-user kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} /bin/bash -c 'make poetry'
129134
- name: 'Build distribution'
130-
run: docker exec -u github-user kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} /bin/bash -c 'CXX=clang++-14 poetry -C kevm-pyk run kdist --verbose build -j`nproc` evm-semantics.plugin evm-semantics.haskell'
135+
run: docker exec -u github-user kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} /bin/bash -c 'CXX=clang++-14 poetry -C kevm-pyk run kdist --verbose build -j`nproc` evm-semantics.plugin evm-semantics.haskell evm-semantics.summary'
131136
- name: 'Run proofs'
132137
run: docker exec -u github-user kevm-ci-haskell-${{ matrix.test-suite }}-${{ github.sha }} /bin/bash -c "make ${{ matrix.test-suite }} PYTEST_ARGS='-vv ${{ matrix.test-args }}' PYTEST_PARALLEL=${{ matrix.parallel }}"
133138
- name: 'Tear down Docker'

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ profile: poetry
9090
$(MAKE) -C kevm-pyk/ profile
9191
find /tmp/pytest-of-$$(whoami)/pytest-current/ -type f -name '*.prof' | sort | xargs tail -n +1
9292

93+
test-summarize: poetry
94+
$(MAKE) -C kevm-pyk/ test-integration PYTEST_ARGS+='-k "test_summarize"'
95+
9396

9497
# Smoke Tests
9598

deps/blockchain-k-plugin_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c9264b240c00d1f6cc20e22aac83c94d1a499138
1+
651a2db5afc1789c89553f9113c1afa39e391e35

deps/k_release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.212
1+
7.1.219

flake.lock

Lines changed: 52 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
description = "A flake for the KEVM Semantics";
33

44
inputs = {
5-
k-framework.url = "github:runtimeverification/k/v7.1.212";
5+
k-framework.url = "github:runtimeverification/k/v7.1.219";
66
nixpkgs.follows = "k-framework/nixpkgs";
77
flake-utils.follows = "k-framework/flake-utils";
88
rv-utils.follows = "k-framework/rv-utils";
99
poetry2nix.follows = "k-framework/poetry2nix";
1010
blockchain-k-plugin = {
1111
url =
12-
"github:runtimeverification/blockchain-k-plugin/c9264b240c00d1f6cc20e22aac83c94d1a499138";
12+
"github:runtimeverification/blockchain-k-plugin/651a2db5afc1789c89553f9113c1afa39e391e35";
1313
inputs.flake-utils.follows = "k-framework/flake-utils";
1414
inputs.nixpkgs.follows = "k-framework/nixpkgs";
1515
};

kevm-pyk/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/dist/
22
__pycache__/
33
.coverage
4+
proofs/
5+
summaries/

0 commit comments

Comments
 (0)