diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ad3ff03..0a4384f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,13 +116,10 @@ if (DRAMSYS_USE_FETCH_CONTENT) FetchContent_Declare( SystemCLanguage - URL https://github.com/accellera-official/systemc/archive/refs/tags/2.3.4.tar.gz + URL https://github.com/accellera-official/systemc/archive/refs/tags/3.0.1.tar.gz OVERRIDE_FIND_PACKAGE ) - # TODO: remove with SystemC 3.0 - set(CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD} CACHE STRING "") - FetchContent_MakeAvailable(SystemCLanguage) # Set include directories to SYSTEM to suppress warnings diff --git a/src/libdramsys/DRAMSys/controller/Controller.h b/src/libdramsys/DRAMSys/controller/Controller.h index 08e4956d..eecfca78 100644 --- a/src/libdramsys/DRAMSys/controller/Controller.h +++ b/src/libdramsys/DRAMSys/controller/Controller.h @@ -76,7 +76,6 @@ public: const SimConfig& simConfig, const AddressDecoder& addressDecoder, TlmRecorder* tlmRecorder); - SC_HAS_PROCESS(Controller); [[nodiscard]] bool idle() const { return totalNumberOfPayloads == 0; } void registerIdleCallback(std::function idleCallback); diff --git a/src/libdramsys/DRAMSys/simulation/Arbiter.h b/src/libdramsys/DRAMSys/simulation/Arbiter.h index 80f5214a..3ecf8644 100644 --- a/src/libdramsys/DRAMSys/simulation/Arbiter.h +++ b/src/libdramsys/DRAMSys/simulation/Arbiter.h @@ -73,7 +73,6 @@ protected: const McConfig& mcConfig, const MemSpec& memSpec, const AddressDecoder& addressDecoder); - SC_HAS_PROCESS(Arbiter); void end_of_elaboration() override; @@ -117,7 +116,6 @@ public: const McConfig& mcConfig, const MemSpec& memSpec, const AddressDecoder& addressDecoder); - SC_HAS_PROCESS(ArbiterSimple); private: void end_of_elaboration() override; @@ -134,7 +132,6 @@ public: const McConfig& mcConfig, const MemSpec& memSpec, const AddressDecoder& addressDecoder); - SC_HAS_PROCESS(ArbiterFifo); private: void end_of_elaboration() override; @@ -158,7 +155,6 @@ public: const McConfig& mcConfig, const MemSpec& memSpec, const AddressDecoder& addressDecoder); - SC_HAS_PROCESS(ArbiterReorder); private: void end_of_elaboration() override; diff --git a/src/libdramsys/DRAMSys/simulation/DRAMSys.h b/src/libdramsys/DRAMSys/simulation/DRAMSys.h index af354353..30457270 100644 --- a/src/libdramsys/DRAMSys/simulation/DRAMSys.h +++ b/src/libdramsys/DRAMSys/simulation/DRAMSys.h @@ -71,7 +71,6 @@ class DRAMSys : public sc_core::sc_module public: tlm_utils::multi_passthrough_target_socket tSocket{"DRAMSys_tSocket"}; - SC_HAS_PROCESS(DRAMSys); DRAMSys(const sc_core::sc_module_name& name, const Config::Configuration& config); ~DRAMSys() override; diff --git a/src/libdramsys/DRAMSys/simulation/Dram.h b/src/libdramsys/DRAMSys/simulation/Dram.h index 8f73e042..a79541a6 100644 --- a/src/libdramsys/DRAMSys/simulation/Dram.h +++ b/src/libdramsys/DRAMSys/simulation/Dram.h @@ -93,7 +93,6 @@ public: const SimConfig& simConfig, const MemSpec& memSpec, TlmRecorder* tlmRecorder); - SC_HAS_PROCESS(Dram); Dram(const Dram&) = delete; Dram(Dram&&) = delete; diff --git a/src/simulator/simulator/Cache.h b/src/simulator/simulator/Cache.h index 2a9b156f..840c427f 100644 --- a/src/simulator/simulator/Cache.h +++ b/src/simulator/simulator/Cache.h @@ -63,7 +63,6 @@ public: sc_core::sc_time cycleTime, std::size_t hitCycles, DRAMSys::MemoryManager& memoryManager); - SC_HAS_PROCESS(Cache); private: void peqCallback(tlm::tlm_generic_payload& trans, const tlm::tlm_phase& phase); diff --git a/src/simulator/simulator/EccModule.h b/src/simulator/simulator/EccModule.h index d0708e99..63a1a7ef 100644 --- a/src/simulator/simulator/EccModule.h +++ b/src/simulator/simulator/EccModule.h @@ -55,7 +55,6 @@ public: tlm_utils::simple_target_socket tSocket; EccModule(sc_core::sc_module_name const& name, DRAMSys::AddressDecoder const& addressDecoder); - SC_HAS_PROCESS(EccModule); private: using Block = uint64_t; diff --git a/src/simulator/simulator/request/RequestIssuer.h b/src/simulator/simulator/request/RequestIssuer.h index 177fd086..587b2026 100644 --- a/src/simulator/simulator/request/RequestIssuer.h +++ b/src/simulator/simulator/request/RequestIssuer.h @@ -60,7 +60,6 @@ public: std::optional maxPendingWriteRequests, std::function transactionFinished, std::function terminate); - SC_HAS_PROCESS(RequestIssuer); uint64_t totalRequests() { return producer->totalRequests(); }; diff --git a/tests/tests_dramsys/b_transport/b_transport.cpp b/tests/tests_dramsys/b_transport/b_transport.cpp index 381a4a7b..49a108f8 100644 --- a/tests/tests_dramsys/b_transport/b_transport.cpp +++ b/tests/tests_dramsys/b_transport/b_transport.cpp @@ -83,7 +83,6 @@ struct BlockingInitiator : sc_core::sc_module SC_THREAD(readAccess); SC_THREAD(writeAccess); } - SC_HAS_PROCESS(BlockingInitiator); void readAccess() { diff --git a/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb b/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb index 2c1b1a98..a7e1a6ba 100644 --- a/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb +++ b/tests/tests_regression/DDR4/expected/DRAMSys_ddr4-bankgrp_ddr4_ch0.tdb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b581129f7e4242d78470a7945deab9486fe8740ee11f374d9dc55e9f65702061 +oid sha256:9c374f446fc8177dc8865a7638a819dc4806fe92f950e76ac78a6f8703bb9f28 size 5079040 diff --git a/tests/tests_simulator/cache/ListInitiator.h b/tests/tests_simulator/cache/ListInitiator.h index 2d0e5e58..3c6cc539 100644 --- a/tests/tests_simulator/cache/ListInitiator.h +++ b/tests/tests_simulator/cache/ListInitiator.h @@ -43,7 +43,6 @@ class ListInitiator : public sc_core::sc_module public: tlm_utils::simple_initiator_socket iSocket; - SC_HAS_PROCESS(ListInitiator); ListInitiator(const sc_core::sc_module_name& name, DRAMSys::MemoryManager& memoryManager); struct TestTransactionData diff --git a/tests/tests_simulator/cache/TargetMemory.h b/tests/tests_simulator/cache/TargetMemory.h index 527d0942..b3081e4c 100644 --- a/tests/tests_simulator/cache/TargetMemory.h +++ b/tests/tests_simulator/cache/TargetMemory.h @@ -46,7 +46,6 @@ class TargetMemory : public sc_core::sc_module { public: tlm_utils::simple_target_socket tSocket; - SC_HAS_PROCESS(TargetMemory); TargetMemory(const sc_core::sc_module_name& name, sc_core::sc_time acceptDelay, sc_core::sc_time memoryLatency, diff --git a/tests/tests_simulator/cache/tests_cache.cpp b/tests/tests_simulator/cache/tests_cache.cpp index f711ae18..18494f28 100644 --- a/tests/tests_simulator/cache/tests_cache.cpp +++ b/tests/tests_simulator/cache/tests_cache.cpp @@ -44,7 +44,10 @@ class SystemCTest : public testing::Test { public: - ~SystemCTest() override { sc_core::sc_get_curr_simcontext()->reset(); } + ~SystemCTest() override { + sc_core::sc_curr_simcontext = new sc_core::sc_simcontext(); + sc_core::sc_default_global_context = sc_core::sc_curr_simcontext; + } }; class DirectMappedCache : public SystemCTest diff --git a/vcpkg.json b/vcpkg.json index a279a775..2b1d603e 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -14,11 +14,5 @@ }, "systemc" ], - "overrides": [ - { - "name": "systemc", - "version": "2.3.4" - } - ], "builtin-baseline": "ce613c41372b23b1f51333815feb3edd87ef8a8b" } \ No newline at end of file