chore(ssa refactor): Add code to handle less than comparison#1433

Merged

kevaundray merged 22 commits intomasterfrom

kw/add-comparison

May 30, 2023

Contributor

kevaundray commented May 28, 2023

Description

This adds code to handle the less than operation, to handle more than, we just need to handle the NOT operation which we can put in another PR.

Problem*

Resolves

Summary*

This PR sets out to

Example

Before:

After:

Documentation

This PR requires documentation updates when merged.
- I will submit a noir-lang/docs PR.
- I will request for and support Dev Rel's help in documenting this PR.

Additional Context

PR Checklist*

I have tested the changes locally.
I have formatted the changes with Prettier and/or cargo fmt on default settings.

kevaundray added 14 commits

May 27, 2023 18:34


          add field mul and div

83de289


          add code to process field mul and div

1ef2ca9


          add assert example


          add is_equal constraint

18c4274


          add eq_var method for AcirVar

171d5d9


          process Constrain instruction and BinaryOp::Eq

f1bfdc6


          add TODO for more than the maximum number of bits

58edbc9


          add numeric_cast_var method which constrains a variable to be equal t…

3c8c901

…o a NumericType


          implement casting for numeric types

a58f7a4


          add simple range constraint example

ca60032


          add constraints for more_than_eq

fbdfefa


          - add more_than_eq method

327c2f6

- This method needs to know the bit size, so we cache this information whenever we do a range constraint.
We should ideally also cache it for constants too since we can figure out their bit-sizes easily


          add method to process less than binary operation

90c2102


          add example

99f414b

Contributor Author

kevaundray commented May 28, 2023 •

edited

Loading

This was failing before because the result was not being cached when we did a cast operation. I incorrectly assumed that the value_id of the input to cast will equal the value_id of the output to cast

kevaundray changed the base branch from master to kw/range-constraints

May 28, 2023 18:26

kevaundray commented

View reviewed changes

crates/nargo_cli/tests/test_data_ssa_refactor/simple_comparison/src/main.nr

kevaundray commented

View reviewed changes

crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/acir_variable.rs

kevaundray commented

View reviewed changes

crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/acir_variable.rs

kevaundray commented

View reviewed changes

crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/acir_variable.rs

kevaundray commented

View reviewed changes

crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/generated_acir.rs

kevaundray commented

View reviewed changes

crates/noirc_evaluator/src/ssa_refactor/acir_gen/mod.rs Outdated

kevaundray added 4 commits

May 29, 2023 18:24


          assign result of cast operation

8d7f7f9


          Merge branch 'kw/range-constraints' into kw/add-comparison

a7f1178


          add y as an input value

6b159ee


          return optimized circuit

1c2cee5

Contributor Author

kevaundray commented May 29, 2023

This is now blocked by #1435 since we are now producing circuits which have a width greater than three


          Merge branch 'kw/add-optimized-circuit' into kw/add-comparison

b935436

kevaundray marked this pull request as ready for review

May 29, 2023 18:19

joss-aztec mentioned this pull request

Track more information about the bit size of Variables during Acir Gen #1439

Closed

joss-aztec reviewed

View reviewed changes

Contributor

joss-aztec left a comment

Any particular reason for the merkle test changes in this PR?

kevaundray mentioned this pull request

Consider having the frontend disallow as u{FieldElement::max_num_bits()} conversions #1443

Closed


          Addressed in Address GtEq extra opcodes #1444

7d8753b

kevaundray mentioned this pull request

Add proper documentation of how we generate constraints for greater_than_equal bounds checks #1445

Closed

kevaundray requested a review from joss-aztec

May 30, 2023 14:35

jfecher reviewed

View reviewed changes

crates/noirc_evaluator/src/ssa_refactor/acir_gen/acir_ir/acir_variable.rs

kevaundray mentioned this pull request

Address GtEq extra opcodes #1444

Closed

Contributor Author

kevaundray commented May 30, 2023

Any particular reason for the merkle test changes in this PR?

I think this might be because of a rebase, we just merged merkle changes into master

kevaundray force-pushed the kw/add-comparison branch from 346a216 to 7d8753b Compare

May 30, 2023 15:09

Contributor

jfecher commented May 30, 2023

Can we merge master with this PR so the extraneous diffs get removed?


          Merge remote-tracking branch 'origin/master' into kw/add-comparison

Contributor Author

kevaundray commented May 30, 2023

Can we merge master with this PR so the extraneous diffs get removed?

We are merging into the range-constraints PR so I think we need to update it there

jfecher previously approved these changes

View reviewed changes

Contributor

jfecher left a comment

I'm alright with merging this into another PR. We can fix up the other PR afterward so the diff is cleaner.

Base automatically changed from kw/range-constraints to master

May 30, 2023 16:30


          Merge remote-tracking branch 'origin/master' into kw/add-comparison

c654b5d

kevaundray dismissed jfecher’s stale review via

c654b5d

May 30, 2023 17:15

Contributor Author

kevaundray commented May 30, 2023

Diff should be clean now!

kevaundray enabled auto-merge

May 30, 2023 17:44

joss-aztec approved these changes

View reviewed changes

kevaundray added this pull request to the merge queue

Merged via the queue into master with commit 92796aa

kevaundray deleted the kw/add-comparison branch

May 30, 2023 19:15

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet