summaryrefslogtreecommitdiff
path: root/src/intersim2
diff options
context:
space:
mode:
Diffstat (limited to 'src/intersim2')
-rw-r--r--src/intersim2/CMakeLists.txt106
-rw-r--r--src/intersim2/Makefile2
-rw-r--r--src/intersim2/config_utils.cpp10
-rw-r--r--src/intersim2/config_utils.hpp2
-rw-r--r--src/intersim2/interconnect_interface.cpp2
5 files changed, 114 insertions, 8 deletions
diff --git a/src/intersim2/CMakeLists.txt b/src/intersim2/CMakeLists.txt
new file mode 100644
index 0000000..c3da1b1
--- /dev/null
+++ b/src/intersim2/CMakeLists.txt
@@ -0,0 +1,106 @@
+option(GPGPUSIM_INTERSIM_STANDALONE "Whether to also build intersim in standalone mode" OFF)
+
+# Specify Flex and Bison target
+BISON_TARGET(intersim_config_parser config.y ${CMAKE_CURRENT_BINARY_DIR}/y.tab.c
+ COMPILE_FLAGS "-y -d --file-prefix=${CMAKE_CURRENT_BINARY_DIR}/y")
+FLEX_TARGET(intersim_config_lexer config.l ${CMAKE_CURRENT_BINARY_DIR}/lex.yy.c)
+ADD_FLEX_BISON_DEPENDENCY(intersim_config_lexer intersim_config_parser)
+
+# Set generated source files to CXX
+set_source_files_properties(${BISON_intersim_config_parser_OUTPUT_SOURCE}
+ ${FLEX_intersim_config_lexer_OUTPUTS}
+ PROPERTIES LANGUAGE CXX)
+
+# Create booksim or libintersim.a
+# Shared include path
+list(APPEND intersim_INC ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/allocators
+ ${CMAKE_CURRENT_SOURCE_DIR}/arbiters
+ ${CMAKE_CURRENT_SOURCE_DIR}/networks
+ ${CMAKE_CURRENT_SOURCE_DIR}/power
+ ${CMAKE_CURRENT_SOURCE_DIR}/routers
+ ${PROJECT_SOURCE_DIR}/src)
+
+# Shared source files
+list(APPEND intersim_SRC
+ ${BISON_intersim_config_parser_OUTPUT_SOURCE}
+ ${FLEX_intersim_config_lexer_OUTPUTS}
+ allocators/allocator.cpp
+ allocators/islip.cpp
+ allocators/loa.cpp
+ allocators/maxsize.cpp
+ allocators/pim.cpp
+ allocators/selalloc.cpp
+ allocators/separable.cpp
+ allocators/separable_input_first.cpp
+ allocators/separable_output_first.cpp
+ allocators/wavefront.cpp
+ arbiters/arbiter.cpp
+ arbiters/matrix_arb.cpp
+ arbiters/prio_arb.cpp
+ arbiters/roundrobin_arb.cpp
+ arbiters/tree_arb.cpp
+ batchtrafficmanager.cpp
+ booksim_config.cpp
+ buffer.cpp
+ buffer_state.cpp
+ config_utils.cpp
+ credit.cpp
+ flitchannel.cpp
+ flit.cpp
+ gputrafficmanager.cpp
+ injection.cpp
+ interconnect_interface.cpp
+ intersim_config.cpp
+ main.cpp
+ misc_utils.cpp
+ module.cpp
+ networks/anynet.cpp
+ networks/cmesh.cpp
+ networks/dragonfly.cpp
+ networks/fattree.cpp
+ networks/flatfly_onchip.cpp
+ networks/fly.cpp
+ networks/kncube.cpp
+ networks/network.cpp
+ networks/qtree.cpp
+ networks/tree4.cpp
+ outputset.cpp
+ packet_reply_info.cpp
+ power/buffer_monitor.cpp
+ power/power_module.cpp
+ power/switch_monitor.cpp
+ rng_double_wrapper.cpp
+ rng_wrapper.cpp
+ routefunc.cpp
+ routers/chaos_router.cpp
+ routers/event_router.cpp
+ routers/iq_router.cpp
+ routers/router.cpp
+ stats.cpp
+ traffic.cpp
+ trafficmanager.cpp
+ vc.cpp)
+
+# If standalone, also build for it
+if(GPGPUSIM_INTERSIM_STANDALONE)
+ list(REMOVE_ITEM ${intersim_SRC} interconnect_interface.cpp)
+ add_executable(booksim ${intersim_SRC})
+ target_include_directories(booksim PUBLIC
+ ${intersim_INC})
+ target_include_directories(booksim PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+ target_include_directories(booksim PUBLIC ${CUDAToolkit_INCLUDE_DIRS})
+ # Remove globally set TRACING_ON flag
+ target_compile_options(booksim PRIVATE -UTRACING_ON)
+endif()
+
+# Specify sources for libintersim.a
+add_library(intersim STATIC ${intersim_SRC})
+target_include_directories(intersim PUBLIC
+ ${intersim_INC}
+ ${PROJECT_SOURCE_DIR}/src/gpgpu-sim)
+target_include_directories(intersim PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(intersim PUBLIC ${CUDAToolkit_INCLUDE_DIRS})
+target_compile_definitions(intersim PRIVATE CREATE_LIBRARY)
+# Remove globally set TRACING_ON flag
+target_compile_options(intersim PRIVATE -UTRACING_ON)
diff --git a/src/intersim2/Makefile b/src/intersim2/Makefile
index dad436a..a7485e2 100644
--- a/src/intersim2/Makefile
+++ b/src/intersim2/Makefile
@@ -28,7 +28,7 @@
# Makefile
#
CXX = g++
-CC = gcc
+CC = g++
CREATE_LIBRARY ?= 0
INTERFACE = interconnect_interface.cpp
DEBUG ?= 0
diff --git a/src/intersim2/config_utils.cpp b/src/intersim2/config_utils.cpp
index fad5fce..a896a93 100644
--- a/src/intersim2/config_utils.cpp
+++ b/src/intersim2/config_utils.cpp
@@ -199,27 +199,27 @@ Configuration * Configuration::GetTheConfig()
//============================================================
-extern "C" void config_error( char const * msg, int lineno )
+void config_error( char * msg, int lineno )
{
Configuration::GetTheConfig( )->ParseError( msg, lineno );
}
-extern "C" void config_assign_string( char const * field, char const * value )
+ void config_assign_string( char const * field, char const * value )
{
Configuration::GetTheConfig()->Assign(field, value);
}
-extern "C" void config_assign_int( char const * field, int value )
+void config_assign_int( char const * field, int value )
{
Configuration::GetTheConfig()->Assign(field, value);
}
-extern "C" void config_assign_float( char const * field, double value )
+void config_assign_float( char const * field, double value )
{
Configuration::GetTheConfig()->Assign(field, value);
}
-extern "C" int config_input(char * line, int max_size)
+int config_input(char * line, int max_size)
{
return Configuration::GetTheConfig()->Input(line, max_size);
}
diff --git a/src/intersim2/config_utils.hpp b/src/intersim2/config_utils.hpp
index de3343b..1d960b6 100644
--- a/src/intersim2/config_utils.hpp
+++ b/src/intersim2/config_utils.hpp
@@ -35,7 +35,7 @@
#include<map>
#include<vector>
-extern "C" int yyparse();
+int yyparse();
class Configuration {
static Configuration * theConfig;
diff --git a/src/intersim2/interconnect_interface.cpp b/src/intersim2/interconnect_interface.cpp
index 1e1a2d7..438852e 100644
--- a/src/intersim2/interconnect_interface.cpp
+++ b/src/intersim2/interconnect_interface.cpp
@@ -200,7 +200,7 @@ void InterconnectInterface::Push(unsigned input_deviceID, unsigned output_device
void* InterconnectInterface::Pop(unsigned deviceID)
{
int icntID = _node_map[deviceID];
-#if DEBUG
+#if 0
cout<<"Call interconnect POP " << output<<endl;
#endif
generated by cgit v1.3 (git 2.53.0) at 2026-07-10 23:25:50 +0000