diff --git a/crates/nargo_cli/src/cli/gates_cmd.rs b/crates/nargo_cli/src/cli/info_cmd.rs similarity index 72% rename from crates/nargo_cli/src/cli/gates_cmd.rs rename to crates/nargo_cli/src/cli/info_cmd.rs index dc4a63c4105..7ad0a2caf8c 100644 --- a/crates/nargo_cli/src/cli/gates_cmd.rs +++ b/crates/nargo_cli/src/cli/info_cmd.rs @@ -8,22 +8,25 @@ use crate::errors::CliError; use super::NargoConfig; -/// Counts the occurrences of different gates in circuit +/// Provides detailed informaton on a circuit +/// Current information provided: +/// 1. The number of ACIR opcodes +/// 2. Counts the final number gates in the circuit used by a backend #[derive(Debug, Clone, Args)] -pub(crate) struct GatesCommand { +pub(crate) struct InfoCommand { #[clap(flatten)] compile_options: CompileOptions, } pub(crate) fn run( backend: &B, - args: GatesCommand, + args: InfoCommand, config: NargoConfig, ) -> Result<(), CliError> { - count_gates_with_path(backend, config.program_dir, &args.compile_options) + count_opcodes_and_gates_with_path(backend, config.program_dir, &args.compile_options) } -fn count_gates_with_path>( +fn count_opcodes_and_gates_with_path>( backend: &B, program_dir: P, compile_options: &CompileOptions, diff --git a/crates/nargo_cli/src/cli/mod.rs b/crates/nargo_cli/src/cli/mod.rs index 9832a28a0fe..67c05232401 100644 --- a/crates/nargo_cli/src/cli/mod.rs +++ b/crates/nargo_cli/src/cli/mod.rs @@ -12,7 +12,7 @@ mod check_cmd; mod codegen_verifier_cmd; mod compile_cmd; mod execute_cmd; -mod gates_cmd; +mod info_cmd; mod init_cmd; mod lsp_cmd; mod new_cmd; @@ -57,7 +57,7 @@ enum NargoCommand { Prove(prove_cmd::ProveCommand), Verify(verify_cmd::VerifyCommand), Test(test_cmd::TestCommand), - Gates(gates_cmd::GatesCommand), + Info(info_cmd::InfoCommand), Lsp(lsp_cmd::LspCommand), } @@ -80,7 +80,7 @@ pub fn start_cli() -> eyre::Result<()> { NargoCommand::Prove(args) => prove_cmd::run(&backend, args, config), NargoCommand::Verify(args) => verify_cmd::run(&backend, args, config), NargoCommand::Test(args) => test_cmd::run(&backend, args, config), - NargoCommand::Gates(args) => gates_cmd::run(&backend, args, config), + NargoCommand::Info(args) => info_cmd::run(&backend, args, config), NargoCommand::CodegenVerifier(args) => codegen_verifier_cmd::run(&backend, args, config), NargoCommand::Lsp(args) => lsp_cmd::run(&backend, args, config), }?; diff --git a/crates/noirc_evaluator/src/ssa_refactor/opt/flatten_cfg.rs b/crates/noirc_evaluator/src/ssa_refactor/opt/flatten_cfg.rs index f90704d3b16..ac62071d6ee 100644 --- a/crates/noirc_evaluator/src/ssa_refactor/opt/flatten_cfg.rs +++ b/crates/noirc_evaluator/src/ssa_refactor/opt/flatten_cfg.rs @@ -132,7 +132,7 @@ //! v12 = add v10, v11 //! store v12 at v5 (new store) use std::{ - collections::{HashMap, HashSet, BTreeMap}, + collections::{BTreeMap, HashMap, HashSet}, rc::Rc, };