derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace tabs with whitespaces.

Browse Source
This commit is contained in:
Lukas Steiner
2023-05-25 16:09:55 +02:00
parent b3955d6d02
commit 20f6aae787
18 changed files with 98 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@@ -30,6 +30,7 @@
# #
# Authors: # Authors:
# Thomas Psota # Thomas Psota
# Lukas Steiner
############################################### ###############################################
### DRAMSys ### ### DRAMSys ###
@@ -110,9 +111,9 @@ add_subdirectory(${DRAMSYS_LIBRARY_DIR}/sqlite3)
### GoogleTest ### ### GoogleTest ###
if(DRAMSYS_BUILD_TESTS) if(DRAMSYS_BUILD_TESTS)
FetchContent_Declare( FetchContent_Declare(
googletest googletest
GIT_REPOSITORY https://github.com/google/googletest GIT_REPOSITORY https://github.com/google/googletest
GIT_TAG release-1.12.1) GIT_TAG release-1.12.1)
# For Windows: Prevent overriding the parent project's compiler/linker settings # For Windows: Prevent overriding the parent project's compiler/linker settings
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
@@ -123,23 +124,12 @@ if(DRAMSYS_BUILD_TESTS)
set_target_properties(gtest_main PROPERTIES FOLDER lib/gtest) set_target_properties(gtest_main PROPERTIES FOLDER lib/gtest)
endif() endif()
### sqlite-amalgamation ###
# FetchContent_Declare(
# sqlite-amalgamation
# GIT_REPOSITORY https://github.com/azadkuh/sqlite-amalgamation.git
# GIT_TAG 3.38.2)
#
# set(SQLITE_ENABLE_RTREE ON CACHE BOOL "Enable R-Tree Feature")
# FetchContent_MakeAvailable(sqlite-amalgamation)
# set_target_properties(SQLite3 PROPERTIES FOLDER lib)
# add_library(sqlite::sqlite3 ALIAS SQLite3)
### SystemC ### ### SystemC ###
list(APPEND CMAKE_PREFIX_PATH $ENV{SYSTEMC_HOME} /opt/systemc/) list(APPEND CMAKE_PREFIX_PATH $ENV{SYSTEMC_HOME} /opt/systemc/)
FetchContent_Declare( FetchContent_Declare(
systemc systemc
GIT_REPOSITORY https://github.com/accellera-official/systemc.git GIT_REPOSITORY https://github.com/accellera-official/systemc.git
GIT_TAG 2.3.4 GIT_TAG 2.3.4
FIND_PACKAGE_ARGS NAMES SystemCLanguage) FIND_PACKAGE_ARGS NAMES SystemCLanguage)
set(DISABLE_COPYRIGHT_MESSAGE True) set(DISABLE_COPYRIGHT_MESSAGE True)
@@ -165,7 +155,7 @@ add_subdirectory(src/configuration)
add_subdirectory(src/libdramsys) add_subdirectory(src/libdramsys)
if(DRAMSYS_BUILD_CLI) if(DRAMSYS_BUILD_CLI)
add_subdirectory(src/simulator) add_subdirectory(src/simulator)
endif() endif()
if(DRAMSYS_ENABLE_EXTENSIONS) if(DRAMSYS_ENABLE_EXTENSIONS)
@@ -177,7 +167,7 @@ endif()
############################################### ###############################################
if(DRAMSYS_BUILD_TESTS) if(DRAMSYS_BUILD_TESTS)
include( GoogleTest ) include(GoogleTest)
include( CTest ) include(CTest)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif()

4
extensions/apps/CMakeLists.txt
View File

@@ -12,6 +12,6 @@
option(DRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE "Enable DRAMSys Trace Analyzer" ON) option(DRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE "Enable DRAMSys Trace Analyzer" ON)
if(DRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE) if(DRAMSYS_EXTENSION_TRACE_ANALYZER_ENABLE)
message(STATUS " * Trace Analyzer") message(STATUS " * Trace Analyzer")
add_subdirectory(traceAnalyzer) add_subdirectory(traceAnalyzer)
endif() endif()

