simplified coremark

2022-06-10 19:15:17 +00:00 · 2022-06-10 19:15:17 +00:00 · 4bbe5eeecd
commit 4bbe5eeecd
parent 13c1cf12b2
146 changed files with 6 additions and 3632 deletions
--- a/benchmarks/riscv-coremark/.gitignore
+++ b/benchmarks/riscv-coremark/.gitignore
--- a/benchmarks/riscv-coremark/.gitmodules
+++ b/benchmarks/riscv-coremark/.gitmodules
@ -1,3 +1,3 @@
 [submodule "coremark"]
-	path = coremark
+	path = src
 	url = https://github.com/eembc/coremark
--- a/benchmarks/riscv-coremark/LICENSE
+++ b/benchmarks/riscv-coremark/LICENSE
--- a/benchmarks/riscv-coremark/Makefile
+++ b/benchmarks/riscv-coremark/Makefile
@ -1,6 +1,6 @@
 #cmbase=../../addins/coremark
 PORT_DIR = $(CURDIR)/riscv64-baremetal
-cmbase=coremark
+cmbase=src
 sources=$(cmbase)/core_main.c $(cmbase)/core_list_join.c $(cmbase)/coremark.h  \
        $(cmbase)/core_matrix.c $(cmbase)/core_state.c $(cmbase)/core_util.c \
 		$(PORT_DIR)/core_portme.h $(PORT_DIR)/core_portme.c $(PORT_DIR)/core_portme.mak \
@ -10,6 +10,8 @@ work/coremark.bare.riscv.elf.memfile: work/coremark.bare.riscv
 	riscv64-unknown-elf-objdump -D $< > $<.elf.objdump
 	riscv64-unknown-elf-elf2hex --bit-width 64 --input $< --output $@
 	extractFunctionRadix.sh $<.elf.objdump
+	(cd ../../pipelined/regression && (vsim -c -do "do wally-pipelined-batch.do rv64gc coremark" > ../../benchmarks/coremark/work/coremark.bare.riscv.sim.output))
+	cd ../../benchmarks/coremark/

 work/coremark.bare.riscv: $(sources) Makefile
 #	make -C $(cmbase) PORT_DIR=$(PORT_DIR) compile RISCV=/opt/riscv/riscv-gnu-toolchain XCFLAGS="-march=rv64imd -mabi=lp64d -mbranch-cost=1 -DSKIP_DEFAULT_MEMSET -mtune=sifive-7-series -Ofast -funroll-all-loops -fno-delete-null-pointer-checks -fno-rename-registers --param=loop-max-datarefs-for-datadeps=0 -funroll-all-loops --param=uninlined-function-insns=8 -fno-tree-vrp -fwrapv -fno-toplevel-reorder --param=max-inline-insns-size=128 -fipa-pta"
@ -19,6 +21,7 @@ work/coremark.bare.riscv: $(sources) Makefile
 	mkdir -p work/
 	mv $(cmbase)/coremark.bare.riscv work/

+
 .PHONY: clean

 clean:
