diff --git a/APP_Framework/Applications/benchmark/boards/generic/board.cfg b/APP_Framework/Applications/benchmark/boards/generic/board.cfg deleted file mode 100644 index 952958011..000000000 --- a/APP_Framework/Applications/benchmark/boards/generic/board.cfg +++ /dev/null @@ -1,16 +0,0 @@ -# Board configuration for generic ARC -# -# Copyright (C) 2019 Embecosm Limited -# -# Contributor Jeremy Bennett -# -# This file is part of Embench. -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# This is a python setting of parameters for the board. See the online -# documenation for details of the contents of this file. - -# For generic ARC, we mark a clock rate of 1MHz - -cpu_mhz = 1 diff --git a/APP_Framework/Applications/benchmark/boards/generic/boardsupport.c b/APP_Framework/Applications/benchmark/boards/generic/boardsupport.c deleted file mode 100644 index c04a90a01..000000000 --- a/APP_Framework/Applications/benchmark/boards/generic/boardsupport.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Board support for generic ARC board - - Copyright (C) 2019 Embecosm Limited - - Contributor Jeremy Bennett - - This file is part of Embench. - - SPDX-License-Identifier: GPL-3.0-or-later */ - -#include - -void -initialise_board () -{ - __asm__ volatile ("nop" : : : "memory"); -} - -void __attribute__ ((noinline)) __attribute__ ((externally_visible)) -start_trigger () -{ - __asm__ volatile ("nop" : : : "memory"); -} - -void __attribute__ ((noinline)) __attribute__ ((externally_visible)) -stop_trigger () -{ - __asm__ volatile ("nop" : : : "memory"); -} diff --git a/APP_Framework/Applications/benchmark/boards/generic/boardsupport.h b/APP_Framework/Applications/benchmark/boards/generic/boardsupport.h deleted file mode 100644 index bfc913614..000000000 --- a/APP_Framework/Applications/benchmark/boards/generic/boardsupport.h +++ /dev/null @@ -1,13 +0,0 @@ -/* Board support header for generic ARC board - - Copyright (C) 2019 Embecosm Limited - - Contributor Jeremy Bennett - - This file is part of Embench. - - SPDX-License-Identifier: GPL-3.0-or-later */ - -/* Should match board.cfg (and why have to specify it again). */ - -#define CPU_MHZ 1 diff --git a/APP_Framework/Applications/benchmark/src/SConscript b/APP_Framework/Applications/benchmark/src/SConscript new file mode 100644 index 000000000..a338d52f2 --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/SConscript @@ -0,0 +1,15 @@ +import os + +Import('RTT_ROOT') +from building import * + +cwd = GetCurrentDir() +objs = [] +list = os.listdir(cwd) + +for d in list: + path = os.path.join(cwd, d) + if os.path.isfile(os.path.join(path, 'SConscript')): + objs = objs + SConscript(os.path.join(path, 'SConscript')) + +Return('objs') diff --git a/APP_Framework/Applications/benchmark/src/aha-mont64/SConscript b/APP_Framework/Applications/benchmark/src/aha-mont64/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/aha-mont64/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/crc32/SConscript b/APP_Framework/Applications/benchmark/src/crc32/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/crc32/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/cubic/SConscript b/APP_Framework/Applications/benchmark/src/cubic/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/cubic/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/edn/SConscript b/APP_Framework/Applications/benchmark/src/edn/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/edn/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/huffbench/SConscript b/APP_Framework/Applications/benchmark/src/huffbench/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/huffbench/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/matmult-int/SConscript b/APP_Framework/Applications/benchmark/src/matmult-int/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/matmult-int/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/md5sum/SConscript b/APP_Framework/Applications/benchmark/src/md5sum/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/md5sum/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/minver/SConscript b/APP_Framework/Applications/benchmark/src/minver/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/minver/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/nbody/SConscript b/APP_Framework/Applications/benchmark/src/nbody/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/nbody/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/nettle-aes/SConscript b/APP_Framework/Applications/benchmark/src/nettle-aes/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/nettle-aes/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/nettle-sha256/SConscript b/APP_Framework/Applications/benchmark/src/nettle-sha256/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/nettle-sha256/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/nsichneu/SConscript b/APP_Framework/Applications/benchmark/src/nsichneu/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/nsichneu/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/picojpeg/SConscript b/APP_Framework/Applications/benchmark/src/picojpeg/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/picojpeg/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/primecount/SConscript b/APP_Framework/Applications/benchmark/src/primecount/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/primecount/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/qrduino/SConscript b/APP_Framework/Applications/benchmark/src/qrduino/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/qrduino/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/sglib-combined/SConscript b/APP_Framework/Applications/benchmark/src/sglib-combined/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/sglib-combined/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/slre/SConscript b/APP_Framework/Applications/benchmark/src/slre/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/slre/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/st/SConscript b/APP_Framework/Applications/benchmark/src/st/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/st/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/statemate/SConscript b/APP_Framework/Applications/benchmark/src/statemate/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/statemate/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/tarfind/SConscript b/APP_Framework/Applications/benchmark/src/tarfind/SConscript new file mode 100644 index 000000000..c62506d1f --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/tarfind/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') \ No newline at end of file diff --git a/APP_Framework/Applications/benchmark/src/ud/SConscript b/APP_Framework/Applications/benchmark/src/ud/SConscript new file mode 100644 index 000000000..406ccb8b8 --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/ud/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') diff --git a/APP_Framework/Applications/benchmark/src/wikisort/SConscript b/APP_Framework/Applications/benchmark/src/wikisort/SConscript new file mode 100644 index 000000000..1d19ddf32 --- /dev/null +++ b/APP_Framework/Applications/benchmark/src/wikisort/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMAKR'], CPPPATH=path) + +Return('group') diff --git a/APP_Framework/Applications/benchmark/support/SConscript b/APP_Framework/Applications/benchmark/support/SConscript new file mode 100644 index 000000000..406ccb8b8 --- /dev/null +++ b/APP_Framework/Applications/benchmark/support/SConscript @@ -0,0 +1,10 @@ +import os +from building import * + +cwd = GetCurrentDir() +src = Glob('*.c') +path = [cwd] + +group = DefineGroup('benchmark', src, depend=['USING_BENCHMARK'], CPPPATH=path) + +Return('group') diff --git a/APP_Framework/Applications/benchmark/support/benchmark.c b/APP_Framework/Applications/benchmark/support/benchmark.c index 5c2960582..0baf8a853 100644 --- a/APP_Framework/Applications/benchmark/support/benchmark.c +++ b/APP_Framework/Applications/benchmark/support/benchmark.c @@ -75,8 +75,14 @@ extern void add_benchmark_handle(benchmark_handle *, benchmark_handle *); clock_t tmp_diff = 0.0; clock_t global_diff = 0.0; -void start_trigger(clock_t *start_time) { *start_time = PrivGetTickTime(); } -void stop_trigger(clock_t *end_time) { *end_time = PrivGetTickTime(); } +void start_trigger(clock_t *start_time) { + // *start_time = PrivGetTickTime(); + *start_time = read_cycle(); +} +void stop_trigger(clock_t *end_time) { + *end_time = PrivGetTickTime(); + *end_time = read_cycle(); +} void init_benchmark_runset(benchmark_handle *head) { int i = 0; diff --git a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/base-drivers/SConscript b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/base-drivers/SConscript index ef646a255..56ebe4e1e 100644 --- a/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/base-drivers/SConscript +++ b/Ubiquitous/RT-Thread_Fusion_XiUOS/aiit_board/xidatong-riscv64/base-drivers/SConscript @@ -3,7 +3,7 @@ import rtconfig from building import * cwd = GetCurrentDir() -drv_path = cwd+"/../../../rt-thread/bsp/k210/driver/" +drv_path = cwd + "/../../../aiit_board/k210/kendryte-sdk/kendryte-sdk-source/lib/drivers/include" src = [ 'board.c', 'heap.c',