ci: Update opcodes

xiaorui-yin · Aug 31, 2023 · 0e54f2f · 0e54f2f
1 parent 89e4375
commit 0e54f2f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1,349 deletions.
diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
@@ -101,6 +101,8 @@ snRuntime-test-vsim:
     - $CI_PROJECT_DIR/util/memora_retry.sh get tc-riscv-gcc
     # Download bender
     - make bender
+    # Update opcodes
+    - make update_opcodes
     # Download python dependencies
     - export PYTHON3=$(which python3.6)
     - ${PYTHON3} -m pip install --user jsonref
@@ -126,6 +128,8 @@ snRuntime-test-vcs:
     - $CI_PROJECT_DIR/util/memora_retry.sh get tc-riscv-gcc
     # Download bender
     - make bender
+    # Update opcodes
+    - make update_opcodes
     # Download python dependencies
     - export PYTHON3=$(which python3.6)
     - ${PYTHON3} -m pip install --user jsonref
@@ -152,6 +156,8 @@ snRuntime-test-vlt:
     - $CI_PROJECT_DIR/util/memora_retry.sh get verilator
     # Download bender
     - make bender
+    # Update opcodes
+    - make update_opcodes
     # Download python dependencies
     - export PYTHON3=$(which python3.6)
     - ${PYTHON3} -m pip install --user jsonref
@@ -179,6 +185,8 @@ riscvTests-test-vlt:
     - $CI_PROJECT_DIR/util/memora_retry.sh get verilator
     # Download bender
     - make bender
+    # Update opcodes
+    - make update_opcodes
     # Download python dependencies
     - export PYTHON3=$(which python3.6)
     - ${PYTHON3} -m pip install --user jsonref
@@ -206,6 +214,8 @@ spatzBenchmarks-test-vlt:
     - $CI_PROJECT_DIR/util/memora_retry.sh get verilator
     # Download bender
     - make bender
+    # Update opcodes
+    - make update_opcodes
     # Download python dependencies
     - export PYTHON3=$(which python3.6)
     - ${PYTHON3} -m pip install --user jsonref

diff --git a/Makefile b/Makefile
@@ -135,11 +135,11 @@ $(VERILATOR_INSTALL_DIR)/bin/verilator: sw/toolchain/verilator sw/toolchain/help
 #  Opcodes  #
 #############
 
-update_opcodes: sw/snRuntime/vendor/riscv-opcodes/encoding.h hw/ip/snitch/src/riscv_instr.sv
+update_opcodes: sw/toolchain/riscv-opcodes sw/toolchain/riscv-opcodes/encoding.h hw/ip/snitch/src/riscv_instr.sv
 hw/ip/snitch/src/riscv_instr.sv: sw/toolchain/riscv-opcodes
 	MY_OPCODES=$(OPCODES) make -C sw/toolchain/riscv-opcodes inst.sverilog
 	mv sw/toolchain/riscv-opcodes/inst.sverilog $@
 
-sw/snRuntime/vendor/riscv-opcodes/encoding.h: sw/toolchain/riscv-opcodes/*
+sw/toolchain/riscv-opcodes/encoding.h:
 	MY_OPCODES=$(OPCODES) make -C sw/toolchain/riscv-opcodes all
 	cp sw/toolchain/riscv-opcodes/encoding_out.h $@