Skip to content

Commit

Permalink
[ENV] Remove ADAMSBRIDGE_ROOT references, use local paths/submodule i…
Browse files Browse the repository at this point in the history 
…nstead (#626)

* Remove ADAMSBRIDGE_ROOT references, use local paths/submodule instead

* Use dilithium5 from ABR submodule

* Remove local copy of test_dilithium5

* organized MLDSA exe files

* Fix some paths to test_dilithium5 executable

* Update ABR submodule

* Regen caliptra_reg after MLDSA KV updates

* ABR file list changes

* Move ADAMSBRIDGE_ROOT refs in .vf file lists to point to submodule from CALIPTRA_ROOT

* MICROSOFT AUTOMATED PIPELINE: Stamp 'cwhitehead-msft-abr-var-at-sub' with updated timestamp and hash after successful run

* Regenerate UVMF caliptra top file lists with ABR var updates

* MICROSOFT AUTOMATED PIPELINE: Stamp 'cwhitehead-msft-abr-var-at-sub' with updated timestamp and hash after successful run

---------

Co-authored-by: Emre Karabulut <“[email protected]”>
  • Loading branch information
@calebofearth
calebofearth and Emre Karabulut authored Nov 5, 2024
1 parent ac8e559 commit 15bfb2f
Show file tree
Hide file tree
Showing 15 changed files with 1,054 additions and 1,015 deletions.
2 changes: 1 addition & 1 deletion .github/workflow_metadata/pr_hash
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b7ce3b14f80888f2274dfad09eff6d9121ca131d4da8685481642253871832b5596daca53ba3d6cf3734cfa470e0fa8e
0aaee120d93ac18bc55c7839a4e4e1fc956b2f12d1d7b11850a42f0eb11914ba98c92368164c95e7a34e41a634c236f5
2 changes: 1 addition & 1 deletion .github/workflow_metadata/pr_timestamp
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1730421807
1730784274
318 changes: 159 additions & 159 deletions src/integration/config/caliptra_top.vf
View file

Large diffs are not rendered by default.

318 changes: 159 additions & 159 deletions src/integration/config/caliptra_top_tb.vf
View file

Large diffs are not rendered by default.

318 changes: 159 additions & 159 deletions src/integration/config/caliptra_top_tb_pkg.vf
View file

Large diffs are not rendered by default.

318 changes: 159 additions & 159 deletions src/integration/config/caliptra_top_trng_tb.vf
View file

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions src/integration/config/compile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ targets:
pre_exec: '$MSFT_SCRIPTS_DIR/run_test_makefile && echo "[PRE-EXEC] Copying ECC vector generator to ${pwd}" && cp $COMPILE_ROOT/../ecc/tb/ecc_secp384r1.exe .
&& echo "[PRE-EXEC] Copying DOE vector generator to ${pwd}" && cp $COMPILE_ROOT/../doe/tb/doe_test_gen.py .
&& echo "[PRE-EXEC] Copying SHA256 wntz vector generator to ${pwd}" && cp $COMPILE_ROOT/../sha256/tb/sha256_wntz_test_gen.py .
&& echo "[PRE-EXEC] Copying MLDSA vector generator to ${pwd}" && cp $COMPILE_ROOT/../mldsa/tb/test_dilithium5 .
&& echo "[PRE-EXEC] Copying MLDSA vector generator to ${pwd}" && cp $COMPILE_ROOT/../../submodules/adams-bridge/src/mldsa_top/uvmf/Dilithium_ref/dilithium/ref/test/test_dilithium5 .
&& echo "[PRE-EXEC] Copying MLDSA debug vector generator to ${pwd}" && cp $COMPILE_ROOT/../../submodules/adams-bridge/src/mldsa_top/uvmf/Dilithium_ref/dilithium/ref/test/test_dilithium5_debug .
&& echo "[PRE-EXEC] Copying mldsa directed vector to ${pwd}" && cp $COMPILE_ROOT/../mldsa/tb/smoke_test_mldsa_vector.hex .'
global:
tool:
Expand Down Expand Up @@ -155,7 +156,8 @@ targets:
pre_exec: '$MSFT_SCRIPTS_DIR/run_test_makefile && echo "[PRE-EXEC] Copying ECC vector generator to ${pwd}" && cp $COMPILE_ROOT/../ecc/tb/ecc_secp384r1.exe .
&& echo "[PRE-EXEC] Copying DOE vector generator to ${pwd}" && cp $COMPILE_ROOT/../doe/tb/doe_test_gen.py .
&& echo "[PRE-EXEC] Copying SHA256 wntz vector generator to ${pwd}" && cp $COMPILE_ROOT/../sha256/tb/sha256_wntz_test_gen.py .
&& echo "[PRE-EXEC] Copying MLDSA vector generator to ${pwd}" && cp $COMPILE_ROOT/../mldsa/tb/test_dilithium5 .
&& echo "[PRE-EXEC] Copying MLDSA vector generator to ${pwd}" && cp $COMPILE_ROOT/../../submodules/adams-bridge/src/mldsa_top/uvmf/Dilithium_ref/dilithium/ref/test/test_dilithium5 .
&& echo "[PRE-EXEC] Copying MLDSA debug vector generator to ${pwd}" && cp $COMPILE_ROOT/../../submodules/adams-bridge/src/mldsa_top/uvmf/Dilithium_ref/dilithium/ref/test/test_dilithium5_debug .
&& echo "[PRE-EXEC] Copying mldsa directed vector to ${pwd}" && cp $COMPILE_ROOT/../mldsa/tb/smoke_test_mldsa_vector.hex .'
global:
tool:
Expand Down
72 changes: 45 additions & 27 deletions src/integration/rtl/caliptra_reg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4577,55 +4577,73 @@
#define CLP_MLDSA_REG_MLDSA_PRIVKEY_OUT_END_ADDR (0x1003531f)
#define CLP_MLDSA_REG_MLDSA_PRIVKEY_IN_BASE_ADDR (0x10036000)
#define CLP_MLDSA_REG_MLDSA_PRIVKEY_IN_END_ADDR (0x1003731f)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_START (0x10038000)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_GLOBAL_INTR_EN_R (0x10038000)
#define MLDSA_REG_INTR_BLOCK_RF_GLOBAL_INTR_EN_R (0x8000)
#define CLP_MLDSA_REG_MLDSA_KV_RD_SEED_CTRL (0x10038000)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL (0x8000)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL_READ_EN_LOW (0)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL_READ_EN_MASK (0x1)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL_READ_ENTRY_LOW (1)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL_READ_ENTRY_MASK (0x3e)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL_PCR_HASH_EXTEND_LOW (6)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL_PCR_HASH_EXTEND_MASK (0x40)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL_RSVD_LOW (7)
#define MLDSA_REG_MLDSA_KV_RD_SEED_CTRL_RSVD_MASK (0xffffff80)
#define CLP_MLDSA_REG_MLDSA_KV_RD_SEED_STATUS (0x10038004)
#define MLDSA_REG_MLDSA_KV_RD_SEED_STATUS (0x8004)
#define MLDSA_REG_MLDSA_KV_RD_SEED_STATUS_READY_LOW (0)
#define MLDSA_REG_MLDSA_KV_RD_SEED_STATUS_READY_MASK (0x1)
#define MLDSA_REG_MLDSA_KV_RD_SEED_STATUS_VALID_LOW (1)
#define MLDSA_REG_MLDSA_KV_RD_SEED_STATUS_VALID_MASK (0x2)
#define MLDSA_REG_MLDSA_KV_RD_SEED_STATUS_ERROR_LOW (2)
#define MLDSA_REG_MLDSA_KV_RD_SEED_STATUS_ERROR_MASK (0x3fc)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_START (0x10038100)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_GLOBAL_INTR_EN_R (0x10038100)
#define MLDSA_REG_INTR_BLOCK_RF_GLOBAL_INTR_EN_R (0x8100)
#define MLDSA_REG_INTR_BLOCK_RF_GLOBAL_INTR_EN_R_ERROR_EN_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_GLOBAL_INTR_EN_R_ERROR_EN_MASK (0x1)
#define MLDSA_REG_INTR_BLOCK_RF_GLOBAL_INTR_EN_R_NOTIF_EN_LOW (1)
#define MLDSA_REG_INTR_BLOCK_RF_GLOBAL_INTR_EN_R_NOTIF_EN_MASK (0x2)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_EN_R (0x10038004)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_EN_R (0x8004)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_EN_R (0x10038104)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_EN_R (0x8104)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_EN_R_ERROR_INTERNAL_EN_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_EN_R_ERROR_INTERNAL_EN_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_EN_R (0x10038008)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_EN_R (0x8008)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_EN_R (0x10038108)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_EN_R (0x8108)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_EN_R_NOTIF_CMD_DONE_EN_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_EN_R_NOTIF_CMD_DONE_EN_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_GLOBAL_INTR_R (0x1003800c)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_GLOBAL_INTR_R (0x800c)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_GLOBAL_INTR_R (0x1003810c)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_GLOBAL_INTR_R (0x810c)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_GLOBAL_INTR_R_AGG_STS_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_GLOBAL_INTR_R_AGG_STS_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_GLOBAL_INTR_R (0x10038010)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_GLOBAL_INTR_R (0x8010)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_GLOBAL_INTR_R (0x10038110)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_GLOBAL_INTR_R (0x8110)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_GLOBAL_INTR_R_AGG_STS_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_GLOBAL_INTR_R_AGG_STS_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_R (0x10038014)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_R (0x8014)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_R (0x10038114)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_R (0x8114)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_R_ERROR_INTERNAL_STS_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_R_ERROR_INTERNAL_STS_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTERNAL_INTR_R (0x10038018)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTERNAL_INTR_R (0x8018)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTERNAL_INTR_R (0x10038118)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTERNAL_INTR_R (0x8118)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTERNAL_INTR_R_NOTIF_CMD_DONE_STS_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTERNAL_INTR_R_NOTIF_CMD_DONE_STS_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_TRIG_R (0x1003801c)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_TRIG_R (0x801c)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_TRIG_R (0x1003811c)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_TRIG_R (0x811c)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_TRIG_R_ERROR_INTERNAL_TRIG_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTR_TRIG_R_ERROR_INTERNAL_TRIG_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_TRIG_R (0x10038020)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_TRIG_R (0x8020)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_TRIG_R (0x10038120)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_TRIG_R (0x8120)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_TRIG_R_NOTIF_CMD_DONE_TRIG_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_INTR_TRIG_R_NOTIF_CMD_DONE_TRIG_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_R (0x10038100)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_R (0x8100)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_R (0x10038180)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_R (0x8180)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_INCR_R (0x10038200)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_INCR_R (0x8200)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_R (0x10038200)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_R (0x8200)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_R (0x10038280)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_R (0x8280)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_INCR_R (0x10038300)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_INCR_R (0x8300)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_INCR_R_PULSE_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_ERROR_INTERNAL_INTR_COUNT_INCR_R_PULSE_MASK (0x1)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_INCR_R (0x10038204)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_INCR_R (0x8204)
#define CLP_MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_INCR_R (0x10038304)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_INCR_R (0x8304)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_INCR_R_PULSE_LOW (0)
#define MLDSA_REG_INTR_BLOCK_RF_NOTIF_CMD_DONE_INTR_COUNT_INCR_R_PULSE_MASK (0x1)
#define CLP_CSRNG_REG_BASE_ADDR (0x20002000)
Expand Down
Loading

0 comments on commit 15bfb2f

Please sign in to comment.