4
extensions/apps/traceAnalyzer/CMakeLists.txt
View File

@@ -95,8 +95,8 @@ target_link_libraries(TraceAnalyzer
set(DRAMSYS_TRACEANALYZER_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(DRAMSYS_TRACEANALYZER_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
target_compile_definitions(${PROJECT_NAME} target_compile_definitions(${PROJECT_NAME}
PUBLIC PUBLIC
DRAMSYS_TRACEANALYZER_DIR="${DRAMSYS_TRACEANALYZER_DIR}" DRAMSYS_TRACEANALYZER_DIR="${DRAMSYS_TRACEANALYZER_DIR}"
) )
build_source_group() build_source_group()

8
extensions/apps/traceAnalyzer/scripts/metrics.py
View File

@@ -367,8 +367,8 @@ def delayed_reasons(connection):
dataStrobesInOrder b dataStrobesInOrder b
WHERE WHERE
a.RowNum = b.RowNum - 1 AND a.RowNum = b.RowNum - 1 AND
b.Begin > a.End AND b.Begin > a.End AND
a.ID NOT IN (SELECT ID FROM idleGaps); a.ID NOT IN (SELECT ID FROM idleGaps);
""" """
cursor.execute(query) cursor.execute(query)
@@ -412,7 +412,7 @@ def delayed_reasons(connection):
p.PhaseName = 'ACT' p.PhaseName = 'ACT'
GROUP BY GROUP BY
d.gapBeginID d.gapBeginID
) )
""" """
cursor.execute(query) cursor.execute(query)
RRM = cursor.fetchone()[0] RRM = cursor.fetchone()[0]
@@ -431,7 +431,7 @@ def delayed_reasons(connection):
p.Transact = d.gapEndID AND p.Transact = d.gapEndID AND
p.PhaseName = 'ACT' p.PhaseName = 'ACT'
GROUP BY GROUP BY
d.gapBeginID d.gapBeginID
) )
""" """
cursor.execute(query) cursor.execute(query)

6
extensions/standards/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ file(GLOB sub_dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_D
message(STATUS " Standards:") message(STATUS " Standards:")
FOREACH(sub_dir ${sub_dirs}) FOREACH(sub_dir ${sub_dirs})
IF(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${sub_dir}") IF(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${sub_dir}")
add_subdirectory(${sub_dir}) add_subdirectory(${sub_dir})
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()

14
extensions/standards/DDR5/CMakeLists.txt
View File

@@ -1,14 +1,14 @@
option(DRAMSYS_EXTENSION_DDR5_ENABLE "Enable DRAMSys DDR5 Support" ON) option(DRAMSYS_EXTENSION_DDR5_ENABLE "Enable DRAMSys DDR5 Support" ON)
if(DRAMSYS_EXTENSION_DDR5_ENABLE) if(DRAMSYS_EXTENSION_DDR5_ENABLE)
message(STATUS " * DDR5") message(STATUS " * DDR5")
file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp) file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp) file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES}) target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(DRAMSys_libdramsys PUBLIC DDR5_SIM) target_compile_definitions(DRAMSys_libdramsys PUBLIC DDR5_SIM)
build_source_group() build_source_group()
endif() endif()

14
extensions/standards/HBM3/CMakeLists.txt
View File

@@ -1,14 +1,14 @@
option(DRAMSYS_EXTENSION_HBM3_ENABLE "Enable DRAMSys HBM3 Support" ON) option(DRAMSYS_EXTENSION_HBM3_ENABLE "Enable DRAMSys HBM3 Support" ON)
if(DRAMSYS_EXTENSION_HBM3_ENABLE) if(DRAMSYS_EXTENSION_HBM3_ENABLE)
message(STATUS " * HBM3") message(STATUS " * HBM3")
file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp) file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp) file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES}) target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(DRAMSys_libdramsys PUBLIC HBM3_SIM) target_compile_definitions(DRAMSys_libdramsys PUBLIC HBM3_SIM)
build_source_group() build_source_group()
endif() endif()

