Skip to content

chore: migrate to Miden protocol 0.16.0-rc.3 and VM 0.29 #1311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
greenhat wants to merge 1 commit into
base: next
Choose a base branch
from
Draft

chore: migrate to Miden protocol 0.16.0-rc.3 and VM 0.29 #1311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,145 changes: 973 additions & 172 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,23 @@ litcheck-filecheck = "0.4"
log = { version = "0.4", features = ["kv"] }

# Miden Dependencies
miden-assembly = { version = "0.25", default-features = false }
miden-core = { version = "0.25", default-features = false }
miden-debug = { version = "0.9" }
miden-debug-types = { version = "0.25", default-features = false }
miden-assembly-syntax = { version = "0.25", default-features = false }
miden-assembly-syntax-cst = { version = "0.25", default-features = false }
miden-assembly = { version = "0.29", default-features = false }
miden-core = { version = "0.29", default-features = false }
miden-debug = { version = "0.10" }
miden-debug-types = { version = "0.29", default-features = false }
miden-assembly-syntax = { version = "0.29", default-features = false }
miden-assembly-syntax-cst = { version = "0.29", default-features = false }
miden-formatting = { version = "0.1", default-features = false }
miden-protocol = { version = "=0.16.0-alpha.4", default-features = false }
miden-standards = { version = "=0.16.0-alpha.4", default-features = false }
miden-processor = { version = "0.25", default-features = false }
miden-core-lib = { version = "0.25", default-features = false }
miden-mast-package = { version = "0.25", default-features = false }
miden-package-registry = { version = "0.25", default-features = false }
miden-project = { version = "0.25", default-features = false }
miden-utils-sync = { version = "0.25", default-features = false }
miden-field = { version = "0.28", default-features = false }
midenc-hir-type = "0.9"
miden-protocol = { version = "=0.16.0-rc.3", default-features = false }
miden-standards = { version = "=0.16.0-rc.3", default-features = false }
miden-processor = { version = "0.29", default-features = false }
miden-core-lib = { version = "0.29", default-features = false }
miden-mast-package = { version = "0.29", default-features = false }
miden-package-registry = { version = "0.29", default-features = false }
miden-project = { version = "0.29", default-features = false }
miden-utils-sync = { version = "0.29", default-features = false }
miden-field = { version = "0.29", default-features = false }
midenc-hir-type = "0.10"

paste = "1.0"
parking_lot = "0.12"
Expand Down
8 changes: 5 additions & 3 deletions codegen/masm/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ fn main() -> Result<(), Report> {
midenc_session::Options::new(None, None, cwd, target_dir.clone(), None, toolchain_dir);

let mut registry = midenc_session::registry::HybridPackageRegistry::new(&options)?;
// Extend the registry with the built-in core library, in case the midenup toolchain is not
// available
registry.cache_package(CoreLibrary::default().package())?;
// Extend the registry with the built-in core library packages (miden-core and its
// miden-precompiles dependency), in case the midenup toolchain is not available
for package in CoreLibrary::default().packages() {
registry.cache_package(package)?;
}

let assembler = Assembler::default();
let mut project_assembler =
Expand Down
10 changes: 5 additions & 5 deletions codegen/masm/src/emit/crypto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ impl OpEmitter<'_> {
self.felt_stack_transform(masm::Instruction::EvalCircuit, 3, 3, "crypto", span);
}

/// Log a precompile event into the VM precompile transcript.
pub fn log_precompile(&mut self, span: SourceSpan) {
self.felt_stack_transform(masm::Instruction::LogPrecompile, 12, 12, "crypto", span);
/// Log a deferred precompile computation request.
pub fn log_deferred(&mut self, span: SourceSpan) {
self.felt_stack_transform(masm::Instruction::LogDeferred, 12, 12, "crypto", span);
}
}

Expand Down Expand Up @@ -171,8 +171,8 @@ mod tests {
assert_transform(masm::Instruction::EvalCircuit, 3, 3, |emitter, span| {
emitter.eval_circuit(span);
});
assert_transform(masm::Instruction::LogPrecompile, 12, 12, |emitter, span| {
emitter.log_precompile(span);
assert_transform(masm::Instruction::LogDeferred, 12, 12, |emitter, span| {
emitter.log_deferred(span);
});
}
}
2 changes: 1 addition & 1 deletion codegen/masm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ fn lower_hir_ops(info: &mut midenc_hir::DialectInfo) {
info.register_operation_trait::<hir::HornerBase, dyn HirLowering>();
info.register_operation_trait::<hir::HornerExt, dyn HirLowering>();
info.register_operation_trait::<hir::EvalCircuit, dyn HirLowering>();
info.register_operation_trait::<hir::LogPrecompile, dyn HirLowering>();
info.register_operation_trait::<hir::LogDeferred, dyn HirLowering>();
info.register_operation_trait::<hir::MemStream, dyn HirLowering>();
info.register_operation_trait::<hir::MemGrow, dyn HirLowering>();
info.register_operation_trait::<hir::MemSize, dyn HirLowering>();
Expand Down
2 changes: 1 addition & 1 deletion codegen/masm/src/lower/lowering.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@ impl_simple_hir_lowering!(hir::FriExt2Fold4 => fri_ext2fold4);
impl_simple_hir_lowering!(hir::HornerBase => horner_base);
impl_simple_hir_lowering!(hir::HornerExt => horner_ext);
impl_simple_hir_lowering!(hir::EvalCircuit => eval_circuit);
impl_simple_hir_lowering!(hir::LogPrecompile => log_precompile);
impl_simple_hir_lowering!(hir::LogDeferred => log_deferred);
impl_simple_hir_lowering!(hir::MemStream => mem_stream);
impl_simple_hir_lowering!(hir::AdvicePipe => advice_pipe);

Expand Down
6 changes: 3 additions & 3 deletions dialects/hir/src/builders.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,16 +477,16 @@ pub trait HirOpBuilder<'f, B: ?Sized + Builder> {
Ok(op_results!(op))
}

/// Log a precompile event into the VM precompile transcript.
fn log_precompile<A>(
/// Log a deferred precompile computation request.
fn log_deferred<A>(
&mut self,
stack: A,
span: SourceSpan,
) -> Result<SmallVec<[ValueRef; 12]>, Report>
where
A: IntoIterator<Item = ValueRef>,
{
let op_builder = self.builder_mut().create::<crate::ops::LogPrecompile, (A,)>(span);
let op_builder = self.builder_mut().create::<crate::ops::LogDeferred, (A,)>(span);
let op = op_builder(stack)?;
Ok(op_results!(op))
}
Expand Down
6 changes: 3 additions & 3 deletions dialects/hir/src/ops/crypto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,18 +378,18 @@ pub struct EvalCircuit {

infer_felt_outputs!(EvalCircuit, "hir.eval_circuit", 3, 3);

/// Log a precompile event into the VM precompile transcript.
/// Log a deferred precompile computation request.
#[derive(EffectOpInterface, OpPrinter, OpParser)]
#[operation(
dialect = HirDialect,
implements(InferTypeOpInterface, MemoryEffectOpInterface, OpPrinter)
)]
#[effects(MemoryEffect(MemoryEffect::Read, MemoryEffect::Write))]
pub struct LogPrecompile {
pub struct LogDeferred {
#[operands]
stack: IntFelt,
#[results]
outputs: IntFelt,
}

infer_felt_outputs!(LogPrecompile, "hir.log_precompile", 12, 12);
infer_felt_outputs!(LogDeferred, "hir.log_deferred", 12, 12);
Loading
Loading