From 406a5bae2a1fefa11ade56fc62b78e7a0d91ff0f Mon Sep 17 00:00:00 2001
From: Cloud User <centos@ip-172-31-19-158.us-west-2.compute.internal>
Date: Wed, 21 Aug 2019 09:18:45 +0000
Subject: [PATCH] Updated files for bls12-381 to compile on AWS

---
 aws/cl_zcash/verif/scripts/waves.tcl   |  2 +-
 aws/cl_zcash/verif/tests/test_zcash.sv |  2 +-
 zcash_fpga/src/rtl/top/include.f       | 24 +++++++++++++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/aws/cl_zcash/verif/scripts/waves.tcl b/aws/cl_zcash/verif/scripts/waves.tcl
index ddedecd..43d78c2 100644
--- a/aws/cl_zcash/verif/scripts/waves.tcl
+++ b/aws/cl_zcash/verif/scripts/waves.tcl
@@ -21,4 +21,4 @@ add_wave /tb/card/fpga/CL/zcash_if_tx/*
 add_wave /tb/card/fpga/CL/zcash_if_rx/*
 add_wave /tb/card/fpga/CL/cl_zcash_aws_wrapper/*
 
-run 110 us
+run all
diff --git a/aws/cl_zcash/verif/tests/test_zcash.sv b/aws/cl_zcash/verif/tests/test_zcash.sv
index 79ba1b7..b70cdad 100644
--- a/aws/cl_zcash/verif/tests/test_zcash.sv
+++ b/aws/cl_zcash/verif/tests/test_zcash.sv
@@ -307,7 +307,7 @@ task test_bls12_381();
       for (int i = 0; i < 6; i++)
         out_p[i*381 +: 381] = stream_data[i*(48*8) +: 381];
 
-      if (out_p == exp_p) begin
+      if (fp2_to_affine(out_p) == fp2_to_affine(exp_p)) begin
         $display("INFO: Output point matched expected:");
         print_fp2_jb_point(out_p);
       end else begin
diff --git a/zcash_fpga/src/rtl/top/include.f b/zcash_fpga/src/rtl/top/include.f
index 9f9edef..0208da0 100644
--- a/zcash_fpga/src/rtl/top/include.f
+++ b/zcash_fpga/src/rtl/top/include.f
@@ -45,6 +45,7 @@ ${ZCASH_DIR}/ip_cores/sha256/src/rtl/sha256d_top.sv
 ${ZCASH_DIR}/ip_cores/util/src/rtl/accum_mult.sv
 ${ZCASH_DIR}/ip_cores/util/src/rtl/barret_mod.sv
 ${ZCASH_DIR}/ip_cores/util/src/rtl/bin_inv.sv
+${ZCASH_DIR}/ip_cores/util/src/rtl/bin_inv_s.sv
 ${ZCASH_DIR}/ip_cores/util/src/rtl/dup_check.sv
 ${ZCASH_DIR}/ip_cores/util/src/rtl/karatsuba_ofman_mult.sv
 ${ZCASH_DIR}/ip_cores/util/src/rtl/packet_arb.sv
@@ -53,7 +54,6 @@ ${ZCASH_DIR}/ip_cores/util/src/rtl/barret_mod_pipe.sv
 ${ZCASH_DIR}/ip_cores/util/src/rtl/adder_pipe.sv
 ${ZCASH_DIR}/ip_cores/util/src/rtl/subtracter_pipe.sv
 
-
 ${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fp_mult_mod.sv
 ${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fp2_arithmetic.sv
 ${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fp2_point_add.sv
@@ -61,8 +61,30 @@ ${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fp2_point_dbl.sv
 ${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_point_add.sv
 ${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_point_dbl.sv
 ${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_point_mult.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fe12_inv_s.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fe12_mul_s.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fe12_pow_s.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fe2_inv_s.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fe2_mul_s.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fe6_inv_s.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/ec_fe6_mul_s.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/fe2_mul_by_nonresidue_s.sv
+${ZCASH_DIR}/ip_cores/ec/src/rtl/fe6_mul_by_nonresidue_s.sv
+
 
 ${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_axi_bridge.sv
 ${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_top.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_pairing.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_pairing_wrapper.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_pairing_miller_dbl.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_pairing_miller_add.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_final_exponent.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_fe6_fmap.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_fe2_fmap.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_fe12_inv_wrapper.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_fe12_fmap.sv
+${ZCASH_DIR}/zcash_fpga/src/rtl/bls12_381/bls12_381_fe12_fmap_wrapper.sv
+
+
 
 ${ZCASH_DIR}/zcash_fpga/src/rtl/top/zcash_fpga_top.sv