Compare commits
33 Commits
Author | SHA1 | Date | |
---|---|---|---|
74c2ec2014 | |||
bccfc67926 | |||
8b3dc54e5c | |||
9909769c0a | |||
071d9cc8eb | |||
a5825bfd67 | |||
36404dd7e0 | |||
658ffbb405 | |||
c6bfaf0546 | |||
e88c1148fb | |||
686d01ab3e | |||
884d445cb9 | |||
eee14af478 | |||
727fdcb7bb | |||
3def42153f | |||
75ba2e7588 | |||
1629b165b5 | |||
a2e932c56f | |||
cde5ae627c | |||
85304d1a43 | |||
fddf608418 | |||
90c45d7c3c | |||
48cfa8d868 | |||
64d6045d43 | |||
765f48e85a | |||
1ce18ee1f6 | |||
b4a3a36b2e | |||
2a541997a4 | |||
70d94c1051 | |||
0df111f945 | |||
9105f5fb14 | |||
4cc156e0d0 | |||
5955f54a4d |
3
.gitignore
vendored
3
.gitignore
vendored
@ -151,3 +151,6 @@ compile_commands.json
|
||||
CTestTestfile.cmake
|
||||
*.dump
|
||||
|
||||
.vscode/c_cpp_properties.json
|
||||
semihosting_test/build/semihosting_test
|
||||
semihosting_test/build/Makefile
|
||||
|
@ -1,19 +0,0 @@
|
||||
if (NOT DEFINED BOARD)
|
||||
set(BOARD iss)
|
||||
endif()
|
||||
if (NOT DEFINED ISA)
|
||||
set(ISA imc)
|
||||
endif()
|
||||
message(STATUS "Building firmware using ${BOARD} board configuration")
|
||||
add_custom_target(fw-hello-world ALL
|
||||
COMMAND make -C ${riscvfw_SOURCE_DIR}/hello-world BOARD=${BOARD} ISA=${ISA}
|
||||
USES_TERMINAL
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
add_custom_target(fw-dhrystone ALL
|
||||
COMMAND make -C ${riscvfw_SOURCE_DIR}/benchmarks/dhrystone BOARD=${BOARD} ISA=${ISA}
|
||||
USES_TERMINAL
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
add_custom_target(fw-coremark ALL
|
||||
COMMAND make -C ${riscvfw_SOURCE_DIR}/benchmarks/coremark BOARD=${BOARD} ISA=${ISA}
|
||||
USES_TERMINAL
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
Submodule bare-metal-bsp updated: 87dc0ec230...540397494a
46
benchmarks/coremark/CMakeLists.txt
Normal file
46
benchmarks/coremark/CMakeLists.txt
Normal file
@ -0,0 +1,46 @@
|
||||
cmake_minimum_required(VERSION 3.21)
|
||||
project(coremark C)
|
||||
set(TARGET coremark)
|
||||
#set(CMAKE_BUILD_TYPE Release)
|
||||
|
||||
option(HAVE_NO_INIT_FINI "Enable NO_INIT_FINI" OFF)
|
||||
|
||||
if(HAVE_NO_INIT_FINI)
|
||||
#if HAVE_NO_INIT_FINI is ON
|
||||
add_definitions(-DHAVE_NO_INIT_FINI)
|
||||
endif()
|
||||
|
||||
|
||||
# Source files
|
||||
set(SOURCES
|
||||
core_portme.c
|
||||
cvt.c
|
||||
ee_printf.c
|
||||
cm/core_list_join.c
|
||||
cm/core_main.c
|
||||
cm/core_matrix.c
|
||||
cm/core_state.c
|
||||
cm/core_util.c
|
||||
)
|
||||
|
||||
|
||||
# Create executable
|
||||
add_executable(coremark ${SOURCES})
|
||||
target_include_directories(${TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/cm)
|
||||
target_compile_options(${TARGET} PRIVATE -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -fno-builtin-strnlen -fno-common -funroll-loops -finline-functions -falign-functions=16 -falign-jumps=4 -falign-loops=4 -finline-limit=1000 -fno-if-conversion2 -fselective-scheduling -fno-crossjumping -freorder-blocks-and-partition -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -fno-common -funroll-loops -finline-functions -falign-functions=16 -falign-jumps=4 -falign-loops=4 -finline-limit=1000 -fno-if-conversion2 -fselective-scheduling -fno-crossjumping -freorder-blocks-and-partition )
|
||||
target_compile_definitions(${TARGET} PRIVATE PERFORMANCE_RUN=1 CLOCKS_PER_SEC=10000000 FLAGS_STR="" PERFORMANCE_RUN=1 CLOCKS_PER_SEC=10000000 ITERATIONS=600)
|
||||
|
||||
set(BOARD "iss" CACHE STRING "Target board")
|
||||
add_subdirectory(../../bare-metal-bsp bsp)
|
||||
target_link_libraries(${TARGET} PRIVATE bsp)
|
||||
target_link_options(${TARGET} PRIVATE -Wl,-Map=${TARGET}.map)
|
||||
|
||||
include(CMakePrintHelpers)
|
||||
cmake_print_properties(TARGETS ${TARGET} PROPERTIES COMPILE_DEFINITIONS COMPILE_OPTIONS LINK_OPTIONS INTERFACE_LINK_OPTIONS)
|
||||
|
||||
#message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}")
|
||||
#message(STATUS "CMAKE_C_FLAGS = ${CMAKE_C_FLAGS}")
|
||||
|
||||
add_custom_command(TARGET ${TARGET} POST_BUILD
|
||||
COMMAND ${CMAKE_OBJDUMP} -S ${TARGET}.elf > ${TARGET}.dis
|
||||
COMMENT "Creating disassembly for ${TARGET}")
|
70
benchmarks/coremark/CMakePresets.json
Normal file
70
benchmarks/coremark/CMakePresets.json
Normal file
@ -0,0 +1,70 @@
|
||||
{
|
||||
"version": 3,
|
||||
"vendor": {
|
||||
"conan": {}
|
||||
},
|
||||
"cmakeMinimumRequired": {
|
||||
"major": 3,
|
||||
"minor": 24,
|
||||
"patch": 0
|
||||
},
|
||||
"configurePresets": [
|
||||
{
|
||||
"name": "debug",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_moon",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "moonlight",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_tgc",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "tgc_vp",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64_moon",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "moonlight",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64_tgc",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "tgc_vp",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "release",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Release",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
@ -15,55 +15,58 @@ limitations under the License.
|
||||
|
||||
Original Author: Shay Gal-on
|
||||
*/
|
||||
#include "coremark.h"
|
||||
#include "core_portme.h"
|
||||
//Read cycle CSR
|
||||
unsigned long long _read_cycle()
|
||||
{
|
||||
unsigned long long result;
|
||||
unsigned long lower;
|
||||
unsigned long upper1;
|
||||
unsigned long upper2;
|
||||
#include "coremark.h"
|
||||
#include <unistd.h>
|
||||
// Read cycle CSR
|
||||
unsigned long long _read_cycle() {
|
||||
unsigned long long result;
|
||||
unsigned long lower;
|
||||
unsigned long upper1;
|
||||
unsigned long upper2;
|
||||
|
||||
asm volatile (
|
||||
"repeat_cycle_%=: csrr %0, cycleh;\n"
|
||||
" csrr %1, cycle;\n"
|
||||
" csrr %2, cycleh;\n"
|
||||
" bne %0, %2, repeat_cycle_%=;\n"
|
||||
: "=r" (upper1),"=r" (lower),"=r" (upper2) // Outputs : temp variable for load result
|
||||
:
|
||||
:
|
||||
);
|
||||
*(unsigned long *)(&result) = lower;
|
||||
*((unsigned long *)(&result)+1) = upper1;
|
||||
asm volatile("repeat_cycle_%=: csrr %0, cycleh;\n"
|
||||
" csrr %1, cycle;\n"
|
||||
" csrr %2, cycleh;\n"
|
||||
" bne %0, %2, repeat_cycle_%=;\n"
|
||||
: "=r"(upper1), "=r"(lower),
|
||||
"=r"(upper2) // Outputs : temp variable for load result
|
||||
:
|
||||
:);
|
||||
*(unsigned long *)(&result) = lower;
|
||||
*((unsigned long *)(&result) + 1) = upper1;
|
||||
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
volatile int tohost;
|
||||
volatile int fromhost;
|
||||
// extern volatile int tohost;
|
||||
// extern volatile int fromhost;
|
||||
|
||||
void exit(int n){
|
||||
tohost = 0x1;
|
||||
for (;;);
|
||||
void write_hex(int fd, uint32_t hex);
|
||||
|
||||
void exit(int n) {
|
||||
write_hex(STDERR_FILENO, 1);
|
||||
// tohost = 0x1;
|
||||
for (;;)
|
||||
;
|
||||
}
|
||||
|
||||
void __libc_init_array (void) {
|
||||
/*
|
||||
size_t count;
|
||||
size_t i;
|
||||
count = __preinit_array_end - __preinit_array_start;
|
||||
for (i = 0; i < count; i++)
|
||||
__preinit_array_start[i] ();
|
||||
void __libc_init_array(void) {
|
||||
/*
|
||||
size_t count;
|
||||
size_t i;
|
||||
count = __preinit_array_end - __preinit_array_start;
|
||||
for (i = 0; i < count; i++)
|
||||
__preinit_array_start[i] ();
|
||||
|
||||
#ifdef HAVE_INIT_FINI
|
||||
_init ();
|
||||
#endif
|
||||
#ifdef HAVE_INIT_FINI
|
||||
_init ();
|
||||
#endif
|
||||
|
||||
count = __init_array_end - __init_array_start;
|
||||
for (i = 0; i < count; i++)
|
||||
__init_array_start[i] ();
|
||||
*/
|
||||
count = __init_array_end - __init_array_start;
|
||||
for (i = 0; i < count; i++)
|
||||
__init_array_start[i] ();
|
||||
*/
|
||||
}
|
||||
#if VALIDATION_RUN
|
||||
volatile ee_s32 seed1_volatile = 0x3415;
|
||||
@ -89,10 +92,7 @@ volatile ee_s32 seed5_volatile = 0;
|
||||
time.h and windows.h definitions included.
|
||||
*/
|
||||
CORETIMETYPE
|
||||
barebones_clock()
|
||||
{
|
||||
return (CORETIMETYPE)_read_cycle();
|
||||
}
|
||||
barebones_clock() { return (CORETIMETYPE)_read_cycle(); }
|
||||
/* Define : TIMER_RES_DIVIDER
|
||||
Divider to trade off timer resolution and total time that can be
|
||||
measured.
|
||||
@ -101,11 +101,11 @@ barebones_clock()
|
||||
does not occur. If there are issues with the return value overflowing,
|
||||
increase this value.
|
||||
*/
|
||||
#define GETMYTIME(_t) (*_t = barebones_clock())
|
||||
#define MYTIMEDIFF(fin, ini) ((fin) - (ini))
|
||||
#define TIMER_RES_DIVIDER 1
|
||||
#define GETMYTIME(_t) (*_t = barebones_clock())
|
||||
#define MYTIMEDIFF(fin, ini) ((fin) - (ini))
|
||||
#define TIMER_RES_DIVIDER 1
|
||||
#define SAMPLE_TIME_IMPLEMENTATION 1
|
||||
#define EE_TICKS_PER_SEC (CLOCKS_PER_SEC / TIMER_RES_DIVIDER)
|
||||
#define EE_TICKS_PER_SEC (CLOCKS_PER_SEC / TIMER_RES_DIVIDER)
|
||||
|
||||
/** Define Host specific (POSIX), or target specific global time variables. */
|
||||
static CORETIMETYPE start_time_val, stop_time_val;
|
||||
@ -118,11 +118,7 @@ static CORETIMETYPE start_time_val, stop_time_val;
|
||||
example code) or zeroing some system parameters - e.g. setting the cpu clocks
|
||||
cycles to 0.
|
||||
*/
|
||||
void
|
||||
start_time(void)
|
||||
{
|
||||
GETMYTIME(&start_time_val);
|
||||
}
|
||||
void start_time(void) { GETMYTIME(&start_time_val); }
|
||||
/* Function : stop_time
|
||||
This function will be called right after ending the timed portion of the
|
||||
benchmark.
|
||||
@ -131,11 +127,7 @@ start_time(void)
|
||||
example code) or other system parameters - e.g. reading the current value of
|
||||
cpu cycles counter.
|
||||
*/
|
||||
void
|
||||
stop_time(void)
|
||||
{
|
||||
GETMYTIME(&stop_time_val);
|
||||
}
|
||||
void stop_time(void) { GETMYTIME(&stop_time_val); }
|
||||
/* Function : get_time
|
||||
Return an abstract "ticks" number that signifies time on the system.
|
||||
|
||||
@ -146,11 +138,9 @@ stop_time(void)
|
||||
controlled by <TIMER_RES_DIVIDER>
|
||||
*/
|
||||
CORE_TICKS
|
||||
get_time(void)
|
||||
{
|
||||
CORE_TICKS elapsed
|
||||
= (CORE_TICKS)(MYTIMEDIFF(stop_time_val, start_time_val));
|
||||
return elapsed;
|
||||
get_time(void) {
|
||||
CORE_TICKS elapsed = (CORE_TICKS)(MYTIMEDIFF(stop_time_val, start_time_val));
|
||||
return elapsed;
|
||||
}
|
||||
/* Function : time_in_secs
|
||||
Convert the value returned by get_time to seconds.
|
||||
@ -159,11 +149,9 @@ get_time(void)
|
||||
floating point. Default implementation implemented by the EE_TICKS_PER_SEC
|
||||
macro above.
|
||||
*/
|
||||
secs_ret
|
||||
time_in_secs(CORE_TICKS ticks)
|
||||
{
|
||||
secs_ret retval = ((secs_ret)ticks) / (secs_ret)EE_TICKS_PER_SEC;
|
||||
return retval;
|
||||
secs_ret time_in_secs(CORE_TICKS ticks) {
|
||||
secs_ret retval = ((secs_ret)ticks) / (secs_ret)EE_TICKS_PER_SEC;
|
||||
return retval;
|
||||
}
|
||||
|
||||
ee_u32 default_num_contexts = 1;
|
||||
@ -172,27 +160,18 @@ ee_u32 default_num_contexts = 1;
|
||||
Target specific initialization code
|
||||
Test for some common mistakes.
|
||||
*/
|
||||
void
|
||||
portable_init(core_portable *p, int *argc, char *argv[])
|
||||
{
|
||||
if (sizeof(ee_ptr_int) != sizeof(ee_u8 *))
|
||||
{
|
||||
ee_printf(
|
||||
"ERROR! Please define ee_ptr_int to a type that holds a "
|
||||
"pointer!\n");
|
||||
}
|
||||
if (sizeof(ee_u32) != 4)
|
||||
{
|
||||
ee_printf("ERROR! Please define ee_u32 to a 32b unsigned type!\n");
|
||||
}
|
||||
p->portable_id = 1;
|
||||
ee_printf("portable_init finished.\n");
|
||||
void portable_init(core_portable *p, int *argc, char *argv[]) {
|
||||
if (sizeof(ee_ptr_int) != sizeof(ee_u8 *)) {
|
||||
ee_printf("ERROR! Please define ee_ptr_int to a type that holds a "
|
||||
"pointer!\n");
|
||||
}
|
||||
if (sizeof(ee_u32) != 4) {
|
||||
ee_printf("ERROR! Please define ee_u32 to a 32b unsigned type!\n");
|
||||
}
|
||||
p->portable_id = 1;
|
||||
ee_printf("portable_init finished.\n");
|
||||
}
|
||||
/* Function : portable_fini
|
||||
Target specific final code
|
||||
*/
|
||||
void
|
||||
portable_fini(core_portable *p)
|
||||
{
|
||||
p->portable_id = 0;
|
||||
}
|
||||
void portable_fini(core_portable *p) { p->portable_id = 0; }
|
||||
|
File diff suppressed because it is too large
Load Diff
1
benchmarks/dhrystone/.gitignore
vendored
1
benchmarks/dhrystone/.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
dhrystone
|
||||
/dhrystone.dis
|
||||
build/
|
31
benchmarks/dhrystone/CMakeLists.txt
Normal file
31
benchmarks/dhrystone/CMakeLists.txt
Normal file
@ -0,0 +1,31 @@
|
||||
cmake_minimum_required(VERSION 3.21)
|
||||
project(dhrystone C)
|
||||
set(TARGET dhrystone)
|
||||
|
||||
option(HAVE_NO_INIT_FINI "Enable NO_INIT_FINI" OFF)
|
||||
|
||||
if(HAVE_NO_INIT_FINI)
|
||||
#if HAVE_NO_INIT_FINI is ON
|
||||
add_definitions(-DHAVE_NO_INIT_FINI)
|
||||
endif()
|
||||
|
||||
set(ITERATIONS 50000) # 20000 for TGC
|
||||
|
||||
add_executable(${TARGET} dhry_1.c dhry_2.c dhry_stubs.c)
|
||||
target_include_directories(${TARGET} PRIVATE ${CMAKE_CURRENT_LIST_DIR})
|
||||
target_compile_options(${TARGET} PRIVATE -fno-inline -fno-builtin-printf -fno-common -Wno-implicit -funroll-loops -fpeel-loops -fgcse-sm -fgcse-las)
|
||||
target_compile_definitions(${TARGET} PRIVATE ITERATIONS=${ITERATIONS} HZ=32768 TIME NO_INIT)
|
||||
|
||||
set(BOARD "iss" CACHE STRING "Target board")
|
||||
add_subdirectory(../../bare-metal-bsp bsp)
|
||||
target_link_libraries(${TARGET} PRIVATE bsp)
|
||||
target_link_options(${TARGET} PRIVATE LINKER:--wrap=scanf)
|
||||
#target_link_options(${TARGET} PRIVATE LINKER:--wrap=scanf -Wl,--no-gc-sections)
|
||||
|
||||
target_link_options(${TARGET} PRIVATE -Wl,-Map=${TARGET}.map)
|
||||
include(CMakePrintHelpers)
|
||||
cmake_print_properties(TARGETS ${TARGET} PROPERTIES COMPILE_DEFINITIONS COMPILE_OPTIONS LINK_OPTIONS INTERFACE_LINK_OPTIONS)
|
||||
|
||||
add_custom_command(TARGET ${TARGET} POST_BUILD
|
||||
COMMAND ${CMAKE_OBJDUMP} -S ${TARGET}.elf > ${TARGET}.dis
|
||||
COMMENT "Creating disassembly for ${TARGET}")
|
70
benchmarks/dhrystone/CMakePresets.json
Normal file
70
benchmarks/dhrystone/CMakePresets.json
Normal file
@ -0,0 +1,70 @@
|
||||
{
|
||||
"version": 3,
|
||||
"vendor": {
|
||||
"conan": {}
|
||||
},
|
||||
"cmakeMinimumRequired": {
|
||||
"major": 3,
|
||||
"minor": 24,
|
||||
"patch": 0
|
||||
},
|
||||
"configurePresets": [
|
||||
{
|
||||
"name": "debug",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_moon",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "moonlight",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_tgc",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "tgc_vp",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64_moon",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "moonlight",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64_tgc",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "tgc_vp",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "release",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Release",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
@ -15,9 +15,9 @@ else
|
||||
RISCV_ABI:=ilp32
|
||||
endif
|
||||
# '-lgcc -lm' are needed to add softfloat routines
|
||||
CFLAGS := -g -march=$(RISCV_ARCH)_zicsr_zifencei -mabi=$(RISCV_ABI) -mcmodel=medlow -O3 -DITERATIONS=$(ITERATIONS) -DHZ=32768 -DTIME -DNO_INIT -fno-inline -fno-builtin-printf -fno-common -Wno-implicit \
|
||||
CFLAGS := -g -O3 -DITERATIONS=$(ITERATIONS) -DHZ=32768 -DTIME -DNO_INIT -fno-inline -fno-builtin-printf -fno-common -Wno-implicit \
|
||||
-funroll-loops -fpeel-loops -fgcse-sm -fgcse-las
|
||||
LDFLAGS := -g -march=$(RISCV_ARCH)_zicsr_zifencei -mabi=$(RISCV_ABI) -mcmodel=medlow -Wl,--wrap=scanf -Wl,--wrap=printf -Wl,--wrap=exit -lgcc -lm
|
||||
LDFLAGS := -Wl,--wrap=scanf
|
||||
|
||||
TOOL_DIR=$(dir $(compiler))
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
#include "platform.h"
|
||||
#include <unistd.h>
|
||||
#ifndef ITERATIONS
|
||||
#define ITERATIONS 20000
|
||||
#endif
|
||||
@ -6,20 +7,16 @@
|
||||
/* The functions in this file are only meant to support Dhrystone on an
|
||||
* embedded RV32 system and are obviously incorrect in general. */
|
||||
|
||||
long time(void)
|
||||
{
|
||||
return get_timer_value();
|
||||
}
|
||||
long time(void) { return get_timer_value(); }
|
||||
|
||||
// set the number of dhrystone iterations
|
||||
void __wrap_scanf(const char* fmt, int* n)
|
||||
{
|
||||
*n = ITERATIONS;
|
||||
}
|
||||
void __wrap_scanf(const char *fmt, int *n) { *n = ITERATIONS; }
|
||||
|
||||
extern volatile uint32_t tohost;
|
||||
// extern volatile uint64_t tohost;
|
||||
|
||||
void exit(int n){
|
||||
tohost = 0x1;
|
||||
for (;;);
|
||||
void exit(int n) {
|
||||
// tohost = 0x1;
|
||||
write_hex(STDERR_FILENO, 1);
|
||||
for (;;)
|
||||
;
|
||||
}
|
||||
|
@ -1,108 +0,0 @@
|
||||
import argparse
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
import time
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def run_command(command, cwd=None):
|
||||
"""Run a shell command in the specified directory and return its output."""
|
||||
result = subprocess.run(
|
||||
command,
|
||||
shell=True,
|
||||
cwd=cwd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
check=False,
|
||||
)
|
||||
return result.stdout.decode("utf-8"), result.stderr.decode("utf-8")
|
||||
|
||||
|
||||
def build_test_cases(makefile_dir, iterations):
|
||||
"""Run the Makefile with the specified iterations."""
|
||||
make_command = f"make clean && make ITERATIONS={iterations}"
|
||||
stdout, stderr = run_command(make_command, cwd=makefile_dir)
|
||||
if stderr:
|
||||
raise RuntimeError(f"Error during make: {stderr}")
|
||||
|
||||
|
||||
def main(simulator_path, makefile_dir):
|
||||
# Directory for generated test cases
|
||||
generated_dir = makefile_dir.parent / "workspace"
|
||||
os.makedirs(generated_dir, exist_ok=True)
|
||||
|
||||
# Define the iterations
|
||||
iterations_list = [10, 20, 30]
|
||||
# 15 value up to 6.000.000 evenly apart on a log scale
|
||||
iterations_list = [
|
||||
1,
|
||||
2,
|
||||
4,
|
||||
8,
|
||||
17,
|
||||
34,
|
||||
69,
|
||||
141,
|
||||
287,
|
||||
582,
|
||||
1182,
|
||||
2401,
|
||||
4878,
|
||||
9910,
|
||||
20133,
|
||||
40914,
|
||||
83103,
|
||||
168830,
|
||||
343042,
|
||||
696712,
|
||||
1414641,
|
||||
2874878,
|
||||
5837995,
|
||||
]
|
||||
|
||||
for iteration in iterations_list:
|
||||
try:
|
||||
# Update the Makefile with the current ITERATIONS value
|
||||
build_test_cases(makefile_dir, iteration)
|
||||
except RuntimeError as e:
|
||||
print(f"Error during compilation with ITERATIONS={iteration}: {e}")
|
||||
continue
|
||||
|
||||
# Run the simulator with the generated test case
|
||||
exe = makefile_dir / "dhrystone.elf"
|
||||
if not exe.is_file():
|
||||
exit(f"{exe} does not exist")
|
||||
verbose_exe = generated_dir / "bin" / f"dhrystone_{iteration}.elf"
|
||||
os.makedirs(verbose_exe.parent, exist_ok=True)
|
||||
shutil.copy(exe, verbose_exe)
|
||||
backends = ["interp", "llvm", "tcc", "asmjit"]
|
||||
for backend in backends:
|
||||
log_file = os.path.join(generated_dir, f"{backend}_{iteration}.log")
|
||||
|
||||
sim_command = f"{simulator_path} -f {exe} --backend {backend}"
|
||||
start_time = time.time()
|
||||
sim_stdout, sim_stderr = run_command(sim_command)
|
||||
end_time = time.time()
|
||||
elapsed_time = end_time - start_time
|
||||
|
||||
# Save the output to the logfile
|
||||
with open(log_file, "w", encoding="utf8") as f:
|
||||
f.write(sim_stdout)
|
||||
if sim_stderr:
|
||||
f.write(f"\nErrors:\n{sim_stderr}")
|
||||
|
||||
print(
|
||||
f"Ran {backend} in {elapsed_time:.2f} s, Output saved to {backend}_{iteration}.log"
|
||||
)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Run simulations with generated test cases."
|
||||
)
|
||||
parser.add_argument("simulator_path", help="Path to the simulator executable.")
|
||||
|
||||
args = parser.parse_args()
|
||||
dhrystone_path = Path(__file__).parent / "dhrystone"
|
||||
main(args.simulator_path, dhrystone_path)
|
@ -1,86 +0,0 @@
|
||||
import argparse
|
||||
import os
|
||||
import re
|
||||
from pathlib import Path
|
||||
|
||||
import plotly.express as px
|
||||
import yaml
|
||||
|
||||
|
||||
def parse_logs(log_dir):
|
||||
results = []
|
||||
for filename in os.listdir(log_dir):
|
||||
if filename.endswith(".log"):
|
||||
filepath = os.path.join(log_dir, filename)
|
||||
with open(filepath, "r", encoding="utf8") as file:
|
||||
for line in file:
|
||||
if (
|
||||
"Executed" in line
|
||||
and "instructions" in line
|
||||
and "during" in line
|
||||
and "resulting in" in line
|
||||
):
|
||||
parts = line.split()
|
||||
instructions = int(parts[3])
|
||||
time_idx = parts.index("during") + 1
|
||||
time = int(parts[time_idx].rstrip("ms"))
|
||||
mips_idx = parts.index("resulting") + 2
|
||||
mips = float(parts[mips_idx].rstrip("MIPS"))
|
||||
backend, iterations, _ = re.split(r"[_.]", filename)
|
||||
|
||||
results.append(
|
||||
{
|
||||
"backend": backend,
|
||||
"run_count": int(iterations),
|
||||
"instructions": instructions,
|
||||
"time": time,
|
||||
"mips": mips,
|
||||
}
|
||||
)
|
||||
return results
|
||||
|
||||
|
||||
def write_yaml(results, output_file):
|
||||
with open(output_file, "w", encoding="utf8") as file:
|
||||
yaml.dump(results, file)
|
||||
|
||||
|
||||
def visualize_mips_over_instructions(yaml_file):
|
||||
# Read data from YAML file
|
||||
with open(yaml_file, "r", encoding="utf8") as file:
|
||||
data = yaml.safe_load(file)
|
||||
|
||||
# Extract instructions and MIPS values
|
||||
run_count = [entry["run_count"] for entry in data]
|
||||
mips = [entry["mips"] for entry in data]
|
||||
backends = [entry["backend"] for entry in data]
|
||||
# Create scatter plot using Plotly Express
|
||||
fig = px.line(
|
||||
x=run_count,
|
||||
y=mips,
|
||||
color=backends,
|
||||
labels={"x": "Dhrystone Iterations", "y": "MIPS", "color": "Backend"},
|
||||
title="MIPS over Amount of Dhrystone Iterations",
|
||||
log_x=True,
|
||||
)
|
||||
fig.show()
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(
|
||||
description="""
|
||||
Parse log files and extract relevant information. Create a 'results.yaml' file and visualize it.
|
||||
Intended to be run after 'dhrystone_run_multiple.py'"""
|
||||
)
|
||||
parser.add_argument("log_dir", help="Path to the directory containing log files.")
|
||||
args = parser.parse_args()
|
||||
|
||||
result_file = Path(__file__).parent / "results.yaml"
|
||||
if not result_file.is_file():
|
||||
results = parse_logs(args.log_dir)
|
||||
write_yaml(results, result_file)
|
||||
visualize_mips_over_instructions(result_file)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
1
hello-world/.gitignore
vendored
1
hello-world/.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
/hello
|
||||
/hello.dis
|
||||
build/
|
23
hello-world/CMakeLists.txt
Normal file
23
hello-world/CMakeLists.txt
Normal file
@ -0,0 +1,23 @@
|
||||
cmake_minimum_required(VERSION 3.21)
|
||||
project(hello-world C)
|
||||
set(TARGET hello)
|
||||
option(HAVE_NO_INIT_FINI "Enable NO_INIT_FINI" OFF)
|
||||
|
||||
if(HAVE_NO_INIT_FINI)
|
||||
#if HAVE_NO_INIT_FINI is ON
|
||||
add_definitions(-DHAVE_NO_INIT_FINI)
|
||||
endif()
|
||||
|
||||
add_executable(${TARGET} hello.c)
|
||||
|
||||
|
||||
|
||||
set(BOARD "iss" CACHE STRING "Target board")
|
||||
message(" BOARD = ${BOARD}")
|
||||
add_subdirectory(../bare-metal-bsp bsp)
|
||||
target_link_libraries(${TARGET} PRIVATE bsp)
|
||||
target_link_options(${TARGET} PRIVATE -Wl,-Map=${TARGET}.map)
|
||||
|
||||
add_custom_command(TARGET ${TARGET} POST_BUILD
|
||||
COMMAND ${CMAKE_OBJDUMP} -S ${TARGET}.elf > ${TARGET}.dis
|
||||
COMMENT "Creating disassembly for ${TARGET}")
|
70
hello-world/CMakePresets.json
Normal file
70
hello-world/CMakePresets.json
Normal file
@ -0,0 +1,70 @@
|
||||
{
|
||||
"version": 3,
|
||||
"vendor": {
|
||||
"conan": {}
|
||||
},
|
||||
"cmakeMinimumRequired": {
|
||||
"major": 3,
|
||||
"minor": 24,
|
||||
"patch": 0
|
||||
},
|
||||
"configurePresets": [
|
||||
{
|
||||
"name": "debug",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_moon",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "moonlight",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_tgc",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "tgc_vp",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64_moon",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "moonlight",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "debug_64_tgc",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Debug",
|
||||
"BOARD": "tgc_vp",
|
||||
"HAVE_NO_INIT_FINI": "ON",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "release",
|
||||
"cacheVariables": {
|
||||
"CMAKE_BUILD_TYPE": "Release",
|
||||
"CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
@ -1,24 +1,37 @@
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "platform.h"
|
||||
#include "encoding.h"
|
||||
#include "platform.h"
|
||||
#include <string.h>
|
||||
|
||||
int factorial(int i){
|
||||
int factorial(int i) {
|
||||
|
||||
volatile int result = 1;
|
||||
for (int ii = 1; ii <= i; ii++) {
|
||||
result = result * ii;
|
||||
}
|
||||
return result;
|
||||
volatile int result = 1;
|
||||
for (int ii = 1; ii <= i; ii++) {
|
||||
result = result * ii;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
extern volatile uintptr_t tohost;
|
||||
|
||||
void write_tohost(char *string) {
|
||||
volatile uint64_t payload[4] = {64, 0, (uintptr_t)string,
|
||||
(strlen(string) + 1)};
|
||||
tohost = (uintptr_t)payload;
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
volatile int result = factorial (10);
|
||||
printf("Factorial is %d\n", result);
|
||||
printf("End of execution");
|
||||
return 0;
|
||||
int main() {
|
||||
char string[] = "hello world with write in hello";
|
||||
|
||||
write_tohost(string);
|
||||
|
||||
write(STDOUT_FILENO, string, sizeof(string));
|
||||
|
||||
int result = factorial(10);
|
||||
printf("Factorial is %d", result);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user