Update verilator makefiles to support the last SpinalHDL changes (process merges)
This commit is contained in:
parent
9b9bbaa4ad
commit
b7f4f09814
|
@ -62,6 +62,9 @@ class VexRiscv(val config : VexRiscvConfig) extends Component with Pipeline{
|
|||
writeBack.input(config.PC) keep() addAttribute(Verilator.public)
|
||||
writeBack.arbitration.isValid keep() addAttribute(Verilator.public)
|
||||
writeBack.arbitration.isFiring keep() addAttribute(Verilator.public)
|
||||
decode.arbitration.removeIt.noBackendCombMerge //Verilator perf
|
||||
memory.arbitration.removeIt.noBackendCombMerge
|
||||
execute.arbitration.flushAll.noBackendCombMerge
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -326,7 +326,7 @@ class CsrPlugin(config : CsrPluginConfig) extends Plugin[VexRiscv] with Exceptio
|
|||
|
||||
//Used to make the pipeline empty softly (for interrupts)
|
||||
val pipelineLiberator = new Area{
|
||||
val enable = False
|
||||
val enable = False.noBackendCombMerge //Verilator Perf
|
||||
prefetch.arbitration.haltByOther setWhen(enable)
|
||||
val done = ! List(fetch, decode, execute, memory).map(_.arbitration.isValid).orR
|
||||
}
|
||||
|
|
|
@ -46,7 +46,7 @@ run: compile
|
|||
./obj_dir/VBriey
|
||||
|
||||
verilate:
|
||||
verilator -cc ../../../../Briey.v -CFLAGS -std=c++11 ${ADDCFLAGS} --gdbbt ${VERILATOR_ARGS} -Wno-WIDTH --x-assign unique --exe main.cpp
|
||||
verilator -cc ../../../../Briey.v -CFLAGS -std=c++11 ${ADDCFLAGS} --gdbbt ${VERILATOR_ARGS} -Wno-WIDTH -Wno-UNOPTFLAT --x-assign unique --exe main.cpp
|
||||
|
||||
compile: verilate
|
||||
make -j -C obj_dir/ -f VBriey.mk VBriey
|
||||
|
|
|
@ -29,7 +29,7 @@ run: compile
|
|||
./obj_dir/VMurax
|
||||
|
||||
verilate:
|
||||
verilator -cc ../../../../Murax.v -CFLAGS -std=c++11 ${ADDCFLAGS} --gdbbt ${VERILATOR_ARGS} -Wno-WIDTH --x-assign unique --exe main.cpp
|
||||
verilator -cc ../../../../Murax.v -CFLAGS -std=c++11 ${ADDCFLAGS} --gdbbt ${VERILATOR_ARGS} -Wno-WIDTH -Wno-UNOPTFLAT --x-assign unique --exe main.cpp
|
||||
|
||||
compile: verilate
|
||||
make -j -C obj_dir/ -f VMurax.mk VMurax
|
||||
|
|
|
@ -94,7 +94,7 @@ run: compile
|
|||
./obj_dir/VVexRiscv
|
||||
|
||||
verilate:
|
||||
verilator -cc ../../../../VexRiscv.v -O3 -CFLAGS -std=c++11 -LDFLAGS -pthread ${ADDCFLAGS} --gdbbt ${VERILATOR_ARGS} -Wno-WIDTH --x-assign unique --exe main.cpp
|
||||
verilator -cc ../../../../VexRiscv.v -O3 -CFLAGS -std=c++11 -LDFLAGS -pthread ${ADDCFLAGS} --gdbbt ${VERILATOR_ARGS} -Wno-UNOPTFLAT -Wno-WIDTH --x-assign unique --exe main.cpp
|
||||
|
||||
compile: verilate
|
||||
make -j -C obj_dir/ -f VVexRiscv.mk VVexRiscv
|
||||
|
|
Loading…
Reference in New Issue