summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/gpgpu-sim/gpu-sim.cc3
-rw-r--r--src/gpgpu-sim/icnt_wrapper.cc30
-rw-r--r--src/gpgpu-sim/icnt_wrapper.h5
-rw-r--r--src/intersim2/interconnect_interface.cpp105
-rw-r--r--src/intersim2/interconnect_interface.hpp35
5 files changed, 101 insertions, 77 deletions
diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc
index 36e72e8..987942a 100644
--- a/src/gpgpu-sim/gpu-sim.cc
+++ b/src/gpgpu-sim/gpu-sim.cc
@@ -578,7 +578,8 @@ gpgpu_sim::gpgpu_sim( const gpgpu_sim_config &config )
}
}
- icnt_wrapper_init(m_shader_config->n_simt_clusters,m_memory_config->m_n_mem_sub_partition);
+ icnt_wrapper_init();
+ icnt_create(m_shader_config->n_simt_clusters,m_memory_config->m_n_mem_sub_partition);
time_vector_create(NUM_MEM_REQ_STAT);
fprintf(stdout, "GPGPU-Sim uArch: performance model initialization complete.\n");
diff --git a/src/gpgpu-sim/icnt_wrapper.cc b/src/gpgpu-sim/icnt_wrapper.cc
index c005dd9..ee58ece 100644
--- a/src/gpgpu-sim/icnt_wrapper.cc
+++ b/src/gpgpu-sim/icnt_wrapper.cc
@@ -30,16 +30,17 @@
#include "../intersim2/globals.hpp"
#include "../intersim2/interconnect_interface.hpp"
-icnt_init_p icnt_init;
-icnt_has_buffer_p icnt_has_buffer;
-icnt_push_p icnt_push;
-icnt_pop_p icnt_pop;
-icnt_transfer_p icnt_transfer;
-icnt_busy_p icnt_busy;
-icnt_display_stats_p icnt_display_stats;
+icnt_create_p icnt_create;
+icnt_init_p icnt_init;
+icnt_has_buffer_p icnt_has_buffer;
+icnt_push_p icnt_push;
+icnt_pop_p icnt_pop;
+icnt_transfer_p icnt_transfer;
+icnt_busy_p icnt_busy;
+icnt_display_stats_p icnt_display_stats;
icnt_display_overall_stats_p icnt_display_overall_stats;
-icnt_display_state_p icnt_display_state;
-icnt_get_flit_size_p icnt_get_flit_size;
+icnt_display_state_p icnt_display_state;
+icnt_get_flit_size_p icnt_get_flit_size;
int g_network_mode;
char* g_network_config_filename;
@@ -48,6 +49,12 @@ char* g_network_config_filename;
// Wrapper to intersim2 to accompany old icnt_wrapper
// TODO: use delegate/boost/c++11<funtion> instead
+
+static void intersim2_create(unsigned int n_shader, unsigned int n_mem)
+{
+ g_icnt_interface->CreateInterconnect(n_shader, n_mem);
+}
+
static void intersim2_init()
{
g_icnt_interface->Init();
@@ -104,12 +111,13 @@ void icnt_reg_options( class OptionParser * opp )
option_parser_register(opp, "-inter_config_file", OPT_CSTR, &g_network_config_filename, "Interconnection network config file", "mesh");
}
-void icnt_wrapper_init( unsigned int n_shader, unsigned int n_mem )
+void icnt_wrapper_init()
{
switch (g_network_mode) {
case INTERSIM:
//FIXME: delete the object: may add icnt_done wrapper
- g_icnt_interface = new InterconnectInterface(g_network_config_filename, n_shader, n_mem );
+ g_icnt_interface = InterconnectInterface::New(g_network_config_filename);
+ icnt_create = intersim2_create;
icnt_init = intersim2_init;
icnt_has_buffer = intersim2_has_buffer;
icnt_push = intersim2_push;
diff --git a/src/gpgpu-sim/icnt_wrapper.h b/src/gpgpu-sim/icnt_wrapper.h
index 2cbe0df..a4d123e 100644
--- a/src/gpgpu-sim/icnt_wrapper.h
+++ b/src/gpgpu-sim/icnt_wrapper.h
@@ -32,6 +32,7 @@
// functional interface to the interconnect
+typedef void (*icnt_create_p)(unsigned n_shader, unsigned n_mem);
typedef void (*icnt_init_p)( );
typedef bool (*icnt_has_buffer_p)(unsigned input, unsigned int size);
typedef void (*icnt_push_p)(unsigned input, unsigned output, void* data, unsigned int size);
@@ -44,7 +45,7 @@ typedef void (*icnt_display_overall_stats_p)( );
typedef void (*icnt_display_state_p)(FILE* fp);
typedef unsigned (*icnt_get_flit_size_p)();
-
+extern icnt_create_p icnt_create;
extern icnt_init_p icnt_init;
extern icnt_has_buffer_p icnt_has_buffer;
extern icnt_push_p icnt_push;
@@ -63,7 +64,7 @@ enum network_mode {
N_NETWORK_MODE
};
-void icnt_wrapper_init( unsigned int n_shader, unsigned int n_mem );
+void icnt_wrapper_init();
void icnt_reg_options( class OptionParser * opp );
#endif
diff --git a/src/intersim2/interconnect_interface.cpp b/src/intersim2/interconnect_interface.cpp
index 338e82e..eecf96e 100644
--- a/src/intersim2/interconnect_interface.cpp
+++ b/src/intersim2/interconnect_interface.cpp
@@ -43,15 +43,44 @@
#include "intersim_config.hpp"
#include "network.hpp"
-InterconnectInterface::InterconnectInterface(const char* const config_file, unsigned int n_shader, unsigned int n_mem)
-:_n_shader(n_shader), _n_mem(n_mem)
+InterconnectInterface* InterconnectInterface::New(const char* const config_file)
{
if (! config_file ) {
cout << "Interconnect Requires a configfile" << endl;
exit (-1);
}
- _icnt_config = new IntersimConfig();
- _icnt_config->ParseFile(config_file);
+ InterconnectInterface* icnt_interface = new InterconnectInterface();
+ icnt_interface->_icnt_config = new IntersimConfig();
+ icnt_interface->_icnt_config->ParseFile(config_file);
+
+ return icnt_interface;
+}
+
+InterconnectInterface::InterconnectInterface()
+{
+
+}
+
+InterconnectInterface::~InterconnectInterface()
+{
+ for (int i=0; i<_subnets; ++i) {
+ ///Power analysis
+ if(_icnt_config->GetInt("sim_power") > 0){
+ Power_Module pnet(_net[i], *_icnt_config);
+ pnet.run();
+ }
+ delete _net[i];
+ }
+
+ delete _traffic_manager;
+ _traffic_manager = NULL;
+ delete _icnt_config;
+}
+
+void InterconnectInterface::CreateInterconnect(unsigned n_shader, unsigned n_mem)
+{
+ _n_shader = n_shader;
+ _n_mem = n_mem;
InitializeRoutingMap(*_icnt_config);
@@ -103,23 +132,6 @@ InterconnectInterface::InterconnectInterface(const char* const config_file, uns
_CreateBuffer();
_CreateNodeMap(_n_shader, _n_mem, _traffic_manager->_nodes, _icnt_config->GetInt("use_map"));
-
-}
-
-InterconnectInterface::~InterconnectInterface()
-{
- for (int i=0; i<_subnets; ++i) {
- ///Power analysis
- if(_icnt_config->GetInt("sim_power") > 0){
- Power_Module pnet(_net[i], *_icnt_config);
- pnet.run();
- }
- delete _net[i];
- }
-
- delete _traffic_manager;
- _traffic_manager = NULL;
- delete _icnt_config;
}
void InterconnectInterface::Init()
@@ -145,13 +157,14 @@ void InterconnectInterface::Push(unsigned input_deviceID, unsigned output_device
if (_subnets == 1) {
subnet = 0;
} else {
- if (int(input_deviceID) < _n_shader ) {
+ if (input_deviceID < _n_shader ) {
subnet = 0;
} else {
subnet = 1;
}
}
+ //TODO: Remove mem_fetch to reduce dependency
Flit::FlitType packet_type;
mem_fetch* mf = static_cast<mem_fetch*>(data);
@@ -209,10 +222,10 @@ void InterconnectInterface::Advance()
bool InterconnectInterface::Busy() const
{
- bool busy = !_traffic_manager->_measured_in_flight_flits[0].empty();
+ bool busy = !_traffic_manager->_total_in_flight_flits[0].empty();
if (!busy) {
for (int s = 0; s < _subnets; ++s) {
- for (int n = 0; n < _n_shader+_n_mem; ++n) {
+ for (unsigned n = 0; n < _n_shader+_n_mem; ++n) {
//FIXME: if this cannot make sure _partial_packets is empty
assert(_traffic_manager->_input_queue[s][n][0].empty());
}
@@ -221,7 +234,7 @@ bool InterconnectInterface::Busy() const
else
return true;
for (int s = 0; s < _subnets; ++s) {
- for (int n=0; n < (_n_shader+_n_mem); ++n) {
+ for (unsigned n=0; n < (_n_shader+_n_mem); ++n) {
for (int vc=0; vc<_vcs; ++vc) {
if (_boundary_buffer[s][n][vc].HasPacket() ) {
return true;
@@ -240,7 +253,7 @@ bool InterconnectInterface::HasBuffer(unsigned deviceID, unsigned int size) cons
has_buffer = _traffic_manager->_input_queue[0][icntID][0].size() +n_flits <= _input_buffer_capacity;
- if ((_subnets>1) && int(deviceID) >= _n_shader) // deviceID is memory node
+ if ((_subnets>1) && deviceID >= _n_shader) // deviceID is memory node
has_buffer = _traffic_manager->_input_queue[1][icntID][0].size() +n_flits <= _input_buffer_capacity;
return has_buffer;
@@ -346,7 +359,7 @@ Flit* InterconnectInterface::GetEjectedFlit(int subnet, int node)
void InterconnectInterface::_CreateBuffer()
{
- int nodes = _n_shader + _n_mem;
+ unsigned nodes = _n_shader + _n_mem;
_boundary_buffer.resize(_subnets);
_ejection_buffer.resize(_subnets);
@@ -359,52 +372,52 @@ void InterconnectInterface::_CreateBuffer()
_round_robin_turn[subnet].resize(nodes);
_ejected_flit_queue[subnet].resize(nodes);
- for (int node=0;node<nodes;++node){
+ for (unsigned node=0;node < nodes;++node){
_ejection_buffer[subnet][node].resize(_vcs);
_boundary_buffer[subnet][node].resize(_vcs);
}
}
}
-void InterconnectInterface::_CreateNodeMap(int n_shader, int n_mem, int n_node, int use_map)
+void InterconnectInterface::_CreateNodeMap(unsigned n_shader, unsigned n_mem, unsigned n_node, int use_map)
{
if (use_map) {
- map<int, vector<int> > preset_memory_map;
+ map<unsigned, vector<unsigned> > preset_memory_map;
// good for 8 shaders and 8 memory cores
{
- int memory_node[] = {1, 3, 4, 6, 9, 11, 12, 14};
- preset_memory_map[16] = vector<int>(memory_node, memory_node+8);
+ unsigned memory_node[] = {1, 3, 4, 6, 9, 11, 12, 14};
+ preset_memory_map[16] = vector<unsigned>(memory_node, memory_node+8);
}
// good for 28 shaders and 8 memory cores
{
- int memory_node[] = {3, 7, 10, 12, 23, 25, 28, 32};
- preset_memory_map[36] = vector<int>(memory_node, memory_node+8);
+ unsigned memory_node[] = {3, 7, 10, 12, 23, 25, 28, 32};
+ preset_memory_map[36] = vector<unsigned>(memory_node, memory_node+8);
}
// good for 56 shaders and 8 memory cores
{
- int memory_node[] = {3, 15, 17, 29, 36, 47, 49, 61};
- preset_memory_map[64] = vector<int>(memory_node, memory_node+sizeof(memory_node)/sizeof(int));
+ unsigned memory_node[] = {3, 15, 17, 29, 36, 47, 49, 61};
+ preset_memory_map[64] = vector<unsigned>(memory_node, memory_node+sizeof(memory_node)/sizeof(unsigned));
}
// good for 110 shaders and 11 memory cores
{
- int memory_node[] = {12, 20, 25, 28, 57, 60, 63, 92, 95,100,108};
- preset_memory_map[121] = vector<int>(memory_node, memory_node+sizeof(memory_node)/sizeof(int));
+ unsigned memory_node[] = {12, 20, 25, 28, 57, 60, 63, 92, 95,100,108};
+ preset_memory_map[121] = vector<unsigned>(memory_node, memory_node+sizeof(memory_node)/sizeof(unsigned));
}
- const vector<int> &memory_node = preset_memory_map[n_node];
+ const vector<unsigned> &memory_node = preset_memory_map[n_node];
if (memory_node.empty()) {
cerr<<"ERROR!!! NO MAPPING IMPLEMENTED YET FOR THIS CONFIG"<<endl;
assert(0);
}
// create node map
- int next_node = 0;
- int memory_node_index = 0;
- for (int i = 0; i < n_shader; ++i) {
+ unsigned next_node = 0;
+ unsigned memory_node_index = 0;
+ for (unsigned i = 0; i < n_shader; ++i) {
while (next_node == memory_node[memory_node_index]) {
next_node += 1;
memory_node_index += 1;
@@ -412,17 +425,17 @@ void InterconnectInterface::_CreateNodeMap(int n_shader, int n_mem, int n_node,
_node_map[i] = next_node;
next_node += 1;
}
- for (int i = n_shader; i < n_shader+n_mem; ++i) {
+ for (unsigned i = n_shader; i < n_shader+n_mem; ++i) {
_node_map[i] = memory_node[i-n_shader];
}
} else { //not use preset map
- for (int i=0;i<n_node;i++) {
+ for (unsigned i=0;i<n_node;i++) {
_node_map[i]=i;
}
}
- for (int i = 0; i < n_node ; i++) {
- for (int j = 0; j< n_node ; j++) {
+ for (unsigned i = 0; i < n_node ; i++) {
+ for (unsigned j = 0; j< n_node ; j++) {
if ( _node_map[j] == i ) {
_reverse_node_map[i]=j;
break;
diff --git a/src/intersim2/interconnect_interface.hpp b/src/intersim2/interconnect_interface.hpp
index 6ce4418..e62f055 100644
--- a/src/intersim2/interconnect_interface.hpp
+++ b/src/intersim2/interconnect_interface.hpp
@@ -46,21 +46,23 @@ class Stats;
class InterconnectInterface {
public:
- InterconnectInterface(const char* const config_file, unsigned int n_shader, unsigned int n_mem);
+ InterconnectInterface();
virtual ~InterconnectInterface();
+ static InterconnectInterface* New(const char* const config_file);
+ virtual void CreateInterconnect(unsigned n_shader, unsigned n_mem);
//node side functions
- void Init();
- void Push(unsigned input_deviceID, unsigned output_deviceID, void* data, unsigned int size);
- void* Pop(unsigned ouput_deviceID);
- void Advance();
- bool Busy() const;
- bool HasBuffer(unsigned deviceID, unsigned int size) const;
- void DisplayStats() const;
- void DisplayOverallStats() const;
+ virtual void Init();
+ virtual void Push(unsigned input_deviceID, unsigned output_deviceID, void* data, unsigned int size);
+ virtual void* Pop(unsigned ouput_deviceID);
+ virtual void Advance();
+ virtual bool Busy() const;
+ virtual bool HasBuffer(unsigned deviceID, unsigned int size) const;
+ virtual void DisplayStats() const;
+ virtual void DisplayOverallStats() const;
unsigned GetFlitSize() const;
- void DisplayState(FILE* fp) const;
+ virtual void DisplayState(FILE* fp) const;
//booksim side functions
void WriteOutBuffer( int subnet, int output, Flit* flit );
@@ -72,8 +74,7 @@ public:
Flit* GetEjectedFlit(int subnet, int node);
-
-private:
+protected:
class _BoundaryBufferItem {
public:
@@ -92,7 +93,7 @@ private:
typedef queue<Flit*> _EjectionBufferItem;
void _CreateBuffer( );
- void _CreateNodeMap(int n_shader, int n_mem, int n_node, int use_map);
+ void _CreateNodeMap(unsigned n_shader, unsigned n_mem, unsigned n_node, int use_map);
void _DisplayMap(int dim,int count);
// size: [subnets][nodes][vcs]
@@ -109,9 +110,9 @@ private:
vector<vector<int> > _round_robin_turn; //keep track of _boundary_buffer last used in icnt_pop
GPUTrafficManager* _traffic_manager;
- unsigned int _flit_size;
+ unsigned _flit_size;
IntersimConfig* _icnt_config;
- const int _n_shader, _n_mem;
+ unsigned _n_shader, _n_mem;
vector<Network *> _net;
int _vcs;
int _subnets;
@@ -119,10 +120,10 @@ private:
//deviceID to icntID map
//deviceID : Starts from 0 for shaders and then continues until mem nodes
//which starts at location n_shader and then continues to n_shader+n_mem (last device)
- map<int, int> _node_map;
+ map<unsigned, unsigned> _node_map;
//icntID to deviceID map
- map<int, int> _reverse_node_map;
+ map<unsigned, unsigned> _reverse_node_map;
};
generated by cgit v1.3 (git 2.53.0) at 2026-07-10 23:35:14 +0000