Skip to content

Commit a412c40

Browse files
author
Ayush Jain
committed
Cmake COmpile process added along
1 parent 30adee3 commit a412c40

File tree

8 files changed

+32
-137
lines changed

8 files changed

+32
-137
lines changed

CMakeLists.txt

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,12 @@ set(RPCC ${CMAKE_CURRENT_LIST_DIR}/bin/rpcgen)
1313

1414
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLOG_LEVEL_AS_DEBUG -DRPC_STATISTICS")
1515

16-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLOG_LEVEL_AS_DEBUG -DRPC_STATISTICS")
16+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLOG_LEVEL_AS_DEBUG -DRPC_STATISTICS -march=native -flto")
17+
1718

1819
find_package(PkgConfig REQUIRED)
20+
find_package(Boost REQUIRED COMPONENTS context)
1921

20-
if (PKG_CONFIG_FOUND)
21-
pkg_check_modules(DPDK "libdpdk")
22-
endif()
23-
pkg_check_modules(DPDK "libdpdk")
24-
if (DPDK_FOUND)
25-
add_definitions(${DPDK_STATIC_CFLAGS})
26-
set(DPDK_LIBS ${DPDK_STATIC_LDFLAGS})
27-
include_directories(${DPDK_INCLUDE_DIR})
28-
link_libraries(${DPDK_LIBS})
29-
add_definitions(-DDPDK)
30-
endif(DPDK_FOUND)
31-
add_definitions(-DLOG_LEVEL_AS_DEBUG -DRPC_STATISTICS)
3222

3323
include_directories( GLOB src src/base src/misc src/rpc src/rpc/dpdk_transport src/coroutine src/utils )
3424

@@ -45,6 +35,24 @@ set(SOURCES
4535

4636

4737
add_library(rpc
48-
${SOURCES})
38+
${SOURCES} )
39+
40+
41+
target_link_libraries(rpc PRIVATE ${Boost_LIBRARIES})
42+
target_include_directories(rpc PUBLIC ${Boost_INCLUDE_DIRS})
43+
44+
if (PKG_CONFIG_FOUND)
45+
pkg_check_modules(DPDK "libdpdk")
46+
endif()
47+
pkg_check_modules(DPDK "libdpdk")
48+
if (DPDK_FOUND)
49+
add_definitions(${DPDK_STATIC_CFLAGS})
50+
set(DPDK_LIBS ${DPDK_STATIC_LDFLAGS})
51+
include_directories(${DPDK_INCLUDE_DIR})
52+
target_link_libraries(rpc PRIVATE ${DPDK_LIBS})
53+
add_definitions(-DDPDK)
54+
endif(DPDK_FOUND)
55+
add_definitions(-DLOG_LEVEL_AS_DEBUG -DRPC_STATISTICS)
56+
4957

5058
add_subdirectory(apps/rpc_test)

apps/rpc_test/CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,16 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLOG_LEVEL_AS_DEBUG -DRPC_S
1818
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLOG_LEVEL_AS_DEBUG -DRPC_STATISTICS")
1919

2020

21+
add_definitions(-DLOG_LEVEL_AS_DEBUG -DRPC_STATISTICS)
22+
2123
if (PKG_CONFIG_FOUND)
2224
pkg_check_modules(DPDK "libdpdk")
2325
endif()
2426
pkg_check_modules(DPDK "libdpdk")
2527
if (DPDK_FOUND)
26-
add_definitions(${DPDK_STATIC_CFLAGS})
27-
set(DPDK_LIBS ${DPDK_STATIC_LDFLAGS})
2828
include_directories(${DPDK_INCLUDE_DIR})
29-
link_libraries(${DPDK_LIBS})
3029
add_definitions(-DDPDK)
3130
endif(DPDK_FOUND)
32-
add_definitions(-DLOG_LEVEL_AS_DEBUG -DRPC_STATISTICS)
3331

3432

3533
file(GLOB SRC "./src/benchmarks.cpp")
@@ -65,5 +63,5 @@ target_link_libraries(server PRIVATE rpc yaml-cpp pthread )
6563
target_link_libraries(client PRIVATE rpc yaml-cpp pthread )
6664

6765

68-
# target_link_directories(server PRIVATE ../../build)
69-
# target_link_directories(client PRIVATE ../../build)
66+
#target_link_directories(server PRIVATE ../../build)
67+
#target_link_directories(client PRIVATE ../../build)

apps/rpc_test/Makefile

Lines changed: 0 additions & 110 deletions
This file was deleted.

apps/rpc_test/config_files/dpdk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dpdk:
44
# it is recommended to be between 1 and 2
55
num_threads: 1
66
pkt_burst_size: 32
7-
option: ./server -a e3:00.0 -d librte_net_mlx5.so -d librte_mempool_ring.so -l 32-64
7+
option: ./server -a e3:00.0 -l 32-64
88
# option: ./client -a 0000:01:00.0,dv_flow_en=0,rxq_cqe_comp_en=0

apps/rpc_test/run_c.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/rpc_test/run_s.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

scripts/run_c.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sudo ../build/apps/rpc_test/client -f ../apps/rpc_test/config_files/cpu.yml -f ../apps/rpc_test/config_files/dpdk.yml -f ../apps/rpc_test/config_files/host_catskill.yml -f ../apps/rpc_test/config_files/network_catskill.yml -f ../apps/rpc_test/config_files/benchmarks.yml

scripts/run_s.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
sudo ../build/apps/rpc_test/server -f ../apps/rpc_test/config_files/cpu.yml -f ../apps/rpc_test/config_files/dpdk.yml -f ../apps/rpc_test/config_files/host_brooklyn.yml -f ../apps/rpc_test/config_files/network_brooklyn.yml -f ../apps/rpc_test/config_files/benchmarks.yml
2+
3+
4+
#perf record .--event=ref-cycles,cpu/cache-misses/ --call-graph fp -b -C 0-10 --delay=10000 -T -d -j any_call /run_s.sh

0 commit comments

Comments
 (0)