--- a/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.c
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.c
--- a/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.h
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.h
--- a/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.mak
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/core_portme.mak
--- a/benchmarks/riscv-coremark/riscv64-baremetal/crt.S
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/crt.S
--- a/benchmarks/riscv-coremark/riscv64-baremetal/encoding.h
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/encoding.h
--- a/benchmarks/riscv-coremark/riscv64-baremetal/link.ld
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/link.ld
--- a/benchmarks/riscv-coremark/riscv64-baremetal/syscallbackup.c
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/syscallbackup.c
--- a/benchmarks/riscv-coremark/riscv64-baremetal/syscalls.c
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/syscalls.c
--- a/benchmarks/riscv-coremark/riscv64-baremetal/util.h
+++ b/benchmarks/riscv-coremark/riscv64-baremetal/util.h
--- a/benchmarks/riscv-coremark/coremark/LICENSE.md
+++ b/benchmarks/riscv-coremark/coremark/LICENSE.md
--- a/benchmarks/riscv-coremark/coremark/Makefile
+++ b/benchmarks/riscv-coremark/coremark/Makefile
--- a/benchmarks/riscv-coremark/coremark/README.md
+++ b/benchmarks/riscv-coremark/coremark/README.md
--- a/benchmarks/riscv-coremark/coremark/barebones/core_portme.c
+++ b/benchmarks/riscv-coremark/coremark/barebones/core_portme.c
--- a/benchmarks/riscv-coremark/coremark/barebones/core_portme.h
+++ b/benchmarks/riscv-coremark/coremark/barebones/core_portme.h
--- a/benchmarks/riscv-coremark/coremark/barebones/core_portme.mak
+++ b/benchmarks/riscv-coremark/coremark/barebones/core_portme.mak
--- a/benchmarks/riscv-coremark/coremark/barebones/cvt.c
+++ b/benchmarks/riscv-coremark/coremark/barebones/cvt.c
--- a/benchmarks/riscv-coremark/coremark/barebones/ee_printf.c
+++ b/benchmarks/riscv-coremark/coremark/barebones/ee_printf.c
--- a/benchmarks/riscv-coremark/coremark/core_list_join.c
+++ b/benchmarks/riscv-coremark/coremark/core_list_join.c
--- a/benchmarks/riscv-coremark/coremark/core_main.c
+++ b/benchmarks/riscv-coremark/coremark/core_main.c
--- a/benchmarks/riscv-coremark/coremark/core_matrix.c
+++ b/benchmarks/riscv-coremark/coremark/core_matrix.c
--- a/benchmarks/riscv-coremark/coremark/core_state.c
+++ b/benchmarks/riscv-coremark/coremark/core_state.c
--- a/benchmarks/riscv-coremark/coremark/core_util.c
+++ b/benchmarks/riscv-coremark/coremark/core_util.c
--- a/benchmarks/riscv-coremark/coremark/coremark.exe
+++ b/benchmarks/riscv-coremark/coremark/coremark.exe
--- a/benchmarks/riscv-coremark/coremark/coremark.h
+++ b/benchmarks/riscv-coremark/coremark/coremark.h
--- a/benchmarks/riscv-coremark/coremark/coremark.md5
+++ b/benchmarks/riscv-coremark/coremark/coremark.md5
--- a/benchmarks/riscv-coremark/coremark/cygwin/core_portme.c
+++ b/benchmarks/riscv-coremark/coremark/cygwin/core_portme.c
--- a/benchmarks/riscv-coremark/coremark/cygwin/core_portme.h
+++ b/benchmarks/riscv-coremark/coremark/cygwin/core_portme.h
--- a/benchmarks/riscv-coremark/coremark/cygwin/core_portme.mak
+++ b/benchmarks/riscv-coremark/coremark/cygwin/core_portme.mak
--- a/benchmarks/riscv-coremark/coremark/docs/READM.md
+++ b/benchmarks/riscv-coremark/coremark/docs/READM.md
--- a/benchmarks/riscv-coremark/coremark/docs/balance_O0_joined.png
+++ b/benchmarks/riscv-coremark/coremark/docs/balance_O0_joined.png
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/PIC32/core_portme-mak.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/PIC32/core_portme-mak.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/core_list_join-c.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/core_list_join-c.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/core_main-c.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/core_main-c.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/core_matrix-c.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/core_matrix-c.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/core_state-c.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/core_state-c.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/core_util-c.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/core_util-c.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/coremark-h.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/coremark-h.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/docs/core_state.png
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/docs/core_state.png
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/linux/core_portme-c.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/linux/core_portme-c.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/linux/core_portme-h.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/linux/core_portme-h.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/linux/core_portme-mak.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/linux/core_portme-mak.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/readme-txt.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/readme-txt.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/files/release_notes-txt.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/files/release_notes-txt.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/BuildTargets.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/BuildTargets.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/Configuration.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/Configuration.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/Configurations.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/Configurations.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/Files.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/Files.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/Functions.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/Functions.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/General.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/General.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/General2.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/General2.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/Types.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/Types.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/index/Variables.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/index/Variables.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/javascript/main.js
+++ b/benchmarks/riscv-coremark/coremark/docs/html/javascript/main.js
--- a/benchmarks/riscv-coremark/coremark/docs/html/javascript/searchdata.js
+++ b/benchmarks/riscv-coremark/coremark/docs/html/javascript/searchdata.js
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/BuildTargetsP.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/BuildTargetsP.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationC.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationC.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationH.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationH.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationM.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationM.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationS.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationS.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationT.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationT.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationU.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationU.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationsH.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationsH.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationsM.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationsM.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationsS.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationsS.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationsT.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/ConfigurationsT.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FilesC.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FilesC.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FilesR.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FilesR.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsC.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsC.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsG.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsG.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsI.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsI.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsM.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsM.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsP.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsP.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsS.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsS.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsT.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/FunctionsT.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralB.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralB.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralC.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralC.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralD.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralD.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralF.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralF.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralG.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralG.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralH.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralH.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralI.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralI.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralL.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralL.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralM.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralM.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralO.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralO.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralP.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralP.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralR.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralR.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralS.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralS.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralT.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralT.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralU.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralU.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralV.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralV.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralW.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/GeneralW.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/NoResults.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/NoResults.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/TypesS.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/TypesS.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/VariablesC.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/VariablesC.html
--- a/benchmarks/riscv-coremark/coremark/docs/html/search/VariablesD.html
+++ b/benchmarks/riscv-coremark/coremark/docs/html/search/VariablesD.html
--- a/Show More
+++ b/Show More