diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/prover.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/prover.cpp index dd19ce50095..111907bfd7c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/prover.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/prover.cpp @@ -66,7 +66,7 @@ void AvmProver::execute_log_derivative_inverse_round() bb::constexpr_for<0, std::tuple_size_v, 1>([&]() { using Relation = std::tuple_element_t; tasks.push_back([&]() { - AVM_TRACK_TIME(std::string("prove/execute_log_derivative_inverse_round/") + Relation::NAME, + AVM_TRACK_TIME(std::string("prove/execute_log_derivative_inverse_round/") + std::string(Relation::NAME), (compute_logderivative_inverse( prover_polynomials, relation_parameters, key->circuit_size))); }); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/alu.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/alu.hpp index 54135234189..cb825b4c24d 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/alu.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/alu.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -425,7 +427,7 @@ template class aluImpl { template class alu : public Relation> { public: - static constexpr const char* NAME = "alu"; + static constexpr const std::string_view NAME = "alu"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/binary.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/binary.hpp index b76b5ff530e..e499f5001b1 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/binary.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/binary.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -94,7 +96,7 @@ template class binaryImpl { template class binary : public Relation> { public: - static constexpr const char* NAME = "binary"; + static constexpr const std::string_view NAME = "binary"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/bytecode.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/bytecode.hpp index 586390b7f06..266e916608b 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/bytecode.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/bytecode.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -30,7 +32,7 @@ template class bytecodeImpl { template class bytecode : public Relation> { public: - static constexpr const char* NAME = "bytecode"; + static constexpr const std::string_view NAME = "bytecode"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/cmp.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/cmp.hpp index 543af669b0f..5a1e953fbd5 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/cmp.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/cmp.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -223,7 +225,7 @@ template class cmpImpl { template class cmp : public Relation> { public: - static constexpr const char* NAME = "cmp"; + static constexpr const std::string_view NAME = "cmp"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/conversion.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/conversion.hpp index 7a6779a0ac6..29fc8d82e4a 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/conversion.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/conversion.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -30,7 +32,7 @@ template class conversionImpl { template class conversion : public Relation> { public: - static constexpr const char* NAME = "conversion"; + static constexpr const std::string_view NAME = "conversion"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/gas.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/gas.hpp index 5ac772aa28a..79bb37209a7 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/gas.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/gas.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -99,7 +101,7 @@ template class gasImpl { template class gas : public Relation> { public: - static constexpr const char* NAME = "gas"; + static constexpr const std::string_view NAME = "gas"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/keccakf1600.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/keccakf1600.hpp index 59e53de3495..d82bf2e048c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/keccakf1600.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/keccakf1600.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -30,7 +32,7 @@ template class keccakf1600Impl { template class keccakf1600 : public Relation> { public: - static constexpr const char* NAME = "keccakf1600"; + static constexpr const std::string_view NAME = "keccakf1600"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_alu.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_alu.hpp index 2c768213259..132493637f2 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_alu.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_alu.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm { @@ -71,7 +72,7 @@ class lookup_pow_2_0_lookup_settings { template class lookup_pow_2_0_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_POW_2_0"; + static constexpr std::string_view NAME = "LOOKUP_POW_2_0"; }; template using lookup_pow_2_0 = GenericLookup; @@ -138,7 +139,7 @@ class lookup_pow_2_1_lookup_settings { template class lookup_pow_2_1_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_POW_2_1"; + static constexpr std::string_view NAME = "LOOKUP_POW_2_1"; }; template using lookup_pow_2_1 = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_binary.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_binary.hpp index 18d22bccf76..dbb26b46b6d 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_binary.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_binary.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm { @@ -72,7 +73,7 @@ class lookup_byte_lengths_lookup_settings { template class lookup_byte_lengths_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_BYTE_LENGTHS"; + static constexpr std::string_view NAME = "LOOKUP_BYTE_LENGTHS"; }; template using lookup_byte_lengths = GenericLookup; @@ -146,7 +147,7 @@ class lookup_byte_operations_lookup_settings { template class lookup_byte_operations_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_BYTE_OPERATIONS"; + static constexpr std::string_view NAME = "LOOKUP_BYTE_OPERATIONS"; }; template using lookup_byte_operations = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_gas.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_gas.hpp index 5d526599baa..2493238745c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_gas.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_gas.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm { @@ -84,7 +85,7 @@ class lookup_opcode_gas_lookup_settings { template class lookup_opcode_gas_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_OPCODE_GAS"; + static constexpr std::string_view NAME = "LOOKUP_OPCODE_GAS"; }; template using lookup_opcode_gas = GenericLookup; @@ -147,7 +148,7 @@ class lookup_l2_gas_rng_chk_0_lookup_settings { template class lookup_l2_gas_rng_chk_0_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_L2_GAS_RNG_CHK_0"; + static constexpr std::string_view NAME = "LOOKUP_L2_GAS_RNG_CHK_0"; }; template using lookup_l2_gas_rng_chk_0 = GenericLookup; @@ -210,7 +211,7 @@ class lookup_l2_gas_rng_chk_1_lookup_settings { template class lookup_l2_gas_rng_chk_1_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_L2_GAS_RNG_CHK_1"; + static constexpr std::string_view NAME = "LOOKUP_L2_GAS_RNG_CHK_1"; }; template using lookup_l2_gas_rng_chk_1 = GenericLookup; @@ -273,7 +274,7 @@ class lookup_da_gas_rng_chk_0_lookup_settings { template class lookup_da_gas_rng_chk_0_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_DA_GAS_RNG_CHK_0"; + static constexpr std::string_view NAME = "LOOKUP_DA_GAS_RNG_CHK_0"; }; template using lookup_da_gas_rng_chk_0 = GenericLookup; @@ -336,7 +337,7 @@ class lookup_da_gas_rng_chk_1_lookup_settings { template class lookup_da_gas_rng_chk_1_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_DA_GAS_RNG_CHK_1"; + static constexpr std::string_view NAME = "LOOKUP_DA_GAS_RNG_CHK_1"; }; template using lookup_da_gas_rng_chk_1 = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_main.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_main.hpp index 556bef3c50a..d865c9ae363 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_main.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_main.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm { @@ -68,7 +69,7 @@ class incl_main_tag_err_lookup_settings { template class incl_main_tag_err_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "INCL_MAIN_TAG_ERR"; + static constexpr std::string_view NAME = "INCL_MAIN_TAG_ERR"; }; template using incl_main_tag_err = GenericLookup; @@ -131,7 +132,7 @@ class incl_mem_tag_err_lookup_settings { template class incl_mem_tag_err_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "INCL_MEM_TAG_ERR"; + static constexpr std::string_view NAME = "INCL_MEM_TAG_ERR"; }; template using incl_mem_tag_err = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_mem.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_mem.hpp index 5816939d3ac..25913ff2107 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_mem.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_mem.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm { @@ -68,7 +69,7 @@ class lookup_mem_rng_chk_0_lookup_settings { template class lookup_mem_rng_chk_0_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_MEM_RNG_CHK_0"; + static constexpr std::string_view NAME = "LOOKUP_MEM_RNG_CHK_0"; }; template using lookup_mem_rng_chk_0 = GenericLookup; @@ -131,7 +132,7 @@ class lookup_mem_rng_chk_1_lookup_settings { template class lookup_mem_rng_chk_1_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_MEM_RNG_CHK_1"; + static constexpr std::string_view NAME = "LOOKUP_MEM_RNG_CHK_1"; }; template using lookup_mem_rng_chk_1 = GenericLookup; @@ -194,7 +195,7 @@ class lookup_mem_rng_chk_2_lookup_settings { template class lookup_mem_rng_chk_2_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_MEM_RNG_CHK_2"; + static constexpr std::string_view NAME = "LOOKUP_MEM_RNG_CHK_2"; }; template using lookup_mem_rng_chk_2 = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_mem_slice.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_mem_slice.hpp index bb3ad7a759e..023ac08c007 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_mem_slice.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_mem_slice.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm { @@ -71,7 +72,7 @@ class lookup_cd_value_lookup_settings { template class lookup_cd_value_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_CD_VALUE"; + static constexpr std::string_view NAME = "LOOKUP_CD_VALUE"; }; template using lookup_cd_value = GenericLookup; @@ -137,7 +138,7 @@ class lookup_ret_value_lookup_settings { template class lookup_ret_value_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RET_VALUE"; + static constexpr std::string_view NAME = "LOOKUP_RET_VALUE"; }; template using lookup_ret_value = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_range_check.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_range_check.hpp index 1d0cb022d8e..48292df3402 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_range_check.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/lookups_range_check.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm { @@ -72,7 +73,7 @@ class lookup_rng_chk_pow_2_lookup_settings { template class lookup_rng_chk_pow_2_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_POW_2"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_POW_2"; }; template using lookup_rng_chk_pow_2 = GenericLookup; @@ -135,7 +136,7 @@ class lookup_rng_chk_diff_lookup_settings { template class lookup_rng_chk_diff_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_DIFF"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_DIFF"; }; template using lookup_rng_chk_diff = GenericLookup; @@ -198,7 +199,7 @@ class lookup_rng_chk_0_lookup_settings { template class lookup_rng_chk_0_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_0"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_0"; }; template using lookup_rng_chk_0 = GenericLookup; @@ -261,7 +262,7 @@ class lookup_rng_chk_1_lookup_settings { template class lookup_rng_chk_1_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_1"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_1"; }; template using lookup_rng_chk_1 = GenericLookup; @@ -324,7 +325,7 @@ class lookup_rng_chk_2_lookup_settings { template class lookup_rng_chk_2_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_2"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_2"; }; template using lookup_rng_chk_2 = GenericLookup; @@ -387,7 +388,7 @@ class lookup_rng_chk_3_lookup_settings { template class lookup_rng_chk_3_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_3"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_3"; }; template using lookup_rng_chk_3 = GenericLookup; @@ -450,7 +451,7 @@ class lookup_rng_chk_4_lookup_settings { template class lookup_rng_chk_4_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_4"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_4"; }; template using lookup_rng_chk_4 = GenericLookup; @@ -513,7 +514,7 @@ class lookup_rng_chk_5_lookup_settings { template class lookup_rng_chk_5_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_5"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_5"; }; template using lookup_rng_chk_5 = GenericLookup; @@ -576,7 +577,7 @@ class lookup_rng_chk_6_lookup_settings { template class lookup_rng_chk_6_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_6"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_6"; }; template using lookup_rng_chk_6 = GenericLookup; @@ -639,7 +640,7 @@ class lookup_rng_chk_7_lookup_settings { template class lookup_rng_chk_7_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_7"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_7"; }; template using lookup_rng_chk_7 = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/main.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/main.hpp index 25bfae68fe8..767ceeb2014 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/main.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/main.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -691,7 +693,7 @@ template class mainImpl { template class main : public Relation> { public: - static constexpr const char* NAME = "main"; + static constexpr const std::string_view NAME = "main"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/mem.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/mem.hpp index 0bdd472c7b4..49ba9c0c74c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/mem.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/mem.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -387,7 +389,7 @@ template class memImpl { template class mem : public Relation> { public: - static constexpr const char* NAME = "mem"; + static constexpr const std::string_view NAME = "mem"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/mem_slice.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/mem_slice.hpp index 507e4a2742d..cd2717b1a57 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/mem_slice.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/mem_slice.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -87,7 +89,7 @@ template class mem_sliceImpl { template class mem_slice : public Relation> { public: - static constexpr const char* NAME = "mem_slice"; + static constexpr const std::string_view NAME = "mem_slice"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/merkle_tree.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/merkle_tree.hpp index 1b68b2d8d34..9849a7161e6 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/merkle_tree.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/merkle_tree.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -94,7 +96,7 @@ template class merkle_treeImpl { template class merkle_tree : public Relation> { public: - static constexpr const char* NAME = "merkle_tree"; + static constexpr const std::string_view NAME = "merkle_tree"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_alu.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_alu.hpp index 21370c94e81..576292c3647 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_alu.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_alu.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp" #include +#include #include namespace bb::avm { @@ -58,7 +59,7 @@ class perm_rng_alu_permutation_settings { template class perm_rng_alu_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_RNG_ALU"; + static constexpr std::string_view NAME = "PERM_RNG_ALU"; }; template using perm_rng_alu = GenericPermutation; @@ -127,7 +128,7 @@ class perm_cmp_alu_permutation_settings { template class perm_cmp_alu_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_CMP_ALU"; + static constexpr std::string_view NAME = "PERM_CMP_ALU"; }; template using perm_cmp_alu = GenericPermutation; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_cmp.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_cmp.hpp index 1781a3a24b0..8f3f845ab66 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_cmp.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_cmp.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp" #include +#include #include namespace bb::avm { @@ -54,7 +55,7 @@ class perm_rng_non_ff_cmp_permutation_settings { template class perm_rng_non_ff_cmp_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_RNG_NON_FF_CMP"; + static constexpr std::string_view NAME = "PERM_RNG_NON_FF_CMP"; }; template using perm_rng_non_ff_cmp = GenericPermutation; @@ -103,7 +104,7 @@ class perm_rng_cmp_lo_permutation_settings { template class perm_rng_cmp_lo_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_RNG_CMP_LO"; + static constexpr std::string_view NAME = "PERM_RNG_CMP_LO"; }; template using perm_rng_cmp_lo = GenericPermutation; @@ -152,7 +153,7 @@ class perm_rng_cmp_hi_permutation_settings { template class perm_rng_cmp_hi_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_RNG_CMP_HI"; + static constexpr std::string_view NAME = "PERM_RNG_CMP_HI"; }; template using perm_rng_cmp_hi = GenericPermutation; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_main.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_main.hpp index 7851ea1b3a0..48e88c7069f 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_main.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_main.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp" #include +#include #include namespace bb::avm { @@ -110,7 +111,7 @@ class perm_main_alu_permutation_settings { template class perm_main_alu_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_ALU"; + static constexpr std::string_view NAME = "PERM_MAIN_ALU"; }; template using perm_main_alu = GenericPermutation; @@ -175,7 +176,7 @@ class perm_main_bin_permutation_settings { template class perm_main_bin_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_BIN"; + static constexpr std::string_view NAME = "PERM_MAIN_BIN"; }; template using perm_main_bin = GenericPermutation; @@ -236,7 +237,7 @@ class perm_main_conv_permutation_settings { template class perm_main_conv_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_CONV"; + static constexpr std::string_view NAME = "PERM_MAIN_CONV"; }; template using perm_main_conv = GenericPermutation; @@ -293,7 +294,7 @@ class perm_main_sha256_permutation_settings { template class perm_main_sha256_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_SHA256"; + static constexpr std::string_view NAME = "PERM_MAIN_SHA256"; }; template using perm_main_sha256 = GenericPermutation; @@ -350,7 +351,7 @@ class perm_main_pos2_perm_permutation_settings { template class perm_main_pos2_perm_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_POS2_PERM"; + static constexpr std::string_view NAME = "PERM_MAIN_POS2_PERM"; }; template using perm_main_pos2_perm = GenericPermutation; @@ -423,7 +424,7 @@ class perm_main_mem_a_permutation_settings { template class perm_main_mem_a_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_MEM_A"; + static constexpr std::string_view NAME = "PERM_MAIN_MEM_A"; }; template using perm_main_mem_a = GenericPermutation; @@ -496,7 +497,7 @@ class perm_main_mem_b_permutation_settings { template class perm_main_mem_b_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_MEM_B"; + static constexpr std::string_view NAME = "PERM_MAIN_MEM_B"; }; template using perm_main_mem_b = GenericPermutation; @@ -565,7 +566,7 @@ class perm_main_mem_c_permutation_settings { template class perm_main_mem_c_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_MEM_C"; + static constexpr std::string_view NAME = "PERM_MAIN_MEM_C"; }; template using perm_main_mem_c = GenericPermutation; @@ -634,7 +635,7 @@ class perm_main_mem_d_permutation_settings { template class perm_main_mem_d_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_MEM_D"; + static constexpr std::string_view NAME = "PERM_MAIN_MEM_D"; }; template using perm_main_mem_d = GenericPermutation; @@ -692,7 +693,7 @@ template class perm_main_mem_ind_addr_a_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_MEM_IND_ADDR_A"; + static constexpr std::string_view NAME = "PERM_MAIN_MEM_IND_ADDR_A"; }; template using perm_main_mem_ind_addr_a = GenericPermutation; @@ -751,7 +752,7 @@ template class perm_main_mem_ind_addr_b_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_MEM_IND_ADDR_B"; + static constexpr std::string_view NAME = "PERM_MAIN_MEM_IND_ADDR_B"; }; template using perm_main_mem_ind_addr_b = GenericPermutation; @@ -810,7 +811,7 @@ template class perm_main_mem_ind_addr_c_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_MEM_IND_ADDR_C"; + static constexpr std::string_view NAME = "PERM_MAIN_MEM_IND_ADDR_C"; }; template using perm_main_mem_ind_addr_c = GenericPermutation; @@ -869,7 +870,7 @@ template class perm_main_mem_ind_addr_d_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MAIN_MEM_IND_ADDR_D"; + static constexpr std::string_view NAME = "PERM_MAIN_MEM_IND_ADDR_D"; }; template using perm_main_mem_ind_addr_d = GenericPermutation; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_mem_slice.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_mem_slice.hpp index 87776e1bb7b..18dc1755acf 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_mem_slice.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_mem_slice.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp" #include +#include #include namespace bb::avm { @@ -66,7 +67,7 @@ class perm_slice_mem_permutation_settings { template class perm_slice_mem_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_SLICE_MEM"; + static constexpr std::string_view NAME = "PERM_SLICE_MEM"; }; template using perm_slice_mem = GenericPermutation; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_merkle_tree.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_merkle_tree.hpp index 22a7d58c6dc..93be92cbb72 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_merkle_tree.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_merkle_tree.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp" #include +#include #include namespace bb::avm { @@ -63,7 +64,7 @@ template class perm_merkle_poseidon2_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_MERKLE_POSEIDON2"; + static constexpr std::string_view NAME = "PERM_MERKLE_POSEIDON2"; }; template using perm_merkle_poseidon2 = GenericPermutation; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_poseidon2.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_poseidon2.hpp index a386203514a..a6718117504 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_poseidon2.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_poseidon2.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp" #include +#include #include namespace bb::avm { @@ -66,7 +67,7 @@ class perm_pos_mem_read_a_permutation_settings { template class perm_pos_mem_read_a_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS_MEM_READ_A"; + static constexpr std::string_view NAME = "PERM_POS_MEM_READ_A"; }; template using perm_pos_mem_read_a = GenericPermutation; @@ -127,7 +128,7 @@ class perm_pos_mem_read_b_permutation_settings { template class perm_pos_mem_read_b_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS_MEM_READ_B"; + static constexpr std::string_view NAME = "PERM_POS_MEM_READ_B"; }; template using perm_pos_mem_read_b = GenericPermutation; @@ -188,7 +189,7 @@ class perm_pos_mem_read_c_permutation_settings { template class perm_pos_mem_read_c_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS_MEM_READ_C"; + static constexpr std::string_view NAME = "PERM_POS_MEM_READ_C"; }; template using perm_pos_mem_read_c = GenericPermutation; @@ -249,7 +250,7 @@ class perm_pos_mem_read_d_permutation_settings { template class perm_pos_mem_read_d_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS_MEM_READ_D"; + static constexpr std::string_view NAME = "PERM_POS_MEM_READ_D"; }; template using perm_pos_mem_read_d = GenericPermutation; @@ -311,7 +312,7 @@ template class perm_pos_mem_write_a_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS_MEM_WRITE_A"; + static constexpr std::string_view NAME = "PERM_POS_MEM_WRITE_A"; }; template using perm_pos_mem_write_a = GenericPermutation; @@ -373,7 +374,7 @@ template class perm_pos_mem_write_b_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS_MEM_WRITE_B"; + static constexpr std::string_view NAME = "PERM_POS_MEM_WRITE_B"; }; template using perm_pos_mem_write_b = GenericPermutation; @@ -435,7 +436,7 @@ template class perm_pos_mem_write_c_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS_MEM_WRITE_C"; + static constexpr std::string_view NAME = "PERM_POS_MEM_WRITE_C"; }; template using perm_pos_mem_write_c = GenericPermutation; @@ -497,7 +498,7 @@ template class perm_pos_mem_write_d_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS_MEM_WRITE_D"; + static constexpr std::string_view NAME = "PERM_POS_MEM_WRITE_D"; }; template using perm_pos_mem_write_d = GenericPermutation; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_poseidon2_full.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_poseidon2_full.hpp index 4f3c4e12dd4..0758374bb70 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_poseidon2_full.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perms_poseidon2_full.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp" #include +#include #include namespace bb::avm { @@ -83,7 +84,7 @@ template class perm_pos2_fixed_pos2_perm_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_POS2_FIXED_POS2_PERM"; + static constexpr std::string_view NAME = "PERM_POS2_FIXED_POS2_PERM"; }; template using perm_pos2_fixed_pos2_perm = GenericPermutation; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/poseidon2.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/poseidon2.hpp index 9503f383c3b..6ead35b4038 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/poseidon2.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/poseidon2.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -3076,7 +3078,7 @@ template class poseidon2Impl { template class poseidon2 : public Relation> { public: - static constexpr const char* NAME = "poseidon2"; + static constexpr const std::string_view NAME = "poseidon2"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/poseidon2_full.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/poseidon2_full.hpp index 3b7b0f45c35..14f6e74d8c9 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/poseidon2_full.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/poseidon2_full.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -177,7 +179,7 @@ template class poseidon2_fullImpl { template class poseidon2_full : public Relation> { public: - static constexpr const char* NAME = "poseidon2_full"; + static constexpr const std::string_view NAME = "poseidon2_full"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/range_check.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/range_check.hpp index 2b99a106738..18b0c2e61b0 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/range_check.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/range_check.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -254,7 +256,7 @@ template class range_checkImpl { template class range_check : public Relation> { public: - static constexpr const char* NAME = "range_check"; + static constexpr const std::string_view NAME = "range_check"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/sha256.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/sha256.hpp index e72cc1550a0..bca3da6f985 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/sha256.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/sha256.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -30,7 +32,7 @@ template class sha256Impl { template class sha256 : public Relation> { public: - static constexpr const char* NAME = "sha256"; + static constexpr const std::string_view NAME = "sha256"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp index 97c3560e8fe..d25691c2af9 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp @@ -121,7 +121,7 @@ std::unordered_map get_relati } degrees_string += std::to_string(degree) + "°: " + std::to_string(count); } - relations_degrees.insert({ Relation::NAME, std::move(degrees_string) }); + relations_degrees.insert({ std::string(Relation::NAME), std::move(degrees_string) }); }); return relations_degrees; diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/prover.cpp b/barretenberg/cpp/src/barretenberg/vm2/generated/prover.cpp index 3cfd083e2db..55d07ccc503 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/generated/prover.cpp +++ b/barretenberg/cpp/src/barretenberg/vm2/generated/prover.cpp @@ -66,7 +66,7 @@ void AvmProver::execute_log_derivative_inverse_round() bb::constexpr_for<0, std::tuple_size_v, 1>([&]() { using Relation = std::tuple_element_t; tasks.push_back([&]() { - AVM_TRACK_TIME(std::string("prove/execute_log_derivative_inverse_round/") + Relation::NAME, + AVM_TRACK_TIME(std::string("prove/execute_log_derivative_inverse_round/") + std::string(Relation::NAME), (compute_logderivative_inverse( prover_polynomials, relation_parameters, key->circuit_size))); }); diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/alu.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/alu.hpp index c2316109c3f..40abf10492d 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/alu.hpp +++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/alu.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -36,7 +38,7 @@ template class aluImpl { template class alu : public Relation> { public: - static constexpr const char* NAME = "alu"; + static constexpr const std::string_view NAME = "alu"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/execution.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/execution.hpp index 7c2fd8fc879..e4e35f44aed 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/execution.hpp +++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/execution.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -56,7 +58,7 @@ template class executionImpl { template class execution : public Relation> { public: - static constexpr const char* NAME = "execution"; + static constexpr const std::string_view NAME = "execution"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_execution.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_execution.hpp index f7c95a7989a..b2cc2632abd 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_execution.hpp +++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_execution.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm2 { @@ -79,7 +80,7 @@ class lookup_dummy_precomputed_lookup_settings { template class lookup_dummy_precomputed_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_DUMMY_PRECOMPUTED"; + static constexpr std::string_view NAME = "LOOKUP_DUMMY_PRECOMPUTED"; }; template using lookup_dummy_precomputed = GenericLookup; @@ -152,7 +153,7 @@ class lookup_dummy_dynamic_lookup_settings { template class lookup_dummy_dynamic_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_DUMMY_DYNAMIC"; + static constexpr std::string_view NAME = "LOOKUP_DUMMY_DYNAMIC"; }; template using lookup_dummy_dynamic = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_range_check.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_range_check.hpp index 1853d7d51e3..d3ca59ee7fe 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_range_check.hpp +++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/lookups_range_check.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_lookup/generic_lookup_relation.hpp" #include +#include #include namespace bb::avm2 { @@ -72,7 +73,7 @@ class lookup_rng_chk_pow_2_lookup_settings { template class lookup_rng_chk_pow_2_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_POW_2"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_POW_2"; }; template using lookup_rng_chk_pow_2 = GenericLookup; @@ -135,7 +136,7 @@ class lookup_rng_chk_diff_lookup_settings { template class lookup_rng_chk_diff_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_DIFF"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_DIFF"; }; template using lookup_rng_chk_diff = GenericLookup; @@ -199,7 +200,7 @@ template class lookup_rng_chk_is_r0_16_bit_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_IS_R0_16_BIT"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_IS_R0_16_BIT"; }; template using lookup_rng_chk_is_r0_16_bit = GenericLookup; @@ -264,7 +265,7 @@ template class lookup_rng_chk_is_r1_16_bit_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_IS_R1_16_BIT"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_IS_R1_16_BIT"; }; template using lookup_rng_chk_is_r1_16_bit = GenericLookup; @@ -329,7 +330,7 @@ template class lookup_rng_chk_is_r2_16_bit_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_IS_R2_16_BIT"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_IS_R2_16_BIT"; }; template using lookup_rng_chk_is_r2_16_bit = GenericLookup; @@ -394,7 +395,7 @@ template class lookup_rng_chk_is_r3_16_bit_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_IS_R3_16_BIT"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_IS_R3_16_BIT"; }; template using lookup_rng_chk_is_r3_16_bit = GenericLookup; @@ -459,7 +460,7 @@ template class lookup_rng_chk_is_r4_16_bit_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_IS_R4_16_BIT"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_IS_R4_16_BIT"; }; template using lookup_rng_chk_is_r4_16_bit = GenericLookup; @@ -524,7 +525,7 @@ template class lookup_rng_chk_is_r5_16_bit_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_IS_R5_16_BIT"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_IS_R5_16_BIT"; }; template using lookup_rng_chk_is_r5_16_bit = GenericLookup; @@ -589,7 +590,7 @@ template class lookup_rng_chk_is_r6_16_bit_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_IS_R6_16_BIT"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_IS_R6_16_BIT"; }; template using lookup_rng_chk_is_r6_16_bit = GenericLookup; @@ -654,7 +655,7 @@ template class lookup_rng_chk_is_r7_16_bit_relation : public GenericLookupRelation { public: - static constexpr const char* NAME = "LOOKUP_RNG_CHK_IS_R7_16_BIT"; + static constexpr std::string_view NAME = "LOOKUP_RNG_CHK_IS_R7_16_BIT"; }; template using lookup_rng_chk_is_r7_16_bit = GenericLookup; diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/perms_execution.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/perms_execution.hpp index 9c4775f0bdb..64706541518 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/perms_execution.hpp +++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/perms_execution.hpp @@ -5,6 +5,7 @@ #include "barretenberg/relations/generic_permutation/generic_permutation_relation.hpp" #include +#include #include namespace bb::avm2 { @@ -62,7 +63,7 @@ class perm_dummy_dynamic_permutation_settings { template class perm_dummy_dynamic_relation : public GenericPermutationRelation { public: - static constexpr const char* NAME = "PERM_DUMMY_DYNAMIC"; + static constexpr std::string_view NAME = "PERM_DUMMY_DYNAMIC"; }; template using perm_dummy_dynamic = GenericPermutation; diff --git a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/range_check.hpp b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/range_check.hpp index 1e556aa9a21..d5b00b66630 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/generated/relations/range_check.hpp +++ b/barretenberg/cpp/src/barretenberg/vm2/generated/relations/range_check.hpp @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -230,7 +232,7 @@ template class range_checkImpl { template class range_check : public Relation> { public: - static constexpr const char* NAME = "range_check"; + static constexpr const std::string_view NAME = "range_check"; static std::string get_subrelation_label(size_t index) { diff --git a/barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp b/barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp index 04010e2c107..4b0f10f4fb1 100644 --- a/barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp +++ b/barretenberg/cpp/src/barretenberg/vm2/tracegen_helper.cpp @@ -12,6 +12,7 @@ #include "barretenberg/vm/stats.hpp" #include "barretenberg/vm2/common/map.hpp" #include "barretenberg/vm2/generated/columns.hpp" +#include "barretenberg/vm2/generated/flavor.hpp" #include "barretenberg/vm2/generated/relations/lookups_execution.hpp" #include "barretenberg/vm2/generated/relations/lookups_range_check.hpp" #include "barretenberg/vm2/generated/relations/perms_execution.hpp" @@ -64,12 +65,27 @@ template inline void clear_events(T& c) void print_trace_stats(const TraceContainer& trace) { + constexpr auto main_relation_names = [] { + constexpr size_t size = std::tuple_size_v; + std::array names{}; + constexpr_for<0, size, 1>( + [&names] { names[i] = std::tuple_element_t::NAME; }); + return names; + }(); + unordered_flat_map namespace_column_sizes; uint64_t total_rows = 0; for (size_t col = 0; col < trace.num_columns(); ++col) { const auto& column_rows = trace.get_column_rows(static_cast(col)); const std::string& column_name = COLUMN_NAMES.at(col); - const auto namespace_name = column_name.substr(0, column_name.find('_')); + const std::string namespace_name = [&]() { + for (const auto& main_relation_name : main_relation_names) { + if (column_name.starts_with(main_relation_name)) { + return std::string(main_relation_name); + } + } + return column_name.substr(0, column_name.find_first_of('_')); + }(); namespace_column_sizes[namespace_name] = std::max(namespace_column_sizes[namespace_name], column_rows); total_rows += column_rows; } diff --git a/bb-pilcom/bb-pil-backend/templates/lookup.hpp.hbs b/bb-pilcom/bb-pil-backend/templates/lookup.hpp.hbs index d575c38b964..1797a518a75 100644 --- a/bb-pilcom/bb-pil-backend/templates/lookup.hpp.hbs +++ b/bb-pilcom/bb-pil-backend/templates/lookup.hpp.hbs @@ -6,6 +6,7 @@ #include #include +#include namespace bb::{{snakeCase root_name}} { @@ -82,7 +83,7 @@ class {{lookup_name}}_lookup_settings { template class {{lookup_name}}_relation : public GenericLookupRelation<{{lookup_name}}_lookup_settings, FF_> { public: - static constexpr const char* NAME = "{{shoutySnakeCase lookup_name}}"; + static constexpr std::string_view NAME = "{{shoutySnakeCase lookup_name}}"; }; template using {{lookup_name}} = GenericLookup<{{lookup_name}}_lookup_settings, FF_>; diff --git a/bb-pilcom/bb-pil-backend/templates/permutation.hpp.hbs b/bb-pilcom/bb-pil-backend/templates/permutation.hpp.hbs index 126568a5781..2dbd857924b 100644 --- a/bb-pilcom/bb-pil-backend/templates/permutation.hpp.hbs +++ b/bb-pilcom/bb-pil-backend/templates/permutation.hpp.hbs @@ -6,6 +6,7 @@ #include #include +#include namespace bb::{{snakeCase root_name}} { @@ -48,7 +49,7 @@ class {{perm_name}}_permutation_settings { template class {{perm_name}}_relation : public GenericPermutationRelation<{{perm_name}}_permutation_settings, FF_> { public: - static constexpr const char* NAME = "{{shoutySnakeCase perm_name}}"; + static constexpr std::string_view NAME = "{{shoutySnakeCase perm_name}}"; }; template using {{perm_name}} = GenericPermutation<{{perm_name}}_permutation_settings, FF_>; diff --git a/bb-pilcom/bb-pil-backend/templates/prover.cpp.hbs b/bb-pilcom/bb-pil-backend/templates/prover.cpp.hbs index 91500209a9b..79df0244c6b 100644 --- a/bb-pilcom/bb-pil-backend/templates/prover.cpp.hbs +++ b/bb-pilcom/bb-pil-backend/templates/prover.cpp.hbs @@ -66,7 +66,7 @@ void AvmProver::execute_log_derivative_inverse_round() bb::constexpr_for<0, std::tuple_size_v, 1>([&]() { using Relation = std::tuple_element_t; tasks.push_back([&]() { - AVM_TRACK_TIME(std::string("prove/execute_log_derivative_inverse_round/") + Relation::NAME, + AVM_TRACK_TIME(std::string("prove/execute_log_derivative_inverse_round/") + std::string(Relation::NAME), (compute_logderivative_inverse( prover_polynomials, relation_parameters, key->circuit_size))); }); diff --git a/bb-pilcom/bb-pil-backend/templates/relation.hpp.hbs b/bb-pilcom/bb-pil-backend/templates/relation.hpp.hbs index 43f122cfdc2..5f3fc6fb871 100644 --- a/bb-pilcom/bb-pil-backend/templates/relation.hpp.hbs +++ b/bb-pilcom/bb-pil-backend/templates/relation.hpp.hbs @@ -1,6 +1,8 @@ // AUTOGENERATED FILE #pragma once +#include + #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/relation_types.hpp" @@ -46,7 +48,7 @@ template class {{name}}Impl { template class {{name}} : public Relation<{{name}}Impl> { public: - static constexpr const char* NAME = "{{name}}"; + static constexpr const std::string_view NAME = "{{name}}"; static std::string get_subrelation_label(size_t index) { switch (index) {