use stable-mir-json from PATH in Makefile

Author: juliankuners

Makefile

@@ -16,23 +16,16 @@ test: test-unit test-integration smir-parse-tests
 ##################################################
 # for integration tests: build stable-mir-json in-tree
 
-stable-mir-json: CARGO_BUILD_OPTS =
-stable-mir-json:
-	cd deps/stable-mir-json && cargo build ${CARGO_BUILD_OPTS}
-	cd deps/stable-mir-json && cargo run --bin cargo_stable_mir_json -- ${TOP_DIR}/deps/stable-mir-json ${TOP_DIR}/deps
-	${TOP_DIR}/deps/.stable-mir-json/release.sh --version || ${TOP_DIR}/deps/.stable-mir-json/debug.sh --version
-
 # 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 -q -Z unstable-options -C deps/stable-mir-json run --
 smir-parse-tests: # build # commented out for CI's sake
 	errors=""; \
 	report() { echo $$2; errors="$$errors $$1"; }; \
 	for source in ${TESTS}; do \
 	    echo -n "$$source: "; \
 	    dir=$$(dirname $${source}); \
 	    target=$${dir}/$$(basename $${source%.rs}).smir.json; \
-	    ${SMIR} -Z no-codegen --out-dir $${dir} $$source \
+	    stable_mir_json -Z no-codegen --out-dir $${dir} $$source \
 		&& echo -n "smir-ed " \
 		|| report "$$source" "SMIR ERROR!"; \
 	    if [ -s $${target} ]; then \
@@ -49,7 +42,7 @@ smir-parse-tests: # build # commented out for CI's sake
 test-unit:
 	$(UV_RUN) pytest $(TOP_DIR)/kmir/src/tests/unit --maxfail=1 --verbose $(TEST_ARGS)
 
-test-integration: stable-mir-json build
+test-integration: build
 	$(UV_RUN) pytest $(TOP_DIR)/kmir/src/tests/integration --maxfail=1 --verbose \
 			--durations=0 --numprocesses=$(PARALLEL) --dist=worksteal $(TEST_ARGS)
 
@@ -102,13 +95,9 @@ cov-integration: test-integration
 ##################################################
 # Utilities
 
-.PHONY: clean stable-mir-json-clean
-
-stable-mir-json-clean:
-	cd deps/stable-mir-json && cargo clean
-	rm -rf deps/.stable-mir-json
+.PHONY: clean
 
-clean: stable-mir-json-clean
+clean:
 	rm -rf kmir/dist kmir/.coverage kmir/cov-* kmir/.mypy_cache kmir/.pytest_cache
 	find kmir/ -type d -name __pycache__ -prune -exec rm -rf {} \;
 
@@ -126,13 +115,12 @@ update-exec-smir:
 # file paths for spans in the the updated smir are truncated to known infixes
 .PHONY: update-smir-json
 update-smir-json: TARGETS = $(shell git ls-files | grep -e ".*\.smir\.json$$" | grep -v -e pinocchio)
-update-smir-json: SMIR = cargo -q -Z unstable-options -C deps/stable-mir-json run --
-update-smir-json: stable-mir-json
+update-smir-json:
 	for file in ${TARGETS}; do \
 		dir=$$(realpath $$(dirname $$file)); \
 		rust=$$dir/$$(basename $${file%.smir.json}.rs); \
 		[ -f "$$rust" ] || (echo "Source file $$rust missing."; exit 1); \
-		${SMIR} -Zno-codegen --out-dir $$dir $$rust; \
+		stable_mir_json -Zno-codegen --out-dir $$dir $$rust; \
 		jq '.spans[].[1].[0] |= sub("/.*lib/rustlib"; "rustlib") | .spans[].[1].[0] |= sub("/.*/integration/data"; "data")' $$file > $$file.tmp; \
 		mv $$file.tmp $$file; \
 	done