summaryrefslogtreecommitdiff
path: root/src/intersim2
diff options
context:
space:
mode:
authorgpgpu-sim <[email protected]>2018-10-29 13:55:31 -0700
committerGitHub <[email protected]>2018-10-29 13:55:31 -0700
commit42d8d8c9b5b0eb93ff228a877fd6a5bed5cf956d (patch)
tree7bc8917d1f685487d775975596f9b22a063e4aef /src/intersim2
parent68134d5eb326552fc1ef4b02b2eb21103266283b (diff)
parentea226a289bcdf94811712a4563ae3eb334ee3a7b (diff)
Merge pull request #79 from purdue-aalp/dev
Merging dev-purdue to public-dev-gpgpu-sim-repo
Diffstat (limited to 'src/intersim2')
-rw-r--r--src/intersim2/Makefile2
-rw-r--r--src/intersim2/interconnect_interface.cpp9
2 files changed, 9 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 ?