Skip to content
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

Jump to bottom

chore!: update codegened acir parser #631

Closed
wants to merge 7 commits into from
Closed

chore!: update codegened acir parser #631

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aec85a3
chore!: update codegened acir parser
TomAFrench Jul 26, 2023
9d22c64
chore: point at `acvm-struct` branch
TomAFrench Jul 26, 2023
2f6afc4
chore: remove unwanted changes
TomAFrench Jul 26, 2023
546122a
Update acir_tests/run_acir_tests.sh
TomAFrench Jul 26, 2023
3f5ef3d
chore: Remove block/ram/rom opcodes (#633)
guipublic Jul 27, 2023
d6fc024
Update acir_tests/run_acir_tests.sh
TomAFrench Jul 27, 2023
66a463f
Merge branch 'master' into update-acir-codegen
TomAFrench Jul 27, 2023
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
2 changes: 1 addition & 1 deletion acir_tests/run_acir_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e

BB=$PWD/${BB:-../cpp/build/bin/bb}
CRS_PATH=~/.bb-crs
BRANCH=master
BRANCH=acvm-struct
TomAFrench marked this conversation as resolved.
Show resolved Hide resolved

# Pull down the test vectors from the noir repo, if we don't have the folder already.
if [ ! -d acir_tests ]; then
Expand Down
8 changes: 7 additions & 1 deletion cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,6 +967,7 @@ struct PublicInputs {
struct Circuit {
uint32_t current_witness_index;
std::vector<Opcode> opcodes;
std::vector<Witness> private_parameters;
PublicInputs public_parameters;
PublicInputs return_values;

Expand Down Expand Up @@ -4459,6 +4460,9 @@ inline bool operator==(const Circuit& lhs, const Circuit& rhs)
if (!(lhs.opcodes == rhs.opcodes)) {
return false;
}
if (!(lhs.private_parameters == rhs.private_parameters)) {
return false;
}
if (!(lhs.public_parameters == rhs.public_parameters)) {
return false;
}
Expand Down Expand Up @@ -4494,6 +4498,7 @@ void serde::Serializable<Circuit::Circuit>::serialize(const Circuit::Circuit& ob
serializer.increase_container_depth();
serde::Serializable<decltype(obj.current_witness_index)>::serialize(obj.current_witness_index, serializer);
serde::Serializable<decltype(obj.opcodes)>::serialize(obj.opcodes, serializer);
serde::Serializable<decltype(obj.private_parameters)>::serialize(obj.private_parameters, serializer);
serde::Serializable<decltype(obj.public_parameters)>::serialize(obj.public_parameters, serializer);
serde::Serializable<decltype(obj.return_values)>::serialize(obj.return_values, serializer);
serializer.decrease_container_depth();
Expand All @@ -4507,6 +4512,7 @@ Circuit::Circuit serde::Deserializable<Circuit::Circuit>::deserialize(Deserializ
Circuit::Circuit obj;
obj.current_witness_index = serde::Deserializable<decltype(obj.current_witness_index)>::deserialize(deserializer);
obj.opcodes = serde::Deserializable<decltype(obj.opcodes)>::deserialize(deserializer);
obj.private_parameters = serde::Deserializable<decltype(obj.private_parameters)>::deserialize(deserializer);
obj.public_parameters = serde::Deserializable<decltype(obj.public_parameters)>::deserialize(deserializer);
obj.return_values = serde::Deserializable<decltype(obj.return_values)>::deserialize(deserializer);
deserializer.decrease_container_depth();
Expand Down Expand Up @@ -6426,4 +6432,4 @@ Circuit::Witness serde::Deserializable<Circuit::Witness>::deserialize(Deserializ
obj.value = serde::Deserializable<decltype(obj.value)>::deserialize(deserializer);
deserializer.decrease_container_depth();
return obj;
}
}