From c7cd0843b84ff1c767a60c220f78a07299cdcbf3 Mon Sep 17 00:00:00 2001 From: Hongyu Liu Date: Fri, 6 Jun 2025 14:38:14 +0200 Subject: [PATCH] uses inherits in preset json for benchmarks and corrects typo for 64bit --- benchmarks/coremark/CMakePresets.json | 135 +++++++++++++------------ benchmarks/dhrystone/CMakePresets.json | 135 +++++++++++++------------ hello-world/CMakePresets.json | 2 +- 3 files changed, 145 insertions(+), 127 deletions(-) diff --git a/benchmarks/coremark/CMakePresets.json b/benchmarks/coremark/CMakePresets.json index b5e7c0e..8ebf6fc 100644 --- a/benchmarks/coremark/CMakePresets.json +++ b/benchmarks/coremark/CMakePresets.json @@ -10,100 +10,109 @@ }, "configurePresets": [ { - "name": "ISS_Debug", + "name": "32imc", + "hidden": true, "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "iss", "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + } + }, + { + "name": "64imc", + "hidden": true, + "cacheVariables": { + "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" + } + }, + { + "name": "iss", + "hidden": true, + "cacheVariables": { + "BOARD": "iss" + } + }, + { + "name": "moonlight", + "hidden": true, + "cacheVariables": { + "BOARD": "moonlight" + } + }, + { + "name": "tgc_vp", + "hidden": true, + "cacheVariables": { + "BOARD": "tgc_vp" + } + }, + { + "name": "rtl", + "hidden": true, + "cacheVariables": { + "BOARD": "rtl" + } + }, + { + "name": "debug", + "hidden": true, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } + }, + { + "name": "release", + "hidden": true, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } + }, + { + "name": "ISS_Debug", + "inherits": ["iss", "debug", "32imc"] }, { "name": "Moonlight_Debug", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "moonlight", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "inherits": ["moonlight", "debug", "32imc"] }, { - "name": "TGC_Debug", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "tgc_vp", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "name": "TGC_VP_Debug", + "inherits": ["tgc_vp", "debug", "32imc"] }, { "name": "ISS_Debug_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "iss", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "inherits": ["iss", "debug", "64imc"] }, { "name": "Moonlight_Debug_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "moonlight", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "inherits": ["moonlight", "debug", "64imc"] }, { - "name": "TGC_Debug_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "tgc_vp", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "name": "TGC_VP_Debug_64", + "inherits": ["tgc_vp", "debug", "64imc"] }, { "name": "ISS_Release", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "iss", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "inherits": ["iss", "release", "32imc"] }, { "name": "Moonlight_Release", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "moonlight", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "inherits": ["moonlight", "release", "32imc"] }, { - "name": "TGC_Release", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "tgc_vp", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "name": "TGC_VP_Release", + "inherits": ["tgc_vp", "release", "32imc"] }, { "name": "ISS_Release_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "iss", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "inherits": ["iss", "release", "64imc"] }, { "name": "Moonlight_Release_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "moonlight", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "inherits": ["moonlight", "release", "64imc"] }, { - "name": "TGC_Release_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "tgc_vp", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "name": "TGC_VP_Release_64", + "inherits": ["tgc_vp", "release", "64imc"] } + ] } \ No newline at end of file diff --git a/benchmarks/dhrystone/CMakePresets.json b/benchmarks/dhrystone/CMakePresets.json index b5e7c0e..8ebf6fc 100644 --- a/benchmarks/dhrystone/CMakePresets.json +++ b/benchmarks/dhrystone/CMakePresets.json @@ -10,100 +10,109 @@ }, "configurePresets": [ { - "name": "ISS_Debug", + "name": "32imc", + "hidden": true, "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "iss", "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + } + }, + { + "name": "64imc", + "hidden": true, + "cacheVariables": { + "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" + } + }, + { + "name": "iss", + "hidden": true, + "cacheVariables": { + "BOARD": "iss" + } + }, + { + "name": "moonlight", + "hidden": true, + "cacheVariables": { + "BOARD": "moonlight" + } + }, + { + "name": "tgc_vp", + "hidden": true, + "cacheVariables": { + "BOARD": "tgc_vp" + } + }, + { + "name": "rtl", + "hidden": true, + "cacheVariables": { + "BOARD": "rtl" + } + }, + { + "name": "debug", + "hidden": true, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } + }, + { + "name": "release", + "hidden": true, + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } + }, + { + "name": "ISS_Debug", + "inherits": ["iss", "debug", "32imc"] }, { "name": "Moonlight_Debug", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "moonlight", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "inherits": ["moonlight", "debug", "32imc"] }, { - "name": "TGC_Debug", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "tgc_vp", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "name": "TGC_VP_Debug", + "inherits": ["tgc_vp", "debug", "32imc"] }, { "name": "ISS_Debug_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "iss", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "inherits": ["iss", "debug", "64imc"] }, { "name": "Moonlight_Debug_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "moonlight", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "inherits": ["moonlight", "debug", "64imc"] }, { - "name": "TGC_Debug_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug", - "BOARD": "tgc_vp", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "name": "TGC_VP_Debug_64", + "inherits": ["tgc_vp", "debug", "64imc"] }, { "name": "ISS_Release", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "iss", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "inherits": ["iss", "release", "32imc"] }, { "name": "Moonlight_Release", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "moonlight", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "inherits": ["moonlight", "release", "32imc"] }, { - "name": "TGC_Release", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "tgc_vp", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv32imc.cmake" - } + "name": "TGC_VP_Release", + "inherits": ["tgc_vp", "release", "32imc"] }, { "name": "ISS_Release_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "iss", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "inherits": ["iss", "release", "64imc"] }, { "name": "Moonlight_Release_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "moonlight", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "inherits": ["moonlight", "release", "64imc"] }, { - "name": "TGC_Release_64", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release", - "BOARD": "tgc_vp", - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" - } + "name": "TGC_VP_Release_64", + "inherits": ["tgc_vp", "release", "64imc"] } + ] } \ No newline at end of file diff --git a/hello-world/CMakePresets.json b/hello-world/CMakePresets.json index 5e5c728..8ebf6fc 100644 --- a/hello-world/CMakePresets.json +++ b/hello-world/CMakePresets.json @@ -20,7 +20,7 @@ "name": "64imc", "hidden": true, "cacheVariables": { - "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64imc.cmake" + "CMAKE_TOOLCHAIN_FILE": "../../bare-metal-bsp/cmake/rv64gc.cmake" } }, {