From 725d7e9d19fa88e66519924626503f260bd05e06 Mon Sep 17 00:00:00 2001 From: "Thanh C. Tran" Date: Fri, 3 Mar 2017 03:20:37 +0100 Subject: [PATCH] Fix compile errors & warnings # Explain what has been changed # Explain why this change is being made # Provide links to any relevant tickets, articles or other resources --- .../analyzer/businessObjects/phases/phase.h | 14 ++++++------- DRAMSys/analyzer/businessObjects/timespan.h | 3 ++- .../src/common/tlm2_base_protocol_checker.h | 6 +++--- DRAMSys/simulator/src/controller/Controller.h | 2 +- .../src/controller/scheduler/ReadyBatch.cpp | 4 ++-- .../src/controller/scheduler/SMS.cpp | 20 +++++++++---------- .../simulator/src/controller/scheduler/SMS.h | 5 +++-- 7 files changed, 28 insertions(+), 26 deletions(-) diff --git a/DRAMSys/analyzer/businessObjects/phases/phase.h b/DRAMSys/analyzer/businessObjects/phases/phase.h index 62c5ea27..ef8d187a 100644 --- a/DRAMSys/analyzer/businessObjects/phases/phase.h +++ b/DRAMSys/analyzer/businessObjects/phases/phase.h @@ -180,7 +180,7 @@ public: using AUTO_REFRESH::AUTO_REFRESH; protected: virtual QString Name() const override {return "REFA";} - virtual bool isBankwise() const {return false;} + virtual bool isBankwise() const override {return false;} }; class REFB : public AUTO_REFRESH @@ -201,7 +201,7 @@ protected: virtual std::vector getTimesOnCommandBus() const {return {span.Begin()};} virtual QColor getColor(const TraceDrawingProperties &drawingProperties) const override {Q_UNUSED(drawingProperties) return getPhaseColor();} virtual QColor getPhaseColor() const override {return ColorGenerator::getColor(10);} - virtual bool isBankwise() const {return false;} + virtual bool isBankwise() const override {return false;} }; class PDNAB : public Phase @@ -222,7 +222,7 @@ public: using PDNAB::PDNAB; protected: virtual QString Name() const override {return "PDNA";} - virtual bool isBankwise() const {return false;} + virtual bool isBankwise() const override {return false;} }; class PDNPB : public Phase @@ -243,7 +243,7 @@ public: using PDNPB::PDNPB; protected: virtual QString Name() const override {return "PDNP";} - virtual bool isBankwise() const {return false;} + virtual bool isBankwise() const override {return false;} }; class SREFB : public Phase @@ -251,8 +251,8 @@ class SREFB : public Phase public: using Phase::Phase; protected: - virtual QString Name() const {return "SREFB";} - virtual Qt::BrushStyle getBrushStyle() const {return Qt::Dense1Pattern;} + virtual QString Name() const override {return "SREFB";} + virtual Qt::BrushStyle getBrushStyle() const override {return Qt::Dense1Pattern;} virtual QColor getColor(const TraceDrawingProperties &drawingProperties) const override {Q_UNUSED(drawingProperties) return getPhaseColor();} virtual QColor getPhaseColor() const override {return QColor(Qt::black);} virtual Phase::PhaseSymbol getPhaseSymbol() const override {return PhaseSymbol::Rect;} @@ -264,7 +264,7 @@ public: using SREFB::SREFB; protected: virtual QString Name() const override {return "SREF";} - virtual bool isBankwise() const {return false;} + virtual bool isBankwise() const override {return false;} }; diff --git a/DRAMSys/analyzer/businessObjects/timespan.h b/DRAMSys/analyzer/businessObjects/timespan.h index c54f99b0..dcc32839 100644 --- a/DRAMSys/analyzer/businessObjects/timespan.h +++ b/DRAMSys/analyzer/businessObjects/timespan.h @@ -38,6 +38,7 @@ #ifndef TIMESPAN_H #define TIMESPAN_H #include +#include #include "tracetime.h" class Timespan @@ -47,7 +48,7 @@ class Timespan public: Timespan(traceTime begin = 0, traceTime end = 0) : begin(begin), end(end){} - traceTime timeCovered() const{return abs(End()-Begin());} + traceTime timeCovered() const{return std::abs(End()-Begin());} traceTime Begin() const{return begin;} void setBegin(traceTime time){begin = time;} traceTime End() const{return end;} diff --git a/DRAMSys/simulator/src/common/tlm2_base_protocol_checker.h b/DRAMSys/simulator/src/common/tlm2_base_protocol_checker.h index eb0833a1..99b5ce10 100755 --- a/DRAMSys/simulator/src/common/tlm2_base_protocol_checker.h +++ b/DRAMSys/simulator/src/common/tlm2_base_protocol_checker.h @@ -343,7 +343,7 @@ void tlm2_base_protocol_checker:: BOILERPLATE b_transport_pre_checks( - tlm::tlm_generic_payload& trans, sc_core::sc_time& delay) + tlm::tlm_generic_payload& trans, sc_core::sc_time& /*delay*/) { ++ m_map[&trans].b_call; @@ -372,7 +372,7 @@ b_transport_pre_checks( BOILERPLATE b_transport_post_checks( - tlm::tlm_generic_payload& trans, sc_core::sc_time& delay) + tlm::tlm_generic_payload& trans, sc_core::sc_time& /*delay*/) { check_response_path(trans, "b_transport"); check_trans_not_modified(trans, "b_transport"); @@ -914,7 +914,7 @@ get_direct_mem_ptr_pre_checks( BOILERPLATE -get_direct_mem_ptr_post_checks( tlm::tlm_generic_payload& trans, tlm::tlm_dmi& dmi_data ) +get_direct_mem_ptr_post_checks( tlm::tlm_generic_payload& trans, tlm::tlm_dmi& /*dmi_data*/ ) { tlm::tlm_generic_payload* init = m_map[&trans].gp; diff --git a/DRAMSys/simulator/src/controller/Controller.h b/DRAMSys/simulator/src/controller/Controller.h index a1286d1f..77de4bf3 100644 --- a/DRAMSys/simulator/src/controller/Controller.h +++ b/DRAMSys/simulator/src/controller/Controller.h @@ -110,7 +110,7 @@ private: void buildScheduler(); void payloadEntersSystem(tlm_generic_payload& payload); void payloadLeavesSystem(tlm_generic_payload& payload); - void scheduleNextFromScheduler(Bank bank); + void scheduleNextFromScheduler(Bank bank) override; // --- FRONTEND ------ tlm_sync_enum nb_transport_fw(tlm_generic_payload& payload, tlm_phase& phase, sc_time& fwDelay); diff --git a/DRAMSys/simulator/src/controller/scheduler/ReadyBatch.cpp b/DRAMSys/simulator/src/controller/scheduler/ReadyBatch.cpp index 84af0d69..2200a6f4 100644 --- a/DRAMSys/simulator/src/controller/scheduler/ReadyBatch.cpp +++ b/DRAMSys/simulator/src/controller/scheduler/ReadyBatch.cpp @@ -3,7 +3,7 @@ ReadyBatch::ReadyBatch() { fifosize = Configuration::getInstance().ReadyBatchSize; - thresholdAge(Configuration::getInstance().ReadyBatchThresholdAge, SC_NS); + thresholdAge = sc_time(Configuration::getInstance().ReadyBatchThresholdAge, SC_NS); } unsigned int ReadyBatch::getNumRequests() @@ -34,7 +34,7 @@ bool ReadyBatch::addTransaction(gp* payload) { sc_time currentAge = sc_time_stamp() - getTimeOfOldestRequest(); Row newRow = DramExtension::getExtension(payload).getRow(); - if (getNumRequests == fifosize || currentAge >= thresholdAge || newRow != getRow()) { + if (getNumRequests() == fifosize || currentAge >= thresholdAge || newRow != getRow()) { return false; } else { readybatch.emplace_back(payload); diff --git a/DRAMSys/simulator/src/controller/scheduler/SMS.cpp b/DRAMSys/simulator/src/controller/scheduler/SMS.cpp index 252300b1..7e9fd5b5 100644 --- a/DRAMSys/simulator/src/controller/scheduler/SMS.cpp +++ b/DRAMSys/simulator/src/controller/scheduler/SMS.cpp @@ -58,8 +58,8 @@ void SMS::batchFormation() } else { - auto totalNumThreads = Configuration::getInstance().NumberOfTracePlayers; - for (auto threadID = 1; threadID <= totalNumThreads; threadID++) + unsigned int totalNumThreads = Configuration::getInstance().NumberOfTracePlayers; + for (unsigned int threadID = 1; threadID <= totalNumThreads; threadID++) { batchFormation(Thread(threadID)); } @@ -86,7 +86,7 @@ void SMS::batchScheduler() batchFormation(); if (isSJF) { - selectSJF() + selectSJF(); } else { @@ -96,7 +96,7 @@ void SMS::batchScheduler() } else if (isSJF) { - selectSJF() + selectSJF(); } else { @@ -108,9 +108,9 @@ void SMS::batchScheduler() void SMS::selectSJF() { // find shorstest thread - unsigned int minThread = 1 - auto totalNumThreads = Configuration::getInstance().NumberOfTracePlayers; - for (auto threadID = 2; threadID <= totalNumThreads; threadID++) + unsigned int minThread = 1; + unsigned int totalNumThreads = Configuration::getInstance().NumberOfTracePlayers; + for (unsigned int threadID = 2; threadID <= totalNumThreads; threadID++) { if (memrequestcounter[Thread(threadID)] <= memrequestcounter[Thread(minThread)]) { @@ -123,7 +123,7 @@ void SMS::selectSJF() for (auto intr = requestPtrs.begin(); intr != requestPtrs.end(); intr++) { Bank bank = DramExtension::getExtension(*intr).getBank(); - bankbuffer.emplace(bank, *intr); + bankbuffer[bank].emplace_back(*intr); } requestPtrs.clear(); @@ -140,7 +140,7 @@ void SMS::selectRR() for (auto intr = requestPtrs.begin(); intr != requestPtrs.end(); intr++) { Bank bank = DramExtension::getExtension(*intr).getBank(); - bankbuffer.emplace(bank, *intr); + bankbuffer[bank].emplace_back(*intr); } requestPtrs.clear(); @@ -192,7 +192,7 @@ void SMS::bypassRequests() for(auto request = thread_requests.second.begin(); request != thread_requests.second.end(); request++) { Bank bank = DramExtension::getExtension(*request).getBank(); - bankbuffer[bank].emplace_back(request); + bankbuffer[bank].emplace_back(*request); thread_requests.second.erase(request); } } diff --git a/DRAMSys/simulator/src/controller/scheduler/SMS.h b/DRAMSys/simulator/src/controller/scheduler/SMS.h index 9f871776..6b7853a6 100644 --- a/DRAMSys/simulator/src/controller/scheduler/SMS.h +++ b/DRAMSys/simulator/src/controller/scheduler/SMS.h @@ -5,6 +5,7 @@ #include #include "sysc/utils/sc_report.h" #include "IScheduler.h" +#include "ReadyBatch.h" #include "../core/ControllerCore.h" #include "../core/configuration/Configuration.h" #include "../../common/dramExtension.h" @@ -19,8 +20,8 @@ public: SMS(ControllerCore &controllerCore, unsigned int SJFprobability) : IScheduler(controllerCore), SJFprobability(SJFprobability) { // initialize memory request counter & memory request intensity for each thread - auto totalNumThreads = Configuration::getInstance().NumberOfTracePlayers; - for (auto threadID = 1; threadID <= totalNumThreads; threadID++) + unsigned int totalNumThreads = Configuration::getInstance().NumberOfTracePlayers; + for (unsigned int threadID = 1; threadID <= totalNumThreads; threadID++) { memrequestcounter.emplace(Thread(threadID), 0); memoryIntensity.emplace(Thread(threadID), 0);