github-mirrors/ibex
1
0
Fork 0
mirror of https://github.com/lowRISC/ibex.git synced 2025-04-22 04:47:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove GEN_OPTS from core_ibex Makefile

Browse source 
We don't actually use it anywhere and it adds some complexity. Let's
put it back in if we turn out to need it.
This commit is contained in:
Rupert Swarbrick 2022-04-13 11:53:15 +01:00 • committed by Rupert Swarbrick
parent ccc9bef3ec
commit 4854a131fa
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/03_reference/verification.rst
View file

@ -205,9 +205,6 @@ The entirety of this flow is controlled by the Makefile found at
# Generate the assembly tests only # Generate the assembly tests only
make gen make gen
# Pass addtional options to the generator
make GEN_OPTS="xxxx" ...
# Compile and run RTL simulation # Compile and run RTL simulation
make TEST=xxx compile,rtl_sim make TEST=xxx compile,rtl_sim

21
dv/uvm/core_ibex/Makefile
View file

@ -41,8 +41,6 @@ export cov_merge_dir := $(OUT-SEED)/cov_merge
export cov_merge_db_dir := $(cov_merge_dir)/merged export cov_merge_db_dir := $(cov_merge_dir)/merged
export cov_report_dir := $(OUT-SEED)/cov_report export cov_report_dir := $(OUT-SEED)/cov_report
# Run time options for the instruction generator
GEN_OPTS :=
# Compile time options for ibex RTL simulation # Compile time options for ibex RTL simulation
COMPILE_OPTS += COMPILE_OPTS +=
# Run time options for ibex RTL simulation # Run time options for ibex RTL simulation
@ -247,9 +245,14 @@ REGEX_EMPTY_LINES := '/^$$/d'
# Build the Random Instruction Generator # Build the Random Instruction Generator
# #
# This depends on the vendored in code in $(GEN_DIR). It also depends on the # This depends on the vendored in code in $(GEN_DIR). It also depends on the
# values of the following Makefile variables (we want to regenerate things if, # values of some variables (we want to regenerate things if, for example, the
# for example, the simulator changes). # simulator changes). Since we're writing out to $(OUT-SEED), we don't have to
instr-gen-build-var-deps := GEN_OPTS SIMULATOR RISCV_DV_OPTS ISA CSR_OPTS \ # depend on the value of SEED. However, we do have to make sure that the
# variables whose names are listed in $(instr-gen-build-var-deps) haven't changed.
#
# To do this variable tracking, we dump each of the variables to a Makefile
# fragment and try to load it up the next time around.
instr-gen-build-var-deps := SIMULATOR RISCV_DV_OPTS ISA CSR_OPTS \
SIGNATURE_ADDR PMP_REGIONS PMP_GRANULARITY TEST_OPTS SIGNATURE_ADDR PMP_REGIONS PMP_GRANULARITY TEST_OPTS
# Since we're writing out to $(OUT-SEED), we don't have to depend on the value # Since we're writing out to $(OUT-SEED), we don't have to depend on the value
# of SEED. However, we do have to make sure that the variables listed have not # of SEED. However, we do have to make sure that the variables listed have not
@ -291,7 +294,7 @@ $(metadata)/.instr_gen.build.stamp: \
$(verb)rm -rf $(OUT-SEED)/instr_gen $(verb)rm -rf $(OUT-SEED)/instr_gen
$(verb)python3 ${GEN_DIR}/run.py \ $(verb)python3 ${GEN_DIR}/run.py \
--co --steps=gen \ --co --steps=gen \
--output=$(OUT-SEED)/instr_gen ${GEN_OPTS} \ --output=$(OUT-SEED)/instr_gen \
--simulator="${SIMULATOR}" \ --simulator="${SIMULATOR}" \
${RISCV_DV_OPTS} \ ${RISCV_DV_OPTS} \
--isa=${ISA} \ --isa=${ISA} \
@ -314,7 +317,7 @@ $(metadata)/.instr_gen.run.stamp: \
@ # Generate the commands to be run into $(INSTR_GEN_RUN_COMMANDS) @ # Generate the commands to be run into $(INSTR_GEN_RUN_COMMANDS)
$(verb)python3 ${GEN_DIR}/run.py \ $(verb)python3 ${GEN_DIR}/run.py \
--so --steps=gen \ --so --steps=gen \
--output=$(OUT-SEED)/instr_gen ${GEN_OPTS} \ --output=$(OUT-SEED)/instr_gen \
--lsf_cmd="${LSF_CMD}" \ --lsf_cmd="${LSF_CMD}" \
--simulator="${SIMULATOR}" \ --simulator="${SIMULATOR}" \
--isa=${ISA} \ --isa=${ISA} \
@ -347,7 +350,7 @@ instr_gen_run: $(metadata)/.instr_gen.run.stamp
$(metadata)/.instr_gen.compile_tests.stamp: \ $(metadata)/.instr_gen.compile_tests.stamp: \
$(metadata)/.instr_gen.run.stamp $(TESTLIST) $(metadata)/.instr_gen.run.stamp $(TESTLIST)
$(verb)python3 ${GEN_DIR}/run.py \ $(verb)python3 ${GEN_DIR}/run.py \
--o=$(OUT-SEED)/instr_gen ${GEN_OPTS} \ --o=$(OUT-SEED)/instr_gen \
--steps=gcc_compile \ --steps=gcc_compile \
${TEST_OPTS} \ ${TEST_OPTS} \
--gcc_opts=-mno-strict-align \ --gcc_opts=-mno-strict-align \
@ -374,7 +377,7 @@ $(metadata)/.iss.run.stamp: \
$(metadata)/.instr_gen.compile_tests.stamp $(iss-vars-prereq) $(TESTLIST) $(metadata)/.instr_gen.compile_tests.stamp $(iss-vars-prereq) $(TESTLIST)
@ # Generate the commands to be run into $(ISS_COMMANDS) @ # Generate the commands to be run into $(ISS_COMMANDS)
$(verb)python3 ${GEN_DIR}/run.py \ $(verb)python3 ${GEN_DIR}/run.py \
--o=$(OUT-SEED)/instr_gen ${GEN_OPTS} \ --o=$(OUT-SEED)/instr_gen \
--steps=iss_sim \ --steps=iss_sim \
${TEST_OPTS} \ ${TEST_OPTS} \
--iss="${ISS}" \ --iss="${ISS}" \