Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mavis is now a library; reduces build time and .o sizes #95

Merged
1 commit merged into from
Oct 13, 2023
+10 −9
Merged

Mavis is now a library; reduces build time and .o sizes #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ include_directories (core mss)
include_directories (SYSTEM mavis)
This conversation was marked as resolved.
Show resolved Hide resolved
include_directories (SYSTEM stf_lib)

# The Core, MSS, and the simulator
add_subdirectory(core)
add_subdirectory(mss)
# Mavis, the Core, MSS, and the simulator
add_subdirectory (mavis)
add_subdirectory (core)
add_subdirectory (mss)

# Add STF library to the build
add_subdirectory (${STF_LIB_BASE})
Expand All @@ -92,7 +93,7 @@ add_executable(olympia
sim/OlympiaSim.cpp
sim/main.cpp
)
target_link_libraries (olympia core mss SPARTA::sparta ${STF_LINK_LIBS})
target_link_libraries (olympia core mss SPARTA::sparta mavis ${STF_LINK_LIBS})
if (CMAKE_BUILD_TYPE MATCHES "^[Rr]elease")
target_compile_options (core PUBLIC -flto)
target_compile_options (mss PUBLIC -flto)
Expand Down
2 changes: 1 addition & 1 deletion mavis
Open in desktop
Submodule mavis updated 46 files
+6 −2 CMakeLists.txt
+28 −7 impl/DTable.tcc
+2 −4 impl/DTableBuildSpecial.tcc
+971 −150 impl/ExtractorDerived.tpp
+202 −0 impl/ExtractorForms.tpp
+96 −0 impl/ExtractorRegistry.cpp
+256 −342 impl/Form.h
+62 −0 impl/FormRegistry.cpp
+200 −178 json/isa_rv64a.json
+291 −253 json/isa_rv64c.json
+36 −30 json/isa_rv64cd.json
+14 −3 json/isa_rv64g.json
+12 −1 json/isa_rv64i.json
+2,587 −2,303 json/isa_rv64v.json
+952 −824 json/isa_rv64vf.json
+8 −4 mavis/ContextRegistry.hpp
+11 −9 mavis/DTable.h
+3 −0 mavis/DecodedInstInfo.h
+25 −6 mavis/Extractor.h
+8 −5 mavis/ExtractorDirectImplementations.hpp
+13 −13 mavis/ExtractorDirectInfo.h
+11 −2 mavis/ExtractorIF.h
+4 −73 mavis/ExtractorRegistry.h
+7 −6 mavis/ExtractorTraceInfo.h
+4 −4 mavis/ExtractorWrap.hpp
+228 −0 mavis/FormCommon.h
+12 −2 mavis/FormIF.h
+2 −3 mavis/FormPseudo.h
+4 −52 mavis/FormRegistry.h
+225 −0 mavis/FormStub.h
+22 −0 mavis/IFactory.h
+7 −2 mavis/IFactoryBuilder.h
+2 −0 mavis/IFactoryCustom.h
+90 −53 mavis/InstMetaData.h
+114 −0 mavis/MatchSet.hpp
+27 −27 mavis/Mavis.h
+10 −0 mavis/OpcodeInfo.h
+25 −4 mavis/OperandInfo.hpp
+0 −1 mavis/Overlay.hpp
+31 −0 mavis/Pattern.hpp
+31 −0 mavis/Tag.hpp
+17 −2 test/CMakeLists.txt
+9 −0 test/Inst.h
+4 −0 test/main.cpp
+2,216 −2,048 test/out
+6 −4 test/rv64.tset
2 changes: 1 addition & 1 deletion test/core/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ project(common_test)
add_library(common_test
SourceUnit.cpp
)
target_link_libraries(common_test PRIVATE core SPARTA::sparta)
target_link_libraries(common_test PRIVATE core mavis SPARTA::sparta)
2 changes: 1 addition & 1 deletion test/core/dispatch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(Dispatch_test)

add_executable(Dispatch_test Dispatch_test.cpp)
target_link_libraries(Dispatch_test core common_test ${STF_LINK_LIBS} SPARTA::sparta)
target_link_libraries(Dispatch_test core common_test ${STF_LINK_LIBS} mavis SPARTA::sparta)

file(CREATE_LINK ${SIM_BASE}/mavis/json ${CMAKE_CURRENT_BINARY_DIR}/mavis_isa_files SYMBOLIC)
file(CREATE_LINK ${SIM_BASE}/arches ${CMAKE_CURRENT_BINARY_DIR}/arches SYMBOLIC)
Expand Down
4 changes: 2 additions & 2 deletions test/core/rename/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ target_link_libraries (core mss)

add_executable(Rename_test Rename_test.cpp ${SIM_BASE}/sim/OlympiaSim.cpp)

target_link_libraries(Rename_test core common_test ${STF_LINK_LIBS} SPARTA::sparta)
target_link_libraries(Rename_test core common_test ${STF_LINK_LIBS} mavis SPARTA::sparta)

file(CREATE_LINK ${SIM_BASE}/mavis/json ${CMAKE_CURRENT_BINARY_DIR}/mavis_isa_files SYMBOLIC)
file(CREATE_LINK ${SIM_BASE}/arches ${CMAKE_CURRENT_BINARY_DIR}/arches SYMBOLIC)
Expand All @@ -24,4 +24,4 @@ sparta_named_test(Rename_test_Run_Big_Small_Rename Rename_test big_core_small
sparta_named_test(Rename_test_Run_Small_lsu_int_dependency Rename_test small_core.out -c test_cores/test_small_core_full.yaml --input-file raw_int_lsu.json)
sparta_named_test(Rename_test_Run_Small_lsu_float_dependency Rename_test small_core.out -c test_cores/test_small_core_full.yaml --input-file raw_float_lsu.json)
sparta_named_test(Rename_test_Run_Small_int_dependency Rename_test small_core.out -c test_cores/test_medium_core_full.yaml --input-file raw_integer.json)
sparta_named_test(Rename_test_i2f Rename_test small_core.out -c test_cores/test_medium_core_full.yaml --input-file i2f.json)
sparta_named_test(Rename_test_i2f Rename_test small_core.out -c test_cores/test_medium_core_full.yaml --input-file i2f.json)