Create proof_programs symbolic links in deps target (#1556)

* Replace symlinks with script * Add target to deps * Create symlimks in workflow * Remove script * Simplify * Debug * Try * Reorder targets * Try fix * Use gitkeep to push proof_programs directory * restore command * Change target name * Restore * Update workflow * Always build symlinks * Create symlinks before fetching from cache * Create symlinks before fetching from cache before computing traces * Create symlinks before fetching from cache before running comparisons * Remove new symlinks * Create symlinks before fetching from cache clippy * Use artifacts to ensure ther eis no hash mismatch when retrieving files * Fix
lambdaclass · Feb 19, 2024 · 9fb1b83 · 9fb1b83
1 parent 2382700
commit 9fb1b83
Show file tree

Hide file tree

Showing 150 changed files with 64 additions and 149 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -22,7 +22,23 @@ env:
   PROPTEST_CASES: 100
 
 jobs:
+
+  # We need to use the same files across all jobs or else hashing will fail
+  upload_proof_programs_symlinks:
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Create proof_programs symlinks
+      run: make create-proof-programs-symlinks
+    - uses: actions/upload-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/*.cairo
+
   build-programs:
+    needs: upload_proof_programs_symlinks
     strategy:
       matrix:
         # NOTE: we build cairo_bench_programs so clippy can check the benchmarks too
@@ -41,6 +57,11 @@ jobs:
       with:
         fetch-depth: 0
 
+    - uses: actions/download-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/
+
     - name: Fetch from cache
       uses: actions/cache@v3
       id: cache-programs
@@ -91,6 +112,11 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
+
+    - uses: actions/download-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/
 
     - name: Fetch test programs
       uses: actions/cache/restore@v3
@@ -143,9 +169,15 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
+    - uses: actions/download-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/
+
     - name: Format
       run: make check-fmt
 
+
     - name: Fetch programs
       uses: actions/cache/restore@v3
       with:
@@ -181,6 +213,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
+    - uses: actions/download-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/
+
     - name: Fetch programs
       uses: actions/cache/restore@v3
       with:
@@ -228,6 +265,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
+    - uses: actions/download-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/
+
     - name: Fetch programs
       uses: actions/cache/restore@v3
       with:
@@ -314,6 +356,11 @@ jobs:
       with:
         fetch-depth: 0
 
+    - uses: actions/download-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/
+
     - name: Check cache
       uses: actions/cache@v3
       id: trace-cache
@@ -381,6 +428,11 @@ jobs:
         path: target/release/cairo-vm-cli
         fail-on-cache-miss: true
 
+    - uses: actions/download-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/
+
     - name: Fetch programs
       uses: actions/cache/restore@v3
       with:
@@ -496,6 +548,11 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
+    - uses: actions/download-artifact@master
+      with:
+        name: proof_programs
+        path: cairo_programs/proof_programs/
+
     - name: Fetch traces for cairo-lang
       uses: actions/cache/restore@v3
       with:

diff --git a/.gitignore b/.gitignore
@@ -22,5 +22,6 @@ cairo-vm-pypy-env/*
 cairo1-run/corelib/
 cairo-vm-cli/air_input.pub
 ensure-no_std/Cargo.lock
+cairo_programs/proof_programs/*.cairo
 
 !vm/src/tests/cairo_pie_test_output.json
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ endif
 	compare_trace_memory_proof  compare_all_proof compare_trace_proof compare_memory_proof compare_air_public_input  compare_air_private_input\
 	cairo_bench_programs cairo_proof_programs cairo_test_programs cairo_1_test_contracts cairo_2_test_contracts \
 	cairo_trace cairo-vm_trace cairo_proof_trace cairo-vm_proof_trace \
-	fuzzer-deps fuzzer-run-cairo-compiled fuzzer-run-hint-diff build-cairo-lang hint-accountant \
+	fuzzer-deps fuzzer-run-cairo-compiled fuzzer-run-hint-diff build-cairo-lang hint-accountant \ create-proof-programs-symlinks \
 	$(RELBIN) $(DBGBIN)
 
 # Proof mode consumes too much memory with cairo-lang to execute
@@ -196,7 +196,7 @@ cargo-deps:
 cairo1-run-deps:
 	cd cairo1-run; make deps
 
-deps: cargo-deps build-cairo-1-compiler build-cairo-2-compiler cairo1-run-deps
+deps: create-proof-programs-symlinks cargo-deps build-cairo-1-compiler build-cairo-2-compiler cairo1-run-deps
 	pyenv install -s pypy3.9-7.3.9
 	PYENV_VERSION=pypy3.9-7.3.9 python -m venv cairo-vm-pypy-env
 	. cairo-vm-pypy-env/bin/activate ; \
@@ -206,7 +206,7 @@ deps: cargo-deps build-cairo-1-compiler build-cairo-2-compiler cairo1-run-deps
 	. cairo-vm-env/bin/activate ; \
 	pip install -r requirements.txt ; \
 
-deps-macos: cargo-deps build-cairo-1-compiler-macos build-cairo-2-compiler-macos cairo1-run-deps
+deps-macos: create-proof-programs-symlinks cargo-deps build-cairo-1-compiler-macos build-cairo-2-compiler-macos cairo1-run-deps
 	arch -x86_64 pyenv install -s pypy3.9-7.3.9
 	PYENV_VERSION=pypy3.9-7.3.9 python -m venv cairo-vm-pypy-env
 	. cairo-vm-pypy-env/bin/activate ; \
@@ -331,6 +331,7 @@ clean:
 	rm -f $(PRINT_TEST_DIR)/*.json
 	rm -f $(CAIRO_1_CONTRACTS_TEST_DIR)/*.sierra
 	rm -f $(CAIRO_1_CONTRACTS_TEST_DIR)/*.casm
+	rm -f $(TEST_PROOF_DIR)/*.cairo
 	rm -f $(CAIRO_2_CONTRACTS_TEST_DIR)/*.sierra
 	rm -f $(CAIRO_2_CONTRACTS_TEST_DIR)/*.casm
 	rm -f $(TEST_PROOF_DIR)/*.json
@@ -372,3 +373,5 @@ build-cairo-lang: | $(CAIRO_LANG_REPO_DIR)
 hint-accountant: build-cairo-lang
 	cargo r -p hint_accountant
 
+create-proof-programs-symlinks:
+	cd cairo_programs/proof_programs; ln -s ../*.cairo .
diff --git a/cairo_programs/proof_programs/.gitkeep b/cairo_programs/proof_programs/.gitkeep
diff --git a/cairo_programs/proof_programs/abs_value_array.cairo b/cairo_programs/proof_programs/abs_value_array.cairo
diff --git a/cairo_programs/proof_programs/array_sum.cairo b/cairo_programs/proof_programs/array_sum.cairo
diff --git a/cairo_programs/proof_programs/assert_250_bit_element_array.cairo b/cairo_programs/proof_programs/assert_250_bit_element_array.cairo
diff --git a/cairo_programs/proof_programs/assert_le_felt_hint.cairo b/cairo_programs/proof_programs/assert_le_felt_hint.cairo
diff --git a/cairo_programs/proof_programs/assert_le_felt_old.cairo b/cairo_programs/proof_programs/assert_le_felt_old.cairo
diff --git a/cairo_programs/proof_programs/assert_lt_felt.cairo b/cairo_programs/proof_programs/assert_lt_felt.cairo
diff --git a/cairo_programs/proof_programs/assert_nn.cairo b/cairo_programs/proof_programs/assert_nn.cairo
diff --git a/cairo_programs/proof_programs/assert_not_zero.cairo b/cairo_programs/proof_programs/assert_not_zero.cairo
diff --git a/cairo_programs/proof_programs/big_struct.cairo b/cairo_programs/proof_programs/big_struct.cairo
diff --git a/cairo_programs/proof_programs/bigint.cairo b/cairo_programs/proof_programs/bigint.cairo
diff --git a/cairo_programs/proof_programs/bitand_hint.cairo b/cairo_programs/proof_programs/bitand_hint.cairo
diff --git a/cairo_programs/proof_programs/bitwise_builtin_test.cairo b/cairo_programs/proof_programs/bitwise_builtin_test.cairo
diff --git a/cairo_programs/proof_programs/bitwise_output.cairo b/cairo_programs/proof_programs/bitwise_output.cairo
diff --git a/cairo_programs/proof_programs/bitwise_recursion.cairo b/cairo_programs/proof_programs/bitwise_recursion.cairo
diff --git a/cairo_programs/proof_programs/blake2s_felts.cairo b/cairo_programs/proof_programs/blake2s_felts.cairo
diff --git a/cairo_programs/proof_programs/blake2s_hello_world_hash.cairo b/cairo_programs/proof_programs/blake2s_hello_world_hash.cairo
diff --git a/cairo_programs/proof_programs/blake2s_integration_tests.cairo b/cairo_programs/proof_programs/blake2s_integration_tests.cairo
diff --git a/cairo_programs/proof_programs/cairo_finalize_keccak.cairo b/cairo_programs/proof_programs/cairo_finalize_keccak.cairo
diff --git a/cairo_programs/proof_programs/cairo_finalize_keccak_block_size_1000.cairo b/cairo_programs/proof_programs/cairo_finalize_keccak_block_size_1000.cairo
diff --git a/cairo_programs/proof_programs/call_function_assign_param_by_name.cairo b/cairo_programs/proof_programs/call_function_assign_param_by_name.cairo
diff --git a/cairo_programs/proof_programs/chained_ec_op.cairo b/cairo_programs/proof_programs/chained_ec_op.cairo
diff --git a/cairo_programs/proof_programs/common_signature.cairo b/cairo_programs/proof_programs/common_signature.cairo
diff --git a/cairo_programs/proof_programs/compare_arrays.cairo b/cairo_programs/proof_programs/compare_arrays.cairo
diff --git a/cairo_programs/proof_programs/compare_different_arrays.cairo b/cairo_programs/proof_programs/compare_different_arrays.cairo
diff --git a/cairo_programs/proof_programs/compare_greater_array.cairo b/cairo_programs/proof_programs/compare_greater_array.cairo
diff --git a/cairo_programs/proof_programs/compare_lesser_array.cairo b/cairo_programs/proof_programs/compare_lesser_array.cairo
diff --git a/cairo_programs/proof_programs/compute_doubling_slope_v2.cairo b/cairo_programs/proof_programs/compute_doubling_slope_v2.cairo
diff --git a/cairo_programs/proof_programs/compute_slope_v2.cairo b/cairo_programs/proof_programs/compute_slope_v2.cairo
diff --git a/cairo_programs/proof_programs/dict.cairo b/cairo_programs/proof_programs/dict.cairo
diff --git a/cairo_programs/proof_programs/dict_integration_tests.cairo b/cairo_programs/proof_programs/dict_integration_tests.cairo
diff --git a/cairo_programs/proof_programs/dict_squash.cairo b/cairo_programs/proof_programs/dict_squash.cairo
diff --git a/cairo_programs/proof_programs/dict_store_cast_ptr.cairo b/cairo_programs/proof_programs/dict_store_cast_ptr.cairo
diff --git a/cairo_programs/proof_programs/dict_update.cairo b/cairo_programs/proof_programs/dict_update.cairo
diff --git a/cairo_programs/proof_programs/div_mod_n.cairo b/cairo_programs/proof_programs/div_mod_n.cairo
diff --git a/cairo_programs/proof_programs/ec_double_assign_new_x_v3.cairo b/cairo_programs/proof_programs/ec_double_assign_new_x_v3.cairo
diff --git a/cairo_programs/proof_programs/ec_double_slope.cairo b/cairo_programs/proof_programs/ec_double_slope.cairo
diff --git a/cairo_programs/proof_programs/ec_double_v4.cairo b/cairo_programs/proof_programs/ec_double_v4.cairo
diff --git a/cairo_programs/proof_programs/ec_negate.cairo b/cairo_programs/proof_programs/ec_negate.cairo
diff --git a/cairo_programs/proof_programs/ec_op.cairo b/cairo_programs/proof_programs/ec_op.cairo
diff --git a/cairo_programs/proof_programs/ec_recover.cairo b/cairo_programs/proof_programs/ec_recover.cairo
diff --git a/cairo_programs/proof_programs/ed25519_ec.cairo b/cairo_programs/proof_programs/ed25519_ec.cairo
diff --git a/cairo_programs/proof_programs/ed25519_field.cairo b/cairo_programs/proof_programs/ed25519_field.cairo
diff --git a/cairo_programs/proof_programs/efficient_secp256r1_ec.cairo b/cairo_programs/proof_programs/efficient_secp256r1_ec.cairo
diff --git a/cairo_programs/proof_programs/example_blake2s.cairo b/cairo_programs/proof_programs/example_blake2s.cairo
diff --git a/cairo_programs/proof_programs/example_program.cairo b/cairo_programs/proof_programs/example_program.cairo
diff --git a/cairo_programs/proof_programs/factorial.cairo b/cairo_programs/proof_programs/factorial.cairo
diff --git a/cairo_programs/proof_programs/fast_ec_add_v2.cairo b/cairo_programs/proof_programs/fast_ec_add_v2.cairo
diff --git a/cairo_programs/proof_programs/fast_ec_add_v3.cairo b/cairo_programs/proof_programs/fast_ec_add_v3.cairo
diff --git a/cairo_programs/proof_programs/fibonacci.cairo b/cairo_programs/proof_programs/fibonacci.cairo
diff --git a/cairo_programs/proof_programs/field_arithmetic.cairo b/cairo_programs/proof_programs/field_arithmetic.cairo
diff --git a/cairo_programs/proof_programs/finalize_blake2s.cairo b/cairo_programs/proof_programs/finalize_blake2s.cairo
diff --git a/cairo_programs/proof_programs/finalize_blake2s_v2_hint.cairo b/cairo_programs/proof_programs/finalize_blake2s_v2_hint.cairo
diff --git a/cairo_programs/proof_programs/find_element.cairo b/cairo_programs/proof_programs/find_element.cairo
diff --git a/cairo_programs/proof_programs/fq.cairo b/cairo_programs/proof_programs/fq.cairo
diff --git a/cairo_programs/proof_programs/fq_test.cairo b/cairo_programs/proof_programs/fq_test.cairo
diff --git a/cairo_programs/proof_programs/function_return.cairo b/cairo_programs/proof_programs/function_return.cairo
diff --git a/cairo_programs/proof_programs/function_return_if_print.cairo b/cairo_programs/proof_programs/function_return_if_print.cairo
diff --git a/cairo_programs/proof_programs/function_return_to_variable.cairo b/cairo_programs/proof_programs/function_return_to_variable.cairo
diff --git a/cairo_programs/proof_programs/garaga.cairo b/cairo_programs/proof_programs/garaga.cairo
diff --git a/cairo_programs/proof_programs/highest_bitlen.cairo b/cairo_programs/proof_programs/highest_bitlen.cairo
diff --git a/cairo_programs/proof_programs/if_and_prime.cairo b/cairo_programs/proof_programs/if_and_prime.cairo
diff --git a/cairo_programs/proof_programs/if_in_function.cairo b/cairo_programs/proof_programs/if_in_function.cairo
diff --git a/cairo_programs/proof_programs/if_list.cairo b/cairo_programs/proof_programs/if_list.cairo
diff --git a/cairo_programs/proof_programs/if_reloc_equal.cairo b/cairo_programs/proof_programs/if_reloc_equal.cairo
diff --git a/cairo_programs/proof_programs/integration.cairo b/cairo_programs/proof_programs/integration.cairo
diff --git a/cairo_programs/proof_programs/integration_with_alloc_locals.cairo b/cairo_programs/proof_programs/integration_with_alloc_locals.cairo
diff --git a/cairo_programs/proof_programs/inv_mod_p_uint512.cairo b/cairo_programs/proof_programs/inv_mod_p_uint512.cairo
diff --git a/cairo_programs/proof_programs/is_quad_residue_test.cairo b/cairo_programs/proof_programs/is_quad_residue_test.cairo
diff --git a/cairo_programs/proof_programs/is_zero.cairo b/cairo_programs/proof_programs/is_zero.cairo
diff --git a/cairo_programs/proof_programs/is_zero_pack.cairo b/cairo_programs/proof_programs/is_zero_pack.cairo
diff --git a/cairo_programs/proof_programs/jmp.cairo b/cairo_programs/proof_programs/jmp.cairo
diff --git a/cairo_programs/proof_programs/jmp_if_condition.cairo b/cairo_programs/proof_programs/jmp_if_condition.cairo
diff --git a/cairo_programs/proof_programs/keccak.cairo b/cairo_programs/proof_programs/keccak.cairo
diff --git a/cairo_programs/proof_programs/keccak_add_uint256.cairo b/cairo_programs/proof_programs/keccak_add_uint256.cairo
diff --git a/cairo_programs/proof_programs/keccak_alternative_hint.cairo b/cairo_programs/proof_programs/keccak_alternative_hint.cairo
diff --git a/cairo_programs/proof_programs/keccak_builtin.cairo b/cairo_programs/proof_programs/keccak_builtin.cairo