changeset f249937228b5 in /z/repo/m5 details: http://repo.m5sim.org/m5?cmd=changeset;node=f249937228b5 description: This patch removes the WARN_* and ERROR_* from src/mem/ruby/common/Debug.hh file. These statements have been replaced with warn(), panic() and fatal() defined in src/base/misc.hh
diffstat: src/cpu/testers/rubytest/Check.cc | 25 +-- src/cpu/testers/rubytest/CheckTable.cc | 2 +- src/cpu/testers/rubytest/RubyTester.cc | 10 +- src/mem/protocol/RubySlicc_Util.sm | 1 - src/mem/ruby/buffers/MessageBuffer.cc | 20 +-- src/mem/ruby/common/Debug.hh | 65 ---------- src/mem/ruby/common/NetDest.cc | 4 +- src/mem/ruby/common/Set.cc | 7 +- src/mem/ruby/network/Network.cc | 6 +- src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 6 +- src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 3 +- src/mem/ruby/network/garnet/fixed-pipeline/RoutingUnit_d.cc | 2 +- src/mem/ruby/network/garnet/fixed-pipeline/SWallocator_d.cc | 3 +- src/mem/ruby/network/garnet/fixed-pipeline/VCallocator_d.cc | 3 +- src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 6 +- src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh | 3 +- src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 6 - src/mem/ruby/storebuffer/storebuffer.cc | 28 +-- src/mem/ruby/system/CacheMemory.cc | 2 +- src/mem/ruby/system/PerfectCacheMemory.hh | 4 +- src/mem/ruby/system/Sequencer.cc | 29 ++-- src/mem/ruby/tester/DeterministicDriver.cc | 3 +- src/mem/ruby/tester/RaceyPseudoThread.cc | 10 +- src/mem/ruby/tester/test_framework.cc | 3 +- src/mem/slicc/symbols/StateMachine.py | 10 +- src/mem/slicc/symbols/Type.py | 19 +- 26 files changed, 87 insertions(+), 193 deletions(-) diffs (truncated from 775 to 300 lines): diff -r 42f343470ee3 -r f249937228b5 src/cpu/testers/rubytest/Check.cc --- a/src/cpu/testers/rubytest/Check.cc Tue Dec 21 22:57:29 2010 -0800 +++ b/src/cpu/testers/rubytest/Check.cc Wed Dec 22 23:15:24 2010 -0600 @@ -270,15 +270,13 @@ // Perform load/check for (int byte_number=0; byte_number<CHECK_SIZE; byte_number++) { if (uint8(m_value + byte_number) != data->getByte(byte_number)) { - WARN_EXPR(proc); - WARN_EXPR(address); - WARN_EXPR(data); - WARN_EXPR(byte_number); - WARN_EXPR((int)m_value + byte_number); - WARN_EXPR((int)data->getByte(byte_number)); - WARN_EXPR(*this); - WARN_EXPR(g_eventQueue_ptr->getTime()); - ERROR_MSG("Action/check failure"); + panic("Action/check failure: proc: %d address: %s data: %s " + "byte_number: %d m_value+byte_number: %d byte: %d %s" + "Time: %d\n", + proc, address, data, byte_number, + (int)m_value + byte_number, + (int)data->getByte(byte_number), *this, + g_eventQueue_ptr->getTime()); } } DPRINTF(RubyTest, "Action/check success\n"); @@ -291,12 +289,9 @@ pickValue(); } else { - WARN_EXPR(*this); - WARN_EXPR(proc); - WARN_EXPR(data); - WARN_EXPR(m_status); - WARN_EXPR(g_eventQueue_ptr->getTime()); - ERROR_MSG("Unexpected TesterStatus"); + panic("Unexpected TesterStatus: %s proc: %d data: %s m_status: %s " + "time: %d\n", + *this, proc, data, m_status, g_eventQueue_ptr->getTime()); } DPRINTF(RubyTest, "proc: %d, Address: 0x%x\n", proc, diff -r 42f343470ee3 -r f249937228b5 src/cpu/testers/rubytest/CheckTable.cc --- a/src/cpu/testers/rubytest/CheckTable.cc Tue Dec 21 22:57:29 2010 -0800 +++ b/src/cpu/testers/rubytest/CheckTable.cc Wed Dec 22 23:15:24 2010 -0600 @@ -81,7 +81,7 @@ { if (floorLog2(CHECK_SIZE) != 0) { if (address.bitSelect(0, CHECK_SIZE_BITS - 1) != 0) { - ERROR_MSG("Check not aligned"); + panic("Check not aligned"); } } diff -r 42f343470ee3 -r f249937228b5 src/cpu/testers/rubytest/RubyTester.cc --- a/src/cpu/testers/rubytest/RubyTester.cc Tue Dec 21 22:57:29 2010 -0800 +++ b/src/cpu/testers/rubytest/RubyTester.cc Wed Dec 22 23:15:24 2010 -0600 @@ -27,6 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/misc.hh" #include "cpu/testers/rubytest/Check.hh" #include "cpu/testers/rubytest/RubyTester.hh" #include "mem/ruby/common/Global.hh" @@ -173,11 +174,10 @@ for (int processor = 0; processor < size; processor++) { if ((current_time - m_last_progress_vector[processor]) > m_deadlock_threshold) { - WARN_EXPR(current_time); - WARN_EXPR(m_last_progress_vector[processor]); - WARN_EXPR(current_time - m_last_progress_vector[processor]); - WARN_EXPR(processor); - ERROR_MSG("Deadlock detected."); + panic("Deadlock detected: current_time: %d last_progress_time: %d " + "difference: %d processor: %d\n", + current_time, m_last_progress_vector[processor], + current_time - m_last_progress_vector[processor], processor); } } } diff -r 42f343470ee3 -r f249937228b5 src/mem/protocol/RubySlicc_Util.sm --- a/src/mem/protocol/RubySlicc_Util.sm Tue Dec 21 22:57:29 2010 -0800 +++ b/src/mem/protocol/RubySlicc_Util.sm Wed Dec 22 23:15:24 2010 -0600 @@ -46,7 +46,6 @@ Time getTimePlusInt(Time addend1, int addend2); Time getTimeMinusTime(Time t1, Time t2); Time getPreviousDelayedCycles(Time t1, Time t2); -void WARN_ERROR_TIME(Time time); void procProfileCoherenceRequest(NodeID node, bool needCLB); void dirProfileCoherenceRequest(NodeID node, bool needCLB); bool isPerfectProtocol(); diff -r 42f343470ee3 -r f249937228b5 src/mem/ruby/buffers/MessageBuffer.cc --- a/src/mem/ruby/buffers/MessageBuffer.cc Tue Dec 21 22:57:29 2010 -0800 +++ b/src/mem/ruby/buffers/MessageBuffer.cc Wed Dec 22 23:15:24 2010 -0600 @@ -27,6 +27,7 @@ */ #include "base/cprintf.hh" +#include "base/misc.hh" #include "base/stl_helpers.hh" #include "mem/ruby/buffers/MessageBuffer.hh" #include "mem/ruby/system/System.hh" @@ -161,9 +162,7 @@ // the plus one is a kluge because of a SLICC issue if (!m_ordering_set) { - // WARN_EXPR(*this); - WARN_EXPR(m_name); - ERROR_MSG("Ordering property of this queue has not been set"); + panic("Ordering property of %s has not been set", m_name); } // Calculate the arrival time of the message, that is, the first @@ -191,13 +190,10 @@ assert(arrival_time > current_time); if (m_strict_fifo) { if (arrival_time < m_last_arrival_time) { - WARN_EXPR(*this); - WARN_EXPR(m_name); - WARN_EXPR(current_time); - WARN_EXPR(delta); - WARN_EXPR(arrival_time); - WARN_EXPR(m_last_arrival_time); - ERROR_MSG("FIFO ordering violated"); + panic("FIFO ordering violated: %s name: %s current time: %d " + "delta: %d arrival_time: %d last arrival_time: %d\n", + *this, m_name, current_time, delta, arrival_time, + m_last_arrival_time); } } m_last_arrival_time = arrival_time; @@ -229,9 +225,7 @@ if (m_consumer_ptr != NULL) { g_eventQueue_ptr->scheduleEventAbsolute(m_consumer_ptr, arrival_time); } else { - WARN_EXPR(*this); - WARN_EXPR(m_name); - ERROR_MSG("No consumer"); + panic("No consumer: %s name: %s\n", *this, m_name); } } diff -r 42f343470ee3 -r f249937228b5 src/mem/ruby/common/Debug.hh --- a/src/mem/ruby/common/Debug.hh Tue Dec 21 22:57:29 2010 -0800 +++ b/src/mem/ruby/common/Debug.hh Wed Dec 22 23:15:24 2010 -0600 @@ -119,9 +119,6 @@ return out; } -const bool ERROR_MESSAGE_FLAG = true; -const bool WARNING_MESSAGE_FLAG = true; - #undef assert #define assert(EXPR) ASSERT(EXPR) #undef ASSERT @@ -161,67 +158,5 @@ #endif // NDEBUG -#define ERROR_MSG(MESSAGE) do { \ - using namespace std; \ - if (ERROR_MESSAGE_FLAG) { \ - cerr << "Fatal Error: in fn " \ - << __PRETTY_FUNCTION__ << " in " \ - << __FILE__ << ":" \ - << __LINE__ << ": " \ - << (MESSAGE) << endl << flush; \ - (* debug_cout_ptr) << "Fatal Error: in fn " \ - << __PRETTY_FUNCTION__ << " in " \ - << __FILE__ << ":" \ - << __LINE__ << ": " \ - << (MESSAGE) << endl << flush; \ - abort(); \ - } \ -} while(0) - -#define WARN_MSG(MESSAGE) do { \ - using namespace std; \ - if (WARNING_MESSAGE_FLAG) { \ - cerr << "Warning: in fn " \ - << __PRETTY_FUNCTION__ << " in " \ - << __FILE__ << ":" \ - << __LINE__ << ": " \ - << (MESSAGE) << endl << flush; \ - (* debug_cout_ptr) << "Warning: in fn " \ - << __PRETTY_FUNCTION__ << " in " \ - << __FILE__ << ":" \ - << __LINE__ << ": " \ - << (MESSAGE) << endl << flush; \ - } \ -} while (0) - -#define WARN_EXPR(EXPR) do { \ - using namespace std; \ - if (WARNING_MESSAGE_FLAG) { \ - cerr << "Warning: in fn " \ - << __PRETTY_FUNCTION__ << " in " \ - << __FILE__ << ":" \ - << __LINE__ << ": " \ - << #EXPR << " is " \ - << (EXPR) << endl << flush; \ - (* debug_cout_ptr) << "Warning: in fn " \ - << __PRETTY_FUNCTION__ << " in " \ - << __FILE__ << ":" \ - << __LINE__ << ": " \ - << #EXPR << " is " \ - << (EXPR) << endl << flush; \ - } \ -} while (0) - -#define ERROR_OUT( rest... ) do { \ - using namespace std; \ - if (ERROR_MESSAGE_FLAG) { \ - cout << "error: in fn " \ - << __PRETTY_FUNCTION__ << " in " \ - << __FILE__ << ":" \ - << __LINE__ << ": "; \ - g_debug_ptr->debugMsg(rest); \ - } \ -} while (0) - #endif // __MEM_RUBY_COMMON_DEBUG_HH__ diff -r 42f343470ee3 -r f249937228b5 src/mem/ruby/common/NetDest.cc --- a/src/mem/ruby/common/NetDest.cc Tue Dec 21 22:57:29 2010 -0800 +++ b/src/mem/ruby/common/NetDest.cc Wed Dec 22 23:15:24 2010 -0600 @@ -151,7 +151,7 @@ } } } - ERROR_MSG("No smallest element of an empty set."); + panic("No smallest element of an empty set."); } MachineID @@ -165,7 +165,7 @@ } } - ERROR_MSG("No smallest element of given MachineType."); + panic("No smallest element of given MachineType."); } // Returns true iff all bits are set diff -r 42f343470ee3 -r f249937228b5 src/mem/ruby/common/Set.cc --- a/src/mem/ruby/common/Set.cc Tue Dec 21 22:57:29 2010 -0800 +++ b/src/mem/ruby/common/Set.cc Wed Dec 22 23:15:24 2010 -0600 @@ -29,6 +29,7 @@ // modified (rewritten) 05/20/05 by Dan Gibson to accomimdate FASTER // >32 bit set sizes +#include "base/misc.hh" #include "mem/ruby/common/Set.hh" #include "mem/ruby/system/System.hh" @@ -199,13 +200,11 @@ x = x >> 1; } - ERROR_MSG("No smallest element of an empty set."); + panic("No smallest element of an empty set."); } } - ERROR_MSG("No smallest element of an empty set."); - - return 0; + panic("No smallest element of an empty set."); } /* diff -r 42f343470ee3 -r f249937228b5 src/mem/ruby/network/Network.cc --- a/src/mem/ruby/network/Network.cc Tue Dec 21 22:57:29 2010 -0800 +++ b/src/mem/ruby/network/Network.cc Wed Dec 22 23:15:24 2010 -0600 @@ -26,6 +26,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "base/misc.hh" #include "mem/protocol/MachineType.hh" #include "mem/ruby/network/Network.hh" #include "mem/ruby/network/simple/Topology.hh" @@ -64,7 +65,7 @@ { switch(size_type) { case MessageSizeType_Undefined: - ERROR_MSG("Can't convert Undefined MessageSizeType to integer"); + panic("Can't convert Undefined MessageSizeType to integer"); break; case MessageSizeType_Control: case MessageSizeType_Request_Control: @@ -85,10 +86,9 @@ case MessageSizeType_Writeback_Data: return m_data_msg_size; default: - ERROR_MSG("Invalid range for type MessageSizeType"); + panic("Invalid range for type MessageSizeType"); break; } _______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev