Merge branch 'develop'

This commit is contained in:
Eyck Jentzsch 2022-04-23 17:16:21 +02:00
commit 1a8566be34
9 changed files with 22 additions and 21 deletions

14
.gitmodules vendored
View File

@ -1,12 +1,12 @@
[submodule "scc"] [submodule "scc"]
path = scc path = scc
url = https://github.com/Minres/SystemC-Components.git url = https://github.com/Minres/SystemC-Components.git
[submodule "tgfs"]
path = tgfs
url = https://git.minres.com/DBT-RISE/DBT-RISE-TGFS.git
[submodule "dbt-core"]
path = dbt-core
url = https://git.minres.com/DBT-RISE/DBT-RISE-Core.git
[submodule "coredsl"] [submodule "coredsl"]
path = coredsl path = coredsl
url = https://git.minres.com/DBT-RISE/CoreDSL.git url = https://git.minres.com/DBT-RISE/CoreDSL-Generator.git
[submodule "dbt-rise-core"]
path = dbt-rise-core
url = https://github.com/Minres/DBT-RISE-Core.git
[submodule "dbt-rise-tgc"]
path = dbt-rise-tgc
url = https://git.minres.com/DBT-RISE/DBT-RISE-TGC.git

View File

@ -38,10 +38,7 @@ set(CONAN_BOOST_OPTIONS
boost:fPIC=True boost:fPIC=True
boost:shared=True boost:shared=True
boost:header_only=False boost:header_only=False
boost:without_context=True
boost:without_contract=True boost:without_contract=True
boost:without_coroutine=True
boost:without_fiber=True
boost:without_graph=True boost:without_graph=True
boost:without_graph_parallel=True boost:without_graph_parallel=True
boost:without_iostreams=True boost:without_iostreams=True
@ -54,7 +51,6 @@ boost:without_nowide=True
boost:without_python=True boost:without_python=True
boost:without_random=True boost:without_random=True
boost:without_regex=True boost:without_regex=True
boost:without_serialization=True
boost:without_stacktrace=True boost:without_stacktrace=True
boost:without_test=True boost:without_test=True
boost:without_timer=True boost:without_timer=True
@ -109,9 +105,13 @@ if (ENABLE_CLANG_TIDY)
endif() endif()
include(CodeGen) include(CodeGen)
gen_coredsl(${CORE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input/${CORE_NAME}.core_desc interp) if(NOT CORE_DSL_INPUT_DIR)
set(CORE_DSL_INPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input)
endif()
add_subdirectory(dbt-core) gen_coredsl(${CORE_NAME} ${CORE_DSL_INPUT_DIR}/${CORE_NAME}.core_desc interp)
add_subdirectory(dbt-rise-core)
add_subdirectory(scc) add_subdirectory(scc)
add_subdirectory(tgfs) add_subdirectory(dbt-rise-tgc)

View File

@ -18,6 +18,7 @@ if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidate
prereq java/11.0.9 prereq java/11.0.9
} else { } else {
prepend-path PATH $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/bin prepend-path PATH $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt/bin
setenv JAVA_HOME $::env(HOME)/.sdkman/candidates/java/11.0.9.hs-adpt
} }
if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/maven/3.6.3] != 1} { if {![info exists ::env(PROJECT)] && [file exists $::env(HOME)/.sdkman/candidates/maven/3.6.3] != 1} {

View File

@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
option(ENABLE_CODEGEN "Enable code generation for supported cores" ON) option(ENABLE_CODEGEN "Enable code generation for supported cores" ON)
set(ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..) set(ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
set(DBT_CORE_TGC_DIR ${ROOT_DIR}/tgfs) set(DBT_CORE_TGC_DIR ${ROOT_DIR}/dbt-rise-tgc)
#helper to setup code generation and generate outputs #helper to setup code generation and generate outputs
set(GENERATOR_JAR ${ROOT_DIR}/coredsl/com.minres.coredsl.generator.repository/target/com.minres.coredsl.generator-2.0.0-SNAPSHOT.jar) set(GENERATOR_JAR ${ROOT_DIR}/coredsl/com.minres.coredsl.generator.repository/target/com.minres.coredsl.generator-2.0.0-SNAPSHOT.jar)
@ -56,7 +56,6 @@ set(JAVA_OPTS --add-modules ALL-SYSTEM --add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.rmi/java.rmi.server=ALL-UNNAMED --add-opens=java.sql/java.sql=ALL-UNNAMED) --add-opens=java.rmi/java.rmi.server=ALL-UNNAMED --add-opens=java.sql/java.sql=ALL-UNNAMED)
set(GENERATOR java ${JAVA_OPTS} -jar ${GENERATOR_JAR}) set(GENERATOR java ${JAVA_OPTS} -jar ${GENERATOR_JAR})
set(INPUT_DIR ${DBT_CORE_TGC_DIR}/gen_input)
set(REPO_DIR ${DBT_CORE_TGC_DIR}/gen_input/CoreDSL-Instruction-Set-Description) set(REPO_DIR ${DBT_CORE_TGC_DIR}/gen_input/CoreDSL-Instruction-Set-Description)
set(TMPL_DIR ${DBT_CORE_TGC_DIR}/gen_input/templates/) set(TMPL_DIR ${DBT_CORE_TGC_DIR}/gen_input/templates/)
@ -79,6 +78,7 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME.cpp.gtl:${DBT_CORE_TGC_DIR}/src/iss/${CORE_NAMEL}.cpp") list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME.cpp.gtl:${DBT_CORE_TGC_DIR}/src/iss/${CORE_NAMEL}.cpp")
list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/${BACKEND}/CORENAME.cpp.gtl:${DBT_CORE_TGC_DIR}/src/vm/interp/vm_${CORE_NAMEL}.cpp") list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/${BACKEND}/CORENAME.cpp.gtl:${DBT_CORE_TGC_DIR}/src/vm/interp/vm_${CORE_NAMEL}.cpp")
list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME_instr.yaml.gtl:${DBT_CORE_TGC_DIR}/${CORE_NAME}_instr.yaml") list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME_instr.yaml.gtl:${DBT_CORE_TGC_DIR}/${CORE_NAME}_instr.yaml")
list(APPEND ${CORE_NAME}_MAPPING -m "${TMPL_DIR}/CORENAME_cyles.txt.gtl:${DBT_CORE_TGC_DIR}/${CORE_NAME}_cycles.json:no")
set(${CORE_NAME}_OUTPUT_FILES ${DBT_CORE_TGC_DIR}/incl/iss/arch/${CORE_NAMEL}.h ${DBT_CORE_TGC_DIR}/src/iss/${CORE_NAMEL}.cpp ${DBT_CORE_TGC_DIR}/src/vm/interp/vm_${CORE_NAMEL}.cpp) set(${CORE_NAME}_OUTPUT_FILES ${DBT_CORE_TGC_DIR}/incl/iss/arch/${CORE_NAMEL}.h ${DBT_CORE_TGC_DIR}/src/iss/${CORE_NAMEL}.cpp ${DBT_CORE_TGC_DIR}/src/vm/interp/vm_${CORE_NAMEL}.cpp)
#add_custom_command( #add_custom_command(
@ -90,7 +90,7 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
#) #)
if(NOT DEFINED ENV{CI}) if(NOT DEFINED ENV{CI})
add_custom_target(${CORE_NAME}_cpp add_custom_target(${CORE_NAME}_cpp
COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE} COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
COMMENT "Generating ISS sources" COMMENT "Generating ISS sources"
BYPRODUCTS ${${CORE_NAME}_OUTPUT_FILES} BYPRODUCTS ${${CORE_NAME}_OUTPUT_FILES}
@ -98,7 +98,7 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
) )
endif() endif()
execute_process( execute_process(
COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE} COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
RESULT_VARIABLE return_code) RESULT_VARIABLE return_code)
endmacro() endmacro()

@ -1 +0,0 @@
Subproject commit d64b1986626fd927f0b2a5e787f8941d6dd6aecd

1
dbt-rise-core Submodule

@ -0,0 +1 @@
Subproject commit dbc8066315f24bb18ed2fda4767360d48dc1fc16

1
dbt-rise-tgc Submodule

@ -0,0 +1 @@
Subproject commit b6824e68e91742097c8e8976221fd96a0eb6bbec

2
scc

@ -1 +1 @@
Subproject commit 7b2017a21dec666b1fb14650b3147fa11208c886 Subproject commit 9c4dd4aacbd9bbe66041476950a17ae3b29569da

1
tgfs

@ -1 +0,0 @@
Subproject commit d5fa47ef7f9395ae202442535624d99b58e290be