Track variable locations

.gitignore

@@ -17,9 +17,12 @@ env/
 *.out
 node_modules/
 *DS_Store
+._*
 *.iml
 book/
 
 # Ignore Cargo.lock in test projects
 examples/**/Cargo.lock
 tests/**/Cargo.lock
+**/src/bindings.rs
+*.lit_test_times.txt*

Cargo.toml

@@ -75,6 +75,7 @@ inventory = "0.3"
 litcheck = { package = "litcheck-core", version = "0.4" }
 litcheck-filecheck = "0.4"
 log = { version = "0.4", features = ["kv"] }
+env_logger = "0.11"
 
 # Miden Dependencies
 miden-assembly = { version = "0.22", default-features = false }
@@ -140,6 +141,7 @@ midenc-dialect-arith = { version = "0.8.1", path = "dialects/arith" }
 midenc-dialect-hir = { version = "0.8.1", path = "dialects/hir" }
 midenc-dialect-scf = { version = "0.8.1", path = "dialects/scf" }
 midenc-dialect-cf = { version = "0.8.1", path = "dialects/cf" }
+midenc-dialect-debuginfo = { version = "0.8.1", path = "dialects/debuginfo" }
 midenc-dialect-ub = { version = "0.8.1", path = "dialects/ub" }
 midenc-dialect-wasm = { version = "0.8.1", path = "dialects/wasm" }
 midenc-hir = { version = "0.8.1", path = "hir" }
@@ -159,23 +161,6 @@ miden-integration-tests = { path = "tests/integration" }
 midenc-expect-test = { path = "tools/expect-test" }
 miden-field = { version = "0.22" }
 
-[patch.crates-io]
-#miden-assembly = { git = "https://github.com/0xMiden/miden-vm", rev = "614cd7f9b52f45238b0ab59c71ebb49325051e5d" }
-#miden-assembly = { path = "../miden-vm/assembly" }
-#miden-assembly-syntax = { path = "../miden-vm/assembly-syntax" }
-#miden-core = { git = "https://github.com/0xMiden/miden-vm", rev = "614cd7f9b52f45238b0ab59c71ebb49325051e5d" }
-#miden-core = { path = "../miden-vm/core" }
-# miden-client = { git = "https://github.com/0xMiden/miden-client", rev = "0a5add565d1388f77cd182f3639c16aa8f7ec674" }
-# miden-debug = { git = "https://github.com/0xMiden/miden-debug", branch = "main" }
-#miden-debug-types = { path = "../miden-vm/crates/debug/types" }
-#miden-processor = { git = "https://github.com/0xMiden/miden-vm", rev = "614cd7f9b52f45238b0ab59c71ebb49325051e5d" }
-#miden-processor = { path = "../miden-vm/processor" }
-#miden-mast-package = { git = "https://github.com/0xMiden/miden-vm", rev = "614cd7f9b52f45238b0ab59c71ebb49325051e5d" }
-#miden-mast-package = { path = "../miden-vm/package" }
-# miden-protocol = { git = "https://github.com/0xMiden/protocol", rev = "a53bbe2209f506df87876c8b9c9a1730214f456b" }
-# miden-standards = { git = "https://github.com/0xMiden/protocol", rev = "a53bbe2209f506df87876c8b9c9a1730214f456b" }
-# miden-tx        = { tag = "v0.14.0-beta.4", git = "https://github.com/0xMiden/miden-base" }
-
 [profile.dev]
 lto = false
 # Needed for 'inventory' to work

Makefile.toml

@@ -235,6 +235,20 @@ args = [
     "${MIDENC_BIN_DIR}",
 ]
 
+[tasks.miden-debugdump]
+category = "Build"
+description = "Builds miden-debugdump and installs it to the bin folder"
+command = "cargo"
+args = [
+    "-Z",
+    "unstable-options",
+    "build",
+    "-p",
+    "miden-debugdump",
+    "--artifact-dir",
+    "${MIDENC_BIN_DIR}",
+]
+
 [tasks.miden-objtool]
 category = "Build"
 description = "Builds miden-objtool and installs it to the bin folder"