14
extensions/standards/LPDDR5/CMakeLists.txt
View File

@@ -1,14 +1,14 @@
option(DRAMSYS_EXTENSION_LPDDR5_ENABLE "Enable DRAMSys LPDDR5 Support" ON) option(DRAMSYS_EXTENSION_LPDDR5_ENABLE "Enable DRAMSys LPDDR5 Support" ON)
if(DRAMSYS_EXTENSION_LPDDR5_ENABLE) if(DRAMSYS_EXTENSION_LPDDR5_ENABLE)
message(STATUS " * LPDDR5") message(STATUS " * LPDDR5")
file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp) file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS *.cpp)
file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp) file(GLOB_RECURSE HEADER_FILES CONFIGURE_DEPENDS *.h;*.hpp)
target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES}) target_sources(DRAMSys_libdramsys PRIVATE ${SOURCE_FILES} ${HEADER_FILES})
target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(DRAMSys_libdramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_definitions(DRAMSys_libdramsys PUBLIC LPDDR5_SIM) target_compile_definitions(DRAMSys_libdramsys PUBLIC LPDDR5_SIM)
build_source_group() build_source_group()
endif() endif()

2
lib/sqlite3/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ project(sqlite3 VERSION 3.40.1)
FetchContent_Declare(sqlite3 URL "https://www.sqlite.org/2022/sqlite-amalgamation-3400100.zip") FetchContent_Declare(sqlite3 URL "https://www.sqlite.org/2022/sqlite-amalgamation-3400100.zip")
if (NOT sqlite3_POPULATED) if (NOT sqlite3_POPULATED)
FetchContent_Populate(sqlite3) FetchContent_Populate(sqlite3)
endif() endif()
add_library(${PROJECT_NAME}) add_library(${PROJECT_NAME})

8
src/configuration/CMakeLists.txt
View File

@@ -46,13 +46,13 @@ add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PUBLIC PUBLIC
DRAMSys::util DRAMSys::util
) )
target_compile_definitions(${PROJECT_NAME} target_compile_definitions(${PROJECT_NAME}
PUBLIC PUBLIC
DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}" DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
) )
add_library(DRAMSys::config ALIAS ${PROJECT_NAME}) add_library(DRAMSys::config ALIAS ${PROJECT_NAME})

14
src/libdramsys/CMakeLists.txt
View File

@@ -46,16 +46,16 @@ add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PUBLIC PUBLIC
SystemC::systemc SystemC::systemc
DRAMSys::util DRAMSys::util
DRAMSys::config DRAMSys::config
sqlite3::sqlite3 sqlite3::sqlite3
) )
if (DRAMSYS_WITH_DRAMPOWER) if (DRAMSYS_WITH_DRAMPOWER)
target_link_libraries(${PROJECT_NAME} PRIVATE DRAMPower) target_link_libraries(${PROJECT_NAME} PRIVATE DRAMPower)
target_compile_definitions(${PROJECT_NAME} PRIVATE DRAMPOWER) target_compile_definitions(${PROJECT_NAME} PRIVATE DRAMPOWER)
endif () endif ()
add_library(DRAMSys::libdramsys ALIAS ${PROJECT_NAME}) add_library(DRAMSys::libdramsys ALIAS ${PROJECT_NAME})

8
src/util/CMakeLists.txt
View File

@@ -46,13 +46,13 @@ add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES})
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PUBLIC PUBLIC
nlohmann_json::nlohmann_json nlohmann_json::nlohmann_json
) )
target_compile_definitions(${PROJECT_NAME} target_compile_definitions(${PROJECT_NAME}
PUBLIC PUBLIC
DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}" DRAMSYS_RESOURCE_DIR="${DRAMSYS_RESOURCE_DIR}"
) )
add_library(DRAMSys::util ALIAS ${PROJECT_NAME}) add_library(DRAMSys::util ALIAS ${PROJECT_NAME})

