diff options
| author | Timothy G Rogers <[email protected]> | 2017-07-19 15:06:11 -0400 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2017-07-19 15:06:11 -0400 |
| commit | 8b720063ff18ae8450517c89e536a46986bb8d43 (patch) | |
| tree | f729724b0da6e8dc11a8c199625f57d2430004b4 | |
| parent | 4caffa019eb99713ad580259f944952056b65223 (diff) | |
| parent | 48ee58907ca5f7195baa8ef7f82e3ff41440cb15 (diff) | |
Merge pull request #4 from abdallm/dev-purdue-integration
Interconnection assertion failing demystifying
| -rw-r--r-- | src/intersim2/Makefile | 2 | ||||
| -rw-r--r-- | src/intersim2/interconnect_interface.cpp | 9 | ||||
| -rw-r--r-- | src/trace_streams.tup | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/intersim2/Makefile b/src/intersim2/Makefile index bd42000..7d10b3f 100644 --- a/src/intersim2/Makefile +++ b/src/intersim2/Makefile @@ -36,7 +36,7 @@ DEBUG ?= 0 LEX = flex YACC = bison -y DEFINE = #-DTRACK_STALLS -DTRACK_BUFFERS -DTRACK_FLOWS -DTRACK_CREDITS -INCPATH = -I. -Iarbiters -Iallocators -Irouters -Inetworks -Ipower +INCPATH = -I. -Iarbiters -Iallocators -Irouters -Inetworks -Ipower -I$(GPGPUSIM_ROOT)/src ifeq ($(CREATE_LIBRARY),1) INCPATH += -I$(GPGPUSIM_ROOT)/src/gpgpu-sim/ diff --git a/src/intersim2/interconnect_interface.cpp b/src/intersim2/interconnect_interface.cpp index 4386821..1e1a2d7 100644 --- a/src/intersim2/interconnect_interface.cpp +++ b/src/intersim2/interconnect_interface.cpp @@ -44,6 +44,7 @@ #include "booksim.hpp" #include "intersim_config.hpp" #include "network.hpp" +#include "trace.h" InterconnectInterface* InterconnectInterface::New(const char* const config_file) { @@ -147,6 +148,8 @@ void InterconnectInterface::Push(unsigned input_deviceID, unsigned output_device { // it should have free buffer assert(HasBuffer(input_deviceID, size)); + + DPRINTF(INTERCONNECT, "Sent %d bytes from %d to %d", size, input_deviceID, output_deviceID); int output_icntID = _node_map[output_deviceID]; int input_icntID = _node_map[input_deviceID]; @@ -178,7 +181,11 @@ void InterconnectInterface::Push(unsigned input_deviceID, unsigned output_device case WRITE_REQUEST: packet_type = Flit::WRITE_REQUEST ;break; case READ_REPLY: packet_type = Flit::READ_REPLY ;break; case WRITE_ACK: packet_type = Flit::WRITE_REPLY ;break; - default: assert (0); + default: + { + cout<<"Type "<<mf->get_type()<<" is undefined!"<<endl; + assert (0 && "Type is undefined"); + } } //TODO: _include_queuing ? diff --git a/src/trace_streams.tup b/src/trace_streams.tup index c41690e..bbc9bb3 100644 --- a/src/trace_streams.tup +++ b/src/trace_streams.tup @@ -29,5 +29,6 @@ TS_TUP_BEGIN( trace_streams_type ) TS_TUP( WARP_SCHEDULER ), TS_TUP( SCOREBOARD ), TS_TUP( MEMORY_PARTITION_UNIT ), + TS_TUP( INTERCONNECT ), TS_TUP( NUM_TRACE_STREAMS ) TS_TUP_END( trace_streams_type ) |