Fix HIR and MASM handling in `--emit` option, add internal group and folder path support #836

greenhat · 2025-12-23T15:53:36Z

Close #724
Close #816

This PR:

Fixes --emit=hir and masm and preserves Miden package output location;
Adds the --emit=wat[=<path>] option to emit wat files;
Adds the --emit=inter[=<path>] option to emit wat, hir, masm files;
Pass all the cargo miden build options to the midenc (instead of only --emit);
Adds MIDENC_EXPAND=[<path>] env var handling in the compiler test suite to emit Rust code with expanded macros;

bitwalker

Looks good! I have a few minor things I'd like to tweak, but overall I think this should do nicely 👍

bitwalker · 2025-12-26T16:41:29Z

tests/integration/src/compiler_test.rs

+/// working directory. When set to a non-empty value other than `1`, it is treated as the output
+/// directory.
+fn maybe_dump_cargo_expand(test: &CargoTest, rustflags_env: Option<&str>) {
+    let Some(value) = std::env::var_os("MIDENC_EXPAND") else {


I know it's more verbose, but could we use MIDENC_EMIT_MACRO_EXPAND for this? For a couple of reasons:

It keeps our environment variables a bit more structured, and eases future additions.

It is much clearer what the purpose of it is, and it's relationship to --emit

LLMs can probably better understand it. Which isn't a priority for me, but doesn't hurt.

Sure. Done.

bitwalker · 2025-12-26T16:44:24Z

midenc-session/src/outputs.rs

+
+    /// Returns the subset of [OutputType] values considered "intermediate" for convenience
+    /// emission (WAT, HIR, MASM).
+    pub fn inter() -> [OutputType; 3] {


Nit: I'd prefer just ir for this (since all of these are intermediate representations, it's better shorthand, and easier to remember than "inter" IMO).

Done.
Funnily enough, initially I thought about naming it ir but then I decided to go with inter to emphasize that this is a group of multiple intermediate formats and not the HIR representation.

bitwalker · 2025-12-26T16:45:44Z

midenc-session/src/outputs.rs

+
+    /// Returns the subset of [OutputType] values considered "intermediate" for convenience
+    /// emission (WAT, HIR, MASM).
+    pub fn inter() -> [OutputType; 3] {


I'd make the return type &'static [OutputType] here, and mark it const, that way we don't have to hardcode the size of the array in the signature, and it's just as useful at compile-time as an array.

bitwalker · 2025-12-26T16:53:45Z

midenc-session/src/outputs.rs

+    /// Emit a common set of intermediate artifacts (WAT, HIR, MASM) into a directory.
+    ///
+    /// The directory path is interpreted relative to the session working directory.
+    Inter {


I'd suggest we name this variant Subset, and definite it like so:

enum OutputTypeSpec { // ... Subset { output_types: SmallVec<[OutputType; 3]>, path: Option<OutputFile>, }, // ... }

This makes OutputTypeSpec a bit more versatile, and doesn't bake into it the assumption that emitting multiple outputs has to be just intermediate representations, but any combination of two or more output types.

Good idea! Done.

bitwalker · 2025-12-26T16:54:35Z

midenc-session/src/outputs.rs

                PossibleValue::new("mast").help("Merkelized Abstract Syntax Tree (text)"),
                PossibleValue::new("masl").help("Merkelized Abstract Syntax Tree (binary)"),
                PossibleValue::new("masp").help("Miden Assembly Package Format (binary)"),
+                PossibleValue::new("inter").help("WAT + HIR + MASM (text, optional directory)"),


Per my other comment, let's name this value ir instead of inter

bitwalker · 2025-12-26T16:57:02Z

midenc-compile/src/compiler.rs

-        if output_types.is_empty() {
+        let has_final_output = output_types
+            .keys()
+            .any(|ty| matches!(ty, OutputType::Mast | OutputType::Masl | OutputType::Masp));


We should remove the Masl output type - it is no longer useful, and I'm in the process of removing Library entirely from the assembler

bitwalker · 2025-12-26T16:59:02Z

midenc-compile/src/stages/parse.rs


 use super::*;

+/// A wrapper that emits WebAssembly text format (WAT).


Nit: Probably better to define this in the midenc-frontend-wasm crate, and it'll reduce the clutter in this file as an extra benefit.

bitwalker · 2025-12-26T16:59:50Z

midenc-compile/src/stages/codegen.rs

+///
+/// The format matches the [core::fmt::Display] implementation for [MasmComponent], which is
+/// defined in `codegen/masm/src/artifact.rs`.
+struct MasmComponentEmit<'a>(&'a MasmComponent);


Similarly to WasmEmit, let's move this to the midenc-codegen-masm crate.

greenhat · 2025-12-29T11:17:42Z

Rebased and ready for another round.

greenhat · 2025-12-29T11:26:37Z

Don't merge before #810 . I removed merge_midenc_flags in this PR and it is changed in #810. I need to port changes first.

package output location.

add Debugging section in the README.

…ntend

greenhat · 2025-12-29T12:51:05Z

Rebased again after #810 was merged. Ready for merge.

greenhat force-pushed the i724-fix-emit branch from 7651d0b to f293423 Compare December 23, 2025 16:13

greenhat marked this pull request as ready for review December 26, 2025 15:10

greenhat requested a review from bitwalker December 26, 2025 15:10

bitwalker requested changes Dec 26, 2025

View reviewed changes

greenhat force-pushed the i724-fix-emit branch from 9549c10 to af7f2f0 Compare December 29, 2025 11:12

greenhat added 17 commits December 29, 2025 14:39

fix: write hir and masm in --emit option and preserve Miden

abb62b4

package output location.

feature: add WAT support in --emit option

fe8f984

feature: add inter group to --emit option (wat, hir, masm)

ce50932

fix: pass all user options in cargo miden build to midenc

47724c1

test: introduce MIDENC_EXPAND env var to dump expanded Rust code

c77ea49

refactor: pre-allocate string for WAT printer

93e5ddb

fix: handle relative paths in OutputFile::Directory

21b4685

refactor: better error messages, code cleanup

50c33e3

fix: use wasm32-wasip2 in cargo-expand invocation

6318706

fix: no_std build

0f4b586

fix: treat --emit=all=path as a directory

93405fa

refactor: rename MIDENC_EXPAND env var to MIDENC_EMIT_MACRO_EXPAND,

5c6e9cc

add Debugging section in the README.

refactor: rename inter set to ir

7a8a57e

refactor: make OutputTypeSpec::Inter into OutputTypeSpec::Subset

08afd1b

refactor: make OutputType:all and ir return &'static [OutputType]

54c4ae3

refactor: remove OutputType::Masl

c0dd556

refactor: move Masm component and Wat emission to the codegen and fro…

844e236

…ntend

greenhat force-pushed the i724-fix-emit branch from af7f2f0 to 844e236 Compare December 29, 2025 12:50

bitwalker approved these changes Dec 29, 2025

View reviewed changes

greenhat merged commit e8de1ae into next Dec 30, 2025
15 checks passed

greenhat deleted the i724-fix-emit branch December 30, 2025 07:11


		use super::*;

		/// A wrapper that emits WebAssembly text format (WAT).

Fix HIR and MASM handling in --emit option, add internal group and folder path support #836

Fix HIR and MASM handling in --emit option, add internal group and folder path support #836

Uh oh!

Conversation

greenhat commented Dec 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bitwalker left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

greenhat commented Dec 29, 2025

Uh oh!

greenhat commented Dec 29, 2025

Uh oh!

greenhat commented Dec 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Fix HIR and MASM handling in `--emit` option, add internal group and folder path support #836

Fix HIR and MASM handling in `--emit` option, add internal group and folder path support #836

greenhat commented Dec 23, 2025 •

edited

Loading