remove more macros

Author: ledwards2225

barretenberg/cpp/src/barretenberg/bbapi/bbapi_chonk.cpp

@@ -69,11 +69,7 @@ ChonkAccumulate::Response ChonkAccumulate::execute(BBApiRequest& request) &&
         throw_or_abort("No circuit loaded. Call ChonkLoad first.");
     }
 
-    acir_format::WitnessVector witness_data;
-    {
-        BB_BENCH_NAME("ChonkAccumulate::parse_witness");
-        witness_data = acir_format::witness_buf_to_witness_vector(std::move(witness));
-    }
+    acir_format::WitnessVector witness_data = acir_format::witness_buf_to_witness_vector(std::move(witness));
     acir_format::AcirProgram program{ std::move(request.loaded_circuit_constraints.value()), std::move(witness_data) };
 
     // Clear loaded state immediately after moving out of it. This ensures that if any subsequent
@@ -90,35 +86,24 @@ ChonkAccumulate::Response ChonkAccumulate::execute(BBApiRequest& request) &&
     const bool is_hiding_kernel = (request.ivc_stack_depth + 1 == chonk->get_num_circuits());
 
     const acir_format::ProgramMetadata metadata{ .ivc = request.ivc_in_progress };
-    IVCBase::ClientCircuit circuit;
-    {
-        BB_BENCH_NAME("ChonkAccumulate::create_circuit");
-        circuit = acir_format::create_circuit<IVCBase::ClientCircuit>(program, metadata);
-    }
+    IVCBase::ClientCircuit circuit = acir_format::create_circuit<IVCBase::ClientCircuit>(program, metadata);
 
     std::shared_ptr<Chonk::MegaVerificationKey> precomputed_vk;
 
     if (request.vk_policy == VkPolicy::RECOMPUTE) {
         precomputed_vk = nullptr;
     } else if (request.vk_policy == VkPolicy::DEFAULT || request.vk_policy == VkPolicy::CHECK) {
         if (!loaded_vk.empty()) {
-            {
-                BB_BENCH_NAME("ChonkAccumulate::deserialize_vk");
-                validate_vk_size<Chonk::MegaVerificationKey>(loaded_vk);
-                precomputed_vk = from_buffer<std::shared_ptr<Chonk::MegaVerificationKey>>(loaded_vk);
-            }
+            validate_vk_size<Chonk::MegaVerificationKey>(loaded_vk);
+            precomputed_vk = from_buffer<std::shared_ptr<Chonk::MegaVerificationKey>>(loaded_vk);
 
             if (request.vk_policy == VkPolicy::CHECK) {
                 // Note that MegaZKVerificationKey = MegaVerificationKey as C++ classes but their content differs
                 // between ZK and non-ZK flavors.
-                std::shared_ptr<Chonk::MegaVerificationKey> computed_vk;
-                {
-                    BB_BENCH_NAME("ChonkAccumulate::compute_vk_for_check");
-                    computed_vk = is_hiding_kernel ? std::make_shared<Chonk::MegaVerificationKey>(
-                                                         Chonk::HidingKernelProverInstance(circuit).get_precomputed())
-                                                   : std::make_shared<Chonk::MegaVerificationKey>(
-                                                         Chonk::ProverInstance(circuit).get_precomputed());
-                }
+                auto computed_vk = is_hiding_kernel ? std::make_shared<Chonk::MegaVerificationKey>(
+                                                          Chonk::HidingKernelProverInstance(circuit).get_precomputed())
+                                                    : std::make_shared<Chonk::MegaVerificationKey>(
+                                                          Chonk::ProverInstance(circuit).get_precomputed());
 
                 // Dereference to compare VK contents
                 if (*precomputed_vk != *computed_vk) {
@@ -135,10 +120,7 @@ ChonkAccumulate::Response ChonkAccumulate::execute(BBApiRequest& request) &&
     if (detail::use_memory_profile) {
         detail::GLOBAL_MEMORY_PROFILE.set_circuit_name(circuit_name);
     }
-    {
-        BB_BENCH_NAME("ChonkAccumulate::accumulate");
-        request.ivc_in_progress->accumulate(circuit, precomputed_vk);
-    }
+    request.ivc_in_progress->accumulate(circuit, precomputed_vk);
     request.ivc_stack_depth++;
 
     return Response{};