From 7e10f627c0513ffe6bf1423dcdaaf7961cd18df3 Mon Sep 17 00:00:00 2001 From: Derek Christ Date: Wed, 24 Sep 2025 08:21:52 +0200 Subject: [PATCH] Fix various compile warnings --- src/libdramsys/DRAMSys/simulation/Dram.cpp | 16 +++++++--------- src/simulator/simulator/Simulator.cpp | 8 +------- .../simulator/generator/TrafficGenerator.cpp | 4 ++-- src/simulator/simulator/hammer/RowHammer.cpp | 2 +- src/simulator/simulator/player/StlPlayer.cpp | 2 +- tests/tests_dramsys/AddressDecoderTests.cpp | 3 ++- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/libdramsys/DRAMSys/simulation/Dram.cpp b/src/libdramsys/DRAMSys/simulation/Dram.cpp index 0651eb28..ec0e039f 100644 --- a/src/libdramsys/DRAMSys/simulation/Dram.cpp +++ b/src/libdramsys/DRAMSys/simulation/Dram.cpp @@ -159,17 +159,15 @@ Dram::nb_transport_fw(tlm_generic_payload& trans, tlm_phase& phase, [[maybe_unus if (DRAMPower) { - std::size_t channel = static_cast(ArbiterExtension::getChannel(trans)); - std::size_t rank = static_cast( + auto rank = static_cast( ControllerExtension::getRank(trans)); // relaitve to the channel - std::size_t bank_group_abs = static_cast( + auto bank_group_abs = static_cast( ControllerExtension::getBankGroup(trans)); // relative to the channel - std::size_t bank_group = - bank_group_abs - rank * memSpec.groupsPerRank; // relative to the rank - std::size_t bank = static_cast(ControllerExtension::getBank(trans)) - - bank_group_abs * memSpec.banksPerGroup; // relative to the bank_group - std::size_t row = static_cast(ControllerExtension::getRow(trans)); - std::size_t column = static_cast(ControllerExtension::getColumn(trans)); + auto bank_group = bank_group_abs - (rank * memSpec.groupsPerRank); // relative to the rank + auto bank = static_cast(ControllerExtension::getBank(trans)) - + (bank_group_abs * memSpec.banksPerGroup); // relative to the bank_group + auto row = static_cast(ControllerExtension::getRow(trans)); + auto column = static_cast(ControllerExtension::getColumn(trans)); uint64_t cycle = std::lround((sc_time_stamp() + delay) / memSpec.tCK); // DRAMPower: diff --git a/src/simulator/simulator/Simulator.cpp b/src/simulator/simulator/Simulator.cpp index 6cf36d95..31c2107a 100644 --- a/src/simulator/simulator/Simulator.cpp +++ b/src/simulator/simulator/Simulator.cpp @@ -86,14 +86,8 @@ Simulator::instantiateInitiator(const DRAMSys::Config::Initiator& initiator) uint64_t memorySize = dramSys->getMemSpec().getSimMemSizeInBytes(); sc_core::sc_time interfaceClk = dramSys->getMemSpec().tCK; - // To support non-power-of-two values for the burst length and width, we round the BL - // down to the smaller-or-equal power-of-two. - unsigned int burstBits = std::log2(dramSys->getMemSpec().defaultBurstLength); - unsigned int widthBits = std::log2(dramSys->getMemSpec().dataBusWidth); - unsigned int defaultDataLength = std::pow(2, burstBits) * std::pow(2, widthBits) / 8; - return std::visit( - [=](auto&& config) -> std::unique_ptr + [this, memorySize, interfaceClk](auto&& config) -> std::unique_ptr { using T = std::decay_t; if constexpr (std::is_same_v || diff --git a/src/simulator/simulator/generator/TrafficGenerator.cpp b/src/simulator/simulator/generator/TrafficGenerator.cpp index dc36c37c..7f7b77b0 100644 --- a/src/simulator/simulator/generator/TrafficGenerator.cpp +++ b/src/simulator/simulator/generator/TrafficGenerator.cpp @@ -49,7 +49,7 @@ TrafficGenerator::TrafficGenerator(DRAMSys::Config::TrafficGeneratorStateMachine for (auto const& state : config.states) { std::visit( - [=, &config](auto&& arg) + [this, memorySize, dataLength, dataAlignment, &config](auto&& arg) { using DRAMSys::Config::TrafficGeneratorActiveState; using DRAMSys::Config::TrafficGeneratorIdleState; @@ -132,7 +132,7 @@ TrafficGenerator::TrafficGenerator(DRAMSys::Config::TrafficGenerator const& conf Request TrafficGenerator::nextRequest() { if (currentState == STOP_STATE) - return Request{Request::Command::Stop}; + return Request{Request::Command::Stop, 0, 0, {}}; Request request = producers[currentState]->nextRequest(); requestsInState++; diff --git a/src/simulator/simulator/hammer/RowHammer.cpp b/src/simulator/simulator/hammer/RowHammer.cpp index 4dbf9825..55f6edf1 100644 --- a/src/simulator/simulator/hammer/RowHammer.cpp +++ b/src/simulator/simulator/hammer/RowHammer.cpp @@ -46,7 +46,7 @@ RowHammer::RowHammer(DRAMSys::Config::RowHammer const& config) : Request RowHammer::nextRequest() { if (generatedRequests >= numberOfRequests) - return Request{Request::Command::Stop}; + return Request{Request::Command::Stop, 0, 0, {}}; generatedRequests++; diff --git a/src/simulator/simulator/player/StlPlayer.cpp b/src/simulator/simulator/player/StlPlayer.cpp index e823d6d6..8655760e 100644 --- a/src/simulator/simulator/player/StlPlayer.cpp +++ b/src/simulator/simulator/player/StlPlayer.cpp @@ -108,7 +108,7 @@ Request StlPlayer::nextRequest() if (!currentLineContent.has_value()) { // The file is read in completely. Nothing more to do. - return Request{Request::Command::Stop}; + return Request{Request::Command::Stop, 0, 0, {}}; } auto command = currentLineContent->command == LineContent::Command::Read diff --git a/tests/tests_dramsys/AddressDecoderTests.cpp b/tests/tests_dramsys/AddressDecoderTests.cpp index 1189c03a..65f73b4e 100644 --- a/tests/tests_dramsys/AddressDecoderTests.cpp +++ b/tests/tests_dramsys/AddressDecoderTests.cpp @@ -93,8 +93,9 @@ TEST_F(AddressDecoderFixture, DecodingNP2Failure) addressDecoder.plausibilityCheck(*memSpec); uint64_t address = 0x3A59'1478; - addressDecoder.decodeAddress(address); + std::ignore = addressDecoder.decodeAddress(address); // EXPECT_EQ(trans.get_response_status(), tlm::TLM_ADDRESS_ERROR_RESPONSE); + } TEST_F(AddressDecoderFixture, DecodingNP2Success)