@@ -442,7 +456,7 @@ args = [
     "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/bin",
     "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/tests/lit",
 ]
-dependencies = ["litcheck", "midenc", "cargo-miden", "hir-opt"]
+dependencies = ["litcheck", "midenc", "cargo-miden", "hir-opt", "miden-debugdump"]
 
 [tasks.lit]
 category = "Test"
@@ -453,7 +467,7 @@ args = [
     "lit",
     "${@}",
 ]
-dependencies = ["litcheck", "midenc", "cargo-miden", "hir-opt"]
+dependencies = ["litcheck", "midenc", "cargo-miden", "hir-opt", "miden-debugdump"]
 
 
 [tasks.litcheck]

codegen/masm/Cargo.toml

@@ -29,6 +29,7 @@ midenc-hir.workspace = true
 midenc-hir-analysis.workspace = true
 midenc-dialect-arith.workspace = true
 midenc-dialect-cf.workspace = true
+midenc-dialect-debuginfo.workspace = true
 midenc-dialect-hir.workspace = true
 midenc-dialect-scf.workspace = true
 midenc-dialect-ub.workspace = true

codegen/masm/src/emitter.rs

@@ -115,9 +115,16 @@ impl BlockEmitter<'_> {
         // operand stack space on operands that will never be used.
         //self.drop_unused_operands_at(op);
 
-        let lowering = op.as_trait::<dyn HirLowering>().unwrap_or_else(|| {
-            panic!("illegal operation: no lowering has been defined for '{}'", op.name())
-        });
+        let Some(lowering) = op.as_trait::<dyn HirLowering>() else {
+            // Skip debug info ops that have no lowering (e.g. debuginfo.kill,
+            // debuginfo.declare) rather than panicking. These ops carry no
+            // semantic meaning for code generation.
+            if op.name().dialect().as_str() == "debuginfo" {
+                log::trace!(target: "codegen", "skipping debug info op with no lowering: {}", op.name());
+                return;
+            }
+            panic!("illegal operation: no lowering has been defined for '{}'", op.name());
+        };
 
         // Schedule operands for this instruction
         lowering

codegen/masm/src/lib.rs

@@ -29,6 +29,7 @@ pub mod masm {
 
 use midenc_dialect_arith as arith;
 use midenc_dialect_cf as cf;
+use midenc_dialect_debuginfo as debuginfo;
 use midenc_dialect_hir as hir;
 use midenc_dialect_scf as scf;
 use midenc_dialect_ub as ub;
@@ -46,6 +47,9 @@ pub use self::{
 inventory::submit!(::midenc_hir::DialectRegistrationHookInfo::new::<builtin::BuiltinDialect>(
     lower_builtin_ops
 ));
+inventory::submit!(::midenc_hir::DialectRegistrationHookInfo::new::<debuginfo::DebugInfoDialect>(
+    lower_debuginfo_ops
+));
 inventory::submit!(::midenc_hir::DialectRegistrationHookInfo::new::<arith::ArithDialect>(
     lower_arith_ops
 ));
@@ -71,6 +75,10 @@ fn lower_builtin_ops(info: &mut midenc_hir::DialectInfo) {
     info.register_operation_trait::<builtin::GlobalSymbol, dyn HirLowering>();
 }
 
+fn lower_debuginfo_ops(info: &mut midenc_hir::DialectInfo) {
+    info.register_operation_trait::<debuginfo::DebugValue, dyn HirLowering>();
+}
+
 fn lower_arith_ops(info: &mut midenc_hir::DialectInfo) {
     info.register_operation_trait::<arith::Constant, dyn HirLowering>();
     info.register_operation_trait::<arith::Add, dyn HirLowering>();