diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a777d76..81ddc524 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,11 +66,8 @@ include_directories (SYSTEM fsl) include_directories (SYSTEM mavis) include_directories (SYSTEM stf_lib) -# Mavis, the Core, MSS, the simulator and Fusion - +# Mavis add_subdirectory (mavis) -add_subdirectory (core) -add_subdirectory (mss) # Tell FSL to use the top mavis submodule, instead of fsl's submodule set(FSL_MAVIS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/mavis") @@ -79,6 +76,10 @@ add_subdirectory (fsl) # Add STF library to the build add_subdirectory (${STF_LIB_BASE}) +# The Core and MSS +add_subdirectory (core) +add_subdirectory (mss) + # Add testing, but do not build as part of the 'all' target add_subdirectory (test EXCLUDE_FROM_ALL) @@ -87,7 +88,7 @@ add_executable(olympia sim/OlympiaSim.cpp sim/main.cpp ) -target_link_libraries (olympia core mss SPARTA::sparta mavis ${STF_LINK_LIBS}) +target_link_libraries (olympia core mss SPARTA::sparta ${STF_LINK_LIBS}) if (CMAKE_BUILD_TYPE MATCHES "^[Rr]elease") target_compile_options (core PUBLIC -flto) target_compile_options (mss PUBLIC -flto) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 47657c75..ca4a29e2 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,31 +1,32 @@ project (core) add_library(core - FusionDecode.cpp Core.cpp - SimpleBranchPred.cpp - ICache.cpp - Fetch.cpp - Decode.cpp - VectorUopGenerator.cpp - Rename.cpp - Dispatch.cpp - Dispatcher.cpp - Execute.cpp - ExecutePipe.cpp - Inst.cpp - InstArchInfo.cpp - InstGroup.cpp - InstGenerator.cpp - IssueQueue.cpp ROB.cpp - LSU.cpp MMU.cpp - DCache.cpp - MavisUnit.cpp Preloader.cpp CPU.cpp CPUFactory.cpp CPUTopology.cpp ) + +add_library(instgen + Inst.cpp + InstArchInfo.cpp + InstGroup.cpp + InstGenerator.cpp +) + +target_link_libraries(instgen stf zstd mavis) + get_property(SPARTA_INCLUDE_PROP TARGET SPARTA::sparta PROPERTY INTERFACE_INCLUDE_DIRECTORIES) target_include_directories(core SYSTEM PRIVATE ${SPARTA_INCLUDE_PROP}) + +add_subdirectory(fetch) +add_subdirectory(decode) +add_subdirectory(rename) +add_subdirectory(dispatch) +add_subdirectory(execute) +add_subdirectory(vector) +add_subdirectory(lsu) + +target_link_libraries(core fetch decode rename dispatch execute vector lsu instgen) diff --git a/core/CPUFactories.hpp b/core/CPUFactories.hpp index 2947ba89..21bdc0c2 100644 --- a/core/CPUFactories.hpp +++ b/core/CPUFactories.hpp @@ -5,14 +5,14 @@ #include "sparta/simulation/ResourceFactory.hpp" #include "Core.hpp" -#include "ICache.hpp" -#include "Fetch.hpp" -#include "Decode.hpp" -#include "VectorUopGenerator.hpp" -#include "Rename.hpp" -#include "Dispatch.hpp" -#include "Execute.hpp" -#include "LSU.hpp" +#include "fetch/ICache.hpp" +#include "fetch/Fetch.hpp" +#include "decode/Decode.hpp" +#include "vector/VectorUopGenerator.hpp" +#include "rename/Rename.hpp" +#include "dispatch/Dispatch.hpp" +#include "execute/Execute.hpp" +#include "lsu/LSU.hpp" #include "MMU.hpp" #include "SimpleTLB.hpp" #include "BIU.hpp" @@ -21,8 +21,8 @@ #include "ROB.hpp" #include "FlushManager.hpp" #include "Preloader.hpp" -#include "MavisUnit.hpp" -#include "IssueQueue.hpp" +#include "decode/MavisUnit.hpp" +#include "execute/IssueQueue.hpp" namespace olympia{ diff --git a/core/Inst.hpp b/core/Inst.hpp index 0b3bff93..6708d236 100644 --- a/core/Inst.hpp +++ b/core/Inst.hpp @@ -15,7 +15,7 @@ #include "InstArchInfo.hpp" #include "CoreTypes.hpp" -#include "VectorConfig.hpp" +#include "vector/VectorConfig.hpp" #include "MiscUtils.hpp" #include diff --git a/core/InstGenerator.hpp b/core/InstGenerator.hpp index f4c21f9e..7c4c3fca 100644 --- a/core/InstGenerator.hpp +++ b/core/InstGenerator.hpp @@ -11,7 +11,7 @@ #include #include "Inst.hpp" -#include "MavisUnit.hpp" +#include "decode/MavisUnit.hpp" #include "sparta/utils/SpartaAssert.hpp" #include "stf-inc/stf_inst_reader.hpp" diff --git a/core/MMU.hpp b/core/MMU.hpp index c4e4ebc3..a0bf316e 100644 --- a/core/MMU.hpp +++ b/core/MMU.hpp @@ -79,4 +79,4 @@ namespace olympia { "Number of TLB misses", sparta::Counter::COUNT_NORMAL }; }; -} \ No newline at end of file +} diff --git a/core/decode/CMakeLists.txt b/core/decode/CMakeLists.txt new file mode 100644 index 00000000..7094ca78 --- /dev/null +++ b/core/decode/CMakeLists.txt @@ -0,0 +1,6 @@ +add_library(decode + FusionDecode.cpp + Decode.cpp + MavisUnit.cpp +) +target_link_libraries(decode instgen) diff --git a/core/Decode.cpp b/core/decode/Decode.cpp similarity index 99% rename from core/Decode.cpp rename to core/decode/Decode.cpp index 94e26cc9..d702894b 100644 --- a/core/Decode.cpp +++ b/core/decode/Decode.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- -#include "Decode.hpp" -#include "VectorUopGenerator.hpp" +#include "decode/Decode.hpp" +#include "vector/VectorUopGenerator.hpp" #include "fsl_api/FusionTypes.h" #include "sparta/events/StartupEvent.hpp" diff --git a/core/Decode.hpp b/core/decode/Decode.hpp similarity index 99% rename from core/Decode.hpp rename to core/decode/Decode.hpp index 838918a9..2a6ad817 100644 --- a/core/Decode.hpp +++ b/core/decode/Decode.hpp @@ -5,7 +5,7 @@ #include "CoreTypes.hpp" #include "FlushManager.hpp" #include "InstGroup.hpp" -#include "MavisUnit.hpp" +#include "decode/MavisUnit.hpp" #include "fsl_api/FieldExtractor.h" #include "fsl_api/Fusion.h" diff --git a/core/FusionDecode.cpp b/core/decode/FusionDecode.cpp similarity index 100% rename from core/FusionDecode.cpp rename to core/decode/FusionDecode.cpp diff --git a/core/MavisUnit.cpp b/core/decode/MavisUnit.cpp similarity index 100% rename from core/MavisUnit.cpp rename to core/decode/MavisUnit.cpp diff --git a/core/MavisUnit.hpp b/core/decode/MavisUnit.hpp similarity index 100% rename from core/MavisUnit.hpp rename to core/decode/MavisUnit.hpp diff --git a/core/dispatch/CMakeLists.txt b/core/dispatch/CMakeLists.txt new file mode 100644 index 00000000..307c3997 --- /dev/null +++ b/core/dispatch/CMakeLists.txt @@ -0,0 +1,5 @@ +add_library(dispatch + Dispatch.cpp + Dispatcher.cpp +) +target_link_libraries(dispatch instgen) diff --git a/core/Dispatch.cpp b/core/dispatch/Dispatch.cpp similarity index 99% rename from core/Dispatch.cpp rename to core/dispatch/Dispatch.cpp index 74ce4a14..80a03e23 100644 --- a/core/Dispatch.cpp +++ b/core/dispatch/Dispatch.cpp @@ -2,7 +2,7 @@ #include #include "CoreUtils.hpp" -#include "Dispatch.hpp" +#include "dispatch/Dispatch.hpp" #include "sparta/events/StartupEvent.hpp" namespace olympia diff --git a/core/Dispatch.hpp b/core/dispatch/Dispatch.hpp similarity index 99% rename from core/Dispatch.hpp rename to core/dispatch/Dispatch.hpp index 119c643c..fd458c94 100644 --- a/core/Dispatch.hpp +++ b/core/dispatch/Dispatch.hpp @@ -17,7 +17,7 @@ #include "sparta/statistics/WeightedContextCounter.hpp" #include "sparta/simulation/ResourceFactory.hpp" -#include "Dispatcher.hpp" +#include "dispatch/Dispatcher.hpp" #include "CoreTypes.hpp" #include "InstGroup.hpp" #include "FlushManager.hpp" diff --git a/core/Dispatcher.cpp b/core/dispatch/Dispatcher.cpp similarity index 79% rename from core/Dispatcher.cpp rename to core/dispatch/Dispatcher.cpp index 4eea7309..aaf8fef6 100644 --- a/core/Dispatcher.cpp +++ b/core/dispatch/Dispatcher.cpp @@ -1,6 +1,6 @@ -#include "Dispatcher.hpp" -#include "Dispatch.hpp" +#include "dispatch/Dispatcher.hpp" +#include "dispatch/Dispatch.hpp" namespace olympia { diff --git a/core/Dispatcher.hpp b/core/dispatch/Dispatcher.hpp similarity index 100% rename from core/Dispatcher.hpp rename to core/dispatch/Dispatcher.hpp diff --git a/core/execute/CMakeLists.txt b/core/execute/CMakeLists.txt new file mode 100644 index 00000000..6022205e --- /dev/null +++ b/core/execute/CMakeLists.txt @@ -0,0 +1,5 @@ +add_library(execute + Execute.cpp + ExecutePipe.cpp + IssueQueue.cpp +) diff --git a/core/Execute.cpp b/core/execute/Execute.cpp similarity index 99% rename from core/Execute.cpp rename to core/execute/Execute.cpp index 9f9ccfe9..cfdcdcbf 100644 --- a/core/Execute.cpp +++ b/core/execute/Execute.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- -#include "Execute.hpp" +#include "execute/Execute.hpp" #include "CoreUtils.hpp" -#include "IssueQueue.hpp" +#include "execute/IssueQueue.hpp" #include "sparta/utils/SpartaAssert.hpp" namespace olympia diff --git a/core/Execute.hpp b/core/execute/Execute.hpp similarity index 96% rename from core/Execute.hpp rename to core/execute/Execute.hpp index 498ec0f4..daf4a9c2 100644 --- a/core/Execute.hpp +++ b/core/execute/Execute.hpp @@ -6,8 +6,8 @@ #include "sparta/simulation/ResourceFactory.hpp" #include "Inst.hpp" -#include "ExecutePipe.hpp" -#include "IssueQueue.hpp" +#include "execute/ExecutePipe.hpp" +#include "execute/IssueQueue.hpp" namespace olympia { diff --git a/core/ExecutePipe.cpp b/core/execute/ExecutePipe.cpp similarity index 99% rename from core/ExecutePipe.cpp rename to core/execute/ExecutePipe.cpp index 818634c4..13649e2c 100644 --- a/core/ExecutePipe.cpp +++ b/core/execute/ExecutePipe.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "ExecutePipe.hpp" +#include "execute/ExecutePipe.hpp" #include "CoreUtils.hpp" #include "sparta/utils/LogUtils.hpp" #include "sparta/utils/SpartaAssert.hpp" diff --git a/core/ExecutePipe.hpp b/core/execute/ExecutePipe.hpp similarity index 100% rename from core/ExecutePipe.hpp rename to core/execute/ExecutePipe.hpp diff --git a/core/IssueQueue.cpp b/core/execute/IssueQueue.cpp similarity index 99% rename from core/IssueQueue.cpp rename to core/execute/IssueQueue.cpp index c7ff9cb5..37030b9d 100644 --- a/core/IssueQueue.cpp +++ b/core/execute/IssueQueue.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- -#include "IssueQueue.hpp" +#include "execute/IssueQueue.hpp" #include "CoreUtils.hpp" namespace olympia diff --git a/core/IssueQueue.hpp b/core/execute/IssueQueue.hpp similarity index 99% rename from core/IssueQueue.hpp rename to core/execute/IssueQueue.hpp index 318686a6..95490899 100644 --- a/core/IssueQueue.hpp +++ b/core/execute/IssueQueue.hpp @@ -19,7 +19,7 @@ #include "sparta/resources/PriorityQueue.hpp" #include "CoreTypes.hpp" -#include "ExecutePipe.hpp" +#include "execute/ExecutePipe.hpp" #include "FlushManager.hpp" #include "Inst.hpp" diff --git a/core/BranchPredIF.hpp b/core/fetch/BranchPredIF.hpp similarity index 100% rename from core/BranchPredIF.hpp rename to core/fetch/BranchPredIF.hpp diff --git a/core/fetch/CMakeLists.txt b/core/fetch/CMakeLists.txt new file mode 100644 index 00000000..c1ba38a0 --- /dev/null +++ b/core/fetch/CMakeLists.txt @@ -0,0 +1,6 @@ +add_library(fetch + Fetch.cpp + ICache.cpp + SimpleBranchPred.cpp +) +target_link_libraries(fetch instgen) diff --git a/core/Fetch.cpp b/core/fetch/Fetch.cpp similarity index 99% rename from core/Fetch.cpp rename to core/fetch/Fetch.cpp index fbd784f0..e69bee5b 100644 --- a/core/Fetch.cpp +++ b/core/fetch/Fetch.cpp @@ -6,9 +6,9 @@ //! #include -#include "Fetch.hpp" +#include "fetch/Fetch.hpp" #include "InstGenerator.hpp" -#include "MavisUnit.hpp" +#include "decode/MavisUnit.hpp" #include "OlympiaAllocators.hpp" #include "sparta/utils/MathUtils.hpp" diff --git a/core/Fetch.hpp b/core/fetch/Fetch.hpp similarity index 100% rename from core/Fetch.hpp rename to core/fetch/Fetch.hpp diff --git a/core/ICache.cpp b/core/fetch/ICache.cpp similarity index 100% rename from core/ICache.cpp rename to core/fetch/ICache.cpp diff --git a/core/ICache.hpp b/core/fetch/ICache.hpp similarity index 100% rename from core/ICache.hpp rename to core/fetch/ICache.hpp diff --git a/core/SimpleBranchPred.cpp b/core/fetch/SimpleBranchPred.cpp similarity index 100% rename from core/SimpleBranchPred.cpp rename to core/fetch/SimpleBranchPred.cpp diff --git a/core/SimpleBranchPred.hpp b/core/fetch/SimpleBranchPred.hpp similarity index 100% rename from core/SimpleBranchPred.hpp rename to core/fetch/SimpleBranchPred.hpp diff --git a/core/lsu/CMakeLists.txt b/core/lsu/CMakeLists.txt new file mode 100644 index 00000000..737b64d2 --- /dev/null +++ b/core/lsu/CMakeLists.txt @@ -0,0 +1,4 @@ +add_library(lsu + DCache.cpp + LSU.cpp +) diff --git a/core/DCache.cpp b/core/lsu/DCache.cpp similarity index 100% rename from core/DCache.cpp rename to core/lsu/DCache.cpp diff --git a/core/DCache.hpp b/core/lsu/DCache.hpp similarity index 100% rename from core/DCache.hpp rename to core/lsu/DCache.hpp diff --git a/core/LSU.cpp b/core/lsu/LSU.cpp similarity index 100% rename from core/LSU.cpp rename to core/lsu/LSU.cpp diff --git a/core/LSU.hpp b/core/lsu/LSU.hpp similarity index 100% rename from core/LSU.hpp rename to core/lsu/LSU.hpp diff --git a/core/rename/CMakeLists.txt b/core/rename/CMakeLists.txt new file mode 100644 index 00000000..9bfa0db4 --- /dev/null +++ b/core/rename/CMakeLists.txt @@ -0,0 +1,4 @@ +add_library(rename + Rename.cpp +) +target_link_libraries(rename instgen) diff --git a/core/Rename.cpp b/core/rename/Rename.cpp similarity index 99% rename from core/Rename.cpp rename to core/rename/Rename.cpp index 5080b60e..eef7639e 100644 --- a/core/Rename.cpp +++ b/core/rename/Rename.cpp @@ -7,7 +7,7 @@ #include #include "CoreUtils.hpp" -#include "Rename.hpp" +#include "rename/Rename.hpp" #include "sparta/events/StartupEvent.hpp" #include "sparta/app/FeatureConfiguration.hpp" #include "sparta/report/DatabaseInterface.hpp" diff --git a/core/Rename.hpp b/core/rename/Rename.hpp similarity index 100% rename from core/Rename.hpp rename to core/rename/Rename.hpp diff --git a/core/vector/CMakeLists.txt b/core/vector/CMakeLists.txt new file mode 100644 index 00000000..24cf9d90 --- /dev/null +++ b/core/vector/CMakeLists.txt @@ -0,0 +1,3 @@ +add_library(vector + VectorUopGenerator.cpp +) diff --git a/core/VectorConfig.hpp b/core/vector/VectorConfig.hpp similarity index 100% rename from core/VectorConfig.hpp rename to core/vector/VectorConfig.hpp diff --git a/core/VectorUopGenerator.cpp b/core/vector/VectorUopGenerator.cpp similarity index 99% rename from core/VectorUopGenerator.cpp rename to core/vector/VectorUopGenerator.cpp index c6cd7868..02eaa233 100644 --- a/core/VectorUopGenerator.cpp +++ b/core/vector/VectorUopGenerator.cpp @@ -1,4 +1,4 @@ -#include "VectorUopGenerator.hpp" +#include "vector/VectorUopGenerator.hpp" #include "Inst.hpp" #include "InstArchInfo.hpp" #include "mavis/Mavis.h" diff --git a/core/VectorUopGenerator.hpp b/core/vector/VectorUopGenerator.hpp similarity index 99% rename from core/VectorUopGenerator.hpp rename to core/vector/VectorUopGenerator.hpp index 07032f9d..19c004fe 100644 --- a/core/VectorUopGenerator.hpp +++ b/core/vector/VectorUopGenerator.hpp @@ -8,7 +8,7 @@ #include "Inst.hpp" #include "FlushManager.hpp" -#include "MavisUnit.hpp" +#include "decode/MavisUnit.hpp" #include diff --git a/mavis b/mavis index fe4a5570..867258bd 160000 --- a/mavis +++ b/mavis @@ -1 +1 @@ -Subproject commit fe4a557091d5322ded4e090f10fca1e9e0b1704a +Subproject commit 867258bd92e8ba8788538ae24d23d906b8650e94 diff --git a/mss/L2Cache.hpp b/mss/L2Cache.hpp index f367d373..5a0d5e49 100644 --- a/mss/L2Cache.hpp +++ b/mss/L2Cache.hpp @@ -26,7 +26,7 @@ #include "MemoryAccessInfo.hpp" #include "CacheFuncModel.hpp" -#include "LSU.hpp" +#include "lsu/LSU.hpp" namespace olympia_mss { diff --git a/test/core/branch_pred/BranchPred_test.cpp b/test/core/branch_pred/BranchPred_test.cpp index b37ffe15..9a8d53b6 100644 --- a/test/core/branch_pred/BranchPred_test.cpp +++ b/test/core/branch_pred/BranchPred_test.cpp @@ -1,4 +1,4 @@ -#include "SimpleBranchPred.hpp" +#include "fetch/SimpleBranchPred.hpp" #include "sparta/utils/SpartaTester.hpp" TEST_INIT diff --git a/test/core/common/SourceUnit.hpp b/test/core/common/SourceUnit.hpp index c77ccaaa..7fe4f8d2 100644 --- a/test/core/common/SourceUnit.hpp +++ b/test/core/common/SourceUnit.hpp @@ -2,7 +2,7 @@ #pragma once #include "core/InstGenerator.hpp" -#include "core/MavisUnit.hpp" +#include "core/decode/MavisUnit.hpp" #include "core/InstGroup.hpp" #include "mavis/ExtractorDirectInfo.h" diff --git a/test/core/dcache/Dcache_test.cpp b/test/core/dcache/Dcache_test.cpp index 77a32d76..71fc84a8 100644 --- a/test/core/dcache/Dcache_test.cpp +++ b/test/core/dcache/Dcache_test.cpp @@ -1,5 +1,5 @@ -#include "DCache.hpp" +#include "core/lsu/DCache.hpp" #include #include #include "sparta/utils/SpartaTester.hpp" diff --git a/test/core/dcache/NextLvlSourceSinkUnit.hpp b/test/core/dcache/NextLvlSourceSinkUnit.hpp index e808370f..0fdbfa8a 100644 --- a/test/core/dcache/NextLvlSourceSinkUnit.hpp +++ b/test/core/dcache/NextLvlSourceSinkUnit.hpp @@ -5,7 +5,7 @@ #include "sparta/simulation/TreeNode.hpp" #include "sparta/utils/LogUtils.hpp" #include "core/MemoryAccessInfo.hpp" -#include "core/MavisUnit.hpp" +#include "core/decode/MavisUnit.hpp" namespace dcache_test { @@ -50,4 +50,4 @@ namespace dcache_test std::string purpose_; sparta::Clock::Cycle sink_latency_; }; -} // namespace dcache_test \ No newline at end of file +} // namespace dcache_test diff --git a/test/core/dispatch/Dispatch_test.cpp b/test/core/dispatch/Dispatch_test.cpp index 134f185a..8a7de6d6 100644 --- a/test/core/dispatch/Dispatch_test.cpp +++ b/test/core/dispatch/Dispatch_test.cpp @@ -1,35 +1,5 @@ -#include "CPUFactory.hpp" -#include "CoreUtils.hpp" -#include "Dispatch.hpp" -#include "MavisUnit.hpp" -#include "OlympiaAllocators.hpp" -#include "OlympiaSim.hpp" -#include "Rename.hpp" - -#include "test/core/common/SinkUnit.hpp" -#include "test/core/common/SourceUnit.hpp" -#include "test/core/dispatch/Dispatch_test.hpp" -#include "test/core/dispatch/ExecutePipeSinkUnit.hpp" -#include "test/core/rename/ROBSinkUnit.hpp" - -#include "sparta/app/CommandLineSimulator.hpp" -#include "sparta/app/Simulation.hpp" -#include "sparta/events/UniqueEvent.hpp" -#include "sparta/kernel/Scheduler.hpp" -#include "sparta/report/Report.hpp" -#include "sparta/resources/Buffer.hpp" -#include "sparta/simulation/ClockManager.hpp" -#include "sparta/sparta.hpp" -#include "sparta/statistics/StatisticSet.hpp" -#include "sparta/utils/SpartaSharedPointer.hpp" -#include "sparta/utils/SpartaTester.hpp" - -#include -#include -#include -#include -#include +#include "Dispatch_test.hpp" TEST_INIT diff --git a/test/core/dispatch/Dispatch_test.hpp b/test/core/dispatch/Dispatch_test.hpp index 85a38380..bef06dde 100644 --- a/test/core/dispatch/Dispatch_test.hpp +++ b/test/core/dispatch/Dispatch_test.hpp @@ -1,11 +1,11 @@ #include "CPUFactory.hpp" #include "CoreUtils.hpp" -#include "Dispatch.hpp" -#include "MavisUnit.hpp" +#include "dispatch/Dispatch.hpp" +#include "decode/MavisUnit.hpp" #include "OlympiaAllocators.hpp" #include "OlympiaSim.hpp" -#include "Rename.hpp" +#include "rename/Rename.hpp" #include "test/core/common/SinkUnit.hpp" #include "test/core/common/SourceUnit.hpp" @@ -214,4 +214,4 @@ class DispatchSim : public sparta::app::Simulation const std::string input_file_; sparta::log::Tap test_tap_; -}; \ No newline at end of file +}; diff --git a/test/core/icache/ICacheChecker.hpp b/test/core/icache/ICacheChecker.hpp index 4019bbb8..436d30a0 100644 --- a/test/core/icache/ICacheChecker.hpp +++ b/test/core/icache/ICacheChecker.hpp @@ -6,7 +6,7 @@ #include "sparta/events/SingleCycleUniqueEvent.hpp" #include "sparta/utils/SpartaSharedPointer.hpp" #include "sparta/utils/LogUtils.hpp" -#include "ICache.hpp" +#include "core/fetch/ICache.hpp" #include #include @@ -189,4 +189,4 @@ namespace icache_test sparta::DataInPort in_l2cache_req_ {&unit_port_set_, "in_l2cache_req", 1}; sparta::DataInPort in_l2cache_resp_ {&unit_port_set_, "in_l2cache_resp", 1}; }; -} \ No newline at end of file +} diff --git a/test/core/icache/ICache_test.cpp b/test/core/icache/ICache_test.cpp index 790fe3df..3e58e53a 100644 --- a/test/core/icache/ICache_test.cpp +++ b/test/core/icache/ICache_test.cpp @@ -13,7 +13,7 @@ #include "test/core/icache/ICacheSource.hpp" #include "test/core/icache/ICacheChecker.hpp" -#include "ICache.hpp" +#include "fetch/ICache.hpp" #include "OlympiaAllocators.hpp" #include @@ -182,4 +182,4 @@ int main(int argc, char **argv) sparta_assert(false, "Must provide a valid testname"); } return 0; -} \ No newline at end of file +} diff --git a/test/core/issue_queue/IssueQueue_test.cpp b/test/core/issue_queue/IssueQueue_test.cpp index 0e2a9f84..b824a5dc 100644 --- a/test/core/issue_queue/IssueQueue_test.cpp +++ b/test/core/issue_queue/IssueQueue_test.cpp @@ -1,11 +1,11 @@ #include "CPUFactory.hpp" #include "CoreUtils.hpp" -#include "Dispatch.hpp" -#include "MavisUnit.hpp" +#include "dispatch/Dispatch.hpp" +#include "decode/MavisUnit.hpp" #include "OlympiaAllocators.hpp" #include "OlympiaSim.hpp" -#include "IssueQueue.hpp" +#include "execute/IssueQueue.hpp" #include "test/core/dispatch/Dispatch_test.hpp" #include "sparta/app/CommandLineSimulator.hpp" @@ -156,4 +156,4 @@ int main(int argc, char **argv) { REPORT_ERROR; return (int)ERROR_CODE; -} \ No newline at end of file +} diff --git a/test/core/l2cache/L2Cache_test.cpp b/test/core/l2cache/L2Cache_test.cpp index dee33a85..e7d5e272 100644 --- a/test/core/l2cache/L2Cache_test.cpp +++ b/test/core/l2cache/L2Cache_test.cpp @@ -1,6 +1,6 @@ #include "L2Cache.hpp" -#include "MavisUnit.hpp" +#include "decode/MavisUnit.hpp" #include "CoreUtils.hpp" #include "test/core/common/SourceUnit.hpp" diff --git a/test/core/l2cache/L2SourceUnit.hpp b/test/core/l2cache/L2SourceUnit.hpp index 64c87c81..a6c75047 100644 --- a/test/core/l2cache/L2SourceUnit.hpp +++ b/test/core/l2cache/L2SourceUnit.hpp @@ -3,7 +3,7 @@ #include "core/MemoryAccessInfo.hpp" #include "core/InstGenerator.hpp" -#include "core/MavisUnit.hpp" +#include "core/decode/MavisUnit.hpp" #include "mavis/ExtractorDirectInfo.h" #include "sparta/simulation/TreeNode.hpp" #include "sparta/events/SingleCycleUniqueEvent.hpp" diff --git a/test/core/lsu/Lsu_test.cpp b/test/core/lsu/Lsu_test.cpp index a71cfcf3..50e86c15 100644 --- a/test/core/lsu/Lsu_test.cpp +++ b/test/core/lsu/Lsu_test.cpp @@ -1,10 +1,10 @@ -#include "Dispatch.hpp" -#include "MavisUnit.hpp" +#include "dispatch/Dispatch.hpp" +#include "decode/MavisUnit.hpp" #include "CoreUtils.hpp" -#include "Rename.hpp" -#include "ExecutePipe.hpp" -#include "LSU.hpp" +#include "rename/Rename.hpp" +#include "execute/ExecutePipe.hpp" +#include "lsu/LSU.hpp" #include "sim/OlympiaSim.hpp" #include "OlympiaAllocators.hpp" diff --git a/test/core/rename/Rename_test.cpp b/test/core/rename/Rename_test.cpp index 5374fc11..e68b5277 100644 --- a/test/core/rename/Rename_test.cpp +++ b/test/core/rename/Rename_test.cpp @@ -1,11 +1,11 @@ #include "CoreUtils.hpp" -#include "Dispatch.hpp" -#include "ExecutePipe.hpp" -#include "LSU.hpp" -#include "MavisUnit.hpp" +#include "dispatch/Dispatch.hpp" +#include "execute/ExecutePipe.hpp" +#include "lsu/LSU.hpp" +#include "decode/MavisUnit.hpp" #include "OlympiaAllocators.hpp" -#include "Rename.hpp" +#include "rename/Rename.hpp" #include "sim/OlympiaSim.hpp" #include "test/core/common/SinkUnit.hpp" diff --git a/test/core/unit_template/Src.hpp b/test/core/unit_template/Src.hpp index 9232fd37..4a821770 100644 --- a/test/core/unit_template/Src.hpp +++ b/test/core/unit_template/Src.hpp @@ -1,7 +1,7 @@ #pragma once #include "core/InstGenerator.hpp" -#include "core/MavisUnit.hpp" +#include "core/decode/MavisUnit.hpp" #include "core/InstGroup.hpp" #include "mavis/ExtractorDirectInfo.h" diff --git a/test/core/unit_template/Testbench.cpp b/test/core/unit_template/Testbench.cpp index d18d141d..8172f3a5 100644 --- a/test/core/unit_template/Testbench.cpp +++ b/test/core/unit_template/Testbench.cpp @@ -1,5 +1,5 @@ #include "Dut.hpp" -#include "MavisUnit.hpp" +#include "decode/MavisUnit.hpp" #include "OlympiaAllocators.hpp" #include "Sink.hpp" #include "Src.hpp" diff --git a/test/core/vector/Vector_test.cpp b/test/core/vector/Vector_test.cpp index ea3575d9..f8e976bc 100644 --- a/test/core/vector/Vector_test.cpp +++ b/test/core/vector/Vector_test.cpp @@ -1,7 +1,7 @@ #include "OlympiaSim.hpp" -#include "Decode.hpp" +#include "decode/Decode.hpp" #include "ROB.hpp" -#include "VectorUopGenerator.hpp" +#include "vector/VectorUopGenerator.hpp" #include "sparta/app/CommandLineSimulator.hpp" #include "sparta/kernel/Scheduler.hpp"