Skip to content

Commit

Permalink
Updating smir_pretty to stable-mir-json (#443)
Browse files Browse the repository at this point in the history
`https://github.com/runtimeverification/smir_pretty/` has been renamed
to `https://github.com/runtimeverification/stable-mir-json` so the
submodule needs to be updated to the right url

---------

Co-authored-by: devops <[email protected]>
  • Loading branch information
dkcumming and devops authored Feb 1, 2025
1 parent 9e4a5e5 commit cac5263
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ jobs:
if: always()
run: docker stop --time 0 mir-semantics-ci-${GITHUB_SHA}

smir-integration-tests:
stable-mir-json-integration-tests:
needs: code-quality-checks
name: "Integration with smir_pretty"
name: "Integration with stable-mir-json"
runs-on: [self-hosted, linux, normal]
steps:
- name: 'Check out code'
Expand All @@ -91,19 +91,19 @@ jobs:
- name: "Set up nightly Rust" # https://github.com/rust-lang/rustup/issues/3409
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2024-11-29 # Hardcoded version, same as smir_pretty
toolchain: nightly-2024-11-29 # Hardcoded version, same as stable-mir-json

- name: 'remove override'
run: |
cd deps/smir_pretty
cd deps/stable-mir-json
rustup override unset
rustup override unset --nonexistent
rustup toolchain uninstall smir_pretty | echo "rustup toolchain uninstall smir_pretty: FAILED"
rustup toolchain remove smir_pretty | echo "rustup toolchain remove smir_pretty: FAILED"
rustup toolchain uninstall stable-mir-json | echo "rustup toolchain uninstall stable-mir-json: FAILED"
rustup toolchain remove stable-mir-json | echo "rustup toolchain remove stable-mir-json: FAILED"
- name: 'Build smir_pretty'
- name: 'Build stable-mir-json'
run: |
make smir-pretty
make stable-mir-json
- name: 'Set up Docker'
uses: ./.github/actions/with-docker
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "deps/smir_pretty"]
path = deps/smir_pretty
url = https://github.com/runtimeverification/smir_pretty
[submodule "stable-mir-json"]
path = deps/stable-mir-json
url = https://github.com/runtimeverification/stable-mir-json
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ build: kmir
$(POETRY) run kdist -v build mir-semantics.\* -j4

##################################################
# for integration tests: build smir_pretty in-tree
# for integration tests: build stable-mir-json in-tree

smir-pretty:
cd deps/smir_pretty && cargo build
stable-mir-json:
cd deps/stable-mir-json && cargo build

# generate smir and parse given test files (from parameter or run-rs subdirectory)
smir-parse-tests: TESTS = $(shell find $(PWD)/kmir/src/tests/integration/data/run-rs -type f -name "*.rs")
smir-parse-tests: SMIR = cargo -Z unstable-options -C deps/smir_pretty run --
smir-parse-tests: SMIR = cargo -Z unstable-options -C deps/stable-mir-json run --
smir-parse-tests:
errors=""; \
report() { echo $$2; errors="$$errors $$1"; }; \
Expand Down
2 changes: 1 addition & 1 deletion kmir/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "kmir"
version = "0.3.67"
version = "0.3.68"
description = ""
authors = [
"Runtime Verification, Inc. <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion kmir/src/kmir/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from typing import Final

VERSION: Final = '0.3.67'
VERSION: Final = '0.3.68'
2 changes: 1 addition & 1 deletion kmir/src/kmir/kdist/mir-semantics/body.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ syntax AggregateKind ::= aggregateKindArray(Ty)
| aggregateKindCoroutine(CoroutineDef, GenericArgs, Movability) [group(mir-enum), symbol(AggregateKind::Coroutine)]
| aggregateKindRawPtr(Ty, Mutability) [group(mir-enum), symbol(AggregateKind::RawPtr)]
// FIXME the arguments for some of these are _heterogenous lists_ in smir_pretty
// FIXME the arguments for some of these are _heterogenous lists_ in stable-mir-json
syntax Rvalue ::= rvalueAddressOf(Mutability, Place) [group(mir-enum), symbol(Rvalue::AddressOf)]
| rvalueAggregate(AggregateKind, Operands) [group(mir-enum), symbol(Rvalue::Aggregate)]
| rvalueBinaryOp(BinOp, Operand, Operand) [group(mir-enum), symbol(Rvalue::BinaryOp)]
Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.67
0.3.68

0 comments on commit cac5263

Please sign in to comment.