6
tests/tests_configuration/CMakeLists.txt
View File

@@ -11,12 +11,12 @@ add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/test_configuration.cp
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests/configuration) set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests/configuration)
target_link_libraries(${PROJECT_NAME} PRIVATE target_link_libraries(${PROJECT_NAME} PRIVATE
DRAMSys::config DRAMSys::config
gtest_main gtest_main
) )
gtest_discover_tests(${PROJECT_NAME} gtest_discover_tests(${PROJECT_NAME}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
add_executable(jsonconverter ${CMAKE_CURRENT_SOURCE_DIR}/jsonconverter.cpp) add_executable(jsonconverter ${CMAKE_CURRENT_SOURCE_DIR}/jsonconverter.cpp)

8
tests/tests_dramsys/CMakeLists.txt
View File

@@ -14,13 +14,13 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES})
target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR})
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests) set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
DRAMSys::util DRAMSys::util
DRAMSys::libdramsys DRAMSys::libdramsys
gtest_main gtest_main
) )
gtest_discover_tests(${PROJECT_NAME} gtest_discover_tests(${PROJECT_NAME}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
build_source_group() build_source_group()

12
tests/tests_dramsys/test_misc.cpp
View File

@@ -2,13 +2,13 @@
class MiscTest : public ::testing::Test { class MiscTest : public ::testing::Test {
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
} }
virtual void TearDown() virtual void TearDown()
{ {
} }
}; };
TEST_F(MiscTest, Test) TEST_F(MiscTest, Test)

4
tests/tests_simulator/CMakeLists.txt
View File

@@ -17,11 +17,11 @@ set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests/simulator)
target_link_libraries(${PROJECT_NAME} PRIVATE target_link_libraries(${PROJECT_NAME} PRIVATE
DRAMSys_Simulator DRAMSys_Simulator
gtest_main gtest_main
) )
gtest_discover_tests(${PROJECT_NAME} gtest_discover_tests(${PROJECT_NAME}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
) )
build_source_group() build_source_group()

4
tests/tests_util/CMakeLists.txt
View File

@@ -14,8 +14,8 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES})
target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}) target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR})
set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests) set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER tests)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
DRAMSys::util DRAMSys::util
gtest_main gtest_main
) )
gtest_discover_tests(${PROJECT_NAME}) gtest_discover_tests(${PROJECT_NAME})

46
tests/tests_util/test_json.cpp
View File

@@ -4,35 +4,35 @@
class JsonTest : public ::testing::Test { class JsonTest : public ::testing::Test {
protected: protected:
virtual void SetUp() virtual void SetUp()
{ {
} }
virtual void TearDown() virtual void TearDown()
{ {
} }
}; };
TEST_F(JsonTest, Test) TEST_F(JsonTest, Test)
{ {
auto in = json_t::parse(R"( auto in = json_t::parse(R"(
{ {
"test": 5, "test": 5,
"null": null "null": null
} }
)"); )");
std::optional<int> opt_in; std::optional<int> opt_in;
std::optional<int> opt_null; std::optional<int> opt_null;
std::optional<int> opt_nil; std::optional<int> opt_nil;
in["test"].get_to(opt_in); in["test"].get_to(opt_in);
in["null"].get_to(opt_null); in["null"].get_to(opt_null);
in["nil"].get_to(opt_nil); in["nil"].get_to(opt_nil);
ASSERT_TRUE(opt_in.has_value()); ASSERT_TRUE(opt_in.has_value());
ASSERT_EQ(*opt_in, 5); ASSERT_EQ(*opt_in, 5);
ASSERT_FALSE(opt_null.has_value()); ASSERT_FALSE(opt_null.has_value());
ASSERT_FALSE(opt_nil.has_value()); ASSERT_FALSE(opt_nil.has_value());
}; };