Build Scimark2 with "rv32imf"

Author: vacantron

docs/prebuilt.md

@@ -49,13 +49,15 @@ The prebuilt binaries in `rv32emu-prebuilt` are built from the following reposit
 - `pi` : See [tests/pi.c](/tests/pi.c)
 - `puzzle` : See [tests/puzzle.c](/tests/puzzle.c)
 - `qrcode` : See [tests/qrcode.c](/tests/qrcode.c)
-- `quake` : See [sysprog21/quake-embedded](https://github.com/sysprog21/quake-embedded)
 - `richards` : See [tests/richards.c](/tests/richards.c)
 - `rvsim` : See [tests/rvsim.c](/tests/rvsim.c)
-- `scimark2` : See [Scimark 2.0](https://math.nist.gov/scimark2)
 - `spirograph` : See [tests/spirograph.c](/tests/spirograph.c)
 - `uaes` : See [tests/uaes.c](/tests/uaes.c)
 
+To determine performance of the floating point arithmetic, the following RISC-V binaries are built with option `-march=rv32imf`:
+- `quake` : See [sysprog21/quake-embedded](https://github.com/sysprog21/quake-embedded)
+- `scimark2` : See [Scimark 2.0](https://math.nist.gov/scimark2)
+
 There are still some prebuilt standalone RISC-V binaries under `build/` directory only for testing purpose:
 
 - `hello.elf` : See [tests/asm-hello](/tests/asm-hello)

mk/artifact.mk

@@ -78,24 +78,25 @@ else
 	$(Q)$(PRINTF) "Building quake ...\n"
 	$(Q)cd ./tests/quake && mkdir -p build && cd build && \
 	    cmake -DCMAKE_TOOLCHAIN_FILE=../port/boards/rv32emu/toolchain.cmake \
-		      -DCROSS_COMPILE=$(CROSS_COMPILE) \
-		      -DCMAKE_BUILD_TYPE=RELEASE -DBOARD_NAME=rv32emu .. && \
+	          -DCROSS_COMPILE=$(CROSS_COMPILE) \
+	          -DCMAKE_BUILD_TYPE=RELEASE -DBOARD_NAME=rv32emu .. && \
 	    make
 	$(Q)cp ./tests/quake/build/port/boards/rv32emu/quake $(BIN_DIR)/riscv32/quake
 endif
 
-scimark2: ieeelib
+scimark2:
 ifeq ($(call has, PREBUILT), 0)
 	$(Q)$(call prologue,"scimark2")
 	$(Q)$(call download,$(SCIMARK2_URL))
 	$(Q)$(call verify,$(SCIMARK2_SHA1),$(notdir $(SCIMARK2_URL)))
 	$(Q)$(call extract,"./tests/scimark2",$(notdir $(SCIMARK2_URL)))
 	$(Q)$(call epilogue,$(notdir $(SCIMARK2_URL)),$(SHA1_FILE1),$(SHA1_FILE2))
 	$(Q)$(PRINTF) "Building scimark2 ...\n"
-	$(Q)$(MAKE) -C ./tests/scimark2 CC=$(CC) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	$(Q)$(MAKE) -C ./tests/scimark2 clean && $(RM) ./tests/scimark2/scimark2.o
+	$(Q)$(MAKE) -C ./tests/scimark2 CC=$(CC) CFLAGS="-m32 -O2"
 	$(Q)cp ./tests/scimark2/scimark2 $(BIN_DIR)/linux-x86-softfp/scimark2
 	$(Q)$(MAKE) -C ./tests/scimark2 clean && $(RM) ./tests/scimark2/scimark2.o
-	$(Q)$(MAKE) -C ./tests/scimark2 CC=$(CROSS_COMPILE)gcc CFLAGS="$(CFLAGS_CROSS)"
+	$(Q)$(MAKE) -C ./tests/scimark2 CC=$(CROSS_COMPILE)gcc CFLAGS="-march=rv32imf -mabi=ilp32 -O2"
 	$(Q)cp ./tests/scimark2/scimark2 $(BIN_DIR)/riscv32/scimark2
 endif