diff --git a/riscv-tools b/riscv-tools index 98682995..3190b9c2 160000 --- a/riscv-tools +++ b/riscv-tools @@ -1 +1 @@ -Subproject commit 98682995dc4a1ab8777ff45ba673cf2658e54ae2 +Subproject commit 3190b9c21ecb5a845614937aadf56988d05a0e2f diff --git a/vsim/Makefrag b/vsim/Makefrag index 36716d77..281df88f 100644 --- a/vsim/Makefrag +++ b/vsim/Makefrag @@ -80,5 +80,5 @@ $(simv_debug) : $(sim_vsrcs) $(sim_csrcs) #-------------------------------------------------------------------- seed = $(shell date +%s) -exec_simv = $(simv) -q +ntb_random_seed_automatic -exec_simv_debug = $(simv_debug) -q +ntb_random_seed_automatic +exec_simv = $(simv) +permissive -q +ntb_random_seed_automatic +permissive-off +exec_simv_debug = $(simv_debug) +permissive -q +ntb_random_seed_automatic +permissive-off diff --git a/vsim/Makefrag-verilog b/vsim/Makefrag-verilog index 82db9f7a..46ab0356 100644 --- a/vsim/Makefrag-verilog +++ b/vsim/Makefrag-verilog @@ -28,19 +28,19 @@ $(generated_dir)/$(long_name).behav_srams.v : $(generated_dir)/$(long_name).conf .PRECIOUS: $(output_dir)/%.vpd $(output_dir)/%.run: $(output_dir)/% $(simv) - cd $(sim_dir) && $(exec_simv) +max-cycles=$(timeout_cycles) $< 2> /dev/null 2> $@ && [ $$PIPESTATUS -eq 0 ] + cd $(sim_dir) && $(exec_simv) +permissive +max-cycles=$(timeout_cycles) +permissive-off $< 2> /dev/null 2> $@ && [ $$PIPESTATUS -eq 0 ] $(output_dir)/%.out: $(output_dir)/% $(simv) - cd $(sim_dir) && $(exec_simv) +verbose +max-cycles=$(timeout_cycles) $< $(disasm) $@ && [ $$PIPESTATUS -eq 0 ] + cd $(sim_dir) && $(exec_simv) +permissive +verbose +max-cycles=$(timeout_cycles) +permissive-off $< $(disasm) $@ && [ $$PIPESTATUS -eq 0 ] $(output_dir)/%.vcd: $(output_dir)/% $(simv_debug) - cd $(sim_dir) && $(exec_simv_debug) +verbose +vcdfile=$@ +max-cycles=$(timeout_cycles) $< $(disasm) $(patsubst %.vcd,%.out,$@) && [ $$PIPESTATUS -eq 0 ] + cd $(sim_dir) && $(exec_simv_debug) +permissive +verbose +vcdfile=$@ +max-cycles=$(timeout_cycles) +permissive-off $< $(disasm) $(patsubst %.vcd,%.out,$@) && [ $$PIPESTATUS -eq 0 ] $(output_dir)/%.vpd: $(output_dir)/% $(simv_debug) - cd $(sim_dir) && $(exec_simv_debug) +verbose +vcdplusfile=$@ +max-cycles=$(timeout_cycles) $< $(disasm) $(patsubst %.vpd,%.out,$@) && [ $$PIPESTATUS -eq 0 ] + cd $(sim_dir) && $(exec_simv_debug) +permissive +verbose +vcdplusfile=$@ +max-cycles=$(timeout_cycles) +permissive-off $< $(disasm) $(patsubst %.vpd,%.out,$@) && [ $$PIPESTATUS -eq 0 ] $(output_dir)/%.saif: $(output_dir)/% $(simv_debug) - cd $(sim_dir) && rm -f $(output_dir)/pipe-$*.vcd && vcd2saif -input $(output_dir)/pipe-$*.vcd -pipe "$(exec_simv_debug) +verbose +vcdfile=$(output_dir)/pipe-$*.vcd +max-cycles=$(bmark_timeout_cycles) $<" -output $@ > $(patsubst %.saif,%.out,$@) 2>&1 + cd $(sim_dir) && rm -f $(output_dir)/pipe-$*.vcd && vcd2saif -input $(output_dir)/pipe-$*.vcd -pipe "$(exec_simv_debug) +permissive +verbose +vcdfile=$(output_dir)/pipe-$*.vcd +max-cycles=$(bmark_timeout_cycles) +permissive-off $<" -output $@ > $(patsubst %.saif,%.out,$@) 2>&1 run: run-asm-tests run-bmark-tests run-debug: run-asm-tests-debug run-bmark-tests-debug